[java-shib-profile] branch main updated: Factor out RelyingPartyConfiguration into interface.
Scott Cantor
cantor.2 at osu.edu
Mon Mar 6 19:59:42 UTC 2023
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-shib-profile.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-profile.git;a=commit;h=4370053f2088170c84a19377ea256ea988def5d2
The following commit(s) were added to refs/heads/main by this push:
new 4370053 Factor out RelyingPartyConfiguration into interface.
4370053 is described below
commit 4370053f2088170c84a19377ea256ea988def5d2
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Mar 6 14:59:39 2023 -0500
Factor out RelyingPartyConfiguration into interface.
---
...on.java => BasicRelyingPartyConfiguration.java} | 55 +------
.../relyingparty/RelyingPartyConfiguration.java | 182 ++-------------------
...faultRelyingPartyConfigurationResolverTest.java | 31 ++--
.../impl/RelyingPartyConfigurationTest.java | 17 +-
.../RelyingPartyConfigurationSupport.java | 36 ++--
5 files changed, 63 insertions(+), 258 deletions(-)
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/relyingparty/RelyingPartyConfiguration.java b/shib-profile-api/src/main/java/net/shibboleth/profile/relyingparty/BasicRelyingPartyConfiguration.java
similarity index 82%
copy from shib-profile-api/src/main/java/net/shibboleth/profile/relyingparty/RelyingPartyConfiguration.java
copy to shib-profile-api/src/main/java/net/shibboleth/profile/relyingparty/BasicRelyingPartyConfiguration.java
index 311c255..4b5802f 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/relyingparty/RelyingPartyConfiguration.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/relyingparty/BasicRelyingPartyConfiguration.java
@@ -36,7 +36,6 @@ import net.shibboleth.shared.annotation.constraint.NotLive;
import net.shibboleth.shared.annotation.constraint.Unmodifiable;
import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponent;
-import net.shibboleth.shared.component.IdentifiedComponent;
import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.logic.FunctionSupport;
import net.shibboleth.shared.logic.PredicateSupport;
@@ -52,8 +51,8 @@ import net.shibboleth.shared.primitive.StringSupport;
*
* @since 5.0.0
*/
-public class RelyingPartyConfiguration extends AbstractIdentifiableInitializableComponent implements
- IdentifiedComponent, Predicate<ProfileRequestContext> {
+public class BasicRelyingPartyConfiguration extends AbstractIdentifiableInitializableComponent implements
+ RelyingPartyConfiguration, Predicate<ProfileRequestContext> {
/** Lookup function to supply issuer. */
@Nonnull private Function<ProfileRequestContext,String> issuerLookupStrategy;
@@ -69,24 +68,14 @@ public class RelyingPartyConfiguration extends AbstractIdentifiableInitializable
@Nonnull private Predicate<ProfileRequestContext> activationCondition;
/** Constructor. */
- public RelyingPartyConfiguration() {
+ public BasicRelyingPartyConfiguration() {
activationCondition = PredicateSupport.alwaysTrue();
issuerLookupStrategy = FunctionSupport.constant(null);
detailedErrorsPredicate = PredicateSupport.alwaysFalse();
profileConfigurationsLookupStrategy = FunctionSupport.constant(null);
}
- /**
- * Get the name to use when issuing messages to peers.
- *
- * <p>In SAML this is an "entityID", in other protocols it may have other labels.</p>
- *
- * @param profileRequestContext current profile request context
- *
- * @return name to use when issuing messages
- *
- * @since 5.0.0
- */
+ /** {@inheritDoc} */
@Nullable @NotEmpty public String getIssuer(@Nullable final ProfileRequestContext profileRequestContext) {
return issuerLookupStrategy.apply(profileRequestContext);
}
@@ -115,13 +104,7 @@ public class RelyingPartyConfiguration extends AbstractIdentifiableInitializable
issuerLookupStrategy = Constraint.isNotNull(strategy, "Lookup strategy cannot be null");
}
- /**
- * Legacy property setter for issuer.
- *
- * @param issuer the issuer to set
- *
- * @deprecated
- */
+ /** {@inheritDoc} */
@Deprecated(since="5.0.0", forRemoval=true)
public void setResponderId(@Nullable @NotEmpty final String issuer) {
DeprecationSupport.warn(ObjectType.METHOD, "setResponderId", "relying-party.xml", "setIssuer");
@@ -142,13 +125,7 @@ public class RelyingPartyConfiguration extends AbstractIdentifiableInitializable
setIssuerLookupStrategy(strategy);
}
- /**
- * Get whether detailed information about errors should be exposed.
- *
- * @param profileRequestContext current profile request context
- *
- * @return true iff it is acceptable to expose detailed error information
- */
+ /** {@inheritDoc} */
public boolean isDetailedErrors(@Nullable final ProfileRequestContext profileRequestContext) {
return detailedErrorsPredicate.test(profileRequestContext);
}
@@ -172,13 +149,7 @@ public class RelyingPartyConfiguration extends AbstractIdentifiableInitializable
detailedErrorsPredicate = Constraint.isNotNull(condition, "Condition cannot be null");
}
- /**
- * Get the unmodifiable set of profile configurations for this relying party.
- *
- * @param profileRequestContext current profile request context
- *
- * @return unmodifiable set of profile configurations for this relying party, never null
- */
+ /** {@inheritDoc} */
@Nonnull @NonnullElements @Unmodifiable @NotLive public Map<String,ProfileConfiguration> getProfileConfigurations(
@Nullable final ProfileRequestContext profileRequestContext) {
@@ -189,17 +160,7 @@ public class RelyingPartyConfiguration extends AbstractIdentifiableInitializable
return CollectionSupport.emptyMap();
}
- /**
- * Get the profile configuration, for the relying party, for the given profile. This is a convenience method and is
- * equivalent to calling {@link Map#get(Object)} on the return of
- * {@link #getProfileConfigurations(ProfileRequestContext)}. This map contains no null entries, keys, or values.
- *
- * @param profileRequestContext current profile request context
- * @param profileId the ID of the profile
- *
- * @return the configuration for the profile or null if the profile ID was null or empty or there is no
- * configuration for the given profile
- */
+ /** {@inheritDoc} */
@Nullable public ProfileConfiguration getProfileConfiguration(
@Nullable final ProfileRequestContext profileRequestContext, @Nullable final String profileId) {
final String trimmedId = StringSupport.trimOrNull(profileId);
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/relyingparty/RelyingPartyConfiguration.java b/shib-profile-api/src/main/java/net/shibboleth/profile/relyingparty/RelyingPartyConfiguration.java
index 311c255..6fd7347 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/relyingparty/RelyingPartyConfiguration.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/relyingparty/RelyingPartyConfiguration.java
@@ -17,11 +17,7 @@
package net.shibboleth.profile.relyingparty;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
import java.util.Map;
-import java.util.function.Function;
import java.util.function.Predicate;
import javax.annotation.Nonnull;
@@ -34,15 +30,8 @@ import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.annotation.constraint.NotLive;
import net.shibboleth.shared.annotation.constraint.Unmodifiable;
-import net.shibboleth.shared.collection.CollectionSupport;
-import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponent;
import net.shibboleth.shared.component.IdentifiedComponent;
-import net.shibboleth.shared.logic.Constraint;
-import net.shibboleth.shared.logic.FunctionSupport;
-import net.shibboleth.shared.logic.PredicateSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
-import net.shibboleth.shared.primitive.StringSupport;
+import net.shibboleth.shared.component.InitializableComponent;
/**
* The configuration that applies to a peer with which the software is communicating.
@@ -52,29 +41,8 @@ import net.shibboleth.shared.primitive.StringSupport;
*
* @since 5.0.0
*/
-public class RelyingPartyConfiguration extends AbstractIdentifiableInitializableComponent implements
- IdentifiedComponent, Predicate<ProfileRequestContext> {
-
- /** Lookup function to supply issuer. */
- @Nonnull private Function<ProfileRequestContext,String> issuerLookupStrategy;
-
- /** Controls whether detailed information about errors should be exposed. */
- @Nonnull private Predicate<ProfileRequestContext> detailedErrorsPredicate;
-
- /** Lookup function to supply <code>profileConfigurations</code> property. */
- @Nonnull
- private Function<ProfileRequestContext,Map<String,ProfileConfiguration>> profileConfigurationsLookupStrategy;
-
- /** Predicate that must be true for this configuration to be active for a given request. */
- @Nonnull private Predicate<ProfileRequestContext> activationCondition;
-
- /** Constructor. */
- public RelyingPartyConfiguration() {
- activationCondition = PredicateSupport.alwaysTrue();
- issuerLookupStrategy = FunctionSupport.constant(null);
- detailedErrorsPredicate = PredicateSupport.alwaysFalse();
- profileConfigurationsLookupStrategy = FunctionSupport.constant(null);
- }
+public interface RelyingPartyConfiguration extends InitializableComponent, IdentifiedComponent,
+ Predicate<ProfileRequestContext> {
/**
* Get the name to use when issuing messages to peers.
@@ -87,33 +55,7 @@ public class RelyingPartyConfiguration extends AbstractIdentifiableInitializable
*
* @since 5.0.0
*/
- @Nullable @NotEmpty public String getIssuer(@Nullable final ProfileRequestContext profileRequestContext) {
- return issuerLookupStrategy.apply(profileRequestContext);
- }
-
- /**
- * Set the name to use when issuing messages to peers.
- *
- * @param issuer name to set
- *
- * @since 5.0.0
- */
- public void setIssuer(@Nullable @NotEmpty final String issuer) {
- checkSetterPreconditions();
- issuerLookupStrategy = FunctionSupport.constant(issuer);
- }
-
- /**
- * Set a lookup strategy for the name to use when issuing messages to peers.
- *
- * @param strategy lookup strategy
- *
- * @since 5.0.0
- */
- public void setIssuerLookupStrategy(@Nonnull final Function<ProfileRequestContext,String> strategy) {
- checkSetterPreconditions();
- issuerLookupStrategy = Constraint.isNotNull(strategy, "Lookup strategy cannot be null");
- }
+ @Nullable @NotEmpty String getIssuer(@Nullable final ProfileRequestContext profileRequestContext);
/**
* Legacy property setter for issuer.
@@ -123,24 +65,7 @@ public class RelyingPartyConfiguration extends AbstractIdentifiableInitializable
* @deprecated
*/
@Deprecated(since="5.0.0", forRemoval=true)
- public void setResponderId(@Nullable @NotEmpty final String issuer) {
- DeprecationSupport.warn(ObjectType.METHOD, "setResponderId", "relying-party.xml", "setIssuer");
- setIssuer(issuer);
- }
-
- /**
- * Set a lookup strategy for the issuer property.
- *
- * @param strategy lookup strategy
- *
- * @deprecated
- */
- @Deprecated(since="5.0.0", forRemoval=true)
- public void setResponderIdLookupStrategy(@Nonnull final Function<ProfileRequestContext,String> strategy) {
- DeprecationSupport.warn(ObjectType.METHOD, "setResponderIdLookupStrategy", "relying-party.xml",
- "setIssuerLookupStrategy");
- setIssuerLookupStrategy(strategy);
- }
+ void setResponderId(@Nullable @NotEmpty final String issuer);
/**
* Get whether detailed information about errors should be exposed.
@@ -149,28 +74,7 @@ public class RelyingPartyConfiguration extends AbstractIdentifiableInitializable
*
* @return true iff it is acceptable to expose detailed error information
*/
- public boolean isDetailedErrors(@Nullable final ProfileRequestContext profileRequestContext) {
- return detailedErrorsPredicate.test(profileRequestContext);
- }
-
- /**
- * Set whether detailed information about errors should be exposed.
- *
- * @param flag flag to set
- */
- public void setDetailedErrors(final boolean flag) {
- checkSetterPreconditions();
- detailedErrorsPredicate = PredicateSupport.constant(flag);
- }
-
- /**
- * Set a condition to determine whether detailed information about errors should be exposed.
- *
- * @param condition condition to set
- */
- public void setDetailedErrorsPredicate(@Nonnull final Predicate<ProfileRequestContext> condition) {
- detailedErrorsPredicate = Constraint.isNotNull(condition, "Condition cannot be null");
- }
+ boolean isDetailedErrors(@Nullable final ProfileRequestContext profileRequestContext);
/**
* Get the unmodifiable set of profile configurations for this relying party.
@@ -179,15 +83,9 @@ public class RelyingPartyConfiguration extends AbstractIdentifiableInitializable
*
* @return unmodifiable set of profile configurations for this relying party, never null
*/
- @Nonnull @NonnullElements @Unmodifiable @NotLive public Map<String,ProfileConfiguration> getProfileConfigurations(
- @Nullable final ProfileRequestContext profileRequestContext) {
-
- final Map<String,ProfileConfiguration> map = profileConfigurationsLookupStrategy.apply(profileRequestContext);
- if (map != null) {
- return CollectionSupport.copyToMap(map);
- }
- return CollectionSupport.emptyMap();
- }
+ @Nonnull @NonnullElements @Unmodifiable @NotLive Map<String,ProfileConfiguration> getProfileConfigurations(
+ @Nullable final ProfileRequestContext profileRequestContext);
+
/**
* Get the profile configuration, for the relying party, for the given profile. This is a convenience method and is
@@ -200,65 +98,7 @@ public class RelyingPartyConfiguration extends AbstractIdentifiableInitializable
* @return the configuration for the profile or null if the profile ID was null or empty or there is no
* configuration for the given profile
*/
- @Nullable public ProfileConfiguration getProfileConfiguration(
- @Nullable final ProfileRequestContext profileRequestContext, @Nullable final String profileId) {
- final String trimmedId = StringSupport.trimOrNull(profileId);
- if (trimmedId == null) {
- return null;
- }
-
- return getProfileConfigurations(profileRequestContext).get(trimmedId);
- }
-
- /**
- * Set the profile configurations for this relying party.
- *
- * @param configs the configurations to set
- */
- public void setProfileConfigurations(@Nullable @NonnullElements final Collection<ProfileConfiguration> configs) {
- checkSetterPreconditions();
- if (configs == null) {
- profileConfigurationsLookupStrategy = FunctionSupport.constant(null);
- } else {
- final HashMap<String,ProfileConfiguration> map = new HashMap<>();
- for (final ProfileConfiguration config : List.copyOf(configs)) {
- final String trimmedId =
- Constraint.isNotNull(StringSupport.trimOrNull(config.getId()),
- "ID of profile configuration class " + config.getClass().getName() + " cannot be null");
- map.put(trimmedId, config);
- }
- profileConfigurationsLookupStrategy = FunctionSupport.constant(Map.copyOf(map));
- }
- }
-
- /**
- * Set a lookup strategy for the <code>profileConfigurations</code> property.
- *
- * @param strategy lookup strategy
- *
- * @since 4.0.0
- */
- public void setProfileConfigurationsLookupStrategy(
- @Nonnull final Function<ProfileRequestContext,Map<String,ProfileConfiguration>> strategy) {
- checkSetterPreconditions();
- profileConfigurationsLookupStrategy = Constraint.isNotNull(strategy, "Lookup strategy cannot be null");
- }
-
- /**
- * Set the condition under which the relying party configuration should be active.
- *
- * @param condition the activation condition
- */
- public void setActivationCondition(@Nonnull final Predicate<ProfileRequestContext> condition) {
- checkSetterPreconditions();
- activationCondition =
- Constraint.isNotNull(condition, "Relying party configuration activation condition cannot be null");
- }
-
- /** {@inheritDoc} */
- public boolean test(@Nullable final ProfileRequestContext input) {
- checkComponentActive();
- return activationCondition.test(input);
- }
+ @Nullable ProfileConfiguration getProfileConfiguration(@Nullable final ProfileRequestContext profileRequestContext,
+ @Nullable final String profileId);
}
\ No newline at end of file
diff --git a/shib-profile-impl/src/test/java/net/shibboleth/profile/relyingparty/impl/DefaultRelyingPartyConfigurationResolverTest.java b/shib-profile-impl/src/test/java/net/shibboleth/profile/relyingparty/impl/DefaultRelyingPartyConfigurationResolverTest.java
index 594b984..1a9a277 100644
--- a/shib-profile-impl/src/test/java/net/shibboleth/profile/relyingparty/impl/DefaultRelyingPartyConfigurationResolverTest.java
+++ b/shib-profile-impl/src/test/java/net/shibboleth/profile/relyingparty/impl/DefaultRelyingPartyConfigurationResolverTest.java
@@ -20,6 +20,7 @@ package net.shibboleth.profile.relyingparty.impl;
import java.util.Iterator;
import java.util.List;
+import net.shibboleth.profile.relyingparty.BasicRelyingPartyConfiguration;
import net.shibboleth.profile.relyingparty.RelyingPartyConfiguration;
import net.shibboleth.profile.relyingparty.VerifiedProfileCriterion;
import net.shibboleth.shared.collection.CollectionSupport;
@@ -30,25 +31,25 @@ import net.shibboleth.shared.resolver.CriteriaSet;
import org.testng.Assert;
import org.testng.annotations.Test;
-/** Unit test for {@link DefaultRelyingPartyConfigurationResolver}. */
+/** Unit test for {@link DefaultBasicRelyingPartyConfigurationResolver}. */
@SuppressWarnings("javadoc")
public class DefaultRelyingPartyConfigurationResolverTest {
@Test public void testConstruction() throws ComponentInitializationException {
- final RelyingPartyConfiguration one = new RelyingPartyConfiguration();
+ final BasicRelyingPartyConfiguration one = new BasicRelyingPartyConfiguration();
one.setId("one");
one.initialize();
- final RelyingPartyConfiguration two = new RelyingPartyConfiguration();
+ final BasicRelyingPartyConfiguration two = new BasicRelyingPartyConfiguration();
two.setId("two");
two.setActivationCondition(PredicateSupport.alwaysFalse());
two.initialize();
- final RelyingPartyConfiguration three = new RelyingPartyConfiguration();
+ final BasicRelyingPartyConfiguration three = new BasicRelyingPartyConfiguration();
three.setId("three");
three.initialize();
- final List<RelyingPartyConfiguration> rpConfigs = CollectionSupport.listOf(one, two, three);
+ final List<BasicRelyingPartyConfiguration> rpConfigs = CollectionSupport.listOf(one, two, three);
DefaultRelyingPartyConfigurationResolver resolver = new DefaultRelyingPartyConfigurationResolver();
resolver.setId("test");
@@ -68,11 +69,11 @@ public class DefaultRelyingPartyConfigurationResolverTest {
}
@Test public void testDefault() throws Exception {
- final RelyingPartyConfiguration anonRP = new RelyingPartyConfiguration();
+ final BasicRelyingPartyConfiguration anonRP = new BasicRelyingPartyConfiguration();
anonRP.setId("anonRPId");
anonRP.initialize();
- final RelyingPartyConfiguration defaultRP = new RelyingPartyConfiguration();
+ final BasicRelyingPartyConfiguration defaultRP = new BasicRelyingPartyConfiguration();
defaultRP.setId("defaultRPId");
defaultRP.initialize();
@@ -98,11 +99,11 @@ public class DefaultRelyingPartyConfigurationResolverTest {
@Test public void testAnon() throws Exception {
- final RelyingPartyConfiguration anonRP = new RelyingPartyConfiguration();
+ final BasicRelyingPartyConfiguration anonRP = new BasicRelyingPartyConfiguration();
anonRP.setId("anonRPId");
anonRP.initialize();
- final RelyingPartyConfiguration defaultRP = new RelyingPartyConfiguration();
+ final BasicRelyingPartyConfiguration defaultRP = new BasicRelyingPartyConfiguration();
defaultRP.setId("defaultRPId");
defaultRP.initialize();
@@ -124,28 +125,28 @@ public class DefaultRelyingPartyConfigurationResolverTest {
}
@Test public void testResolve() throws Exception {
- final RelyingPartyConfiguration anonRP = new RelyingPartyConfiguration();
+ final BasicRelyingPartyConfiguration anonRP = new BasicRelyingPartyConfiguration();
anonRP.setId("anonRPId");
anonRP.initialize();
- final RelyingPartyConfiguration defaultRP = new RelyingPartyConfiguration();
+ final BasicRelyingPartyConfiguration defaultRP = new BasicRelyingPartyConfiguration();
defaultRP.setId("defaultRPId");
defaultRP.initialize();
- final RelyingPartyConfiguration one = new RelyingPartyConfiguration();
+ final BasicRelyingPartyConfiguration one = new BasicRelyingPartyConfiguration();
one.setId("one");
one.initialize();
- final RelyingPartyConfiguration two = new RelyingPartyConfiguration();
+ final BasicRelyingPartyConfiguration two = new BasicRelyingPartyConfiguration();
two.setId("two");
two.setActivationCondition(PredicateSupport.alwaysFalse());
two.initialize();
- final RelyingPartyConfiguration three = new RelyingPartyConfiguration();
+ final BasicRelyingPartyConfiguration three = new BasicRelyingPartyConfiguration();
three.setId("three");
three.initialize();
- final List<RelyingPartyConfiguration> rpConfigs = CollectionSupport.listOf(one, two, three);
+ final List<BasicRelyingPartyConfiguration> rpConfigs = CollectionSupport.listOf(one, two, three);
final DefaultRelyingPartyConfigurationResolver resolver = new DefaultRelyingPartyConfigurationResolver();
resolver.setId("test");
diff --git a/shib-profile-impl/src/test/java/net/shibboleth/profile/relyingparty/impl/RelyingPartyConfigurationTest.java b/shib-profile-impl/src/test/java/net/shibboleth/profile/relyingparty/impl/RelyingPartyConfigurationTest.java
index a2fd530..d88267f 100644
--- a/shib-profile-impl/src/test/java/net/shibboleth/profile/relyingparty/impl/RelyingPartyConfigurationTest.java
+++ b/shib-profile-impl/src/test/java/net/shibboleth/profile/relyingparty/impl/RelyingPartyConfigurationTest.java
@@ -23,6 +23,7 @@ import java.util.Map;
import net.shibboleth.profile.config.ProfileConfiguration;
import net.shibboleth.profile.config.testing.MockProfileConfiguration;
+import net.shibboleth.profile.relyingparty.BasicRelyingPartyConfiguration;
import net.shibboleth.profile.relyingparty.RelyingPartyConfiguration;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.ConstraintViolationException;
@@ -36,13 +37,13 @@ import org.testng.annotations.Test;
public class RelyingPartyConfigurationTest {
@Test public void testConstruction() throws ComponentInitializationException {
- RelyingPartyConfiguration config = new RelyingPartyConfiguration();
+ BasicRelyingPartyConfiguration config = new BasicRelyingPartyConfiguration();
config.setId("foo");
config.initialize();
Assert.assertEquals(config.getId(), "foo");
Assert.assertTrue(config.getProfileConfigurations(null).isEmpty());
- config = new RelyingPartyConfiguration();
+ config = new BasicRelyingPartyConfiguration();
config.setId("foo");
config.initialize();
Assert.assertEquals(config.getId(), "foo");
@@ -52,7 +53,7 @@ public class RelyingPartyConfigurationTest {
profileConfigs.add(new MockProfileConfiguration("foo"));
profileConfigs.add(new MockProfileConfiguration("bar"));
- config = new RelyingPartyConfiguration();
+ config = new BasicRelyingPartyConfiguration();
config.setId("foo");
config.setProfileConfigurations(profileConfigs);
config.initialize();
@@ -60,7 +61,7 @@ public class RelyingPartyConfigurationTest {
Assert.assertEquals(config.getProfileConfigurations(null).size(), 2);
try {
- config = new RelyingPartyConfiguration();
+ config = new BasicRelyingPartyConfiguration();
config.initialize();
Assert.fail();
} catch (final ComponentInitializationException e) {
@@ -68,7 +69,7 @@ public class RelyingPartyConfigurationTest {
}
try {
- config = new RelyingPartyConfiguration();
+ config = new BasicRelyingPartyConfiguration();
config.setId("");
config.initialize();
Assert.fail();
@@ -82,7 +83,7 @@ public class RelyingPartyConfigurationTest {
profileConfigs.add(new MockProfileConfiguration("foo"));
profileConfigs.add(new MockProfileConfiguration("bar"));
- final RelyingPartyConfiguration config = new RelyingPartyConfiguration();
+ final BasicRelyingPartyConfiguration config = new BasicRelyingPartyConfiguration();
config.setId("foo");
config.setProfileConfigurations(profileConfigs);
config.initialize();
@@ -97,7 +98,7 @@ public class RelyingPartyConfigurationTest {
profileConfigs.put("foo", new MockProfileConfiguration("foo"));
profileConfigs.put("bar", new MockProfileConfiguration("bar"));
- RelyingPartyConfiguration config = new RelyingPartyConfiguration();
+ BasicRelyingPartyConfiguration config = new BasicRelyingPartyConfiguration();
config.setId("foo");
config.setProfileConfigurationsLookupStrategy(FunctionSupport.constant(profileConfigs));
config.initialize();
@@ -106,7 +107,7 @@ public class RelyingPartyConfigurationTest {
Assert.assertNotNull(config.getProfileConfiguration(null, "bar"));
Assert.assertNull(config.getProfileConfiguration(null, "baz"));
- config = new RelyingPartyConfiguration();
+ config = new BasicRelyingPartyConfiguration();
config.setId("foo");
config.setProfileConfigurations(profileConfigs.values());
config.setProfileConfigurationsLookupStrategy(FunctionSupport.constant(null));
diff --git a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/relyingparty/RelyingPartyConfigurationSupport.java b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/relyingparty/RelyingPartyConfigurationSupport.java
index c83d0bf..c09b34a 100644
--- a/shib-saml-profile-api/src/main/java/net/shibboleth/saml/relyingparty/RelyingPartyConfigurationSupport.java
+++ b/shib-saml-profile-api/src/main/java/net/shibboleth/saml/relyingparty/RelyingPartyConfigurationSupport.java
@@ -28,8 +28,11 @@ import org.opensaml.saml.common.profile.logic.EntityAttributesPredicate;
import org.opensaml.saml.common.profile.logic.EntityAttributesPredicate.Candidate;
import org.opensaml.saml.common.profile.logic.EntityGroupNamePredicate;
import org.opensaml.saml.metadata.resolver.MetadataResolver;
+import org.opensaml.saml.saml2.metadata.AffiliationDescriptor;
+import org.opensaml.saml.saml2.metadata.EntitiesDescriptor;
import org.opensaml.saml.saml2.metadata.EntityDescriptor;
+import net.shibboleth.profile.relyingparty.BasicRelyingPartyConfiguration;
import net.shibboleth.profile.relyingparty.RelyingPartyConfiguration;
import net.shibboleth.profile.context.logic.RelyingPartyIdPredicate;
import net.shibboleth.saml.profile.context.logic.MappedEntityAttributesPredicate;
@@ -50,8 +53,8 @@ public final class RelyingPartyConfigurationSupport {
}
/**
- * A shorthand method for constructing a {@link RelyingPartyConfiguration} with an activation condition based on
- * one or more relying party IDs.
+ * A shorthand method for constructing a {@link BasicRelyingPartyConfiguration} with an activation condition
+ * based on one or more relying party IDs.
*
* <p>If a single ID is supplied, then the ID is also set as the identifier for the configuration.</p>
*
@@ -59,12 +62,12 @@ public final class RelyingPartyConfigurationSupport {
*
* @return a default-constructed configuration with the appropriate condition set
*/
- @Nonnull public static RelyingPartyConfiguration byName(
+ @Nonnull public static BasicRelyingPartyConfiguration byName(
@Nonnull @NonnullElements final Collection<String> relyingPartyIds) {
Constraint.isNotNull(relyingPartyIds, "Relying Party ID list cannot be null");
- final RelyingPartyConfiguration config = new RelyingPartyConfiguration();
+ final BasicRelyingPartyConfiguration config = new BasicRelyingPartyConfiguration();
config.setActivationCondition(new RelyingPartyIdPredicate(relyingPartyIds));
final StringBuffer name = new StringBuffer("EntityNames[");
@@ -78,16 +81,15 @@ public final class RelyingPartyConfigurationSupport {
}
/**
- * A shorthand method for constructing a {@link RelyingPartyConfiguration} with an activation condition based on
- * one or more {@link org.opensaml.saml.saml2.metadata.EntitiesDescriptor} groups, and optionally via
- * {@link org.opensaml.saml.saml2.metadata.AffiliationDescriptor} lookup.
+ * A shorthand method for constructing a {@link BasicRelyingPartyConfiguration} with an activation condition
+ * based on one or more {@link EntitiesDescriptor} groups, and optionally via {@link AffiliationDescriptor} lookup.
*
* @param groupNames the group names
* @param resolver optional metadata source for affiliation lookup
*
* @return a default-constructed configuration with the appropriate condition set
*/
- @Nonnull public static RelyingPartyConfiguration byGroup(
+ @Nonnull public static BasicRelyingPartyConfiguration byGroup(
@Nonnull @NonnullElements final Collection<String> groupNames,
@Nullable final MetadataResolver resolver) {
Constraint.isNotNull(groupNames, "Group name list cannot be null");
@@ -100,7 +102,7 @@ public final class RelyingPartyConfigurationSupport {
new EntityDescriptorLookupFunction().compose(new SAMLMetadataContextLookupFunction()),
new EntityGroupNamePredicate(groupNames, resolver));
- final RelyingPartyConfiguration config = new RelyingPartyConfiguration();
+ final BasicRelyingPartyConfiguration config = new BasicRelyingPartyConfiguration();
config.setActivationCondition(indirectPredicate);
final StringBuffer name = new StringBuffer("EntityGroups[");
@@ -115,8 +117,8 @@ public final class RelyingPartyConfigurationSupport {
/**
- * A shorthand method for constructing a {@link RelyingPartyConfiguration} with an activation condition based on
- * an {@link EntityAttributesPredicate}.
+ * A shorthand method for constructing a {@link BasicRelyingPartyConfiguration} with an activation condition
+ * based on an {@link EntityAttributesPredicate}.
*
* @param candidates the candidate rules
* @param trim true iff tag values in metadata should be trimmed before comparison
@@ -124,7 +126,7 @@ public final class RelyingPartyConfigurationSupport {
*
* @return a default-constructed configuration with the appropriate condition set
*/
- @Nonnull public static RelyingPartyConfiguration byTag(
+ @Nonnull public static BasicRelyingPartyConfiguration byTag(
@Nonnull @NonnullElements final Collection<Candidate> candidates, final boolean trim,
final boolean matchAll) {
Constraint.isNotNull(candidates, "Candidate list cannot be null");
@@ -137,15 +139,15 @@ public final class RelyingPartyConfigurationSupport {
new EntityDescriptorLookupFunction().compose(new SAMLMetadataContextLookupFunction()),
new EntityAttributesPredicate(candidates, trim, matchAll));
- final RelyingPartyConfiguration config = new RelyingPartyConfiguration();
+ final BasicRelyingPartyConfiguration config = new BasicRelyingPartyConfiguration();
config.setActivationCondition(indirectPredicate);
return config;
}
/**
- * A shorthand method for constructing a {@link RelyingPartyConfiguration} with an activation condition based on
- * a {@link MappedEntityAttributesPredicate}.
+ * A shorthand method for constructing a {@link BasicRelyingPartyConfiguration} with an activation condition
+ * based on a {@link MappedEntityAttributesPredicate}.
*
* @param candidates the candidate rules
* @param trim true iff tag values in metadata should be trimmed before comparison
@@ -153,7 +155,7 @@ public final class RelyingPartyConfigurationSupport {
*
* @return a default-constructed configuration with the appropriate condition set
*/
- @Nonnull public static RelyingPartyConfiguration byMappedTag(
+ @Nonnull public static BasicRelyingPartyConfiguration byMappedTag(
@Nonnull @NonnullElements final Collection<Candidate> candidates, final boolean trim,
final boolean matchAll) {
Constraint.isNotNull(candidates, "Candidate list cannot be null");
@@ -166,7 +168,7 @@ public final class RelyingPartyConfigurationSupport {
new EntityDescriptorLookupFunction().compose(new SAMLMetadataContextLookupFunction()),
new MappedEntityAttributesPredicate(candidates, trim, matchAll));
- final RelyingPartyConfiguration config = new RelyingPartyConfiguration();
+ final BasicRelyingPartyConfiguration config = new BasicRelyingPartyConfiguration();
config.setActivationCondition(indirectPredicate);
return config;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list