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

[noreply at shibboleth.net]

Author: scantor
Date: Sat Jan 31 16:44:57 2015
New Revision: 7297

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7297&view=rev
Log:
Logging cleanup.

Modified:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/AbstractSearchDataConnector.java

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/AbstractSearchDataConnector.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/AbstractSearchDataConnector.java?rev=7297&r1=7296&r2=7297&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/AbstractSearchDataConnector.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/AbstractSearchDataConnector.java Sat Jan 31 16:44:57 2015
@@ -174,11 +174,11 @@
         if (resultsCache != null) {
             final String cacheKey = executable.getResultCacheKey();
             resolvedAttributes = resultsCache.getIfPresent(cacheKey);
-            log.trace("Data connector '{}': cache found resolved attributes {} using cache {}", new Object[] {getId(),
+            log.trace("{} Cache found, resolved attributes {} using cache {}", new Object[] {getLogPrefix(),
                     resolvedAttributes, resultsCache,});
             if (resolvedAttributes == null) {
                 resolvedAttributes = retrieveAttributes(executable);
-                log.trace("Data connector '{}': resolved attributes {}", getId(), resolvedAttributes);
+                log.trace("{} Resolved attributes {}", getLogPrefix(), resolvedAttributes);
                 resultsCache.put(cacheKey, resolvedAttributes);
             }
         } else {
@@ -194,15 +194,14 @@
         super.doInitialize();
 
         if (searchBuilder == null) {
-            throw new ComponentInitializationException("Data connector '" + getId()
-                    + "': no executable search builder was configured");
+            throw new ComponentInitializationException(getLogPrefix() + " No executable search builder was configured");
         }
         if (connectorValidator == null) {
-            throw new ComponentInitializationException("Data connector '" + getId() + "': no validator was configured");
+            throw new ComponentInitializationException(getLogPrefix() + " No validator was configured");
         }
         if (mappingStrategy == null) {
-            throw new ComponentInitializationException("Data connector '" + getId()
-                    + "': no mapping strategy was configured");
-        }
-    }
+            throw new ComponentInitializationException(getLogPrefix() + " No mapping strategy was configured");
+        }
+    }
+    
 }