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 505722c Use final.
505722c is described below
commit 505722c303e78e4f6bdd36f55940cd4659d3219c
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Mar 4 08:49:14 2022 -0500
Use final.
---
src/main/java/org/apache/commons/collections4/ListUtils.java | 4 ++--
.../org/apache/commons/collections4/EnumerationUtilsTest.java | 2 +-
.../org/apache/commons/collections4/TransformerUtilsTest.java | 6 +++---
.../commons/collections4/bidimap/AbstractOrderedBidiMapTest.java | 8 ++++----
.../collections4/comparators/FixedOrderComparatorTest.java | 2 +-
.../commons/collections4/functors/CatchAndRethrowClosureTest.java | 6 +++---
.../commons/collections4/iterators/ArrayListIteratorTest.java | 2 +-
.../collections4/iterators/ObjectArrayListIteratorTest.java | 2 +-
.../org/apache/commons/collections4/map/MultiValueMapTest.java | 4 ++--
9 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/main/java/org/apache/commons/collections4/ListUtils.java
b/src/main/java/org/apache/commons/collections4/ListUtils.java
index 53dea68..6b518d2 100644
--- a/src/main/java/org/apache/commons/collections4/ListUtils.java
+++ b/src/main/java/org/apache/commons/collections4/ListUtils.java
@@ -185,7 +185,7 @@ public class ListUtils {
* @see List#get(int)
* @since 4.5
*/
- public static <T> T getFirst(List<T> list) {
+ public static <T> T getFirst(final List<T> list) {
return Objects.requireNonNull(list, "list").get(0);
}
@@ -200,7 +200,7 @@ public class ListUtils {
* @see List#get(int)
* @since 4.5
*/
- public static <T> T getLast(List<T> list) {
+ public static <T> T getLast(final List<T> list) {
return Objects.requireNonNull(list, "list").get(list.size() - 1);
}
diff --git
a/src/test/java/org/apache/commons/collections4/EnumerationUtilsTest.java
b/src/test/java/org/apache/commons/collections4/EnumerationUtilsTest.java
index 9c8dca4..c708167 100644
--- a/src/test/java/org/apache/commons/collections4/EnumerationUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/EnumerationUtilsTest.java
@@ -50,7 +50,7 @@ public class EnumerationUtilsTest {
assertEquals("one", EnumerationUtils.get(en, 1));
// Enumerator, non-existent entry
- Enumeration<String> finalEn = en;
+ final Enumeration<String> finalEn = en;
assertThrows(IndexOutOfBoundsException.class, () ->
EnumerationUtils.get(finalEn, 3));
assertFalse(en.hasMoreElements());
diff --git
a/src/test/java/org/apache/commons/collections4/TransformerUtilsTest.java
b/src/test/java/org/apache/commons/collections4/TransformerUtilsTest.java
index 3d303ca..3bac7fd 100644
--- a/src/test/java/org/apache/commons/collections4/TransformerUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/TransformerUtilsTest.java
@@ -185,7 +185,7 @@ public class TransformerUtilsTest {
assertEquals("A", TransformerUtils.chainedTransformer(b,
a).transform(null));
assertEquals("B", TransformerUtils.chainedTransformer(a,
b).transform(null));
assertEquals("A", TransformerUtils.chainedTransformer(b,
a).transform(null));
- Collection<Transformer<Object, Object>> coll = new ArrayList<>();
+ final Collection<Transformer<Object, Object>> coll = new ArrayList<>();
coll.add(b);
coll.add(a);
assertEquals("A",
TransformerUtils.chainedTransformer(coll).transform(null));
@@ -203,7 +203,7 @@ public class TransformerUtilsTest {
() -> assertThrows(NullPointerException.class, () ->
TransformerUtils.chainedTransformer(null, null)),
() -> assertThrows(NullPointerException.class, () -> {
- Collection<Transformer<Object, Object>> coll1 = new
ArrayList<>();
+ final Collection<Transformer<Object, Object>> coll1 = new
ArrayList<>();
coll1.add(null);
coll1.add(null);
TransformerUtils.chainedTransformer(coll1);
@@ -400,7 +400,7 @@ public class TransformerUtilsTest {
Transformer<Class<?>, Object> trans =
TransformerUtils.instantiateTransformer(new Class[] { Long.class }, new
Object[] { null });
- Transformer<Class<?>, Object> finalTrans = trans;
+ final Transformer<Class<?>, Object> finalTrans = trans;
assertThrows(FunctorException.class, () ->
finalTrans.transform(String.class));
trans = TransformerUtils.instantiateTransformer();
diff --git
a/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapTest.java
b/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapTest.java
index bab1837..69dfce4 100644
---
a/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapTest.java
+++
b/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapTest.java
@@ -46,7 +46,7 @@ public abstract class AbstractOrderedBidiMapTest<K, V>
extends AbstractBidiMapTe
resetEmpty();
OrderedBidiMap<K, V> bidi = getMap();
- OrderedBidiMap<K, V> finalBidi = bidi;
+ final OrderedBidiMap<K, V> finalBidi = bidi;
assertThrows(NoSuchElementException.class, () -> finalBidi.firstKey());
resetFull();
@@ -59,7 +59,7 @@ public abstract class AbstractOrderedBidiMapTest<K, V>
extends AbstractBidiMapTe
resetEmpty();
OrderedBidiMap<K, V> bidi = getMap();
- OrderedBidiMap<K, V> finalBidi = bidi;
+ final OrderedBidiMap<K, V> finalBidi = bidi;
assertThrows(NoSuchElementException.class, () -> finalBidi.lastKey());
resetFull();
@@ -95,7 +95,7 @@ public abstract class AbstractOrderedBidiMapTest<K, V>
extends AbstractBidiMapTe
assertNull(bidi.nextKey(confirmedLast));
if (!isAllowNullKey()) {
- OrderedBidiMap<K, V> finalBidi = bidi;
+ final OrderedBidiMap<K, V> finalBidi = bidi;
assertThrows(NullPointerException.class, () ->
finalBidi.nextKey(null));
} else {
@@ -129,7 +129,7 @@ public abstract class AbstractOrderedBidiMapTest<K, V>
extends AbstractBidiMapTe
assertNull(bidi.previousKey(confirmedLast));
if (!isAllowNullKey()) {
- OrderedBidiMap<K, V> finalBidi = bidi;
+ final OrderedBidiMap<K, V> finalBidi = bidi;
assertThrows(NullPointerException.class, () ->
finalBidi.previousKey(null));
} else {
diff --git
a/src/test/java/org/apache/commons/collections4/comparators/FixedOrderComparatorTest.java
b/src/test/java/org/apache/commons/collections4/comparators/FixedOrderComparatorTest.java
index db24b1b..06fc352 100644
---
a/src/test/java/org/apache/commons/collections4/comparators/FixedOrderComparatorTest.java
+++
b/src/test/java/org/apache/commons/collections4/comparators/FixedOrderComparatorTest.java
@@ -156,7 +156,7 @@ public class FixedOrderComparatorTest extends
AbstractComparatorTest<String> {
public void testUnknownObjectBehavior() {
FixedOrderComparator<String> comparator = new
FixedOrderComparator<>(topCities);
- FixedOrderComparator<String> finalComparator = comparator;
+ final FixedOrderComparator<String> finalComparator = comparator;
assertThrows(IllegalArgumentException.class, () ->
finalComparator.compare("New York", "Minneapolis"),
"Should have thrown a IllegalArgumentException");
diff --git
a/src/test/java/org/apache/commons/collections4/functors/CatchAndRethrowClosureTest.java
b/src/test/java/org/apache/commons/collections4/functors/CatchAndRethrowClosureTest.java
index dd35e7e..96381ae 100644
---
a/src/test/java/org/apache/commons/collections4/functors/CatchAndRethrowClosureTest.java
+++
b/src/test/java/org/apache/commons/collections4/functors/CatchAndRethrowClosureTest.java
@@ -71,18 +71,18 @@ public class CatchAndRethrowClosureTest extends
AbstractClosureTest {
return Arrays.asList(
dynamicTest("Closure NoException", () -> {
- Closure<Integer> closure = generateNoExceptionClosure();
+ final Closure<Integer> closure =
generateNoExceptionClosure();
closure.execute(Integer.valueOf(0));
}),
dynamicTest("Closure IOException", () -> {
- Closure<Integer> closure = generateIOExceptionClosure();
+ final Closure<Integer> closure =
generateIOExceptionClosure();
final FunctorException thrown =
assertThrows(FunctorException.class, () -> closure.execute(Integer.valueOf(0)));
assertTrue(thrown.getCause() instanceof IOException);
}),
dynamicTest("Closure NullPointerException", () -> {
- Closure<Integer> closure =
generateNullPointerExceptionClosure();
+ final Closure<Integer> closure =
generateNullPointerExceptionClosure();
assertThrows(NullPointerException.class, () ->
closure.execute(Integer.valueOf(0)));
})
diff --git
a/src/test/java/org/apache/commons/collections4/iterators/ArrayListIteratorTest.java
b/src/test/java/org/apache/commons/collections4/iterators/ArrayListIteratorTest.java
index 2f5a714..5ba352b 100644
---
a/src/test/java/org/apache/commons/collections4/iterators/ArrayListIteratorTest.java
+++
b/src/test/java/org/apache/commons/collections4/iterators/ArrayListIteratorTest.java
@@ -105,7 +105,7 @@ public class ArrayListIteratorTest<E> extends
ArrayIteratorTest<E> {
// a call to set() before a call to next() or previous() should throw
an IllegalStateException
iter = makeArrayListIterator(testArray);
- ListIterator<E> finalIter = iter;
+ final ListIterator<E> finalIter = iter;
assertThrows(IllegalStateException.class, () -> finalIter.set((E)
"should fail"), "ListIterator#set should fail if next() or previous() have not
yet been called.");
}
diff --git
a/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIteratorTest.java
b/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIteratorTest.java
index 500ac90..2875db0 100644
---
a/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIteratorTest.java
+++
b/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIteratorTest.java
@@ -102,7 +102,7 @@ public class ObjectArrayListIteratorTest<E> extends
ObjectArrayIteratorTest<E> {
// a call to set() before a call to next() or previous() should throw
an IllegalStateException
iter = makeArrayListIterator((E[]) testArray);
- ListIterator<E> finalIter = iter;
+ final ListIterator<E> finalIter = iter;
assertThrows(IllegalStateException.class, () -> finalIter.set((E)
"should fail"), "ListIterator#set should fail if next() or previous() have not
yet been called.");
}
diff --git
a/src/test/java/org/apache/commons/collections4/map/MultiValueMapTest.java
b/src/test/java/org/apache/commons/collections4/map/MultiValueMapTest.java
index 3fbda3e..35fa6e5 100644
--- a/src/test/java/org/apache/commons/collections4/map/MultiValueMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/MultiValueMapTest.java
@@ -394,13 +394,13 @@ public class MultiValueMapTest<K, V> extends
AbstractObjectTest {
public void testUnsafeDeSerialization() throws Exception {
final MultiValueMap map1 = MultiValueMap.multiValueMap(new HashMap(),
ArrayList.class);
byte[] bytes = serialize(map1);
- Object result = deserialize(bytes);
+ final Object result = deserialize(bytes);
assertEquals(map1, result);
final MultiValueMap map2 = MultiValueMap.multiValueMap(new HashMap(),
(Class) String.class);
bytes = serialize(map2);
- byte[] finalBytes = bytes;
+ final byte[] finalBytes = bytes;
assertThrows(UnsupportedOperationException.class, () ->
deserialize(finalBytes));
}
