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

[noreply at shibboleth.net]

Author: rdw
Date: Sat Oct 18 10:41:43 2014
New Revision: 6741

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6741&view=rev
Log:
IDP-357 Cleanup code around logging, plus javadoc

Modified:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrescopedAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/RegexSplitAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedIdPAttribute.java

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrescopedAttributeDefinition.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrescopedAttributeDefinition.java?rev=6741&r1=6740&r2=6741&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrescopedAttributeDefinition.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrescopedAttributeDefinition.java Sat Oct 18 10:41:43 2014
@@ -92,8 +92,8 @@
 
         final List<IdPAttributeValue<?>> dependencyValues =
                 PluginDependencySupport.getMergedAttributeValues(workContext, getDependencies());
-        log.debug("{} Dependencies {} provided unmapped values of {}", new Object[] {getLogPrefix(), getDependencies(),
-                dependencyValues,});
+        log.debug("{} Dependencies {} provided unmapped values of {}", getLogPrefix(), getDependencies(),
+                dependencyValues);
 
         final List<ScopedStringAttributeValue> valueList = Lists.newArrayListWithExpectedSize(dependencyValues.size());
         for (final IdPAttributeValue<?> dependencyValue : dependencyValues) {

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/RegexSplitAttributeDefinition.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/RegexSplitAttributeDefinition.java?rev=6741&r1=6740&r2=6741&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/RegexSplitAttributeDefinition.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/RegexSplitAttributeDefinition.java Sat Oct 18 10:41:43 2014
@@ -101,19 +101,19 @@
                         dependencyValue.getClass().getName()));
             }
 
-            log.debug("{} Applying regexp '{}' to input value '{}'", new Object[] {getLogPrefix(), regexp.pattern(),
-                    dependencyValue.getValue(),});
+            log.debug("{} Applying regexp '{}' to input value '{}'", getLogPrefix(), regexp.pattern(),
+                    dependencyValue.getValue());
             final Matcher matcher = regexp.matcher((String) dependencyValue.getValue());
             if (matcher.matches()) {
-                log.debug("{} Computed the value '{}' by apply regexp '{}' to input value '{}'", new Object[] {
-                        getLogPrefix(), matcher.group(1), regexp.pattern(), dependencyValue.getValue(),});
+                log.debug("{} Computed the value '{}' by apply regexp '{}' to input value '{}'", 
+                        getLogPrefix(), matcher.group(1), regexp.pattern(), dependencyValue.getValue());
                 resultantValues.add(new StringAttributeValue(matcher.group(1)));
             } else {
-                log.debug("{} Regexp '{}' did not match anything in input value '{}'", new Object[] {getLogPrefix(),
-                        regexp.pattern(), dependencyValue.getValue(),});
+                log.debug("{} Regexp '{}' did not match anything in input value '{}'", getLogPrefix(),
+                        regexp.pattern(), dependencyValue.getValue());
             }
         }
-        
+
         if (!resultantValues.isEmpty()) {
             resultantAttribute.setValues(resultantValues);
         }

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedIdPAttribute.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedIdPAttribute.java?rev=6741&r1=6740&r2=6741&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedIdPAttribute.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedIdPAttribute.java Sat Oct 18 10:41:43 2014
@@ -145,9 +145,9 @@
     }
 
     /**

[... 10 lines stripped ...]