[java-shib-shared] branch main updated: Remove our Predicate warning class.
Scott Cantor
cantor.2 at osu.edu
Mon Sep 26 18:58:35 UTC 2022
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-shib-shared.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-shared.git;a=commit;h=70304acd0b2fcb788481321ed3e4c008226eff53
The following commit(s) were added to refs/heads/main by this push:
new 70304acd Remove our Predicate warning class.
70304acd is described below
commit 70304acd0b2fcb788481321ed3e4c008226eff53
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Sep 26 14:58:32 2022 -0400
Remove our Predicate warning class.
---
.../expression/SpringExpressionPredicate.java | 2 +-
.../support/logic/AbstractTriStatePredicate.java | 2 +
.../java/support/logic/AllMatchPredicate.java | 4 +-
.../java/support/logic/AnyMatchPredicate.java | 4 +-
.../logic/CaseInsensitiveStringMatchPredicate.java | 2 +
.../java/support/logic/FunctionSupport.java | 2 +-
.../utilities/java/support/logic/Predicate.java | 49 ----------------------
.../java/support/logic/PredicateSupport.java | 35 ++++++++--------
.../java/support/logic/RegexPredicate.java | 1 +
.../java/support/logic/ScriptedPredicate.java | 1 +
.../support/logic/StrategyIndirectedPredicate.java | 1 +
.../utilities/java/support/logic/package-info.java | 2 +-
.../ComponentInitializationExceptionPredicate.java | 4 ++
.../java/support/logic/ExceptionPredicate.java | 2 +
.../logic/TransformAndCheckFunctionTest.java | 1 +
15 files changed, 41 insertions(+), 71 deletions(-)
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionPredicate.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionPredicate.java
index 1d4230f3..8b22c730 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionPredicate.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionPredicate.java
@@ -26,7 +26,7 @@ import org.springframework.expression.EvaluationContext;
import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.logic.Predicate;
+import java.util.function.Predicate;
/**
* Predicate whose condition is defined by an Spring EL expression.
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/AbstractTriStatePredicate.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/AbstractTriStatePredicate.java
index 04171f72..c2057611 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/AbstractTriStatePredicate.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/AbstractTriStatePredicate.java
@@ -17,6 +17,8 @@
package net.shibboleth.utilities.java.support.logic;
+import java.util.function.Predicate;
+
/**
* A base {@link Predicate} implementation which provides support for cases where the
* predicate can not meaningfully evaluate the input. The flags on this class
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/AllMatchPredicate.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/AllMatchPredicate.java
index fa57093e..ff8e53b6 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/AllMatchPredicate.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/AllMatchPredicate.java
@@ -17,6 +17,8 @@
package net.shibboleth.utilities.java.support.logic;
+import java.util.function.Predicate;
+
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -32,7 +34,7 @@ import javax.annotation.Nullable;
public class AllMatchPredicate<T> implements Predicate<Iterable<T>> {
/** The predicate applied to each value of the {@link Iterable}. */
- @Nonnull private final java.util.function.Predicate<T> predicate;
+ @Nonnull private final Predicate<T> predicate;
/**
* Constructor.
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/AnyMatchPredicate.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/AnyMatchPredicate.java
index a3193110..b5966db5 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/AnyMatchPredicate.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/AnyMatchPredicate.java
@@ -17,6 +17,8 @@
package net.shibboleth.utilities.java.support.logic;
+import java.util.function.Predicate;
+
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -32,7 +34,7 @@ import javax.annotation.Nullable;
public class AnyMatchPredicate<T> implements Predicate<Iterable<T>> {
/** The predicate applied to each value of the {@link Iterable}. */
- @Nonnull private final java.util.function.Predicate<T> predicate;
+ @Nonnull private final Predicate<T> predicate;
/**
* Constructor.
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/CaseInsensitiveStringMatchPredicate.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/CaseInsensitiveStringMatchPredicate.java
index e7e3bb1e..ff483b84 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/CaseInsensitiveStringMatchPredicate.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/CaseInsensitiveStringMatchPredicate.java
@@ -17,6 +17,8 @@
package net.shibboleth.utilities.java.support.logic;
+import java.util.function.Predicate;
+
import javax.annotation.Nonnull;
/**
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/FunctionSupport.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/FunctionSupport.java
index 69508162..995546f4 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/FunctionSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/FunctionSupport.java
@@ -81,7 +81,7 @@ public final class FunctionSupport {
* @return a corresponding function
*/
@Nonnull public static <T> Function<T,Boolean> forPredicate(
- @Nonnull @ParameterName(name="predicate") final Predicate<? super T> predicate) {
+ @Nonnull @ParameterName(name="predicate") final java.util.function.Predicate<T> predicate) {
return predicate::test;
}
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/Predicate.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/Predicate.java
deleted file mode 100644
index d158da09..00000000
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/Predicate.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.utilities.java.support.logic;
-
-import javax.annotation.Nullable;
-
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
-
-/**
- * A convenience interface to allow our own classes to implement the Java
- * {@link java.util.function.Predicate} and log any calls to the
- * {@link #apply(Object)} method as deprecated.
- *
- * @param <T> type of object upon which this predicate operates
- */
-public interface Predicate<T> extends java.util.function.Predicate<T> {
-
- /**
- * Default method to log deprecated use of Guava's apply() signature.
- *
- * @param input input to predicate
- *
- * @return the result of the {@link #test(Object)} method
- * @deprecated
- */
- @Deprecated
- default boolean apply(@Nullable final T input) {
- DeprecationSupport.warn(ObjectType.METHOD, "apply", "on Predicate objects", "test");
-
- return test(input);
- }
-
-}
\ No newline at end of file
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/PredicateSupport.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/PredicateSupport.java
index e6c26d8c..6c3bce1d 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/PredicateSupport.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/PredicateSupport.java
@@ -19,6 +19,7 @@ package net.shibboleth.utilities.java.support.logic;
import java.util.ArrayList;
import java.util.function.Function;
+import java.util.function.Predicate;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -43,8 +44,8 @@ public final class PredicateSupport {
*
* @return the constructed predicate
*/
- @Nonnull public static <T> Predicate<Iterable<T>> allMatch(@Nonnull final java.util.function.Predicate<T> target) {
- return new AllMatchPredicate<>(target);
+ @Nonnull public static <T> Predicate<Iterable<T>> allMatch(@Nonnull final Predicate<T> target) {
+ return new AllMatchPredicate<T>(target);
}
/**
@@ -55,7 +56,7 @@ public final class PredicateSupport {
*
* @return the constructed predicate
*/
- @Nonnull public static <T> Predicate<Iterable<T>> anyMatch(@Nonnull final java.util.function.Predicate<T> target) {
+ @Nonnull public static <T> Predicate<Iterable<T>> anyMatch(@Nonnull final Predicate<T> target) {
return new AnyMatchPredicate<>(target);
}
@@ -84,7 +85,7 @@ public final class PredicateSupport {
* @since 7.4.0
*/
@Nonnull public static <T> Predicate<T> fromFunction(@Nonnull final Function<T,Boolean> function,
- @Nonnull final java.util.function.Predicate<? super T> defValue) {
+ @Nonnull final Predicate<? super T> defValue) {
return new Predicate<>() {
public boolean test(@Nullable final T input) {
final Boolean result = function.apply(input);
@@ -102,7 +103,7 @@ public final class PredicateSupport {
*
* @return the negated predicate
*/
- @Nonnull public static <T> Predicate<T> not(@Nonnull final java.util.function.Predicate<? super T> predicate) {
+ @Nonnull public static <T> Predicate<T> not(@Nonnull final Predicate<? super T> predicate) {
return predicate.negate()::test;
}
@@ -119,10 +120,10 @@ public final class PredicateSupport {
* @return the composite predicate
*/
@Nonnull public static <T> Predicate<T> and(
- @Nonnull final Iterable<? extends java.util.function.Predicate<? super T>> components) {
+ @Nonnull final Iterable<? extends Predicate<? super T>> components) {
final ArrayList<com.google.common.base.Predicate<T>> copy = new ArrayList<>();
- for (final java.util.function.Predicate<? super T> p : components) {
+ for (final Predicate<? super T> p : components) {
copy.add(p::test);
}
@@ -143,9 +144,9 @@ public final class PredicateSupport {
*/
@SafeVarargs
@Nonnull public static <T> Predicate<T> and(
- @Nonnull final java.util.function.Predicate<? super T>... components) {
+ @Nonnull final Predicate<? super T>... components) {
final ArrayList<com.google.common.base.Predicate<T>> copy = new ArrayList<>();
- for (final java.util.function.Predicate<? super T> p : components) {
+ for (final Predicate<? super T> p : components) {
copy.add(p::test);
}
@@ -165,8 +166,8 @@ public final class PredicateSupport {
*
* @return the composite predicate
*/
- @Nonnull public static <T> Predicate<T> and(@Nonnull final java.util.function.Predicate<? super T> first,
- @Nonnull final java.util.function.Predicate<? super T> second) {
+ @Nonnull public static <T> Predicate<T> and(@Nonnull final Predicate<? super T> first,
+ @Nonnull final Predicate<? super T> second) {
return t -> first.test(t) && second.test(t);
}
@@ -184,10 +185,10 @@ public final class PredicateSupport {
* @return the composite predicate
*/
@Nonnull public static <T> Predicate<T> or(
- @Nonnull final Iterable<? extends java.util.function.Predicate<? super T>> components) {
+ @Nonnull final Iterable<? extends Predicate<? super T>> components) {
final ArrayList<com.google.common.base.Predicate<T>> copy = new ArrayList<>();
- for (final java.util.function.Predicate<? super T> p : components) {
+ for (final Predicate<? super T> p : components) {
copy.add(p::test);
}
@@ -208,10 +209,10 @@ public final class PredicateSupport {
*/
@SafeVarargs
@Nonnull public static <T> Predicate<T> or(
- @Nonnull final java.util.function.Predicate<? super T>... components) {
+ @Nonnull final Predicate<? super T>... components) {
final ArrayList<com.google.common.base.Predicate<T>> copy = new ArrayList<>();
- for (final java.util.function.Predicate<? super T> p : components) {
+ for (final Predicate<? super T> p : components) {
copy.add(p::test);
}
@@ -231,8 +232,8 @@ public final class PredicateSupport {
*
* @return the composite predicate
*/
- @Nonnull public static <T> Predicate<T> or(@Nonnull final java.util.function.Predicate<? super T> first,
- @Nonnull final java.util.function.Predicate<? super T> second) {
+ @Nonnull public static <T> Predicate<T> or(@Nonnull final Predicate<? super T> first,
+ @Nonnull final Predicate<? super T> second) {
return t -> first.test(t) || second.test(t);
}
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/RegexPredicate.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/RegexPredicate.java
index e0ce2279..6489695c 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/RegexPredicate.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/RegexPredicate.java
@@ -17,6 +17,7 @@
package net.shibboleth.utilities.java.support.logic;
+import java.util.function.Predicate;
import java.util.regex.Pattern;
import javax.annotation.Nonnull;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedPredicate.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedPredicate.java
index 610f2ecb..e0af1f3e 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedPredicate.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedPredicate.java
@@ -20,6 +20,7 @@ package net.shibboleth.utilities.java.support.logic;
import java.io.IOException;
import java.io.InputStream;
+import java.util.function.Predicate;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/StrategyIndirectedPredicate.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/StrategyIndirectedPredicate.java
index d41234e7..5e5013d2 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/StrategyIndirectedPredicate.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/StrategyIndirectedPredicate.java
@@ -19,6 +19,7 @@ package net.shibboleth.utilities.java.support.logic;
import java.util.Collection;
import java.util.function.Function;
+import java.util.function.Predicate;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/package-info.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/package-info.java
index 2939ad32..af80f7af 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/package-info.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/package-info.java
@@ -15,6 +15,6 @@
* limitations under the License.
*/
-/** Classes that represent basic first order logic concepts. */
+/** Legacy compatibility stubs. */
package net.shibboleth.utilities.java.support.logic;
\ No newline at end of file
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/ComponentInitializationExceptionPredicate.java b/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/ComponentInitializationExceptionPredicate.java
index d4da19a0..151f4ab7 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/ComponentInitializationExceptionPredicate.java
+++ b/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/ComponentInitializationExceptionPredicate.java
@@ -17,12 +17,16 @@
package net.shibboleth.utilities.java.support.logic;
+import java.util.function.Predicate;
+
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.component.InitializableComponent;
/**
* A {@link Predicate} that always throws a {@link ComponentInitializationException} when {@link #initialize()} is
* called.
+ *
+ * @param <T> type of predicate
*/
public class ComponentInitializationExceptionPredicate<T> implements InitializableComponent, Predicate<T> {
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/ExceptionPredicate.java b/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/ExceptionPredicate.java
index 5ff0aebd..4af9f60c 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/ExceptionPredicate.java
+++ b/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/ExceptionPredicate.java
@@ -17,6 +17,8 @@
package net.shibboleth.utilities.java.support.logic;
+import java.util.function.Predicate;
+
import javax.annotation.Nonnull;
/** A {@link Predicate} that always throws a {@link RuntimeException} of some sort. */
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunctionTest.java b/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunctionTest.java
index a97a711a..0d8b842b 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunctionTest.java
+++ b/shib-support/src/test/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunctionTest.java
@@ -21,6 +21,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.function.Function;
+import java.util.function.Predicate;
import org.testng.annotations.Test;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list