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

[noreply at shibboleth.net]

Author: rdw
Date: Mon May  6 12:38:02 2013
New Revision: 4467

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4467&view=rev
Log:
IDP-203 add logPrefix paradigm to the attribute resolver.  Change prefix for Data Connector

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/BaseDataConnector.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=4467&r1=4466&r2=4467&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 Mon May  6 12:38:02 2013
@@ -65,6 +65,9 @@
     /** Data connectors defined for this resolver. */
     private final Map<String, BaseDataConnector> dataConnectors;
 
+    /** cache for the log prefix - to save multiple recalculations. */
+    private String logPrefix;
+
     /**
      * Constructor.
      * 
@@ -76,6 +79,8 @@
             @Nullable @NullableElements Collection<BaseAttributeDefinition> definitions,
             @Nullable @NullableElements Collection<BaseDataConnector> connectors) {
         setId(resolverId);
+
+        logPrefix = new StringBuilder("Attribute Resolver '").append(getId()).append("':").toString();
 
         HashMap<String, BaseAttributeDefinition> checkedDefinitions = new HashMap<String, BaseAttributeDefinition>();
         if (definitions != null) {
@@ -129,7 +134,7 @@
 
         final LazyList<String> invalidDataConnectors = new LazyList<String>();
         for (BaseDataConnector plugin : dataConnectors.values()) {
-            log.debug("Attribute resolver {}: checking if data connector {} is valid", getId(), plugin.getId());
+            log.debug("{} checking if data connector {} is valid", logPrefix, plugin.getId());
             if (!validateDataConnector(plugin, invalidDataConnectors)) {
                 invalidDataConnectors.add(plugin.getId());
             }
@@ -137,20 +142,18 @@
 
         final LazyList<String> invalidAttributeDefinitions = new LazyList<String>();
         for (BaseAttributeDefinition plugin : attributeDefinitions.values()) {
-            log.debug("Attribute resolver {}: checking if attribute definition {} is valid", getId(), plugin.getId());
+            log.debug("{} checking if attribute definition {} is valid", logPrefix, plugin.getId());
             try {
                 plugin.validate();
-                log.debug("Attribute resolver {}: attribute definition {} is valid", getId(), plugin.getId());
+                log.debug("{} attribute definition {} is valid", logPrefix, plugin.getId());
             } catch (ComponentValidationException e) {
-                log.warn("Attribute resolver {}: attribute definition {} is not valid", new Object[] {this.getId(),
-                        plugin.getId(), e,});
+                log.warn("{} attribute definition {} is not valid", new Object[] {logPrefix, plugin.getId(), e,});
                 invalidAttributeDefinitions.add(plugin.getId());
             }
         }
 
         if (!invalidDataConnectors.isEmpty() || !invalidAttributeDefinitions.isEmpty()) {
-            throw new ComponentValidationException("Attribute resolver " + getId()
-                    + ": the following attribute definitions were invalid ["
+            throw new ComponentValidationException(logPrefix + " the following attribute definitions were invalid ["
                     + StringSupport.listToStringValue(invalidAttributeDefinitions, ", ")
                     + "] and the following data connectors were invalid ["
                     + StringSupport.listToStringValue(invalidDataConnectors, ", ") + "]");
@@ -175,26 +178,25 @@
 
         Constraint.isNotNull(resolutionContext, "Attribute resolution context can not be null");
 
-        log.debug("Attribute Resolver {}: initiating attribute resolution", getId());
+        log.debug("{} initiating attribute resolution", logPrefix);
 
         if (attributeDefinitions.size() == 0) {
-            log.debug("Attribute Resolver {}: no attribute definition available, no attributes were resolved", getId());
+            log.debug("{} no attribute definition available, no attributes were resolved", logPrefix);
             return;
         }
 
         final Collection<String> attributeIds = getToBeResolvedAttributes(resolutionContext);
-        log.debug("Attribute Resolver {}: attempting to resolve the following attribute definitions {}", getId(),
-                attributeIds);
+        log.debug("{} attempting to resolve the following attribute definitions {}", logPrefix, attributeIds);
 

[... 269 lines stripped ...]