[java-identity-provider COMMIT] in /trunk: idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingParty...

[noreply at shibboleth.net]

Author: lajoie
Date: Tue Jul 17 12:54:40 2012
New Revision: 4205

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4205&view=rev
Log:
Rework some relying party related classes to allow for more flexibility of how a RelyingPartyConfiguration is looked up

Added:
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/ActivatedRelyingPartyConfiguration.java   (with props)
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/ActivatedRelyingPartyConfigurationResolver.java   (with props)
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/package-info.java   (with props)
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/ActivatedRelyingPartyConfigurationResolverTest.java
      - copied, changed from r4203, trunk/idp-profile-api/src/test/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationResolverTest.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/ActivatedRelyingPartyConfigurationTest.java   (with props)
Modified:
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfiguration.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationResolver.java
    trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/RequestContextBuilder.java
    trunk/idp-profile-api/src/test/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationResolverTest.java
    trunk/idp-profile-api/src/test/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationTest.java
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/profile/saml1/Saml1ActionTestingSupport.java
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/profile/saml2/Saml2ActionTestingSupport.java

Modified: trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfiguration.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfiguration.java?rev=4205&r1=4204&r2=4205&view=diff
==============================================================================
--- trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfiguration.java (original)
+++ trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfiguration.java Tue Jul 17 12:54:40 2012
@@ -24,7 +24,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import net.shibboleth.idp.profile.ProfileRequestContext;
 import net.shibboleth.idp.profile.config.ProfileConfiguration;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
@@ -33,7 +32,6 @@
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
-import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableMap.Builder;
 
 /** The configuration that applies to given relying party. */
@@ -45,9 +43,6 @@
     /** The entity ID of the IdP. */
     private final String responderEntityId;
 
-    /** Criterion that must be met for this configuration to be active for a given request. */
-    private final Predicate<ProfileRequestContext> activationCriteria;
-
     /** Registered and usable communication profile configurations for this relying party. */
     private final Map<String, ProfileConfiguration> profileConfigurations;
 
@@ -56,12 +51,10 @@
      * 
      * @param configurationId unique ID for this configuration
      * @param responderId the ID by which the responder is known by this relying party
-     * @param criteria criteria that must be met in order for this relying party configuration to apply to a given
-     *            profile request, never null
-     * @param configurations communication profile configurations for this relying party, may be null or empty
+     * @param configurations communication profile configurations for this relying party
      */
     public RelyingPartyConfiguration(@Nonnull @NotEmpty final String configurationId,
-            @Nonnull @NotEmpty final String responderId, @Nonnull final Predicate<ProfileRequestContext> criteria,
+            @Nonnull @NotEmpty final String responderId,
             @Nullable @NullableElements final Collection<? extends ProfileConfiguration> configurations) {
         id =
                 Constraint.isNotNull(StringSupport.trimOrNull(configurationId),
@@ -69,8 +62,6 @@
 
         responderEntityId =
                 Constraint.isNotNull(StringSupport.trimOrNull(responderId), "Responder entity ID can not be null");
-

[... 345 lines stripped ...]