[java-opensaml COMMIT] in /trunk: opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityIdPred...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Sep 22 21:19:35 2014
New Revision: 4044

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4044&view=rev
Log:
Switch predicate parameter to constructor to match the others.

Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityIdPredicate.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/PredicateFilterTest.java

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityIdPredicate.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityIdPredicate.java?rev=4044&r1=4043&r2=4044&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityIdPredicate.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityIdPredicate.java Mon Sep 22 21:19:35 2014
@@ -18,7 +18,6 @@
 package org.opensaml.saml.common.profile.logic;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Set;
 
 import javax.annotation.Nonnull;
@@ -27,7 +26,9 @@
 import org.opensaml.saml.saml2.metadata.EntityDescriptor;
 
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
+import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -43,28 +44,21 @@
     @Nonnull private final Logger log = LoggerFactory.getLogger(EntityIdPredicate.class);
     
     /** Set of entityIDs to check for. */
-    @Nonnull @NonnullElements private Set<String> entityIds;
-    
-    /** Constructor. */
-    public EntityIdPredicate() {
-        entityIds = Collections.emptySet();
-    }
+    @Nonnull @NonnullElements private final Set<String> entityIds;
     
     /**
-     * Set the entityIDs to look for.
+     * Constructor.
      * 
-     * @param ids the entityIDs to look for
+     * @param ids the entityIDs to check for
      */
-    public void setEntityIDs(@Nonnull @NonnullElements final Collection<String> ids) {
-        if (ids == null) {
-            entityIds = Collections.emptySet();
-        } else {
-            entityIds = Sets.newHashSetWithExpectedSize(ids.size());
-            for (final String id : ids) {
-                final String trimmed = StringSupport.trimOrNull(id);
-                if (trimmed != null) {
-                    entityIds.add(trimmed);
-                }
+    public EntityIdPredicate(@Nonnull @NonnullElements final Collection<String> ids) {
+        Constraint.isNotNull(ids, "EntityID collection cannot be null");
+        
+        entityIds = Sets.newHashSetWithExpectedSize(ids.size());
+        for (final String id : ids) {
+            final String trimmed = StringSupport.trimOrNull(id);
+            if (trimmed != null) {
+                entityIds.add(trimmed);
             }
         }
     }

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/PredicateFilterTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/PredicateFilterTest.java?rev=4044&r1=4043&r2=4044&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/PredicateFilterTest.java (original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/PredicateFilterTest.java Mon Sep 22 21:19:35 2014
@@ -56,8 +56,7 @@
         final String whitelisted = "urn:mace:incommon:dartmouth.edu";
         final String blacklisted = "urn:mace:incommon:osu.edu";
 
-        final EntityIdPredicate condition = new EntityIdPredicate();
-        condition.setEntityIDs(Collections.singletonList(blacklisted));
+        final EntityIdPredicate condition = new EntityIdPredicate(Collections.singletonList(blacklisted));
         
         metadataProvider.setMetadataFilter(new PredicateFilter(Direction.EXCLUDE, condition));
         metadataProvider.initialize();
@@ -75,8 +74,7 @@
         final String whitelisted = "urn:mace:incommon:dartmouth.edu";
         final String blacklisted = "urn:mace:incommon:osu.edu";
 
-        final EntityIdPredicate condition = new EntityIdPredicate();
-        condition.setEntityIDs(Collections.singletonList(whitelisted));
+        final EntityIdPredicate condition = new EntityIdPredicate(Collections.singletonList(whitelisted));
         
         metadataProvider.setMetadataFilter(new PredicateFilter(Direction.INCLUDE, condition));
         metadataProvider.initialize();