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 2e492e9 Minor Improvement: (#203)
2e492e9 is described below
commit 2e492e94a56f2548bd57c49461c5aa525c500fdc
Author: Arturo Bernal <[email protected]>
AuthorDate: Mon Dec 28 16:29:07 2020 +0100
Minor Improvement: (#203)
* Add final
* Unnecessary semicolon ';'
---
.../org/apache/commons/collections4/SplitMapUtils.java | 2 +-
.../apache/commons/collections4/bidimap/TreeBidiMap.java | 4 ++--
.../collections4/bloomfilter/AbstractBloomFilter.java | 4 ++--
.../bloomfilter/hasher/function/MD5Cyclic.java | 2 +-
.../collections4/comparators/FixedOrderComparator.java | 2 +-
.../apache/commons/collections4/map/DefaultedMap.java | 2 +-
.../java/org/apache/commons/collections4/map/LRUMap.java | 2 +-
.../commons/collections4/trie/AbstractPatriciaTrie.java | 2 +-
.../java/org/apache/commons/collections4/BulkTest.java | 2 +-
.../apache/commons/collections4/CollectionUtilsTest.java | 2 +-
.../apache/commons/collections4/FluentIterableTest.java | 2 +-
.../apache/commons/collections4/IterableUtilsTest.java | 4 ++--
.../org/apache/commons/collections4/ListUtilsTest.java | 2 +-
.../collections4/junit/AbstractAvailableLocalesTest.java | 2 +-
.../apache/commons/collections4/list/GrowthListTest.java | 4 ++--
.../apache/commons/collections4/map/Flat3MapTest.java | 16 ++++++++--------
.../multimap/ArrayListValuedHashMapTest.java | 4 ++--
.../collections4/multimap/HashSetValuedHashMapTest.java | 8 ++++----
.../collections4/set/AbstractNavigableSetTest.java | 8 ++++----
.../commons/collections4/set/AbstractSortedSetTest.java | 6 +++---
20 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/src/main/java/org/apache/commons/collections4/SplitMapUtils.java
b/src/main/java/org/apache/commons/collections4/SplitMapUtils.java
index 2a1a9e9..899306d 100644
--- a/src/main/java/org/apache/commons/collections4/SplitMapUtils.java
+++ b/src/main/java/org/apache/commons/collections4/SplitMapUtils.java
@@ -127,7 +127,7 @@ public class SplitMapUtils {
@Override
public MapIterator<K, V> mapIterator() {
- MapIterator<K, V> it;
+ final MapIterator<K, V> it;
if (get instanceof IterableGet) {
it = ((IterableGet<K, V>) get).mapIterator();
} else {
diff --git
a/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java
b/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java
index 511aab0..d363789 100644
--- a/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java
+++ b/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java
@@ -623,7 +623,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends
Comparable<V>>
* @return the specified node
*/
private Node<K, V> nextGreater(final Node<K, V> node, final DataElement
dataElement) {
- Node<K, V> rval;
+ final Node<K, V> rval;
if (node == null) {
rval = null;
} else if (node.getRight(dataElement) != null) {
@@ -658,7 +658,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends
Comparable<V>>
* @return the specified node
*/
private Node<K, V> nextSmaller(final Node<K, V> node, final DataElement
dataElement) {
- Node<K, V> rval;
+ final Node<K, V> rval;
if (node == null) {
rval = null;
} else if (node.getLeft(dataElement) != null) {
diff --git
a/src/main/java/org/apache/commons/collections4/bloomfilter/AbstractBloomFilter.java
b/src/main/java/org/apache/commons/collections4/bloomfilter/AbstractBloomFilter.java
index 85d66b6..18e1fee 100644
---
a/src/main/java/org/apache/commons/collections4/bloomfilter/AbstractBloomFilter.java
+++
b/src/main/java/org/apache/commons/collections4/bloomfilter/AbstractBloomFilter.java
@@ -179,8 +179,8 @@ public abstract class AbstractBloomFilter implements
BloomFilter {
verifyShape(other);
final long[] mine = getBits();
final long[] theirs = other.getBits();
- long[] small;
- long[] big;
+ final long[] small;
+ final long[] big;
if (mine.length > theirs.length) {
big = mine;
small = theirs;
diff --git
a/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/function/MD5Cyclic.java
b/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/function/MD5Cyclic.java
index 7bf4e86..8e07793 100644
---
a/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/function/MD5Cyclic.java
+++
b/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/function/MD5Cyclic.java
@@ -69,7 +69,7 @@ public final class MD5Cyclic implements HashFunction {
public long apply(final byte[] buffer, final int seed) {
if (seed == 0) {
- byte[] hash;
+ final byte[] hash;
synchronized (messageDigest) {
messageDigest.update(buffer);
hash = messageDigest.digest();
diff --git
a/src/main/java/org/apache/commons/collections4/comparators/FixedOrderComparator.java
b/src/main/java/org/apache/commons/collections4/comparators/FixedOrderComparator.java
index 8a926e3..437dea8 100644
---
a/src/main/java/org/apache/commons/collections4/comparators/FixedOrderComparator.java
+++
b/src/main/java/org/apache/commons/collections4/comparators/FixedOrderComparator.java
@@ -60,7 +60,7 @@ public class FixedOrderComparator<T> implements
Comparator<T>, Serializable {
* @since 4.0
*/
public enum UnknownObjectBehavior {
- BEFORE, AFTER, EXCEPTION;
+ BEFORE, AFTER, EXCEPTION
}
/** Internal map of object to position */
diff --git
a/src/main/java/org/apache/commons/collections4/map/DefaultedMap.java
b/src/main/java/org/apache/commons/collections4/map/DefaultedMap.java
index 4dbce64..2da1d10 100644
--- a/src/main/java/org/apache/commons/collections4/map/DefaultedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/DefaultedMap.java
@@ -198,7 +198,7 @@ public class DefaultedMap<K, V> extends
AbstractMapDecorator<K, V> implements Se
@Override
@SuppressWarnings("unchecked")
public V get(final Object key) {
- V v;
+ final V v;
return (((v = map.get(key)) != null) || map.containsKey(key))
? v
: value.transform((K) key);
diff --git a/src/main/java/org/apache/commons/collections4/map/LRUMap.java
b/src/main/java/org/apache/commons/collections4/map/LRUMap.java
index 8f10da6..dda0faa 100644
--- a/src/main/java/org/apache/commons/collections4/map/LRUMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/LRUMap.java
@@ -74,7 +74,7 @@ public class LRUMap<K, V>
/** Maximum size */
private transient int maxSize;
/** Scan behavior */
- private boolean scanUntilRemovable;
+ private final boolean scanUntilRemovable;
/**
* Constructs a new empty map with a maximum size of 100.
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 50a41bf..4e38f09 100644
---
a/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java
+++
b/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java
@@ -1897,7 +1897,7 @@ abstract class AbstractPatriciaTrie<K, V> extends
AbstractBitwiseTrie<K, V> {
@Override
public K lastKey() {
- Map.Entry<K, V> e;
+ final Map.Entry<K, V> e;
if (toKey == null) {
e = lastEntry();
} else {
diff --git a/src/test/java/org/apache/commons/collections4/BulkTest.java
b/src/test/java/org/apache/commons/collections4/BulkTest.java
index cc97dc4..00cc734 100644
--- a/src/test/java/org/apache/commons/collections4/BulkTest.java
+++ b/src/test/java/org/apache/commons/collections4/BulkTest.java
@@ -359,7 +359,7 @@ class BulkTestSuiteMaker {
return;
}
- BulkTest bulk2;
+ final BulkTest bulk2;
try {
bulk2 = (BulkTest) m.invoke(bulk, (Object[]) null);
if (bulk2 == null) {
diff --git
a/src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java
b/src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java
index bd15526..649d459 100644
--- a/src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java
@@ -64,7 +64,7 @@ import org.junit.Test;
public class CollectionUtilsTest extends MockTestCase {
// -----------------------------------------------------------------------
- private static Predicate<Number> EQUALS_TWO = input -> input.intValue() ==
2;
+ private static final Predicate<Number> EQUALS_TWO = input ->
input.intValue() == 2;
/**
* Collection of {@link Integer}s
diff --git
a/src/test/java/org/apache/commons/collections4/FluentIterableTest.java
b/src/test/java/org/apache/commons/collections4/FluentIterableTest.java
index 62c72cf..8615f8f 100644
--- a/src/test/java/org/apache/commons/collections4/FluentIterableTest.java
+++ b/src/test/java/org/apache/commons/collections4/FluentIterableTest.java
@@ -103,7 +103,7 @@ public class FluentIterableTest {
emptyIterable = Collections.emptyList();
}
- private static Predicate<Number> EVEN = input -> input.intValue() % 2 == 0;
+ private static final Predicate<Number> EVEN = input -> input.intValue() %
2 == 0;
// -----------------------------------------------------------------------
@Test
diff --git
a/src/test/java/org/apache/commons/collections4/IterableUtilsTest.java
b/src/test/java/org/apache/commons/collections4/IterableUtilsTest.java
index 620ae32..22befdc 100644
--- a/src/test/java/org/apache/commons/collections4/IterableUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/IterableUtilsTest.java
@@ -91,9 +91,9 @@ public class IterableUtilsTest {
emptyIterable = Collections.emptyList();
}
- private static Predicate<Number> EQUALS_TWO = input -> input.intValue() ==
2;
+ private static final Predicate<Number> EQUALS_TWO = input ->
input.intValue() == 2;
- private static Predicate<Number> EVEN = input -> input.intValue() % 2 == 0;
+ private static final Predicate<Number> EVEN = input -> input.intValue() %
2 == 0;
// -----------------------------------------------------------------------
@Test
diff --git a/src/test/java/org/apache/commons/collections4/ListUtilsTest.java
b/src/test/java/org/apache/commons/collections4/ListUtilsTest.java
index 1a375b1..78c3917 100644
--- a/src/test/java/org/apache/commons/collections4/ListUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/ListUtilsTest.java
@@ -447,7 +447,7 @@ public class ListUtilsTest {
assertEquals(strings, partitionMax.get(0));
}
- private static Predicate<Number> EQUALS_TWO = input -> input.intValue() ==
2;
+ private static final Predicate<Number> EQUALS_TWO = input ->
input.intValue() == 2;
@Test
@SuppressWarnings("boxing") // OK in test code
diff --git
a/src/test/java/org/apache/commons/collections4/junit/AbstractAvailableLocalesTest.java
b/src/test/java/org/apache/commons/collections4/junit/AbstractAvailableLocalesTest.java
index ac4f683..4254bcc 100644
---
a/src/test/java/org/apache/commons/collections4/junit/AbstractAvailableLocalesTest.java
+++
b/src/test/java/org/apache/commons/collections4/junit/AbstractAvailableLocalesTest.java
@@ -69,7 +69,7 @@ public abstract class AbstractAvailableLocalesTest {
if (field.getType() == Locale.class &&
Modifier.isStatic(modifiers) && Modifier.isPublic(modifiers)) {
try {
availableLocales.add((Locale) field.get(Locale.class));
- } catch (IllegalArgumentException | IllegalAccessException e) {
+ } catch (final IllegalArgumentException |
IllegalAccessException e) {
throw new IllegalStateException("Field " + field, e);
}
}
diff --git
a/src/test/java/org/apache/commons/collections4/list/GrowthListTest.java
b/src/test/java/org/apache/commons/collections4/list/GrowthListTest.java
index 7f8d63c..cbb89c0 100644
--- a/src/test/java/org/apache/commons/collections4/list/GrowthListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/GrowthListTest.java
@@ -109,7 +109,7 @@ public class GrowthListTest<E> extends AbstractListTest<E> {
*/
@Override
public void testListAddByIndexBoundsChecking() {
- List<E> list;
+ final List<E> list;
final E element = getOtherElements()[0];
try {
list = makeObject();
@@ -125,7 +125,7 @@ public class GrowthListTest<E> extends AbstractListTest<E> {
*/
@Override
public void testListAddByIndexBoundsChecking2() {
- List<E> list;
+ final List<E> list;
final E element = getOtherElements()[0];
try {
list = makeFullCollection();
diff --git
a/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
b/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
index 2ce24a5..dd75e69 100644
--- a/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
@@ -621,7 +621,7 @@ public class Flat3MapTest<K, V> extends
AbstractIterableMapTest<K, V> {
public void testRemove9() {
final Flat3Map<Integer, Integer> m = new Flat3Map<>();
- Object obj;
+ final Object obj;
m.put(ONE, ONE);
@@ -631,7 +631,7 @@ public class Flat3MapTest<K, V> extends
AbstractIterableMapTest<K, V> {
public void testRemove10() {
final Flat3Map<Integer, Integer> m = new Flat3Map<>();
- Object obj;
+ final Object obj;
m.put(ONE, ONE);
m.put(TWO, TWO);
@@ -642,7 +642,7 @@ public class Flat3MapTest<K, V> extends
AbstractIterableMapTest<K, V> {
public void testRemove11() {
final Flat3Map<Integer, Integer> m = new Flat3Map<>();
- Object obj;
+ final Object obj;
m.put(ONE, ONE);
m.put(TWO, TWO);
@@ -654,7 +654,7 @@ public class Flat3MapTest<K, V> extends
AbstractIterableMapTest<K, V> {
public void testRemove12() {
final Flat3Map<Integer, Integer> m = new Flat3Map<>();
- Object obj;
+ final Object obj;
m.put(ONE, ONE);
m.put(TWO, TWO);
@@ -666,7 +666,7 @@ public class Flat3MapTest<K, V> extends
AbstractIterableMapTest<K, V> {
public void testRemove13() {
final Flat3Map<Integer, Integer> m = new Flat3Map<>();
- Object obj;
+ final Object obj;
m.put(ONE, ONE);
m.put(TWO, TWO);
@@ -688,7 +688,7 @@ public class Flat3MapTest<K, V> extends
AbstractIterableMapTest<K, V> {
public void testGet1() {
final Flat3Map<Integer, Integer> m = new Flat3Map<>();
- Object obj;
+ final Object obj;
m.put(null, ONE);
obj = m.get(null);
@@ -697,7 +697,7 @@ public class Flat3MapTest<K, V> extends
AbstractIterableMapTest<K, V> {
public void testGet2() {
final Flat3Map<Integer, Integer> m = new Flat3Map<>();
- Object obj;
+ final Object obj;
m.put(ONE, ONE);
m.put(null, TWO);
@@ -707,7 +707,7 @@ public class Flat3MapTest<K, V> extends
AbstractIterableMapTest<K, V> {
public void testGet3() {
final Flat3Map<Integer, Integer> m = new Flat3Map<>();
- Object obj;
+ final Object obj;
m.put(ONE, ONE);
m.put(TWO, TWO);
diff --git
a/src/test/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMapTest.java
b/src/test/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMapTest.java
index fd42b17..63cc6c6 100644
---
a/src/test/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMapTest.java
+++
b/src/test/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMapTest.java
@@ -150,8 +150,8 @@ public class ArrayListValuedHashMapTest<K, V> extends
AbstractMultiValuedMapTest
}
public void testArrayListValuedHashMap() {
- ListValuedMap<K, V> listMap;
- ListValuedMap<K, V> listMap1;
+ final ListValuedMap<K, V> listMap;
+ final ListValuedMap<K, V> listMap1;
final Map<K, V> map = new HashMap<>();
final Map<K, V> map1 = new HashMap<>();
map.put((K) "A", (V) "W");
diff --git
a/src/test/java/org/apache/commons/collections4/multimap/HashSetValuedHashMapTest.java
b/src/test/java/org/apache/commons/collections4/multimap/HashSetValuedHashMapTest.java
index f615d90..1993de5 100644
---
a/src/test/java/org/apache/commons/collections4/multimap/HashSetValuedHashMapTest.java
+++
b/src/test/java/org/apache/commons/collections4/multimap/HashSetValuedHashMapTest.java
@@ -145,9 +145,9 @@ public class HashSetValuedHashMapTest<K, V> extends
AbstractMultiValuedMapTest<K
public void testHashSetValueHashMap_1() {
final MultiValuedMap<K, V> map = new ArrayListValuedHashMap<>();
- SetValuedMap<K, V> map1;
+ final SetValuedMap<K, V> map1;
final SetValuedMap<K, V> map2 = makeObject();
- SetValuedMap<K, V> map3;
+ final SetValuedMap<K, V> map3;
map.put((K) "A", (V) "W");
map.put((K) "A", (V) "X");
@@ -167,8 +167,8 @@ public class HashSetValuedHashMapTest<K, V> extends
AbstractMultiValuedMapTest<K
public void testHashSetValuedHashMap_2(){
final Map<K, V> map = new HashMap<>();
- SetValuedMap<K, V> map1;
- SetValuedMap<K, V> map2;
+ final SetValuedMap<K, V> map1;
+ final SetValuedMap<K, V> map2;
map.put((K) "A", (V) "W");
map.put((K) "B", (V) "X");
diff --git
a/src/test/java/org/apache/commons/collections4/set/AbstractNavigableSetTest.java
b/src/test/java/org/apache/commons/collections4/set/AbstractNavigableSetTest.java
index 6a6bf2c..33dda9a 100644
---
a/src/test/java/org/apache/commons/collections4/set/AbstractNavigableSetTest.java
+++
b/src/test/java/org/apache/commons/collections4/set/AbstractNavigableSetTest.java
@@ -179,12 +179,12 @@ public abstract class AbstractNavigableSetTest<E> extends
AbstractSortedSetTest<
public class TestNavigableSetSubSet extends AbstractNavigableSetTest<E> {
- private int m_Type;
+ private final int m_Type;
private int m_LowBound;
private int m_HighBound;
- private E[] m_FullElements;
- private E[] m_OtherElements;
- private boolean m_Inclusive;
+ private final E[] m_FullElements;
+ private final E[] m_OtherElements;
+ private final boolean m_Inclusive;
@SuppressWarnings("unchecked")
public TestNavigableSetSubSet(final int bound, final boolean head,
final boolean inclusive) {
diff --git
a/src/test/java/org/apache/commons/collections4/set/AbstractSortedSetTest.java
b/src/test/java/org/apache/commons/collections4/set/AbstractSortedSetTest.java
index 9530cb9..6d96af9 100644
---
a/src/test/java/org/apache/commons/collections4/set/AbstractSortedSetTest.java
+++
b/src/test/java/org/apache/commons/collections4/set/AbstractSortedSetTest.java
@@ -190,11 +190,11 @@ public abstract class AbstractSortedSetTest<E> extends
AbstractSetTest<E> {
public class TestSortedSetSubSet extends AbstractSortedSetTest<E> {
- private int m_Type;
+ private final int m_Type;
private int m_LowBound;
private int m_HighBound;
- private E[] m_FullElements;
- private E[] m_OtherElements;
+ private final E[] m_FullElements;
+ private final E[] m_OtherElements;
@SuppressWarnings("unchecked")
public TestSortedSetSubSet(final int bound, final boolean head) {