[java-identity-provider COMMIT] in /trunk: idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/reso...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Sep  3 12:17:23 2013
New Revision: 4744

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4744&view=rev
Log:
IDP-205 clean up Attribute resolution logging based on my experience of debugging a V2 configuration.  In most cases resolvers become less wordy (debug->trace) in others  more (trace->debug).  Some extra logging has been added and the legacy context gets a better #toString() method.

Modified:
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolver.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseAttributeDefinition.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseDataConnector.java
    trunk/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/V2SAMLProfileRequestContext.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/AbstractSearchDataConnector.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/StaticDataConnector.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/TemplatedExecutableSearchFilterBuilder.java

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolver.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolver.java?rev=4744&r1=4743&r2=4744&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolver.java (original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolver.java Tue Sep  3 12:17:23 2013
@@ -269,10 +269,10 @@
         Constraint.isNotNull(attributeId, "Attribute ID can not be null");
         Constraint.isNotNull(resolutionContext, "Attribute resolution context can not be null");
 
-        log.debug("{} beginning to resolve attribute definition {}", logPrefix, attributeId);
+        log.trace("{} beginning to resolve attribute definition {}", logPrefix, attributeId);
 
         if (resolutionContext.getResolvedAttributeDefinitions().containsKey(attributeId)) {
-            log.debug("{} attribute definition {} was already resolved, nothing to do", logPrefix, attributeId);
+            log.trace("{} attribute definition {} was already resolved, nothing to do", logPrefix, attributeId);
             return;
         }
 
@@ -284,7 +284,7 @@
 
         resolveDependencies(definition, resolutionContext);
 
-        log.debug("{} resolving attribute definition {}", logPrefix, attributeId);
+        log.trace("{} resolving attribute definition {}", logPrefix, attributeId);
         final Attribute resolvedAttribute = definition.resolve(resolutionContext);
 
         if (null == resolvedAttribute) {
@@ -312,9 +312,8 @@
         Constraint.isNotNull(connectorId, "Data connector ID can not be null");
         Constraint.isNotNull(resolutionContext, "Attribute resolution context can not be null");
 
-        log.debug("{} beginning to resolve data connector {}", logPrefix, connectorId);
         if (resolutionContext.getResolvedDataConnectors().containsKey(connectorId)) {
-            log.debug("{} data connector {} was already resolved, nothing to do", logPrefix, connectorId);
+            log.trace("{} data connector {} was already resolved, nothing to do", logPrefix, connectorId);
             return;
         }
 

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseAttributeDefinition.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseAttributeDefinition.java?rev=4744&r1=4743&r2=4744&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseAttributeDefinition.java (original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseAttributeDefinition.java Tue Sep  3 12:17:23 2013
@@ -264,15 +264,15 @@
                     resolvedAttribute.getValues());
         }
 
-        log.debug("{} associating the following display descriptions"
+        log.trace("{} associating the following display descriptions"
                 + " with the resolved attribute: {}", getLogPrefix(), getDisplayDescriptions());
         resolvedAttribute.setDisplayDescriptions(getDisplayDescriptions());
 
-        log.debug("{} associating the following display names with the resolved attribute: {}",
+        log.trace("{} associating the following display names with the resolved attribute: {}",
                 getLogPrefix(), getDisplayNames());

[... 115 lines stripped ...]