[java-opensaml COMMIT] in /trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl: AbstractB...

[noreply at shibboleth.net]

Author: putmanb
Date: Tue Nov  8 20:04:07 2016
New Revision: 4577

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4577&view=rev
Log:
OSJ-186: Suggestions for metadata resolver improvements

Add output of getLogPrefix() to all logging statements in all metadata resolver classes.

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractBatchMetadataResolver.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolver.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractReloadingMetadataResolver.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/DOMMetadataResolver.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolver.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/FilesystemMetadataResolver.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/FunctionDrivenDynamicHTTPMetadataResolver.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/LocalDynamicMetadataResolver.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/ResourceBackedMetadataResolver.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractBatchMetadataResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractBatchMetadataResolver.java?rev=4577&r1=4576&r2=4577&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractBatchMetadataResolver.java	(original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractBatchMetadataResolver.java	Tue Nov  8 20:04:07 2016
@@ -158,8 +158,8 @@
         if (entityIdCriterion != null) {
             final Iterable<EntityDescriptor> entityIdcandidates = lookupEntityID(entityIdCriterion.getEntityId());
             if (log.isDebugEnabled()) {
-                log.debug("Resolved {} candidates via EntityIdCriterion: {}", 
-                        Iterables.size(entityIdcandidates), entityIdCriterion);
+                log.debug("{} Resolved {} candidates via EntityIdCriterion: {}", 
+                        getLogPrefix(), Iterables.size(entityIdcandidates), entityIdCriterion);
             }
             return predicateFilterCandidates(entityIdcandidates, criteria, false);
         }
@@ -167,20 +167,22 @@
         final Optional<Set<EntityDescriptor>> indexedCandidates = lookupByIndexes(criteria);
         if (log.isDebugEnabled()) {
             if (indexedCandidates.isPresent()) {
-                log.debug("Resolved {} candidates via secondary index lookup", Iterables.size(indexedCandidates.get()));
+                log.debug("{} Resolved {} candidates via secondary index lookup", 
+                        getLogPrefix(), Iterables.size(indexedCandidates.get()));
             } else {
-                log.debug("Resolved no candidates via secondary index lookup (Optional indicated result was absent)");
+                log.debug("{} Resolved no candidates via secondary index lookup (Optional indicated result was absent)", 
+                        getLogPrefix());
             }
         }
         
         if (indexedCandidates.isPresent()) {
-            log.debug("Performing predicate filtering of resolved secondary indexed candidates");
+            log.debug("{} Performing predicate filtering of resolved secondary indexed candidates", getLogPrefix());
             return predicateFilterCandidates(indexedCandidates.get(), criteria, false);
         } else if (isResolveViaPredicatesOnly()) {
-            log.debug("Performing predicate filtering of entire metadata collection");
+            log.debug("{} Performing predicate filtering of entire metadata collection", getLogPrefix());
             return predicateFilterCandidates(this, criteria, true);
         } else {
-            log.debug("Resolved no secondary indexed candidates, returning empty result");
+            log.debug("{} Resolved no secondary indexed candidates, returning empty result", getLogPrefix());
             return Collections.emptySet();
         }
         
@@ -280,7 +282,8 @@
         } 
         
         if (filteredMetadata == null) {
-            log.info("Metadata filtering process produced a null document, resulting in an empty data set");

[... 1011 lines stripped ...]