[java-identity-provider COMMIT] /trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/im...

[noreply at shibboleth.net]

Author: rdw
Date: Fri Aug  2 06:29:28 2013
New Revision: 4648

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4648&view=rev
Log:
IDP-264 Clean up logging to help understandign of code and of logs

Modified:
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/policyrule/saml/AttributeInMetadataPolicyRule.java

Modified: trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/policyrule/saml/AttributeInMetadataPolicyRule.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/policyrule/saml/AttributeInMetadataPolicyRule.java?rev=4648&r1=4647&r2=4648&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/policyrule/saml/AttributeInMetadataPolicyRule.java (original)
+++ trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/policyrule/saml/AttributeInMetadataPolicyRule.java Fri Aug  2 06:29:28 2013
@@ -64,11 +64,13 @@
         final Multimap<String, RequestedAttribute> requestedAttributes = filterContext.getRequestedAttributes();
 
         if (null == requestedAttributes || requestedAttributes.isEmpty()) {
-            log.debug("{} The peer's metadata did not have appropriate requested attributes available",
-                    getLogPrefix());
             if (matchIfMetadataSilent) {
+                log.debug("{} The peer's metadata did not have appropriate requested attributes available"
+                        + ", returning all the input values", getLogPrefix());
                 return Collections.unmodifiableSet(attribute.getValues());
             } else {
+                log.debug("{} The peer's metadata did not have appropriate requested attributes available"
+                        + ", returning no values", getLogPrefix());
                 return Collections.EMPTY_SET;
             }
         }
@@ -76,15 +78,14 @@
         final Collection<RequestedAttribute> requestedAttributeList = requestedAttributes.get(attribute.getId());
 
         if (null == requestedAttributeList) {
-            log.debug("{} Attribute {} not found in metadata", getLogPrefix(),
-                    attribute.getId());
+            log.debug("{} Attribute {} not found in metadata", getLogPrefix(), attribute.getId());
             return Collections.EMPTY_SET;
         }
-        
+
         final Set<AttributeValue> values = new HashSet<AttributeValue>();
-        
-        for (RequestedAttribute requestedAttribute: requestedAttributeList) {
-            
+
+        for (RequestedAttribute requestedAttribute : requestedAttributeList) {
+
             if (null == requestedAttribute) {
                 log.info("{} Attribute {} found in metadata but with no values that could be decoded");
                 continue;
@@ -94,7 +95,7 @@
                 log.debug("{} Attribute {} found in metadata, but was not required", getLogPrefix(), attribute.getId());
                 continue;
             }
-            
+
             values.addAll(filterValues(attribute, requestedAttribute.getValues()));
         }
         return values;