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 bb99f201b Make private static classes final
bb99f201b is described below
commit bb99f201b174a64a0eaeb3a5b115ac8a1a2e38d1
Author: Gary Gregory <[email protected]>
AuthorDate: Tue Oct 10 16:14:05 2023 -0400
Make private static classes final
---
src/main/java/org/apache/commons/collections4/CollectionUtils.java | 4 ++--
src/main/java/org/apache/commons/collections4/ListUtils.java | 2 +-
src/main/java/org/apache/commons/collections4/SplitMapUtils.java | 4 ++--
src/main/java/org/apache/commons/collections4/map/MultiValueMap.java | 2 +-
.../org/apache/commons/collections4/multiset/AbstractMapMultiSet.java | 2 +-
.../org/apache/commons/collections4/multiset/AbstractMultiSet.java | 2 +-
.../org/apache/commons/collections4/properties/PropertiesFactory.java | 2 +-
.../org/apache/commons/collections4/sequence/SequencesComparator.java | 2 +-
.../org/apache/commons/collections4/trie/AbstractPatriciaTrie.java | 2 +-
src/test/java/org/apache/commons/collections4/MapPerformance.java | 2 +-
.../org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java | 2 +-
.../collections4/bloomfilter/IndexProducerFromBitmapProducerTest.java | 2 +-
.../apache/commons/collections4/bloomfilter/IndexProducerTest.java | 2 +-
.../collections4/collection/PredicatedCollectionBuilderTest.java | 2 +-
.../commons/collections4/collection/TransformedCollectionTest.java | 4 ++--
.../apache/commons/collections4/functors/ComparatorPredicateTest.java | 2 +-
.../java/org/apache/commons/collections4/map/LazySortedMapTest.java | 2 +-
.../org/apache/commons/collections4/map/PassiveExpiringMapTest.java | 2 +-
.../java/org/apache/commons/collections4/map/ReferenceMapTest.java | 2 +-
.../apache/commons/collections4/sequence/SequencesComparatorTest.java | 2 +-
20 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/main/java/org/apache/commons/collections4/CollectionUtils.java
b/src/main/java/org/apache/commons/collections4/CollectionUtils.java
index 28b5f3a67..caf178164 100644
--- a/src/main/java/org/apache/commons/collections4/CollectionUtils.java
+++ b/src/main/java/org/apache/commons/collections4/CollectionUtils.java
@@ -161,7 +161,7 @@ public class CollectionUtils {
* Helper class for set-related operations, e.g. union, subtract,
intersection.
* @param <O> the element type
*/
- private static class SetOperationCardinalityHelper<O> extends
CardinalityHelper<O> implements Iterable<O> {
+ private static final class SetOperationCardinalityHelper<O> extends
CardinalityHelper<O> implements Iterable<O> {
/** Contains the unique elements of the two collections. */
private final Set<O> elements;
@@ -712,7 +712,7 @@ public class CollectionUtils {
* @param <O> the element type
* @since 4.0
*/
- private static class EquatorWrapper<O> {
+ private static final class EquatorWrapper<O> {
private final Equator<? super O> equator;
private final O object;
diff --git a/src/main/java/org/apache/commons/collections4/ListUtils.java
b/src/main/java/org/apache/commons/collections4/ListUtils.java
index 4dccc16a7..054c070a2 100644
--- a/src/main/java/org/apache/commons/collections4/ListUtils.java
+++ b/src/main/java/org/apache/commons/collections4/ListUtils.java
@@ -98,7 +98,7 @@ public class ListUtils {
* Provides a partition view on a {@link List}.
* @since 4.0
*/
- private static class Partition<T> extends AbstractList<List<T>> {
+ private static final class Partition<T> extends AbstractList<List<T>> {
private final List<T> list;
private final int size;
diff --git a/src/main/java/org/apache/commons/collections4/SplitMapUtils.java
b/src/main/java/org/apache/commons/collections4/SplitMapUtils.java
index fbd1364dd..0fe2ffc04 100644
--- a/src/main/java/org/apache/commons/collections4/SplitMapUtils.java
+++ b/src/main/java/org/apache/commons/collections4/SplitMapUtils.java
@@ -44,7 +44,7 @@ public class SplitMapUtils {
private SplitMapUtils() {}
- private static class WrappedGet<K, V> implements IterableMap<K, V>,
Unmodifiable {
+ private static final class WrappedGet<K, V> implements IterableMap<K, V>,
Unmodifiable {
private final Get<K, V> get;
private WrappedGet(final Get<K, V> get) {
@@ -136,7 +136,7 @@ public class SplitMapUtils {
}
}
- private static class WrappedPut<K, V> implements Map<K, V>, Put<K, V> {
+ private static final class WrappedPut<K, V> implements Map<K, V>, Put<K,
V> {
private final Put<K, V> put;
private WrappedPut(final Put<K, V> put) {
diff --git
a/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java
b/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java
index 796f1b39b..ed2474ae8 100644
--- a/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java
@@ -541,7 +541,7 @@ public class MultiValueMap<K, V> extends
AbstractMapDecorator<K, Object> impleme
/**
* Inner class that provides a simple reflection factory.
*/
- private static class ReflectionFactory<T extends Collection<?>> implements
Factory<T>, Serializable {
+ private static final class ReflectionFactory<T extends Collection<?>>
implements Factory<T>, Serializable {
/** Serialization version */
private static final long serialVersionUID = 2986114157496788874L;
diff --git
a/src/main/java/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java
b/src/main/java/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java
index 4f1cdfd02..05b1ddef0 100644
---
a/src/main/java/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java
+++
b/src/main/java/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java
@@ -147,7 +147,7 @@ public abstract class AbstractMapMultiSet<E> extends
AbstractMultiSet<E> {
/**
* Inner class iterator for the MultiSet.
*/
- private static class MapBasedMultiSetIterator<E> implements Iterator<E> {
+ private static final class MapBasedMultiSetIterator<E> implements
Iterator<E> {
private final AbstractMapMultiSet<E> parent;
private final Iterator<Map.Entry<E, MutableInteger>> entryIterator;
private Map.Entry<E, MutableInteger> current;
diff --git
a/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSet.java
b/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSet.java
index 312ae2b11..fe2b0793d 100644
---
a/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSet.java
+++
b/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSet.java
@@ -122,7 +122,7 @@ public abstract class AbstractMultiSet<E> extends
AbstractCollection<E> implemen
/**
* Inner class iterator for the MultiSet.
*/
- private static class MultiSetIterator<E> implements Iterator<E> {
+ private static final class MultiSetIterator<E> implements Iterator<E> {
private final AbstractMultiSet<E> parent;
private final Iterator<Entry<E>> entryIterator;
private Entry<E> current;
diff --git
a/src/main/java/org/apache/commons/collections4/properties/PropertiesFactory.java
b/src/main/java/org/apache/commons/collections4/properties/PropertiesFactory.java
index 57045254c..ef6eef6bf 100644
---
a/src/main/java/org/apache/commons/collections4/properties/PropertiesFactory.java
+++
b/src/main/java/org/apache/commons/collections4/properties/PropertiesFactory.java
@@ -43,7 +43,7 @@ import java.util.function.Function;
*/
public class PropertiesFactory extends AbstractPropertiesFactory<Properties> {
- private static class EmptyProperties extends Properties {
+ private static final class EmptyProperties extends Properties {
private static final long serialVersionUID = 1L;
diff --git
a/src/main/java/org/apache/commons/collections4/sequence/SequencesComparator.java
b/src/main/java/org/apache/commons/collections4/sequence/SequencesComparator.java
index 212194877..89d940d99 100644
---
a/src/main/java/org/apache/commons/collections4/sequence/SequencesComparator.java
+++
b/src/main/java/org/apache/commons/collections4/sequence/SequencesComparator.java
@@ -292,7 +292,7 @@ public class SequencesComparator<T> {
* This class is a simple placeholder to hold the end part of a path
* under construction in a {@link SequencesComparator SequencesComparator}.
*/
- private static class Snake {
+ private static final class Snake {
/** Start index. */
private final int start;
diff --git
a/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java
b/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java
index 166618c5e..35ab7fb98 100644
---
a/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java
+++
b/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java
@@ -1257,7 +1257,7 @@ public abstract class AbstractPatriciaTrie<K, V> extends
AbstractBitwiseTrie<K,
* wise there's no difference (except for the need to load the
* {@link Reference} Class but that happens only once).
*/
- private static class Reference<E> {
+ private static final class Reference<E> {
private E item;
diff --git a/src/test/java/org/apache/commons/collections4/MapPerformance.java
b/src/test/java/org/apache/commons/collections4/MapPerformance.java
index ba0cf0d14..e2dcff61f 100644
--- a/src/test/java/org/apache/commons/collections4/MapPerformance.java
+++ b/src/test/java/org/apache/commons/collections4/MapPerformance.java
@@ -127,7 +127,7 @@ public class MapPerformance {
System.out.println(name + (endMillis - startMillis));
}
- private static class DummyMap<K, V> implements Map<K, V> {
+ private static final class DummyMap<K, V> implements Map<K, V> {
@Override
public void clear() {
}
diff --git
a/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java
b/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java
index 008f27a80..fd7516d20 100644
---
a/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java
+++
b/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java
@@ -97,7 +97,7 @@ public class DualTreeBidiMap2Test<K extends Comparable<K>, V
extends Comparable<
}
}
- private static class IntegerComparator implements Comparator<Integer>,
Serializable{
+ private static final class IntegerComparator implements
Comparator<Integer>, Serializable{
private static final long serialVersionUID = 1L;
@Override
public int compare(final Integer o1, final Integer o2) {
diff --git
a/src/test/java/org/apache/commons/collections4/bloomfilter/IndexProducerFromBitmapProducerTest.java
b/src/test/java/org/apache/commons/collections4/bloomfilter/IndexProducerFromBitmapProducerTest.java
index f048ba35c..a823e39f0 100644
---
a/src/test/java/org/apache/commons/collections4/bloomfilter/IndexProducerFromBitmapProducerTest.java
+++
b/src/test/java/org/apache/commons/collections4/bloomfilter/IndexProducerFromBitmapProducerTest.java
@@ -84,7 +84,7 @@ public class IndexProducerFromBitmapProducerTest extends
AbstractIndexProducerTe
}
}
- private static class TestingBitMapProducer implements BitMapProducer {
+ private static final class TestingBitMapProducer implements BitMapProducer
{
long[] values;
TestingBitMapProducer(final long[] values) {
diff --git
a/src/test/java/org/apache/commons/collections4/bloomfilter/IndexProducerTest.java
b/src/test/java/org/apache/commons/collections4/bloomfilter/IndexProducerTest.java
index 9cf4bcc37..7aa96e5b3 100644
---
a/src/test/java/org/apache/commons/collections4/bloomfilter/IndexProducerTest.java
+++
b/src/test/java/org/apache/commons/collections4/bloomfilter/IndexProducerTest.java
@@ -54,7 +54,7 @@ public class IndexProducerTest {
}
}
- private static class TestingBitMapProducer implements BitMapProducer {
+ private static final class TestingBitMapProducer implements BitMapProducer
{
long[] values;
TestingBitMapProducer(final long[] values) {
diff --git
a/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionBuilderTest.java
b/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionBuilderTest.java
index 484189fd5..8c25f7776 100644
---
a/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionBuilderTest.java
+++
b/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionBuilderTest.java
@@ -129,7 +129,7 @@ public class PredicatedCollectionBuilderTest {
assertEquals(3, collection.size());
}
- private static class OddPredicate implements Predicate<Integer> {
+ private static final class OddPredicate implements Predicate<Integer> {
@Override
public boolean evaluate(final Integer value) {
return value % 2 == 1;
diff --git
a/src/test/java/org/apache/commons/collections4/collection/TransformedCollectionTest.java
b/src/test/java/org/apache/commons/collections4/collection/TransformedCollectionTest.java
index d5e0b951f..28f52ad3e 100644
---
a/src/test/java/org/apache/commons/collections4/collection/TransformedCollectionTest.java
+++
b/src/test/java/org/apache/commons/collections4/collection/TransformedCollectionTest.java
@@ -38,14 +38,14 @@ import org.junit.jupiter.api.Test;
*/
public class TransformedCollectionTest extends AbstractCollectionTest<Object> {
- private static class StringToInteger implements Transformer<Object,
Object> {
+ private static final class StringToInteger implements Transformer<Object,
Object> {
@Override
public Object transform(final Object input) {
return Integer.valueOf((String) input);
}
}
- private static class ToLowerCase implements Transformer<Object, Object> {
+ private static final class ToLowerCase implements Transformer<Object,
Object> {
@Override
public Object transform(final Object input) {
return ((String) input).toLowerCase();
diff --git
a/src/test/java/org/apache/commons/collections4/functors/ComparatorPredicateTest.java
b/src/test/java/org/apache/commons/collections4/functors/ComparatorPredicateTest.java
index 49603dd47..c3a92a867 100644
---
a/src/test/java/org/apache/commons/collections4/functors/ComparatorPredicateTest.java
+++
b/src/test/java/org/apache/commons/collections4/functors/ComparatorPredicateTest.java
@@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test;
public class ComparatorPredicateTest extends AbstractPredicateTest {
- private static class TestComparator<T extends Comparable<T>> implements
Comparator<T> {
+ private static final class TestComparator<T extends Comparable<T>>
implements Comparator<T> {
@Override
public int compare(final T first, final T second) {
return first.compareTo(second);
diff --git
a/src/test/java/org/apache/commons/collections4/map/LazySortedMapTest.java
b/src/test/java/org/apache/commons/collections4/map/LazySortedMapTest.java
index bc21d916a..39429c955 100644
--- a/src/test/java/org/apache/commons/collections4/map/LazySortedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/LazySortedMapTest.java
@@ -45,7 +45,7 @@ import org.junit.jupiter.api.Test;
@SuppressWarnings("boxing")
public class LazySortedMapTest<K, V> extends AbstractSortedMapTest<K, V> {
- private static class ReverseStringComparator implements Comparator<String>
{
+ private static final class ReverseStringComparator implements
Comparator<String> {
@Override
public int compare(final String arg0, final String arg1) {
diff --git
a/src/test/java/org/apache/commons/collections4/map/PassiveExpiringMapTest.java
b/src/test/java/org/apache/commons/collections4/map/PassiveExpiringMapTest.java
index 39a4bb22e..2efba9413 100644
---
a/src/test/java/org/apache/commons/collections4/map/PassiveExpiringMapTest.java
+++
b/src/test/java/org/apache/commons/collections4/map/PassiveExpiringMapTest.java
@@ -40,7 +40,7 @@ import org.junit.jupiter.api.Test;
*/
public class PassiveExpiringMapTest<K, V> extends AbstractMapTest<K, V> {
- private static class TestExpirationPolicy
+ private static final class TestExpirationPolicy
implements ExpirationPolicy<Integer, String> {
private static final long serialVersionUID = 1L;
diff --git
a/src/test/java/org/apache/commons/collections4/map/ReferenceMapTest.java
b/src/test/java/org/apache/commons/collections4/map/ReferenceMapTest.java
index aa48b36ba..342530a9a 100644
--- a/src/test/java/org/apache/commons/collections4/map/ReferenceMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/ReferenceMapTest.java
@@ -346,7 +346,7 @@ public class ReferenceMapTest<K, V> extends
AbstractIterableMapTest<K, V> {
}
}
- private static class AccessibleEntry<K, V> extends ReferenceEntry<K, V> {
+ private static final class AccessibleEntry<K, V> extends ReferenceEntry<K,
V> {
final AbstractReferenceMap<K, V> parent;
final Consumer<V> consumer;
diff --git
a/src/test/java/org/apache/commons/collections4/sequence/SequencesComparatorTest.java
b/src/test/java/org/apache/commons/collections4/sequence/SequencesComparatorTest.java
index 97c8143ef..6ec1a7984 100644
---
a/src/test/java/org/apache/commons/collections4/sequence/SequencesComparatorTest.java
+++
b/src/test/java/org/apache/commons/collections4/sequence/SequencesComparatorTest.java
@@ -154,7 +154,7 @@ public class SequencesComparatorTest {
return list;
}
- private static class ExecutionVisitor<T> implements CommandVisitor<T> {
+ private static final class ExecutionVisitor<T> implements
CommandVisitor<T> {
private List<T> v;
private int index;
