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

[noreply at shibboleth.net]

Author: rdw
Date: Tue Apr 23 11:32:36 2013
New Revision: 4421

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4421&view=rev
Log:
IDP-203 Minor fix to method names for MappedAttributeDefinition

Modified:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/mapped/MappedAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/mapped/MappedAttributeTest.java

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/mapped/MappedAttributeDefinition.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/mapped/MappedAttributeDefinition.java?rev=4421&r1=4420&r2=4421&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/mapped/MappedAttributeDefinition.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/mapped/MappedAttributeDefinition.java Tue Apr 23 11:32:36 2013
@@ -78,7 +78,7 @@
      * 
      * @return functions used to map an input value to an output value
      */
-    @Nonnull @NonnullElements @Unmodifiable public Set<ValueMap> getValueMaps() {
+    @Nonnull @NonnullElements @Unmodifiable public Collection<ValueMap> getValueMaps() {
         return valueMaps;
     }
 
@@ -99,8 +99,20 @@
      * 
      * @return the default return value.
      */
-    public StringAttributeValue getDefaultValue() {
+    public StringAttributeValue getDefaultAttributeValue() {
         return defaultValue;
+    }
+
+    /**
+     * Gets the default return value.
+     * 
+     * @return the default return value.
+     */
+    public String getDefaultValue() {
+        if (null == defaultValue) {
+            return null;
+        }
+        return defaultValue.getValue();
     }
 
     /**

Modified: trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/mapped/MappedAttributeTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/mapped/MappedAttributeTest.java?rev=4421&r1=4420&r2=4421&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/mapped/MappedAttributeTest.java (original)
+++ trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/mapped/MappedAttributeTest.java Tue Apr 23 11:32:36 2013
@@ -129,8 +129,10 @@
                 "NoSuchAttribute")));
         definition.setValueMaps(Collections.singleton(substringValueMapping("foo", false, "foo")));
         definition.setDefaultValue("");
+        Assert.assertNull(definition.getDefaultAttributeValue());
         Assert.assertNull(definition.getDefaultValue());
         definition.setDefaultValue("default");
+        Assert.assertEquals(definition.getDefaultValue(), "default");
         definition.initialize();
 
         Optional<Attribute> optionalResult = definition.resolve(resolutionContext);
@@ -209,7 +211,7 @@
         Assert.assertTrue(definition.getValueMaps().isEmpty());
         definition.setValueMaps(Collections.singleton(substringValueMapping("elephant", false, "banana")));
         definition.setDefaultValue("default");
-        Assert.assertEquals(definition.getDefaultValue().getValue(), "default");
+        Assert.assertEquals(definition.getDefaultAttributeValue().getValue(), "default");
         Assert.assertFalse(definition.isPassThru());
         definition.initialize();
 
@@ -239,7 +241,7 @@
         Assert.assertTrue(definition.getValueMaps().isEmpty());
         definition.setValueMaps(Collections.singleton(substringValueMapping("elephant", false, "banana")));
         definition.setDefaultValue("default");
-        Assert.assertEquals(definition.getDefaultValue().getValue(), "default");
+        Assert.assertEquals(definition.getDefaultAttributeValue().getValue(), "default");
         definition.setPassThru(true);
         definition.initialize();