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
The following commit(s) were added to refs/heads/master by this push:
new 6f9b16d Define and reuse constants.
6f9b16d is described below
commit 6f9b16da5569378d884702a060749c05c75285de
Author: Gary Gregory <[email protected]>
AuthorDate: Sat Jan 16 12:34:09 2021 -0500
Define and reuse constants.
---
src/main/java/org/apache/commons/collections4/ComparatorUtils.java | 4 +++-
.../org/apache/commons/collections4/functors/ChainedTransformer.java | 4 +++-
src/main/java/org/apache/commons/collections4/map/CompositeMap.java | 4 +++-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/commons/collections4/ComparatorUtils.java
b/src/main/java/org/apache/commons/collections4/ComparatorUtils.java
index be7f928..639bb41 100644
--- a/src/main/java/org/apache/commons/collections4/ComparatorUtils.java
+++ b/src/main/java/org/apache/commons/collections4/ComparatorUtils.java
@@ -41,6 +41,8 @@ import
org.apache.commons.collections4.comparators.TransformingComparator;
*/
public class ComparatorUtils {
+ private static final Comparator[] EMPTY_COMPARATOR_ARRAY = new
Comparator[0];
+
/**
* Don't allow instances.
*/
@@ -98,7 +100,7 @@ public class ComparatorUtils {
@SuppressWarnings("unchecked")
public static <E> Comparator<E> chainedComparator(final
Collection<Comparator<E>> comparators) {
return chainedComparator(
- (Comparator<E>[]) comparators.toArray(new Comparator[0])
+ (Comparator<E>[]) comparators.toArray(EMPTY_COMPARATOR_ARRAY)
);
}
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 a1f4cc5..3c3e4ba 100644
---
a/src/main/java/org/apache/commons/collections4/functors/ChainedTransformer.java
+++
b/src/main/java/org/apache/commons/collections4/functors/ChainedTransformer.java
@@ -33,6 +33,8 @@ import org.apache.commons.collections4.Transformer;
*/
public class ChainedTransformer<T> implements Transformer<T, T>, Serializable {
+ private static final Transformer[] EMPTY_TRANSFORMER_ARRAY = new
Transformer[0];
+
/** Serial version UID */
private static final long serialVersionUID = 3514945074733160196L;
@@ -74,7 +76,7 @@ public class ChainedTransformer<T> implements Transformer<T,
T>, Serializable {
return NOPTransformer.<T>nopTransformer();
}
// convert to array like this to guarantee iterator() ordering
- final Transformer<T, T>[] cmds = transformers.toArray(new
Transformer[0]);
+ final Transformer<T, T>[] cmds =
transformers.toArray(EMPTY_TRANSFORMER_ARRAY);
FunctorUtils.validate(cmds);
return new ChainedTransformer<>(false, cmds);
}
diff --git
a/src/main/java/org/apache/commons/collections4/map/CompositeMap.java
b/src/main/java/org/apache/commons/collections4/map/CompositeMap.java
index e3feed6..3aad891 100644
--- a/src/main/java/org/apache/commons/collections4/map/CompositeMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/CompositeMap.java
@@ -47,6 +47,8 @@ import
org.apache.commons.collections4.collection.CompositeCollection;
*/
public class CompositeMap<K, V> extends AbstractIterableMap<K, V> implements
Serializable {
+ private static final Map[] EMPTY_MAP_ARRAY = new Map[0];
+
/** Serialization version */
private static final long serialVersionUID = -6096931280583808322L;
@@ -109,7 +111,7 @@ public class CompositeMap<K, V> extends
AbstractIterableMap<K, V> implements Ser
@SuppressWarnings("unchecked")
public CompositeMap(final Map<K, V>[] composite, final MapMutator<K, V>
mutator) {
this.mutator = mutator;
- this.composite = new Map[0];
+ this.composite = EMPTY_MAP_ARRAY;
for (int i = composite.length - 1; i >= 0; --i) {
this.addComposited(composite[i]);
}