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

[noreply at shibboleth.net]

Author: lajoie
Date: Wed Feb  1 15:21:32 2012
New Revision: 4111

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4111&view=rev
Log:
review code and sprinkle with appropriate annotations
some minor code cleanup

Modified:
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolutionException.java
    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/BaseAttributeDefinition.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseDataConnector.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseResolverPlugin.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolvedAttributeDefinition.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolvedDataConnector.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolverPluginDependency.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/StaticAttributeDefinition.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/StaticDataConnector.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolutionContextTest.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/BaseAttributeDefinitionTest.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockAttributeDefinition.java

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolutionException.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolutionException.java?rev=4111&r1=4110&r2=4111&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolutionException.java (original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolutionException.java Wed Feb  1 15:21:32 2012
@@ -18,10 +18,12 @@
 package net.shibboleth.idp.attribute.resolver;
 
 import javax.annotation.Nullable;
+import javax.annotation.concurrent.ThreadSafe;
 
 import net.shibboleth.idp.attribute.AttributeException;
 
 /** An exception indicating a problem resolving attribute data. */
+ at ThreadSafe
 public class AttributeResolutionException extends AttributeException {
 
     /** Serial version UID. */

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=4111&r1=4110&r2=4111&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 Wed Feb  1 15:21:32 2012
@@ -450,9 +450,6 @@
                 continue;
             }
 
-            // remove any nulls or duplicate attribute values
-            cleanResolvedAttributeValues(resolvedAttribute.get());
-
             // remove value-less attributes
             if (resolvedAttribute.get().getValues().size() == 0) {
                 log.debug("Attribute Resolver {}: removing result of attribute definition {},"
@@ -464,30 +461,6 @@
         }
 
         resolutionContext.setResolvedAttributes(resolvedAttributes);
-    }
-
-    /**
-     * Cleans the values of the given attribute. Currently this entails removal of any nulls or duplicate values.
-     * 
-     * @param attribute attribute whose values will be cleaned
-     */
-    protected void cleanResolvedAttributeValues(@Nonnull final Attribute attribute) {
-        assert attribute != null : "Attribute can not be null";
-
-        final Collection<?> values = attribute.getValues();
-        if (values.isEmpty()) {
-            return;
-        }
-
-        // TODO(lajoie) this possibly changes the type of value collection for the attribute, should it?
-        final LazySet cleanedValues = new LazySet<Object>();
-        for (Object value : values) {
-            if (value != null) {
-                cleanedValues.add(value);
-            }
-        }
-
-        attribute.setValues(cleanedValues);
     }
 
     /**

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseAttributeDefinition.java

[... 440 lines stripped ...]