[java-identity-provider COMMIT] /trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/logic/RelyingPartyId...

[noreply at shibboleth.net]

Author: scantor
Date: Thu May  8 00:34:14 2014
New Revision: 5882

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5882&view=rev
Log:
Farm part of constructor to base class.

Modified:
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/logic/RelyingPartyIdPredicate.java

Modified: trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/logic/RelyingPartyIdPredicate.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/logic/RelyingPartyIdPredicate.java?rev=5882&r1=5881&r2=5882&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/logic/RelyingPartyIdPredicate.java (original)
+++ trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/logic/RelyingPartyIdPredicate.java Thu May  8 00:34:14 2014
@@ -24,7 +24,6 @@
 import net.shibboleth.idp.profile.context.navigate.RelyingPartyIdLookupFunction;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.logic.CollectionContainmentPredicate;
-import net.shibboleth.utilities.java.support.logic.FunctionSupport;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.profile.context.ProfileRequestContext;
@@ -44,9 +43,7 @@
      * @param candidates hardwired set of values to check against
      */
     public RelyingPartyIdPredicate(@Nonnull @NonnullElements final Collection<String> candidates) {
-        super(new RelyingPartyIdLookupFunction(),
-                FunctionSupport.<ProfileRequestContext,Collection<String>>constant(
-                        StringSupport.normalizeStringCollection(candidates)));
+        super(new RelyingPartyIdLookupFunction(), StringSupport.normalizeStringCollection(candidates));
     }
 
     /**
@@ -57,8 +54,6 @@
      */
     public RelyingPartyIdPredicate(@Nonnull final Function<ProfileRequestContext,String> relyingPartyIdLookupStrategy,
             @Nonnull @NonnullElements final Collection<String> candidates) {
-        super(relyingPartyIdLookupStrategy,
-                FunctionSupport.<ProfileRequestContext,Collection<String>>constant(
-                        StringSupport.normalizeStringCollection(candidates)));
+        super(relyingPartyIdLookupStrategy, StringSupport.normalizeStringCollection(candidates));
     }
 }