From e42f60b041188e487b2c3df613eb44d6b1f70026 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Thu, 11 Jul 2024 09:49:01 -0400 Subject: [PATCH] Migrate toward java.util.function - Package-private changes only - Maintains binary and source compatibility --- .../commons/collections4/functors/ChainedTransformer.java | 2 +- .../apache/commons/collections4/functors/FunctorUtils.java | 6 +++--- .../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 implements Transformer, Serializable { * @since 3.1 */ public Transformer[] getTransformers() { - return FunctorUtils.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 Transformer[] copy(final Transformer... transformers) { + static > T[] copy(final T... transformers) { if (transformers == null) { return null; } - return (Transformer[]) 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 implements Transformer, Serializable * @since 3.1 */ public Transformer[] getTransformers() { - return FunctorUtils.copy(iTransformers); + return FunctorUtils.copy(iTransformers); } /**