[java-identity-provider] branch master updated: IDP-1430 - Review and cleanup of ProfileConfig classes
Scott Cantor
cantor.2 at osu.edu
Thu Mar 28 10:44:29 EDT 2019
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=d837af0471f3f5fad1f3233662e4e733e37ecdf9
The following commit(s) were added to refs/heads/master by this push:
new d837af0 IDP-1430 - Review and cleanup of ProfileConfig classes
d837af0 is described below
commit d837af0471f3f5fad1f3233662e4e733e37ecdf9
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Mar 28 10:44:26 2019 -0400
IDP-1430 - Review and cleanup of ProfileConfig classes
https://issues.shibboleth.net/jira/browse/IDP-1430
Final? cleanup pass hitting MessageContext lookups.
Helper methods for tunnelled access to PRC removed.
---
.../system/conf/relying-party-mddriven.xml | 12 +++---
.../config/AbstractProfileConfiguration.java | 47 ---------------------
.../SAMLArtifactConsumerProfileConfiguration.java | 20 +++++----
.../ClientTLSArtifactRequestsPredicate.java | 2 +-
.../ClientTLSSOAPLogoutRequestsPredicate.java | 2 +-
.../messaging/SignArtifactRequestsPredicate.java | 2 +-
.../messaging/SignSOAPLogoutRequestsPredicate.java | 2 +-
...ractSAML2ArtifactAwareProfileConfiguration.java | 36 +++++++++++++---
.../config/SingleLogoutProfileConfiguration.java | 48 +++++++++++++++++-----
.../AttributeQueryProfileConfigurationTest.java | 10 ++---
.../config/BrowserSSOProfileConfigurationTest.java | 9 ++--
.../SingleLogoutProfileConfigurationTest.java | 10 ++---
12 files changed, 101 insertions(+), 99 deletions(-)
diff --git a/idp-conf/src/main/resources/system/conf/relying-party-mddriven.xml b/idp-conf/src/main/resources/system/conf/relying-party-mddriven.xml
index 2d1cec1..e289c56 100644
--- a/idp-conf/src/main/resources/system/conf/relying-party-mddriven.xml
+++ b/idp-conf/src/main/resources/system/conf/relying-party-mddriven.xml
@@ -307,7 +307,7 @@
<bean parent="shibboleth.MDDrivenBeanProperty" p:propertyName="artifactConfiguration"
p:propertyType="#{T(net.shibboleth.idp.saml.profile.config.SAMLArtifactConfiguration)}" />
</property>
- <property name="signArtifactRequests">
+ <property name="signArtifactRequestsPredicate">
<bean class="net.shibboleth.utilities.java.support.logic.PredicateSupport" factory-method="fromFunction">
<constructor-arg>
<bean parent="shibboleth.MDDrivenBoolProperty" p:propertyName="signArtifactRequests" />
@@ -317,7 +317,7 @@
</constructor-arg>
</bean>
</property>
- <property name="clientTLSArtifactRequests">
+ <property name="clientTLSArtifactRequestsPredicate">
<bean class="net.shibboleth.utilities.java.support.logic.PredicateSupport" factory-method="fromFunction">
<constructor-arg>
<bean parent="shibboleth.MDDrivenBoolProperty" p:propertyName="clientTLSArtifactRequests" />
@@ -426,7 +426,7 @@
<bean parent="shibboleth.MDDrivenBeanProperty" p:propertyName="artifactConfiguration"
p:propertyType="#{T(net.shibboleth.idp.saml.profile.config.SAMLArtifactConfiguration)}" />
</property>
- <property name="signArtifactRequests">
+ <property name="signArtifactRequestsPredicate">
<bean class="net.shibboleth.utilities.java.support.logic.PredicateSupport" factory-method="fromFunction">
<constructor-arg>
<bean parent="shibboleth.MDDrivenBoolProperty" p:propertyName="signArtifactRequests" />
@@ -436,7 +436,7 @@
</constructor-arg>
</bean>
</property>
- <property name="clientTLSArtifactRequests">
+ <property name="clientTLSArtifactRequestsPredicate">
<bean class="net.shibboleth.utilities.java.support.logic.PredicateSupport" factory-method="fromFunction">
<constructor-arg>
<bean parent="shibboleth.MDDrivenBoolProperty" p:propertyName="clientTLSArtifactRequests" />
@@ -450,7 +450,7 @@
</constructor-arg>
</bean>
</property>
- <property name="signSOAPRequests">
+ <property name="signSOAPRequestsPredicate">
<bean class="net.shibboleth.utilities.java.support.logic.PredicateSupport" factory-method="fromFunction">
<constructor-arg>
<bean parent="shibboleth.MDDrivenBoolProperty" p:propertyName="signSOAPRequests" />
@@ -460,7 +460,7 @@
</constructor-arg>
</bean>
</property>
- <property name="clientTLSSOAPRequests">
+ <property name="clientTLSSOAPRequestsPredicate">
<bean class="net.shibboleth.utilities.java.support.logic.PredicateSupport" factory-method="fromFunction">
<constructor-arg>
<bean parent="shibboleth.MDDrivenBoolProperty" p:propertyName="clientTLSSOAPRequests" />
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/AbstractProfileConfiguration.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/AbstractProfileConfiguration.java
index 910e583..097cd17 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/AbstractProfileConfiguration.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/AbstractProfileConfiguration.java
@@ -258,52 +258,5 @@ public abstract class AbstractProfileConfiguration extends AbstractIdentifiableI
final AbstractProfileConfiguration other = (AbstractProfileConfiguration) obj;
return Objects.equals(getId(), other.getId());
}
-
- /**
- * Get the current {@link ProfileRequestContext}.
- *
- * @return current profile request context
- *
- * @since 3.3.0
- */
- @Deprecated
- @Nullable protected ProfileRequestContext getProfileRequestContext() {
- if (servletRequest != null) {
- final Object object = servletRequest.getAttribute(ProfileRequestContext.BINDING_KEY);
- if (object instanceof ProfileRequestContext) {
- return (ProfileRequestContext) object;
- }
- log.warn("ProfileConfiguration {}: No ProfileRequestContext in request", getId());
- } else {
- log.warn("ProfileConfiguration {}: ServletRequest was null", getId());
- }
- return null;
- }
-
- /**
- * Get a property, possibly through indirection via a lookup function.
- *
- * @param <T> type of property
- *
- * @param lookupStrategy lookup strategy function for indirect access
- * @param staticValue static value to return in the absence of a lookup function or if null is returned
- *
- * @return a dynamic or static result, if any
- *
- * @since 3.3.0
- */
- @Deprecated
- @Nullable protected <T> T getIndirectProperty(@Nullable final Function<ProfileRequestContext,T> lookupStrategy,
- @Nullable final T staticValue) {
-
- if (lookupStrategy != null) {
- final T prop = lookupStrategy.apply(getProfileRequestContext());
- if (prop != null) {
- return prop;
- }
- }
-
- return staticValue;
- }
}
\ No newline at end of file
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/SAMLArtifactConsumerProfileConfiguration.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/SAMLArtifactConsumerProfileConfiguration.java
index c7a8fd9..5ba65da 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/SAMLArtifactConsumerProfileConfiguration.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/SAMLArtifactConsumerProfileConfiguration.java
@@ -17,9 +17,7 @@
package net.shibboleth.idp.saml.profile.config;
-import java.util.function.Predicate;
-
-import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
import org.opensaml.messaging.context.MessageContext;
@@ -30,17 +28,21 @@ import org.opensaml.messaging.context.MessageContext;
public interface SAMLArtifactConsumerProfileConfiguration extends SAMLProfileConfiguration {
/**
- * Get the predicate used to determine if artifact resolution requests should be signed.
+ * Get whether artifact resolution requests should be signed.
+ *
+ * @param messageContext current message context
*
- * @return predicate used to determine if artifact resolution requests should be signed
+ * @return whether artifact resolution requests should be signed
*/
- @Nonnull Predicate<MessageContext> getSignArtifactRequests();
+ boolean isSignArtifactRequests(@Nullable final MessageContext messageContext);
/**
- * Get the predicate used to determine if artifact resolution requests should use client TLS.
+ * Get whether artifact resolution requests should use client TLS.
+ *
+ * @param messageContext current message context
*
- * @return predicate used to determine if artifact resolution requests should use client TLS
+ * @return whether artifact resolution requests should use client TLS
*/
- @Nonnull Predicate<MessageContext> getClientTLSArtifactRequests();
+ boolean isClientTLSArtifactRequests(@Nullable final MessageContext messageContext);
}
\ No newline at end of file
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/logic/messaging/ClientTLSArtifactRequestsPredicate.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/logic/messaging/ClientTLSArtifactRequestsPredicate.java
index eee482f..7fa475b 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/logic/messaging/ClientTLSArtifactRequestsPredicate.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/logic/messaging/ClientTLSArtifactRequestsPredicate.java
@@ -36,7 +36,7 @@ public class ClientTLSArtifactRequestsPredicate extends AbstractRelyingPartyPred
if (rpc != null) {
final ProfileConfiguration pc = rpc.getProfileConfig();
if (pc != null && pc instanceof SAMLArtifactConsumerProfileConfiguration) {
- return ((SAMLArtifactConsumerProfileConfiguration) pc).getClientTLSArtifactRequests().test(input);
+ return ((SAMLArtifactConsumerProfileConfiguration) pc).isClientTLSArtifactRequests(input);
}
}
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/logic/messaging/ClientTLSSOAPLogoutRequestsPredicate.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/logic/messaging/ClientTLSSOAPLogoutRequestsPredicate.java
index 18ec968..0290cbf 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/logic/messaging/ClientTLSSOAPLogoutRequestsPredicate.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/logic/messaging/ClientTLSSOAPLogoutRequestsPredicate.java
@@ -36,7 +36,7 @@ public class ClientTLSSOAPLogoutRequestsPredicate extends AbstractRelyingPartyPr
if (rpc != null) {
final ProfileConfiguration pc = rpc.getProfileConfig();
if (pc != null && pc instanceof SingleLogoutProfileConfiguration) {
- return ((SingleLogoutProfileConfiguration) pc).getClientTLSSOAPRequests().test(input);
+ return ((SingleLogoutProfileConfiguration) pc).isClientTLSSOAPRequests(input);
}
}
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/logic/messaging/SignArtifactRequestsPredicate.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/logic/messaging/SignArtifactRequestsPredicate.java
index 5f25a4b..583ed7b 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/logic/messaging/SignArtifactRequestsPredicate.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/logic/messaging/SignArtifactRequestsPredicate.java
@@ -36,7 +36,7 @@ public class SignArtifactRequestsPredicate extends AbstractRelyingPartyPredicate
if (rpc != null) {
final ProfileConfiguration pc = rpc.getProfileConfig();
if (pc != null && pc instanceof SAMLArtifactConsumerProfileConfiguration) {
- return ((SAMLArtifactConsumerProfileConfiguration) pc).getSignArtifactRequests().test(input);
+ return ((SAMLArtifactConsumerProfileConfiguration) pc).isSignArtifactRequests(input);
}
}
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/logic/messaging/SignSOAPLogoutRequestsPredicate.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/logic/messaging/SignSOAPLogoutRequestsPredicate.java
index df819ed..d2b0d78 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/logic/messaging/SignSOAPLogoutRequestsPredicate.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/logic/messaging/SignSOAPLogoutRequestsPredicate.java
@@ -36,7 +36,7 @@ public class SignSOAPLogoutRequestsPredicate extends AbstractRelyingPartyPredica
if (rpc != null) {
final ProfileConfiguration pc = rpc.getProfileConfig();
if (pc != null && pc instanceof SingleLogoutProfileConfiguration) {
- return ((SingleLogoutProfileConfiguration) pc).getSignSOAPRequests().test(input);
+ return ((SingleLogoutProfileConfiguration) pc).isSignSOAPRequests(input);
}
}
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/AbstractSAML2ArtifactAwareProfileConfiguration.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/AbstractSAML2ArtifactAwareProfileConfiguration.java
index 1944288..fcd82fc 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/AbstractSAML2ArtifactAwareProfileConfiguration.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/AbstractSAML2ArtifactAwareProfileConfiguration.java
@@ -27,6 +27,8 @@ import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.logic.NoIntegrityMessageChannelPredicate;
import org.opensaml.profile.context.ProfileRequestContext;
+import com.google.common.base.Predicates;
+
import net.shibboleth.idp.saml.profile.config.SAMLArtifactAwareProfileConfiguration;
import net.shibboleth.idp.saml.profile.config.SAMLArtifactConfiguration;
import net.shibboleth.idp.saml.profile.config.SAMLArtifactConsumerProfileConfiguration;
@@ -91,31 +93,53 @@ public abstract class AbstractSAML2ArtifactAwareProfileConfiguration extends Abs
}
/** {@inheritDoc} */
- public Predicate<MessageContext> getSignArtifactRequests() {
- return signArtifactRequestsPredicate;
+ public boolean isSignArtifactRequests(@Nullable final MessageContext messageContext) {
+ return signArtifactRequestsPredicate.test(messageContext);
+ }
+
+ /**
+ * Set whether artifact resolution requests should be signed.
+ *
+ * @param flag flag to set
+ */
+ public void setSignArtifactRequests(final boolean flag) {
+ signArtifactRequestsPredicate = flag ? Predicates.alwaysTrue() : Predicates.alwaysFalse();
}
/**
* Set the predicate used to determine if artifact resolution requests should be signed.
*
* @param predicate the predicate
+ *
+ * @since 4.0.0
*/
- public void setSignArtifactRequests(@Nonnull final Predicate<MessageContext> predicate) {
+ public void setSignArtifactRequestsPredicate(@Nonnull final Predicate<MessageContext> predicate) {
signArtifactRequestsPredicate = Constraint.isNotNull(predicate,
"Predicate used to determine artifact request signing may not be null");
}
/** {@inheritDoc} */
- public Predicate<MessageContext> getClientTLSArtifactRequests() {
- return clientTLSArtifactRequestsPredicate;
+ public boolean isClientTLSArtifactRequests(@Nullable final MessageContext messageContext) {
+ return clientTLSArtifactRequestsPredicate.test(messageContext);
}
/**
+ * Set whether artifact resolution requests should use client TLS.
+ *
+ * @param flag flag to set
+ */
+ public void setClientTLSArtifactRequests(final boolean flag) {
+ clientTLSArtifactRequestsPredicate = flag ? Predicates.alwaysTrue() : Predicates.alwaysFalse();
+ }
+
+ /**
* Set the predicate used to determine if artifact resolution requests should use client TLS.
*
* @param predicate the predicate
+ *
+ * @since 4.0.0
*/
- public void setClientTLSArtifactRequests(@Nonnull final Predicate<MessageContext> predicate) {
+ public void setClientTLSArtifactRequestsPredicate(@Nonnull final Predicate<MessageContext> predicate) {
clientTLSArtifactRequestsPredicate = Constraint.isNotNull(predicate,
"Predicate used to determine artifact client TLS use may not be null");
}
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/SingleLogoutProfileConfiguration.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/SingleLogoutProfileConfiguration.java
index 15b1890..913f6aa 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/SingleLogoutProfileConfiguration.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/SingleLogoutProfileConfiguration.java
@@ -29,6 +29,8 @@ import org.opensaml.profile.context.ProfileRequestContext;
import org.opensaml.profile.logic.NoConfidentialityMessageChannelPredicate;
import org.opensaml.profile.logic.NoIntegrityMessageChannelPredicate;
+import com.google.common.base.Predicates;
+
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
@@ -75,14 +77,27 @@ public class SingleLogoutProfileConfiguration extends AbstractSAML2ArtifactAware
}
/**
- * Get the predicate used to determine if SOAP-based requests should be signed.
+ * Get whether SOAP-based requests should be signed.
+ *
+ * @param messageContext current message context
+ *
+ * @return whether SOAP-based requests should be signed
+ *
+ * @since 4.0.0
+ */
+ public boolean isSignSOAPRequests(@Nullable final MessageContext messageContext) {
+ return signSOAPRequestsPredicate.test(messageContext);
+ }
+
+ /**
+ * Set whether SOAP-based requests should be signed.
*
- * @return predicate used to determine if SOAP-based requests should be signed
+ * @param flag flag to set
*
* @since 4.0.0
*/
- @Nonnull public Predicate<MessageContext> getSignSOAPRequests() {
- return signSOAPRequestsPredicate;
+ public void setSignSOAPRequests(final boolean flag) {
+ signSOAPRequestsPredicate = flag ? Predicates.alwaysTrue() : Predicates.alwaysFalse();
}
/**
@@ -92,20 +107,33 @@ public class SingleLogoutProfileConfiguration extends AbstractSAML2ArtifactAware
*
* @since 4.0.0
*/
- public void setSignSOAPRequests(@Nonnull final Predicate<MessageContext> predicate) {
+ public void setSignSOAPRequestsPredicate(@Nonnull final Predicate<MessageContext> predicate) {
signSOAPRequestsPredicate = Constraint.isNotNull(predicate,
"Predicate used to determine SOAP-based signing cannot be null");
}
/**
- * Get the predicate used to determine if SOAP-based requests should use client TLS.
+ * Get whether SOAP-based requests should use client TLS.
+ *
+ * @param messageContext current message context
+ *
+ * @return whether SOAP-based requests should use client TLS
+ *
+ * @since 4.0.0
+ */
+ public boolean isClientTLSSOAPRequests(@Nullable final MessageContext messageContext) {
+ return clientTLSSOAPRequestsPredicate.test(messageContext);
+ }
+
+ /**
+ * Set whether SOAP-based requests should use client TLS.
*
- * @return predicate used to determine if SOAP-based requests should use client TLS
+ * @param flag flag to set
*
* @since 4.0.0
*/
- @Nonnull public Predicate<MessageContext> getClientTLSSOAPRequests() {
- return clientTLSSOAPRequestsPredicate;
+ public void setClientTLSSOAPRequests(final boolean flag) {
+ clientTLSSOAPRequestsPredicate = flag ? Predicates.alwaysTrue() : Predicates.alwaysFalse();
}
/**
@@ -115,7 +143,7 @@ public class SingleLogoutProfileConfiguration extends AbstractSAML2ArtifactAware
*
* @since 4.0.0
*/
- public void setClientTLSSOAPRequests(@Nonnull final Predicate<MessageContext> predicate) {
+ public void setClientTLSSOAPRequestsPredicate(@Nonnull final Predicate<MessageContext> predicate) {
clientTLSSOAPRequestsPredicate = Constraint.isNotNull(predicate,
"Predicate used to determine SOAP-based client TLS use cannot be null");
}
diff --git a/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml2/profile/config/AttributeQueryProfileConfigurationTest.java b/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml2/profile/config/AttributeQueryProfileConfigurationTest.java
index 46fb32a..3e296eb 100644
--- a/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml2/profile/config/AttributeQueryProfileConfigurationTest.java
+++ b/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml2/profile/config/AttributeQueryProfileConfigurationTest.java
@@ -20,8 +20,6 @@ package net.shibboleth.idp.saml.saml2.profile.config;
import org.testng.Assert;
import org.testng.annotations.Test;
-import com.google.common.base.Predicates;
-
import net.shibboleth.idp.saml.profile.config.BasicSAMLArtifactConfiguration;
import net.shibboleth.idp.saml.profile.config.SAMLArtifactConfiguration;
import net.shibboleth.utilities.java.support.logic.FunctionSupport;
@@ -63,16 +61,16 @@ public class AttributeQueryProfileConfigurationTest {
public void testSignArtifactRequests() {
final AttributeQueryProfileConfiguration config = new AttributeQueryProfileConfiguration();
- config.setSignArtifactRequests(Predicates.alwaysTrue());
- Assert.assertSame(config.getSignArtifactRequests(), Predicates.alwaysTrue());
+ config.setSignArtifactRequests(true);
+ Assert.assertTrue(config.isSignArtifactRequests(null));
}
@Test
public void testClientTLSArtifactRequests() {
final AttributeQueryProfileConfiguration config = new AttributeQueryProfileConfiguration();
- config.setClientTLSArtifactRequests(Predicates.alwaysTrue());
- Assert.assertSame(config.getClientTLSArtifactRequests(), Predicates.alwaysTrue());
+ config.setClientTLSArtifactRequests(true);
+ Assert.assertTrue(config.isClientTLSArtifactRequests(null));
}
}
\ No newline at end of file
diff --git a/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml2/profile/config/BrowserSSOProfileConfigurationTest.java b/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml2/profile/config/BrowserSSOProfileConfigurationTest.java
index ef53fb6..33aea27 100644
--- a/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml2/profile/config/BrowserSSOProfileConfigurationTest.java
+++ b/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml2/profile/config/BrowserSSOProfileConfigurationTest.java
@@ -30,7 +30,6 @@ import java.util.List;
import java.util.Set;
import java.util.function.Predicate;
-import org.opensaml.messaging.context.MessageContext;
import org.opensaml.profile.context.ProfileRequestContext;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -275,16 +274,16 @@ public class BrowserSSOProfileConfigurationTest {
public void testSignArtifactRequests() {
final BrowserSSOProfileConfiguration config = new BrowserSSOProfileConfiguration();
- config.setSignArtifactRequests(Predicates.<MessageContext>alwaysTrue());
- Assert.assertSame(config.getSignArtifactRequests(), Predicates.alwaysTrue());
+ config.setSignArtifactRequests(true);
+ Assert.assertTrue(config.isSignArtifactRequests(null));
}
@Test
public void testClientTLSArtifactRequests() {
final BrowserSSOProfileConfiguration config = new BrowserSSOProfileConfiguration();
- config.setClientTLSArtifactRequests(Predicates.alwaysTrue());
- Assert.assertSame(config.getClientTLSArtifactRequests(), Predicates.alwaysTrue());
+ config.setClientTLSArtifactRequests(true);
+ Assert.assertTrue(config.isClientTLSArtifactRequests(null));
}
diff --git a/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml2/profile/config/SingleLogoutProfileConfigurationTest.java b/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml2/profile/config/SingleLogoutProfileConfigurationTest.java
index 9d4767f..634431c 100644
--- a/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml2/profile/config/SingleLogoutProfileConfigurationTest.java
+++ b/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml2/profile/config/SingleLogoutProfileConfigurationTest.java
@@ -20,8 +20,6 @@ package net.shibboleth.idp.saml.saml2.profile.config;
import org.testng.Assert;
import org.testng.annotations.Test;
-import com.google.common.base.Predicates;
-
import net.shibboleth.idp.saml.profile.config.BasicSAMLArtifactConfiguration;
import net.shibboleth.idp.saml.profile.config.SAMLArtifactConfiguration;
import net.shibboleth.utilities.java.support.logic.FunctionSupport;
@@ -63,16 +61,16 @@ public class SingleLogoutProfileConfigurationTest {
public void testSignArtifactRequests() {
final SingleLogoutProfileConfiguration config = new SingleLogoutProfileConfiguration();
- config.setSignArtifactRequests(Predicates.alwaysTrue());
- Assert.assertSame(config.getSignArtifactRequests(), Predicates.alwaysTrue());
+ config.setSignArtifactRequests(true);
+ Assert.assertTrue(config.isSignArtifactRequests(null));
}
@Test
public void testClientTLSArtifactRequests() {
final SingleLogoutProfileConfiguration config = new SingleLogoutProfileConfiguration();
- config.setClientTLSArtifactRequests(Predicates.alwaysTrue());
- Assert.assertSame(config.getClientTLSArtifactRequests(), Predicates.alwaysTrue());
+ config.setClientTLSArtifactRequests(true);
+ Assert.assertTrue(config.isClientTLSArtifactRequests(null));
}
}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list