[java-opensaml COMMIT] in /trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec: DecryptionConfiguration.java ...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Dec  3 12:26:16 2013
New Revision: 3510

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3510&view=rev
Log:
Tighten up whitelist/blacklist APIs.

Modified:
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/DecryptionConfiguration.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/SignatureValidationConfiguration.java

Modified: trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/DecryptionConfiguration.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/DecryptionConfiguration.java?rev=3510&r1=3509&r2=3510&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/DecryptionConfiguration.java (original)
+++ trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/DecryptionConfiguration.java Tue Dec  3 12:26:16 2013
@@ -17,9 +17,14 @@
 
 package org.opensaml.xmlsec;
 
-import java.util.List;
+import java.util.Collection;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+
+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 org.opensaml.xmlsec.encryption.support.EncryptedKeyResolver;
 import org.opensaml.xmlsec.keyinfo.KeyInfoCredentialResolver;
@@ -34,14 +39,14 @@
      * 
      * @return the list of algorithms
      */
-    @Nullable public List<String> getWhitelistedAlgorithmURIs();
+    @Nonnull @NonnullElements @Unmodifiable @NotLive public Collection<String> getWhitelistedAlgorithmURIs();
     
     /**
      * Get the list of blacklisted algorithm URI's.
      * 
      * @return the list of algorithms
      */
-    @Nullable public List<String> getBlacklistedAlgorithmsURIs();
+    @Nonnull @NonnullElements @Unmodifiable @NotLive public Collection<String> getBlacklistedAlgorithmsURIs();
     
     /**
      * The KeyInfoCredentialResolver to use when processing the EncryptedData/KeyInfo.

Modified: trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/SignatureValidationConfiguration.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/SignatureValidationConfiguration.java?rev=3510&r1=3509&r2=3510&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/SignatureValidationConfiguration.java (original)
+++ trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/SignatureValidationConfiguration.java Tue Dec  3 12:26:16 2013
@@ -17,9 +17,14 @@
 
 package org.opensaml.xmlsec;
 
-import java.util.List;
+import java.util.Collection;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+
+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 org.opensaml.xmlsec.signature.support.SignatureTrustEngine;
 
@@ -33,14 +38,14 @@
      * 
      * @return the list of algorithms
      */
-    @Nullable public List<String> getWhitelistedAlgorithmURIs();
+    @Nonnull @NonnullElements @Unmodifiable @NotLive public Collection<String> getWhitelistedAlgorithmURIs();
     
     /**
      * Get the list of blacklisted algorithm URI's.
      * 
      * @return the list of algorithms
      */
-    @Nullable public List<String> getBlacklistedAlgorithmsURIs();
+    @Nonnull @NonnullElements @Unmodifiable @NotLive public Collection<String> getBlacklistedAlgorithmsURIs();
     
     /**
      * Get the signature trust engine to use.