From 2965ea14841565916dee9da0d3fa9cc5509c2fb7 Mon Sep 17 00:00:00 2001
From: Gary Gregory <garydgregory@gmail.com>
Date: Wed, 10 Jul 2024 08:53:29 -0400
Subject: [PATCH] Migrate toward java.util.function.Predicate

---
 .../collections4/functors/AbstractQuantifierPredicate.java    | 4 ++++
 .../apache/commons/collections4/functors/AllPredicate.java    | 2 +-
 .../apache/commons/collections4/functors/AnyPredicate.java    | 2 +-
 .../apache/commons/collections4/functors/NonePredicate.java   | 2 +-
 .../apache/commons/collections4/functors/OnePredicate.java    | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java b/src/main/java/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java
index d72d831b3..886287708 100644
--- a/src/main/java/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java
@@ -53,4 +53,8 @@ public abstract class AbstractQuantifierPredicate<T> implements PredicateDecorat
         return FunctorUtils.<T>copy(iPredicates);
     }
 
+    @Override
+    public boolean evaluate(final T object) {
+        return test(object);
+    }
 }
diff --git a/src/main/java/org/apache/commons/collections4/functors/AllPredicate.java b/src/main/java/org/apache/commons/collections4/functors/AllPredicate.java
index 931aa9b97..f656706f1 100644
--- a/src/main/java/org/apache/commons/collections4/functors/AllPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/AllPredicate.java
@@ -104,7 +104,7 @@ public final class AllPredicate<T> extends AbstractQuantifierPredicate<T> {
      * @return true if all decorated predicates return true
      */
     @Override
-    public boolean evaluate(final T object) {
+    public boolean test(final T object) {
         for (final Predicate<? super T> iPredicate : iPredicates) {
             if (!iPredicate.evaluate(object)) {
                 return false;
diff --git a/src/main/java/org/apache/commons/collections4/functors/AnyPredicate.java b/src/main/java/org/apache/commons/collections4/functors/AnyPredicate.java
index f7c345397..465b97e6c 100644
--- a/src/main/java/org/apache/commons/collections4/functors/AnyPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/AnyPredicate.java
@@ -101,7 +101,7 @@ public final class AnyPredicate<T> extends AbstractQuantifierPredicate<T> {
      * @return true if any decorated predicate return true
      */
     @Override
-    public boolean evaluate(final T object) {
+    public boolean test(final T object) {
         for (final Predicate<? super T> iPredicate : iPredicates) {
             if (iPredicate.evaluate(object)) {
                 return true;
diff --git a/src/main/java/org/apache/commons/collections4/functors/NonePredicate.java b/src/main/java/org/apache/commons/collections4/functors/NonePredicate.java
index c21cca02f..b3532f4ba 100644
--- a/src/main/java/org/apache/commons/collections4/functors/NonePredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/NonePredicate.java
@@ -91,7 +91,7 @@ public final class NonePredicate<T> extends AbstractQuantifierPredicate<T> {
      * @return true if none of decorated predicates return true
      */
     @Override
-    public boolean evaluate(final T object) {
+    public boolean test(final T object) {
         for (final Predicate<? super T> iPredicate : iPredicates) {
             if (iPredicate.evaluate(object)) {
                 return false;
diff --git a/src/main/java/org/apache/commons/collections4/functors/OnePredicate.java b/src/main/java/org/apache/commons/collections4/functors/OnePredicate.java
index 5e8100bd7..4ce4eae2f 100644
--- a/src/main/java/org/apache/commons/collections4/functors/OnePredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/OnePredicate.java
@@ -92,7 +92,7 @@ public final class OnePredicate<T> extends AbstractQuantifierPredicate<T> {
      * @return true if only one decorated predicate returns true
      */
     @Override
-    public boolean evaluate(final T object) {
+    public boolean test(final T object) {
         boolean match = false;
         for (final Predicate<? super T> iPredicate : iPredicates) {
             if (iPredicate.evaluate(object)) {