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

[noreply at shibboleth.net]

Author: rdw
Date: Sat Nov  8 06:10:39 2014
New Revision: 6864

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

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

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java?rev=6864&r1=6863&r2=6864&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java Sat Nov  8 06:10:39 2014
@@ -112,8 +112,8 @@
             for (AttributeDefinition definition : definitions) {
                 if (definition != null) {
                     if (checkedDefinitions.containsKey(definition.getId())) {
-                        throw new IllegalArgumentException(logPrefix + " Duplicate Attribute Definition with id "
-                                + definition.getId());
+                        throw new IllegalArgumentException(logPrefix + " Duplicate Attribute Definition with id '"
+                                + definition.getId()+"'");
                     }
                     checkedDefinitions.put(definition.getId(), definition);
                 }
@@ -129,8 +129,8 @@
             for (DataConnector connector : connectors) {
                 if (connector != null) {
                     if (checkedConnectors.containsKey(connector.getId())) {
-                        throw new IllegalArgumentException(logPrefix + " Duplicate Data Connector Definition with id "
-                                + connector.getId());
+                        throw new IllegalArgumentException(logPrefix + " Duplicate Data Connector Definition with id '"
+                                + connector.getId()+"'");
                     }
                     checkedConnectors.put(connector.getId(), connector);
                 }
@@ -248,16 +248,16 @@
         final AttributeResolverWorkContext workContext =
                 resolutionContext.getSubcontext(AttributeResolverWorkContext.class, false);
 
-        log.trace("{} Beginning to resolve attribute definition {}", logPrefix, attributeId);
+        log.trace("{} Beginning to resolve attribute definition '{}'", logPrefix, attributeId);
 
         if (workContext.getResolvedIdPAttributeDefinitions().containsKey(attributeId)) {
-            log.trace("{} Attribute definition {} was already resolved, nothing to do", logPrefix, attributeId);
+            log.trace("{} Attribute definition '{}' was already resolved, nothing to do", logPrefix, attributeId);
             return;
         }
 
         final AttributeDefinition definition = attributeDefinitions.get(attributeId);
         if (definition == null) {
-            log.debug("{} No attribute definition was registered with ID {}, nothing to do", logPrefix, attributeId);
+            log.debug("{} No attribute definition was registered with ID '{}', nothing to do", logPrefix, attributeId);
             return;
         }
 
@@ -267,9 +267,9 @@
         final IdPAttribute resolvedAttribute = definition.resolve(resolutionContext);
 
         if (null == resolvedAttribute) {
-            log.warn("{} Attribute definition {} produced no attribute", logPrefix, attributeId);
+            log.warn("{} Attribute definition '{}' produced no attribute", logPrefix, attributeId);
         } else {
-            log.debug("{} Attribute definition {} produced an attribute with {} values", new Object[] {logPrefix,
+            log.debug("{} Attribute definition '{}' produced an attribute with {} values", new Object[] {logPrefix,
                     attributeId, resolvedAttribute.getValues().size(),});
         }
 
@@ -294,13 +294,13 @@
                 resolutionContext.getSubcontext(AttributeResolverWorkContext.class, false);
 
         if (workContext.getResolvedDataConnectors().containsKey(connectorId)) {
-            log.trace("{} Data connector {} was already resolved, nothing to do", logPrefix, connectorId);
+            log.trace("{} Data connector '{}' was already resolved, nothing to do", logPrefix, connectorId);
             return;
         }
 
         final DataConnector connector = dataConnectors.get(connectorId);
         if (connector == null) {
-            log.debug("{} No data connector was registered with ID {}, nothing to do", logPrefix, connectorId);
+            log.debug("{} No data connector was registered with ID '{}', nothing to do", logPrefix, connectorId);
             return;
         }
 
@@ -312,9 +312,9 @@
         } catch (ResolutionException e) {
             final String failoverDataConnectorId = connector.getFailoverDataConnectorId();

[... 126 lines stripped ...]