[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: Mon Apr 29 11:21:15 2013
New Revision: 4431

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4431&view=rev
Log:
IDP-205 Fix regression in MappedAttributeDefintion parsing not caught by jenkins.

Modified:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/mapped/SourceValue.java
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/mapped.xml

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/mapped/SourceValue.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/SourceValue.java?rev=4431&r1=4430&r2=4431&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/mapped/SourceValue.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/mapped/SourceValue.java Mon Apr 29 11:21:15 2013
@@ -18,6 +18,7 @@
 package net.shibboleth.idp.attribute.resolver.impl.ad.mapped;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.logic.Constraint;
@@ -53,7 +54,7 @@
      * @param thePartialMatch whether partial matches should be allowed
      */
     public SourceValue(String theValue, boolean theIgnoreCase, boolean thePartialMatch) {
-        value = Constraint.isNotNull(StringSupport.trimOrNull(theValue), "All values specified should be non empty");
+        value = StringSupport.trimOrNull(theValue);
         ignoreCase = theIgnoreCase;
         partialMatch = thePartialMatch;
     }
@@ -81,7 +82,7 @@
      * 
      * @return the value string.
      */
-    @Nonnull @NotEmpty public String getValue() {
+    @Nullable public String getValue() {
         return value;
     }
 

Modified: trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/mapped.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/mapped.xml?rev=4431&r1=4430&r2=4431&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/mapped.xml (original)
+++ trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/mapped.xml Mon Apr 29 11:21:15 2013
@@ -1,14 +1,14 @@
 <resolver:AttributeDefintion xsi:type="ad:Mapped"
 	xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
 	xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Mapped">
-	<ValueMap>
+	<ad:ValueMap>
 		<ad:ReturnValue>return</ad:ReturnValue>
 		<ad:SourceValue>source</ad:SourceValue>
-	</ValueMap>
+	</ad:ValueMap>
     <ad:DefaultValue passThru="true">foobar</ad:DefaultValue>
-	<ValueMap>
+	<ad:ValueMap>
 		<ad:ReturnValue>return1</ad:ReturnValue>
 		<ad:SourceValue>source2</ad:SourceValue>
-	</ValueMap>
+	</ad:ValueMap>
 
 </resolver:AttributeDefintion>