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

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Mar 14 15:18:48 2014
New Revision: 3696

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3696&view=rev
Log:
Add some missing @NotEmpty annotations to security config criteria.
Correct JavaDoc copy/paste typos.

Modified:
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/DecryptionConfiguratonCriterion.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/EncryptionConfiguratonCriterion.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/SignatureSigningConfiguratonCriterion.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/SignatureValidationConfiguratonCriterion.java

Modified: trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/DecryptionConfiguratonCriterion.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/DecryptionConfiguratonCriterion.java?rev=3696&r1=3695&r2=3696&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/DecryptionConfiguratonCriterion.java (original)
+++ trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/DecryptionConfiguratonCriterion.java Fri Mar 14 15:18:48 2014
@@ -23,13 +23,13 @@
 import javax.annotation.Nonnull;
 
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
 import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.resolver.Criterion;
 
 import org.opensaml.xmlsec.DecryptionConfiguration;
-import org.opensaml.xmlsec.SignatureValidationConfiguration;
 
 import com.google.common.base.Predicates;
 import com.google.common.collect.Collections2;
@@ -37,7 +37,7 @@
 import com.google.common.collect.Lists;
 
 /**
- * Criterion which holds one or more instances of {@link SignatureValidationConfiguration}.
+ * Criterion which holds one or more instances of {@link DecryptionConfiguration}.
  */
 public class DecryptionConfiguratonCriterion implements Criterion {
     
@@ -49,7 +49,7 @@
      *
      * @param configurations list of configuration instances
      */
-    public DecryptionConfiguratonCriterion(@Nonnull @NonnullElements 
+    public DecryptionConfiguratonCriterion(@Nonnull @NonnullElements @NotEmpty
             List<DecryptionConfiguration> configurations) {
         Constraint.isNotNull(configurations, "List of configurations may not be null");
         configs = Lists.newArrayList(Collections2.filter(configurations, Predicates.notNull()));
@@ -62,7 +62,7 @@
      *
      * @param configurations varargs array of configuration instances
      */
-    public DecryptionConfiguratonCriterion(@Nonnull @NonnullElements 
+    public DecryptionConfiguratonCriterion(@Nonnull @NonnullElements @NotEmpty
             DecryptionConfiguration... configurations) {
         Constraint.isNotNull(configurations, "List of configurations may not be null");
         configs = Lists.newArrayList(Collections2.filter(Arrays.asList(configurations), Predicates.notNull()));
@@ -73,7 +73,7 @@
      * Get the list of configuration instances.
      * @return the list of configuration instances
      */
-    @Nonnull @NonnullElements @NotLive @Unmodifiable
+    @Nonnull @NonnullElements @NotLive @Unmodifiable @NotEmpty
     public List<DecryptionConfiguration> getConfigurations() {
         return ImmutableList.copyOf(configs);
     }

Modified: trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/EncryptionConfiguratonCriterion.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/EncryptionConfiguratonCriterion.java?rev=3696&r1=3695&r2=3696&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/EncryptionConfiguratonCriterion.java (original)
+++ trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/EncryptionConfiguratonCriterion.java Fri Mar 14 15:18:48 2014
@@ -23,13 +23,13 @@
 import javax.annotation.Nonnull;
 
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
 import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.resolver.Criterion;
 
 import org.opensaml.xmlsec.EncryptionConfiguration;
-import org.opensaml.xmlsec.SignatureValidationConfiguration;
 
 import com.google.common.base.Predicates;

[... 136 lines stripped ...]