This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-collections.git
commit ee307055b7b84317a5f0273f425dfb146918e78d
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Thu Jul 11 09:31:45 2024 -0400
Migrate toward java.util.function
- Package-private changes only
- Maintains binary and source compatibility
---
.../commons/collections4/functors/AbstractQuantifierPredicate.java | 2 +-
.../java/org/apache/commons/collections4/functors/AllPredicate.java | 4 ++--
.../java/org/apache/commons/collections4/functors/AnyPredicate.java | 2 +-
.../java/org/apache/commons/collections4/functors/FunctorUtils.java | 6 +++---
.../org/apache/commons/collections4/functors/NonePredicate.java | 3 ++-
.../java/org/apache/commons/collections4/functors/OnePredicate.java | 3 ++-
.../org/apache/commons/collections4/functors/SwitchClosure.java | 2 +-
.../org/apache/commons/collections4/functors/SwitchTransformer.java | 2 +-
8 files changed, 13 insertions(+), 11 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 fe0ad219d..7e326dc64 100644
---
a/src/main/java/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java
+++
b/src/main/java/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java
@@ -51,7 +51,7 @@ public abstract class AbstractQuantifierPredicate<T> extends
AbstractPredicate<T
*/
@Override
public Predicate<? super T>[] getPredicates() {
- return FunctorUtils.<T>copy(iPredicates);
+ return FunctorUtils.copy(iPredicates);
}
}
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 ddaa26c0c..a76cb2157 100644
--- a/src/main/java/org/apache/commons/collections4/functors/AllPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/AllPredicate.java
@@ -84,8 +84,8 @@ public final class AllPredicate<T> extends
AbstractQuantifierPredicate<T> {
if (predicates.length == 1) {
return coerce(predicates[0]);
}
-
- return new AllPredicate<>(FunctorUtils.copy(predicates));
+ // <T> not needed in Eclipse but needed by the command line compiler
+ return new AllPredicate<T>(FunctorUtils.copy(predicates));
}
/**
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 2dd278d4d..fbfb264d8 100644
--- a/src/main/java/org/apache/commons/collections4/functors/AnyPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/AnyPredicate.java
@@ -82,7 +82,7 @@ public final class AnyPredicate<T> extends
AbstractQuantifierPredicate<T> {
if (predicates.length == 1) {
return (Predicate<T>) predicates[0];
}
- return new AnyPredicate<>(FunctorUtils.copy(predicates));
+ return new AnyPredicate<T>(FunctorUtils.copy(predicates));
}
/**
diff --git
a/src/main/java/org/apache/commons/collections4/functors/FunctorUtils.java
b/src/main/java/org/apache/commons/collections4/functors/FunctorUtils.java
index 36687265c..465051dbd 100644
--- a/src/main/java/org/apache/commons/collections4/functors/FunctorUtils.java
+++ b/src/main/java/org/apache/commons/collections4/functors/FunctorUtils.java
@@ -87,7 +87,7 @@ final class FunctorUtils {
* @return the cloned consumers.
*/
@SuppressWarnings("unchecked")
- static <C extends Consumer<?>> C[] copy(final C... consumers) {
+ static <T extends Consumer<?>> T[] copy(final T... consumers) {
if (consumers == null) {
return null;
}
@@ -103,11 +103,11 @@ final class FunctorUtils {
* @return the cloned predicates
*/
@SuppressWarnings("unchecked")
- static <T> Predicate<T>[] copy(final Predicate<? super T>... predicates) {
+ static <T extends java.util.function.Predicate<?>> T[] copy(final T...
predicates) {
if (predicates == null) {
return null;
}
- return (Predicate<T>[]) predicates.clone();
+ return predicates.clone();
}
/**
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 1aa5b8b49..64f4de8d4 100644
--- a/src/main/java/org/apache/commons/collections4/functors/NonePredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/NonePredicate.java
@@ -72,7 +72,8 @@ public final class NonePredicate<T> extends
AbstractQuantifierPredicate<T> {
if (predicates.length == 0) {
return TruePredicate.<T>truePredicate();
}
- return new NonePredicate<>(FunctorUtils.copy(predicates));
+ // <T> not needed in Eclipse but needed by the command line compiler
+ return new NonePredicate<T>(FunctorUtils.copy(predicates));
}
/**
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 a8b74935e..2c5853fdf 100644
--- a/src/main/java/org/apache/commons/collections4/functors/OnePredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/OnePredicate.java
@@ -72,7 +72,8 @@ public final class OnePredicate<T> extends
AbstractQuantifierPredicate<T> {
if (predicates.length == 1) {
return (Predicate<T>) predicates[0];
}
- return new OnePredicate<>(FunctorUtils.copy(predicates));
+ // <T> not needed in Eclipse but needed by the command line compiler
+ return new OnePredicate<T>(FunctorUtils.copy(predicates));
}
/**
diff --git
a/src/main/java/org/apache/commons/collections4/functors/SwitchClosure.java
b/src/main/java/org/apache/commons/collections4/functors/SwitchClosure.java
index eda6c36f4..32775d0df 100644
--- a/src/main/java/org/apache/commons/collections4/functors/SwitchClosure.java
+++ b/src/main/java/org/apache/commons/collections4/functors/SwitchClosure.java
@@ -177,7 +177,7 @@ public class SwitchClosure<E> implements Closure<E>,
Serializable {
* @since 3.1
*/
public Predicate<? super E>[] getPredicates() {
- return FunctorUtils.<E>copy(iPredicates);
+ return FunctorUtils.copy(iPredicates);
}
}
diff --git
a/src/main/java/org/apache/commons/collections4/functors/SwitchTransformer.java
b/src/main/java/org/apache/commons/collections4/functors/SwitchTransformer.java
index d113d816b..995d99a9e 100644
---
a/src/main/java/org/apache/commons/collections4/functors/SwitchTransformer.java
+++
b/src/main/java/org/apache/commons/collections4/functors/SwitchTransformer.java
@@ -164,7 +164,7 @@ public class SwitchTransformer<I, O> implements
Transformer<I, O>, Serializable
* @since 3.1
*/
public Predicate<? super I>[] getPredicates() {
- return FunctorUtils.<I>copy(iPredicates);
+ return FunctorUtils.copy(iPredicates);
}
/**
