You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2024/07/11 17:50:32 UTC
(commons-collections) 03/10: Migrate toward java.util.function
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 e42f60b041188e487b2c3df613eb44d6b1f70026
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Jul 11 09:49:01 2024 -0400
Migrate toward java.util.function
- Package-private changes only
- Maintains binary and source compatibility
---
.../apache/commons/collections4/functors/ChainedTransformer.java | 2 +-
.../java/org/apache/commons/collections4/functors/FunctorUtils.java | 6 +++---
.../org/apache/commons/collections4/functors/SwitchTransformer.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/commons/collections4/functors/ChainedTransformer.java b/src/main/java/org/apache/commons/collections4/functors/ChainedTransformer.java
index 80fd7a1fd..d2e21147c 100644
--- a/src/main/java/org/apache/commons/collections4/functors/ChainedTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/ChainedTransformer.java
@@ -108,7 +108,7 @@ public class ChainedTransformer<T> implements Transformer<T, T>, Serializable {
* @since 3.1
*/
public Transformer<? super T, ? extends T>[] getTransformers() {
- return FunctorUtils.<T, T>copy(iTransformers);
+ return FunctorUtils.copy(iTransformers);
}
/**
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 465051dbd..05bb62d6d 100644
--- a/src/main/java/org/apache/commons/collections4/functors/FunctorUtils.java
+++ b/src/main/java/org/apache/commons/collections4/functors/FunctorUtils.java
@@ -111,17 +111,17 @@ final class FunctorUtils {
}
/**
- * Copy method
+ * Copy method.
*
* @param transformers the transformers to copy
* @return a clone of the transformers
*/
@SuppressWarnings("unchecked")
- static <I, O> Transformer<I, O>[] copy(final Transformer<? super I, ? extends O>... transformers) {
+ static <T extends Function<?, ?>> T[] copy(final T... transformers) {
if (transformers == null) {
return null;
}
- return (Transformer<I, O>[]) transformers.clone();
+ return transformers.clone();
}
/**
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 995d99a9e..395443952 100644
--- a/src/main/java/org/apache/commons/collections4/functors/SwitchTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/SwitchTransformer.java
@@ -174,7 +174,7 @@ public class SwitchTransformer<I, O> implements Transformer<I, O>, Serializable
* @since 3.1
*/
public Transformer<? super I, ? extends O>[] getTransformers() {
- return FunctorUtils.<I, O>copy(iTransformers);
+ return FunctorUtils.copy(iTransformers);
}
/**