[java-identity-provider] branch main updated: Removing additional Guava dependencies.
Scott Cantor
cantor.2 at osu.edu
Thu Apr 20 13:22:06 UTC 2023
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=ce5a19c7db5d8adfdc77f01d9dd75437859e3ad0
The following commit(s) were added to refs/heads/main by this push:
new ce5a19c7d Removing additional Guava dependencies.
ce5a19c7d is described below
commit ce5a19c7db5d8adfdc77f01d9dd75437859e3ad0
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Apr 20 09:22:02 2023 -0400
Removing additional Guava dependencies.
---
.../authn/tests/SubjectCanonicalizationFlowDescriptorTest.java | 8 ++++----
.../shibboleth/idp/cas/flow/impl/GrantProxyTicketAction.java | 8 +++++---
.../idp/saml/saml2/profile/impl/ProcessLogoutRequest.java | 5 ++---
.../java/net/shibboleth/idp/session/impl/DestroySessions.java | 5 ++---
.../shibboleth/idp/session/impl/PopulateSessionContext.java | 10 ++++++----
.../java/net/shibboleth/idp/session/impl/ProcessLogout.java | 5 ++---
.../session/impl/UpdateSessionWithAuthenticationResult.java | 9 +++++----
.../idp/session/impl/UpdateSessionWithSPSession.java | 5 ++---
8 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/tests/SubjectCanonicalizationFlowDescriptorTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/tests/SubjectCanonicalizationFlowDescriptorTest.java
index 85b44c637..00a7bddd4 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/tests/SubjectCanonicalizationFlowDescriptorTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/tests/SubjectCanonicalizationFlowDescriptorTest.java
@@ -22,6 +22,7 @@ import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileR
import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.component.UnmodifiableComponentException;
+import net.shibboleth.shared.logic.PredicateSupport;
import org.opensaml.profile.context.ProfileRequestContext;
import org.springframework.webflow.execution.RequestContext;
@@ -29,9 +30,8 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import com.google.common.base.Predicates;
-
/** {@link SubjectCanonicalizationFlowDescriptor} unit test. */
+ at SuppressWarnings("javadoc")
public class SubjectCanonicalizationFlowDescriptorTest {
private SubjectCanonicalizationFlowDescriptor descriptor;
@@ -56,7 +56,7 @@ public class SubjectCanonicalizationFlowDescriptorTest {
@Test public void testSetters() {
try {
- descriptor.setActivationCondition(Predicates.<ProfileRequestContext> alwaysFalse());
+ descriptor.setActivationCondition(PredicateSupport.alwaysFalse());
Assert.fail();
} catch (UnmodifiableComponentException e) {
// OK
@@ -76,7 +76,7 @@ public class SubjectCanonicalizationFlowDescriptorTest {
@Test public void testPredicate() throws ComponentInitializationException {
descriptor = new SubjectCanonicalizationFlowDescriptor();
descriptor.setId("test");
- descriptor.setActivationCondition(Predicates.<ProfileRequestContext> alwaysFalse());
+ descriptor.setActivationCondition(PredicateSupport.alwaysFalse());
descriptor.initialize();
Assert.assertFalse(descriptor.test(prc));
diff --git a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/GrantProxyTicketAction.java b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/GrantProxyTicketAction.java
index c139be3a2..15a8b4029 100644
--- a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/GrantProxyTicketAction.java
+++ b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/GrantProxyTicketAction.java
@@ -112,7 +112,7 @@ public class GrantProxyTicketAction extends AbstractCASProtocolAction<ProxyTicke
* evaluates to true under any condition, a server-side storage service must be enabled for IdP session
* storage.
*
- * @param predicate Session validation predicate. Default is <code>Predicates.alwaysFalse()</code>.
+ * @param predicate Session validation predicate. Default is {@link PredicateSupport#alwaysFalse()}.
*/
public void setValidateIdPSessionPredicate(@Nonnull final Predicate<ProfileRequestContext> predicate) {
checkSetterPreconditions();
@@ -148,8 +148,10 @@ public class GrantProxyTicketAction extends AbstractCASProtocolAction<ProxyTicke
return true;
}
- /** Null-safe getter
- * @return Returns the proxyGrantingTicket.
+ /**
+ * Null-safe getter.
+ *
+ * @return the proxyGrantingTicket
*/
@SuppressWarnings("null")
@Nonnull private ProxyGrantingTicket getProxyGrantingTicket() {
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogoutRequest.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogoutRequest.java
index 76d2a188e..9f4b3a259 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogoutRequest.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogoutRequest.java
@@ -41,8 +41,6 @@ import org.opensaml.saml.saml2.profile.SAML2ObjectSupport;
import org.slf4j.Logger;
import net.shibboleth.shared.primitive.LoggerFactory;
-import com.google.common.base.Predicates;
-
import net.shibboleth.idp.authn.context.SubjectContext;
import net.shibboleth.idp.profile.AbstractProfileAction;
import net.shibboleth.idp.saml.session.SAML2SPSession;
@@ -60,6 +58,7 @@ import net.shibboleth.shared.annotation.constraint.NonnullBeforeExec;
import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.Constraint;
+import net.shibboleth.shared.logic.PredicateSupport;
import net.shibboleth.shared.resolver.CriteriaSet;
import net.shibboleth.shared.resolver.ResolverException;
@@ -276,7 +275,7 @@ public class ProcessLogoutRequest extends AbstractProfileAction {
protected void doInitialize() throws ComponentInitializationException {
super.doInitialize();
- if (!getActivationCondition().equals(Predicates.alwaysFalse())) {
+ if (!PredicateSupport.isAlwaysFalse(getActivationCondition())) {
if (sessionResolver == null) {
throw new ComponentInitializationException("SessionResolver cannot be null");
}
diff --git a/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/DestroySessions.java b/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/DestroySessions.java
index cf314f87f..ff06fbebb 100644
--- a/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/DestroySessions.java
+++ b/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/DestroySessions.java
@@ -28,8 +28,6 @@ import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
import org.slf4j.Logger;
-import com.google.common.base.Predicates;
-
import net.shibboleth.idp.profile.AbstractProfileAction;
import net.shibboleth.idp.session.IdPSession;
import net.shibboleth.idp.session.SessionException;
@@ -40,6 +38,7 @@ import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
import net.shibboleth.shared.annotation.constraint.NonnullBeforeExec;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.Constraint;
+import net.shibboleth.shared.logic.PredicateSupport;
import net.shibboleth.shared.primitive.LoggerFactory;
/**
@@ -121,7 +120,7 @@ public class DestroySessions extends AbstractProfileAction {
protected void doInitialize() throws ComponentInitializationException {
super.doInitialize();
- if (!getActivationCondition().equals(Predicates.alwaysFalse())) {
+ if (!PredicateSupport.isAlwaysFalse(getActivationCondition())) {
if (sessionManager == null) {
throw new ComponentInitializationException("SessionManager cannot be null");
}
diff --git a/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/PopulateSessionContext.java b/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/PopulateSessionContext.java
index dc25a55c2..e9ff192a9 100644
--- a/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/PopulateSessionContext.java
+++ b/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/PopulateSessionContext.java
@@ -29,8 +29,6 @@ import org.opensaml.profile.context.ProfileRequestContext;
import org.slf4j.Logger;
import net.shibboleth.shared.primitive.LoggerFactory;
-import com.google.common.base.Predicates;
-
import jakarta.servlet.http.HttpServletRequest;
import net.shibboleth.idp.profile.AbstractProfileAction;
import net.shibboleth.idp.session.IdPSession;
@@ -41,6 +39,7 @@ import net.shibboleth.idp.session.criterion.HttpServletRequestCriterion;
import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.Constraint;
+import net.shibboleth.shared.logic.PredicateSupport;
import net.shibboleth.shared.resolver.CriteriaSet;
import net.shibboleth.shared.resolver.ResolverException;
import net.shibboleth.shared.servlet.HttpServletSupport;
@@ -126,8 +125,11 @@ public class PopulateSessionContext extends AbstractProfileAction {
protected void doInitialize() throws ComponentInitializationException {
super.doInitialize();
- if (!getActivationCondition().equals(Predicates.alwaysFalse()) && sessionResolver == null) {
- throw new ComponentInitializationException("SessionResolver cannot be null");
+
+ if (!PredicateSupport.isAlwaysFalse(getActivationCondition())) {
+ if (sessionResolver == null) {
+ throw new ComponentInitializationException("SessionResolver cannot be null");
+ }
}
}
diff --git a/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/ProcessLogout.java b/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/ProcessLogout.java
index 3208dd776..a3d063416 100644
--- a/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/ProcessLogout.java
+++ b/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/ProcessLogout.java
@@ -29,8 +29,6 @@ import org.opensaml.profile.context.ProfileRequestContext;
import org.slf4j.Logger;
import net.shibboleth.shared.primitive.LoggerFactory;
-import com.google.common.base.Predicates;
-
import jakarta.servlet.http.HttpServletRequest;
import net.shibboleth.idp.authn.context.SubjectContext;
import net.shibboleth.idp.profile.AbstractProfileAction;
@@ -44,6 +42,7 @@ import net.shibboleth.idp.session.criterion.HttpServletRequestCriterion;
import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.Constraint;
+import net.shibboleth.shared.logic.PredicateSupport;
import net.shibboleth.shared.resolver.CriteriaSet;
import net.shibboleth.shared.resolver.ResolverException;
import net.shibboleth.shared.servlet.HttpServletSupport;
@@ -168,7 +167,7 @@ public class ProcessLogout extends AbstractProfileAction {
protected void doInitialize() throws ComponentInitializationException {
super.doInitialize();
- if (!getActivationCondition().equals(Predicates.alwaysFalse())) {
+ if (!PredicateSupport.isAlwaysFalse(getActivationCondition())) {
if (sessionResolver == null) {
throw new ComponentInitializationException("SessionResolver cannot be null");
}
diff --git a/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/UpdateSessionWithAuthenticationResult.java b/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/UpdateSessionWithAuthenticationResult.java
index 45c5b6bfc..cc1376340 100644
--- a/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/UpdateSessionWithAuthenticationResult.java
+++ b/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/UpdateSessionWithAuthenticationResult.java
@@ -27,8 +27,6 @@ import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
import org.slf4j.Logger;
-import com.google.common.base.Predicates;
-
import net.shibboleth.idp.authn.AbstractAuthenticationAction;
import net.shibboleth.idp.authn.AuthenticationResult;
import net.shibboleth.idp.authn.context.AuthenticationContext;
@@ -41,6 +39,7 @@ import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
import net.shibboleth.shared.annotation.constraint.NonnullBeforeExec;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.Constraint;
+import net.shibboleth.shared.logic.PredicateSupport;
import net.shibboleth.shared.primitive.LoggerFactory;
/**
@@ -129,8 +128,10 @@ public class UpdateSessionWithAuthenticationResult extends AbstractAuthenticatio
protected void doInitialize() throws ComponentInitializationException {
super.doInitialize();
- if (!getActivationCondition().equals(Predicates.alwaysFalse()) && sessionManager == null) {
- throw new ComponentInitializationException("SessionManager cannot be null");
+ if (!PredicateSupport.isAlwaysFalse(getActivationCondition())) {
+ if (sessionManager == null) {
+ throw new ComponentInitializationException("SessionManager cannot be null");
+ }
}
}
diff --git a/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/UpdateSessionWithSPSession.java b/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/UpdateSessionWithSPSession.java
index 5c2a5e847..36cd1c24d 100644
--- a/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/UpdateSessionWithSPSession.java
+++ b/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/UpdateSessionWithSPSession.java
@@ -27,8 +27,6 @@ import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
import org.slf4j.Logger;
-import com.google.common.base.Predicates;
-
import net.shibboleth.idp.profile.AbstractProfileAction;
import net.shibboleth.idp.session.IdPSession;
import net.shibboleth.idp.session.SPSession;
@@ -38,6 +36,7 @@ import net.shibboleth.idp.session.context.SessionContext;
import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.Constraint;
+import net.shibboleth.shared.logic.PredicateSupport;
import net.shibboleth.shared.primitive.LoggerFactory;
/**
@@ -115,7 +114,7 @@ public class UpdateSessionWithSPSession extends AbstractProfileAction {
protected void doInitialize() throws ComponentInitializationException {
super.doInitialize();
- if (!getActivationCondition().equals(Predicates.alwaysFalse())) {
+ if (!PredicateSupport.isAlwaysFalse(getActivationCondition())) {
if (sessionManager == null) {
throw new ComponentInitializationException("SessionManager cannot be null");
} else if (spSessionCreationStrategy == null) {
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list