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

[noreply at shibboleth.net]

Author: dfisher
Date: Thu Jan 29 00:57:18 2015
New Revision: 7290

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7290&view=rev
Log:
IDP-573
Update StringAttributeValue to no longer trim strings and convert whitespace to null.
Update unit tests accordingly.

Modified:
    trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/ByteAttributeValue.java
    trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/StringAttributeValue.java
    trunk/idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/ScopedStringAttributeValueTest.java
    trunk/idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/StringAttributeValueTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeValueRegexpMatcherTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeValueStringMatcherTest.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/ResolverTestSupport.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrescopedAtributeTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/RegexAtributeTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/TemplateAttributeTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/mapped/impl/MappedAttributeTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnectorTest.java
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/ldapDataConnectorTest.ldif
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/dc/rdbms/RdbmsData.sql

Modified: trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/ByteAttributeValue.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/ByteAttributeValue.java?rev=7290&r1=7289&r2=7290&view=diff
==============================================================================
--- trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/ByteAttributeValue.java (original)
+++ trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/ByteAttributeValue.java Thu Jan 29 00:57:18 2015
@@ -42,7 +42,7 @@
      * @param attributeValue value of the attribute
      */
     public ByteAttributeValue(@Nonnull final byte[] attributeValue) {
-        value = Constraint.isNotNull(attributeValue, "Attribute value cannot be null");
+        value = Constraint.isNotEmpty(attributeValue, "Attribute value cannot be null or empty");
     }
 
     /** {@inheritDoc} */

Modified: trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/StringAttributeValue.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/StringAttributeValue.java?rev=7290&r1=7289&r2=7290&view=diff
==============================================================================
--- trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/StringAttributeValue.java (original)
+++ trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/StringAttributeValue.java Thu Jan 29 00:57:18 2015
@@ -24,7 +24,6 @@
 
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import com.google.common.base.MoreObjects;
 
@@ -39,10 +38,8 @@
      * 
      * @param attributeValue the attribute value
      */
-    public StringAttributeValue(@Nonnull @NotEmpty String attributeValue) {
-        value =
-                Constraint.isNotNull(StringSupport.trimOrNull(attributeValue),
-                        "Attribute value cannot be null or empty");
+    public StringAttributeValue(@Nonnull @NotEmpty final String attributeValue) {
+        value = Constraint.isNotEmpty(attributeValue, "Attribute value cannot be null or empty");
     }
 
     /** {@inheritDoc} */

Modified: trunk/idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/ScopedStringAttributeValueTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/ScopedStringAttributeValueTest.java?rev=7290&r1=7289&r2=7290&view=diff
==============================================================================
--- trunk/idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/ScopedStringAttributeValueTest.java (original)

[... 504 lines stripped ...]