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

[noreply at shibboleth.net]

Author: rdw
Date: Thu Apr  4 14:04:07 2013
New Revision: 4390

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4390&view=rev
Log:
AttributeEncoders has to take a SET not a list, otherwise Spring cannot find the setter.

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

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseAttributeDefinition.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseAttributeDefinition.java?rev=4390&r1=4389&r2=4390&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseAttributeDefinition.java (original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseAttributeDefinition.java Thu Apr  4 14:04:07 2013
@@ -169,7 +169,7 @@
      * @param attributeEncoders encoders used to encode the values of this attribute in to protocol specific formats
      */
     public synchronized void setAttributeEncoders(
-            @Nullable @NullableElements final List<AttributeEncoder<?>> attributeEncoders) {
+            @Nullable @NullableElements final Set<AttributeEncoder<?>> attributeEncoders) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
 

Modified: trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/BaseAttributeDefinitionTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/BaseAttributeDefinitionTest.java?rev=4390&r1=4389&r2=4390&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/BaseAttributeDefinitionTest.java (original)
+++ trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/BaseAttributeDefinitionTest.java Thu Apr  4 14:04:07 2013
@@ -18,10 +18,13 @@
 package net.shibboleth.idp.attribute.resolver;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 
 import net.shibboleth.idp.attribute.Attribute;
 import net.shibboleth.idp.attribute.AttributeEncoder;
@@ -82,7 +85,7 @@
         MockAttributeEncoder enc1 = new MockAttributeEncoder(null, null);
         MockAttributeEncoder enc2 = new MockAttributeEncoder(null, null);
 
-        ArrayList<AttributeEncoder<?>> encoders = new ArrayList<AttributeEncoder<?>>();
+        Set<AttributeEncoder<?>> encoders = new HashSet<AttributeEncoder<?>>(2);
 
         definition.setAttributeEncoders(null);
         Assert.assertNotNull(definition.getAttributeEncoders());
@@ -190,8 +193,9 @@
         MockAttributeEncoder encoder = new MockAttributeEncoder("foo", "baz");
         MockBaseAttributeDefinition definition = new MockBaseAttributeDefinition("foo", (Attribute) null);
         
-        List list = Lists.newArrayList((AttributeEncoder<?>)encoder); 
-        definition.setAttributeEncoders(list);
+        Set<AttributeEncoder<?>> encoders = new HashSet<AttributeEncoder<?>>(1);
+        encoders.add(encoder);
+        definition.setAttributeEncoders(encoders);
         
         Assert.assertFalse(encoder.isInitialized());
         Assert.assertFalse(encoder.getValidateCount() > 0);