[java-identity-provider COMMIT] /trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/logic/Allowe...

[noreply at shibboleth.net]

Author: putmanb
Date: Sun Oct 25 18:45:50 2015
New Revision: 7875

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7875&view=rev
Log:
Normalize presenters collection, to include trimming as well as filtering out nulls.

Modified:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/logic/AllowedSAMLPresentersPredicate.java

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/logic/AllowedSAMLPresentersPredicate.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/logic/AllowedSAMLPresentersPredicate.java?rev=7875&r1=7874&r2=7875&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/logic/AllowedSAMLPresentersPredicate.java	(original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/logic/AllowedSAMLPresentersPredicate.java	Sun Oct 25 18:45:50 2015
@@ -25,14 +25,14 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import net.shibboleth.utilities.java.support.primitive.StringSupport;
+
 import org.opensaml.profile.context.ProfileRequestContext;
 import org.opensaml.saml.common.messaging.context.SAMLPresenterEntityContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-import com.google.common.collect.Collections2;
 
 /**
  * Predicate which evaluates the inbound {@link SAMLPresenterEntityContext#getEntityId()}
@@ -60,7 +60,7 @@
         if (presenters == null) {
             allowedPresenters = Collections.emptySet();
         } else {
-            allowedPresenters = new HashSet<>(Collections2.filter(presenters, Predicates.notNull()));
+            allowedPresenters = new HashSet<>(StringSupport.normalizeStringCollection(presenters));
         }
     }