[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: Tue Aug  6 10:10:38 2013
New Revision: 4666

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4666&view=rev
Log:
IDP-297 modify r4665 to throw and IllegalArgumentException. Modify test to exercise same

Modified:
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolver.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolverTest.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=4666&r1=4665&r2=4666&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 Tue Aug  6 10:10:38 2013
@@ -88,7 +88,8 @@
             for (BaseAttributeDefinition definition : definitions) {
                 if (definition != null) {
                     if (checkedDefinitions.containsKey(definition.getId())) {
-                        log.error("{} duplicate Attribute Definition with id {}", logPrefix, definition.getId());
+                        throw new IllegalArgumentException(logPrefix + " duplicate Attribute Definition with id "
+                                + definition.getId());
                     }
                     checkedDefinitions.put(definition.getId(), definition);
                 }
@@ -101,7 +102,8 @@
             for (BaseDataConnector connector : connectors) {
                 if (connector != null) {
                     if (checkedConnectors.containsKey(connector.getId())) {
-                        log.error("{} duplicate Data Connector Definition with id {}", logPrefix, connector.getId());
+                        throw new IllegalArgumentException(logPrefix + " duplicate Data Connector Definition with id "
+                                + connector.getId());
                     }
                     checkedConnectors.put(connector.getId(), connector);
                 }

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=4666&r1=4665&r2=4666&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 Tue Aug  6 10:10:38 2013
@@ -122,25 +122,39 @@
         definitions.add(new MockAttributeDefinition("foo", new Attribute("test")));
         definitions.add(null);
         definitions.add(new MockAttributeDefinition("bar", new Attribute("test")));
-        definitions.add(new MockAttributeDefinition("foo", new Attribute("test")));
 
         AttributeResolver resolver = new AttributeResolver(" foo ", definitions, null);
         resolver.initialize();
         Assert.assertNotNull(resolver.getAttributeDefinitions());
         Assert.assertEquals(resolver.getAttributeDefinitions().size(), 2);
+        
+        definitions.add(new MockAttributeDefinition("foo", new Attribute("test")));
+        try {
+            new AttributeResolver(" foo ", definitions, null);
+            Assert.fail();
+        } catch (IllegalArgumentException e) {
+            // OK
+        }
     }
 
     /** Test getting, setting, overwriting, defensive collection copy. */
     @Test public void setDataConnectors() throws Exception {
-        LazySet<BaseDataConnector> connectors = new LazySet<BaseDataConnector>();
+        ArrayList<BaseDataConnector> connectors = new ArrayList<BaseDataConnector>();
         connectors.add(new MockDataConnector("foo", (Map) null));
         connectors.add(null);
         connectors.add(new MockDataConnector("bar", (Map) null));
-        connectors.add(new MockDataConnector("foo", (Map) null));
 
         AttributeResolver resolver = new AttributeResolver("foo", null, connectors);
         Assert.assertNotNull(resolver.getDataConnectors());
         Assert.assertEquals(resolver.getDataConnectors().size(), 2);
+
+        connectors.add(new MockDataConnector("foo", (Map) null));
+        try {
+            new AttributeResolver(" foo ", null, connectors);
+            Assert.fail();
+        } catch (IllegalArgumentException e) {
+            // OK
+        }
     }
 
     /** Test that a simple resolve returns the expected results. */