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

[noreply at shibboleth.net]

Author: rdw
Date: Mon Aug 29 17:27:42 2011
New Revision: 4039

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4039&view=rev
Log:
Typo in log message, fix checkstyle warnings (mostly long lines)

Modified:
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolver.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=4039&r1=4038&r2=4039&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 Aug 29 17:27:42 2011
@@ -292,9 +292,8 @@
             resolvedAttribute = definition.resolve(resolutionContext);
         } catch (AttributeResolutionException e) {
             if (definition.isPropagateResolutionExceptions()) {
-                log.debug(
-                        "Attribute Resolver {}: attribute definition {} produced the following error but was configured not to propogate it.",
-                        new Object[] {getId(), attributeId, e,});
+                log.debug("Attribute Resolver {}: attribute definition {} produced the following"
+                        + " error but was configured not to propogate it.", new Object[] {getId(), attributeId, e,});
             } else {
                 throw e;
             }
@@ -348,9 +347,9 @@
                 resolveDataConnector(failoverDataConnectorId, resolutionContext);
             } else {
                 if (connector.isPropagateResolutionExceptions()) {
-                    log.debug(
-                            "Attribute Resolver {}: data connector {} produced the following error but was configured not to propogate it.",
-                            new Object[] {getId(), connectorId, e});
+                    log.debug("Attribute Resolver {}: data connector {} produced the"
+                            + " following error but was configured not to propogate it.", new Object[] {getId(),
+                            connectorId, e,});
                 } else {
                     throw e;
                 }
@@ -422,9 +421,8 @@
 
             // remove dependency-only attributes
             if (definition.isDependencyOnly()) {
-                log.debug(
-                        "Attribute Resolver {}: removing result of attribute definition {}, it's marked as depdency only",
-                        getId(), definition.getId());
+                log.debug("Attribute Resolver {}: removing result of attribute definition {},"
+                        + " it's marked as depdency only", getId(), definition.getId());
                 continue;
             }
 
@@ -433,9 +431,8 @@
 
             // remove value-less attributes
             if (resolvedAttribute.getValues().size() == 0) {
-                log.debug(
-                        "Attribute Resolver {}: removing result of attribute definition {}, it's attribute contains no values",
-                        getId(), definition.getId());
+                log.debug("Attribute Resolver {}: removing result of attribute definition {},"
+                        + " it's attribute contains no values", getId(), definition.getId());
                 continue;
             }
 
@@ -482,14 +479,14 @@
         } catch (ComponentValidationException e) {
             if (connector.getFailoverDataConnectorId() != null) {
                 if (invalidDataConnectors.contains(connector.getFailoverDataConnectorId())) {
-                    log.warn(
-                            "Attribute resolver {}: data connector {} is not valid for the following reason and failover data connector {} has already been found to be inavlid",
-                            new Object[] {getId(), connector.getId(), connector.getFailoverDataConnectorId(), e,});
+                    log.warn("Attribute resolver {}: data connector {} is not valid for the following reason"
+                            + " and failover data connector {} has already been found to be inavlid", new Object[] {
+                            getId(), connector.getId(), connector.getFailoverDataConnectorId(), e,});
                     invalidDataConnectors.add(connector.getId());
                     return false;
                 } else {
-                    log.warn(
-                            "Attribute resolver {}: data connector {} is not valid for the following reason, checking if failover data connector {} is valid",
+                    log.warn("Attribute resolver {}: data connector {} is not valid for the following reason,"
+                            + " checking if failover data connector {} is valid",

[... 13 lines stripped ...]