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

[noreply at shibboleth.net]

Author: tzeller
Date: Mon Mar 11 17:03:51 2013
New Revision: 4322

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4322&view=rev
Log:
For spring dependency injection compatibility, change parameter type of setDependencies() from Collection to Set to match the return type of getDependencies() in BaseResolverPlugin and corresponding tests.

Modified:
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseResolverPlugin.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolverTest.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/BaseResolverPluginTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/PrescopedAtributeTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/RegexAtributeTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScopedAttributeTest.java

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseResolverPlugin.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseResolverPlugin.java?rev=4322&r1=4321&r2=4322&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseResolverPlugin.java (original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseResolverPlugin.java Mon Mar 11 17:03:51 2013
@@ -17,7 +17,6 @@
 
 package net.shibboleth.idp.attribute.resolver;
 
-import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
@@ -134,7 +133,7 @@
      * @param pluginDependencies unmodifiable list of dependencies for this plugin
      */
     public synchronized void setDependencies(
-            @Nullable @NullableElements final Collection<ResolverPluginDependency> pluginDependencies) {
+            @Nullable @NullableElements final Set<ResolverPluginDependency> pluginDependencies) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
 

Modified: trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolverTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolverTest.java?rev=4322&r1=4321&r2=4322&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolverTest.java (original)
+++ trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolverTest.java Mon Mar 11 17:03:51 2013
@@ -34,7 +34,7 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 
 //TODO test during resolve: failover, requested attributes, bad pluginIDs, plugin throwing error, error propagation
 
@@ -243,14 +243,14 @@
 
         ResolverPluginDependency dep1 = new ResolverPluginDependency("dc1", null);
         MockAttributeDefinition ad1 = new MockAttributeDefinition("ad1", new Attribute("test"));
-        ad1.setDependencies(Lists.newArrayList(dep1));
+        ad1.setDependencies(Sets.newHashSet(dep1));
 
         MockAttributeDefinition ad2 = new MockAttributeDefinition("ad2", new Attribute("test"));
 
         ResolverPluginDependency dep2 = new ResolverPluginDependency("ad1", null);
         ResolverPluginDependency dep3 = new ResolverPluginDependency("ad2", null);
         MockAttributeDefinition ad0 = new MockAttributeDefinition("ad0", new Attribute("test"));
-        ad0.setDependencies(Lists.newArrayList(dep2, dep3));
+        ad0.setDependencies(Sets.newHashSet(dep2, dep3));
 
         LazySet<BaseDataConnector> connectors = new LazySet<BaseDataConnector>();
         connectors.add(dc1);
@@ -279,15 +279,14 @@
      * @throws ComponentInitializationException if badness happens
      * @throws ResolutionException if badness happens in attribute resolution
      */
-    @Test public void testResolveWithDependencyFail1() throws ComponentInitializationException,
-            ResolutionException
+    @Test public void testResolveWithDependencyFail1() throws ComponentInitializationException, ResolutionException
     /* throws Exception */{
         MockDataConnector dc1 = new MockDataConnector("dc1", new ResolutionException());
         dc1.setFailoverDataConnectorId("dc2");
 
         ResolverPluginDependency dep1 = new ResolverPluginDependency("dc1", null);
         MockAttributeDefinition ad1 = new MockAttributeDefinition("ad1", new Attribute("test"));

[... 440 lines stripped ...]