[java-opensaml COMMIT] in /trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl: BasicEncryptionConfigur...

[noreply at shibboleth.net]

Author: putmanb
Date: Tue May  6 21:51:46 2014
New Revision: 3843

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3843&view=rev
Log:
Normalize string collections using new StringSupport method.

Modified:
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionConfiguration.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningConfiguration.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicWhitelistBlacklistConfiguration.java

Modified: trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionConfiguration.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionConfiguration.java?rev=3843&r1=3842&r2=3843&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionConfiguration.java (original)
+++ trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionConfiguration.java Tue May  6 21:51:46 2014
@@ -26,6 +26,7 @@
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
 import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
+import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.security.credential.Credential;
 import org.opensaml.xmlsec.EncryptionConfiguration;
@@ -112,7 +113,7 @@
             dataEncryptionAlgorithms = Collections.emptyList();
             return;
         }
-        dataEncryptionAlgorithms = Lists.newArrayList(Collections2.filter(algorithms, Predicates.notNull()));
+        dataEncryptionAlgorithms = Lists.newArrayList(StringSupport.normalizeStringCollection(algorithms));
     }
     
     /** {@inheritDoc} */
@@ -148,7 +149,7 @@
             keyTransportEncryptionAlgorithms = Collections.emptyList();
             return;
         }
-        keyTransportEncryptionAlgorithms = Lists.newArrayList(Collections2.filter(algorithms, Predicates.notNull()));
+        keyTransportEncryptionAlgorithms = Lists.newArrayList(StringSupport.normalizeStringCollection(algorithms));
     }
     
     /** {@inheritDoc} */

Modified: trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningConfiguration.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningConfiguration.java?rev=3843&r1=3842&r2=3843&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningConfiguration.java (original)
+++ trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningConfiguration.java Tue May  6 21:51:46 2014
@@ -29,6 +29,7 @@
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
 import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
+import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.security.credential.Credential;
 import org.opensaml.xmlsec.SignatureSigningConfiguration;
@@ -116,7 +117,7 @@
             signatureAlgorithms = Collections.emptyList();
             return;
         }
-        signatureAlgorithms = Lists.newArrayList(Collections2.filter(algorithms, Predicates.notNull()));
+        signatureAlgorithms = Lists.newArrayList(StringSupport.normalizeStringCollection(algorithms));
     }
     
     /** {@inheritDoc} */
@@ -134,7 +135,7 @@
             signatureReferenceDigestMethods = Collections.emptyList();
             return;
         }
-        signatureReferenceDigestMethods = Lists.newArrayList(Collections2.filter(algorithms, Predicates.notNull()));
+        signatureReferenceDigestMethods = Lists.newArrayList(StringSupport.normalizeStringCollection(algorithms));
     }
 
     /** {@inheritDoc} */
@@ -148,7 +149,7 @@
      * @param algorithmURI a canonicalization algorithm URI
      */
     public void setSignatureCanonicalizationAlgorithm(@Nullable final String algorithmURI) {
-        signatureCanonicalization = algorithmURI;
+        signatureCanonicalization = StringSupport.trimOrNull(algorithmURI);
     }
 
     /** {@inheritDoc} */

Modified: trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicWhitelistBlacklistConfiguration.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicWhitelistBlacklistConfiguration.java?rev=3843&r1=3842&r2=3843&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicWhitelistBlacklistConfiguration.java (original)

[... 33 lines stripped ...]