[java-opensaml] branch main updated: Remove our Predicate warning class.
Scott Cantor
cantor.2 at osu.edu
Mon Sep 26 18:59:00 UTC 2022
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-opensaml.
View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=e04c5881ee64d96d6eb1a7de5ef8669ffd9b9f78
The following commit(s) were added to refs/heads/main by this push:
new e04c5881e Remove our Predicate warning class.
e04c5881e is described below
commit e04c5881ee64d96d6eb1a7de5ef8669ffd9b9f78
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Sep 26 14:58:57 2022 -0400
Remove our Predicate warning class.
---
.../messaging/logic/NoConfidentialityMessageChannelPredicate.java | 2 +-
.../opensaml/messaging/logic/NoIntegrityMessageChannelPredicate.java | 2 +-
.../main/java/org/opensaml/profile/logic/BrowserProfilePredicate.java | 2 +-
.../src/main/java/org/opensaml/profile/logic/IPRangePredicate.java | 2 +-
.../org/opensaml/profile/logic/MessageContextPredicateAdapter.java | 2 +-
.../profile/logic/NoConfidentialityMessageChannelPredicate.java | 2 +-
.../opensaml/profile/logic/NoIntegrityMessageChannelPredicate.java | 2 +-
.../src/main/java/org/opensaml/profile/logic/ProfileIdPredicate.java | 2 +-
.../saml/common/messaging/logic/ProxiedRequesterPredicate.java | 2 +-
.../saml/common/messaging/logic/SignatureCapableBindingPredicate.java | 4 ++--
.../saml/common/profile/logic/AbstractNameIDPolicyPredicate.java | 2 +-
.../saml/common/profile/logic/AbstractRegistrationInfoPredicate.java | 2 +-
.../saml/common/profile/logic/DefaultLocalErrorPredicate.java | 2 +-
.../opensaml/saml/common/profile/logic/EntityAttributesPredicate.java | 2 +-
.../opensaml/saml/common/profile/logic/EntityGroupNamePredicate.java | 2 +-
.../org/opensaml/saml/common/profile/logic/EntityIdPredicate.java | 2 +-
16 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/opensaml-messaging-api/src/main/java/org/opensaml/messaging/logic/NoConfidentialityMessageChannelPredicate.java b/opensaml-messaging-api/src/main/java/org/opensaml/messaging/logic/NoConfidentialityMessageChannelPredicate.java
index 888a76f42..74be672ba 100644
--- a/opensaml-messaging-api/src/main/java/org/opensaml/messaging/logic/NoConfidentialityMessageChannelPredicate.java
+++ b/opensaml-messaging-api/src/main/java/org/opensaml/messaging/logic/NoConfidentialityMessageChannelPredicate.java
@@ -22,7 +22,7 @@ import javax.annotation.Nullable;
import org.opensaml.messaging.context.MessageChannelSecurityContext;
import org.opensaml.messaging.context.MessageContext;
-import net.shibboleth.utilities.java.support.logic.Predicate;
+import java.util.function.Predicate;
/**
* A predicate implementation that indicates whether the message channel does
diff --git a/opensaml-messaging-api/src/main/java/org/opensaml/messaging/logic/NoIntegrityMessageChannelPredicate.java b/opensaml-messaging-api/src/main/java/org/opensaml/messaging/logic/NoIntegrityMessageChannelPredicate.java
index 2b899c678..35a47bbc9 100644
--- a/opensaml-messaging-api/src/main/java/org/opensaml/messaging/logic/NoIntegrityMessageChannelPredicate.java
+++ b/opensaml-messaging-api/src/main/java/org/opensaml/messaging/logic/NoIntegrityMessageChannelPredicate.java
@@ -22,7 +22,7 @@ import javax.annotation.Nullable;
import org.opensaml.messaging.context.MessageChannelSecurityContext;
import org.opensaml.messaging.context.MessageContext;
-import net.shibboleth.utilities.java.support.logic.Predicate;
+import java.util.function.Predicate;
/**
* A predicate implementation that indicates whether the message channel does
diff --git a/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/BrowserProfilePredicate.java b/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/BrowserProfilePredicate.java
index 50fc4bf39..ba88e1a41 100644
--- a/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/BrowserProfilePredicate.java
+++ b/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/BrowserProfilePredicate.java
@@ -21,7 +21,7 @@ import javax.annotation.Nullable;
import org.opensaml.profile.context.ProfileRequestContext;
-import net.shibboleth.utilities.java.support.logic.Predicate;
+import java.util.function.Predicate;
/**
* A predicate implementation that indicates whether the request is associated with a browser profile.
diff --git a/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/IPRangePredicate.java b/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/IPRangePredicate.java
index f86da0674..04b8082be 100644
--- a/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/IPRangePredicate.java
+++ b/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/IPRangePredicate.java
@@ -33,7 +33,7 @@ import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.net.HttpServletSupport;
import net.shibboleth.shared.net.IPRange;
import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.logic.Predicate;
+import java.util.function.Predicate;
/**
* A {@link Predicate} that checks if a request is from a set of one or more {@link IPRange}s.
diff --git a/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/MessageContextPredicateAdapter.java b/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/MessageContextPredicateAdapter.java
index 3589d657d..b64830776 100644
--- a/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/MessageContextPredicateAdapter.java
+++ b/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/MessageContextPredicateAdapter.java
@@ -46,7 +46,7 @@ import org.opensaml.profile.context.navigate.ParentProfileRequestContextLookup;
* </p>
*/
public class MessageContextPredicateAdapter
- implements net.shibboleth.utilities.java.support.logic.Predicate<MessageContext> {
+ implements Predicate<MessageContext> {
/** The lookup function for the ProfileRequestContext. */
@Nonnull private static final ParentProfileRequestContextLookup<MessageContext> PRC_LOOKUP
diff --git a/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/NoConfidentialityMessageChannelPredicate.java b/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/NoConfidentialityMessageChannelPredicate.java
index a2e598548..940786649 100644
--- a/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/NoConfidentialityMessageChannelPredicate.java
+++ b/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/NoConfidentialityMessageChannelPredicate.java
@@ -22,7 +22,7 @@ import javax.annotation.Nullable;
import org.opensaml.messaging.context.MessageChannelSecurityContext;
import org.opensaml.profile.context.ProfileRequestContext;
-import net.shibboleth.utilities.java.support.logic.Predicate;
+import java.util.function.Predicate;
/**
* A predicate implementation that indicates whether the message channel does
diff --git a/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/NoIntegrityMessageChannelPredicate.java b/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/NoIntegrityMessageChannelPredicate.java
index da39c214e..b5825647a 100644
--- a/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/NoIntegrityMessageChannelPredicate.java
+++ b/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/NoIntegrityMessageChannelPredicate.java
@@ -22,7 +22,7 @@ import javax.annotation.Nullable;
import org.opensaml.messaging.context.MessageChannelSecurityContext;
import org.opensaml.profile.context.ProfileRequestContext;
-import net.shibboleth.utilities.java.support.logic.Predicate;
+import java.util.function.Predicate;
/**
* A predicate implementation that indicates whether the message channel does
diff --git a/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/ProfileIdPredicate.java b/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/ProfileIdPredicate.java
index 8ba11bd35..0877b4d1c 100644
--- a/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/ProfileIdPredicate.java
+++ b/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/ProfileIdPredicate.java
@@ -24,7 +24,7 @@ import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.logic.Predicate;
+import java.util.function.Predicate;
import org.opensaml.profile.context.ProfileRequestContext;
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/logic/ProxiedRequesterPredicate.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/logic/ProxiedRequesterPredicate.java
index 6a2958ca3..129683b32 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/logic/ProxiedRequesterPredicate.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/logic/ProxiedRequesterPredicate.java
@@ -21,6 +21,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
+import java.util.function.Predicate;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -31,7 +32,6 @@ import org.opensaml.profile.context.ProxiedRequesterContext;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.logic.Predicate;
/**
* Predicate that determines whether one of a set of candidates is contained in a
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/logic/SignatureCapableBindingPredicate.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/logic/SignatureCapableBindingPredicate.java
index 9b534122a..c0fd75f2c 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/logic/SignatureCapableBindingPredicate.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/logic/SignatureCapableBindingPredicate.java
@@ -17,13 +17,13 @@
package org.opensaml.saml.common.messaging.logic;
+import java.util.function.Predicate;
+
import javax.annotation.Nullable;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.saml.common.binding.SAMLBindingSupport;
-import net.shibboleth.utilities.java.support.logic.Predicate;
-
/**
* Predicate that determines whether the binding associated with a message context is
* signature-capable.
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/AbstractNameIDPolicyPredicate.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/AbstractNameIDPolicyPredicate.java
index 13ff4ffca..bd3470391 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/AbstractNameIDPolicyPredicate.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/AbstractNameIDPolicyPredicate.java
@@ -22,6 +22,7 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
import java.util.function.Function;
+import java.util.function.Predicate;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -40,7 +41,6 @@ import net.shibboleth.shared.component.AbstractInitializableComponent;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.logic.Predicate;
/**
* Base class for implementations of {@link Predicate} that handle evaluation of name identifier content in various
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/AbstractRegistrationInfoPredicate.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/AbstractRegistrationInfoPredicate.java
index 309d90f17..1c1613bf7 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/AbstractRegistrationInfoPredicate.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/AbstractRegistrationInfoPredicate.java
@@ -26,7 +26,7 @@ import org.opensaml.saml.saml2.metadata.EntitiesDescriptor;
import org.opensaml.saml.saml2.metadata.EntityDescriptor;
import org.opensaml.saml.saml2.metadata.Extensions;
-import net.shibboleth.utilities.java.support.logic.Predicate;
+import java.util.function.Predicate;
/**
* Base class for predicate that acts on {@link RegistrationInfo} content.
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/DefaultLocalErrorPredicate.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/DefaultLocalErrorPredicate.java
index e7b6f1650..4ba383541 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/DefaultLocalErrorPredicate.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/DefaultLocalErrorPredicate.java
@@ -39,7 +39,7 @@ import org.opensaml.saml.saml2.core.AuthnRequest;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.logic.Predicate;
+import java.util.function.Predicate;
import org.opensaml.messaging.context.navigate.ChildContextLookup;
import org.opensaml.messaging.context.navigate.MessageLookup;
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityAttributesPredicate.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityAttributesPredicate.java
index f789e120d..cf28b2e04 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityAttributesPredicate.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityAttributesPredicate.java
@@ -53,7 +53,7 @@ import net.shibboleth.shared.annotation.constraint.Unmodifiable;
import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.xml.DOMTypeSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.logic.Predicate;
+import java.util.function.Predicate;
/**
* Predicate to determine whether an {@link EntityDescriptor} or its parent groups contain an {@link EntityAttributes}
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityGroupNamePredicate.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityGroupNamePredicate.java
index 5f7a435a5..25399b82c 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityGroupNamePredicate.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityGroupNamePredicate.java
@@ -20,6 +20,7 @@ package org.opensaml.saml.common.profile.logic;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Set;
+import java.util.function.Predicate;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -40,7 +41,6 @@ import net.shibboleth.shared.annotation.constraint.Unmodifiable;
import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.resolver.CriteriaSet;
import net.shibboleth.shared.resolver.ResolverException;
-import net.shibboleth.utilities.java.support.logic.Predicate;
/**
* Predicate to determine whether one of a set of names matches any of an entity's containing
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityIdPredicate.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityIdPredicate.java
index 78423b902..117f2f501 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityIdPredicate.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityIdPredicate.java
@@ -30,7 +30,7 @@ import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.NotLive;
import net.shibboleth.shared.annotation.constraint.Unmodifiable;
import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.logic.Predicate;
+import java.util.function.Predicate;
/**
* Predicate that matches an {@link EntityDescriptor} against a set of entityIDs.
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list