You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2017/10/11 22:37:16 UTC
[3/5] commons-collections git commit: Revert "Use final for locals."
Revert "Use final for locals."
This reverts commit 712ddb1e193967c27f5624485938e7de5d732c6b.
Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/992ab3c9
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/992ab3c9
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/992ab3c9
Branch: refs/heads/master
Commit: 992ab3c9f2855034f24ee3f7638f57126bc1cb93
Parents: 712ddb1
Author: Gary Gregory <gg...@apache.org>
Authored: Wed Oct 11 16:33:54 2017 -0600
Committer: Gary Gregory <gg...@apache.org>
Committed: Wed Oct 11 16:33:54 2017 -0600
----------------------------------------------------------------------
.../commons/collections4/CollectionUtils.java | 2 +-
.../commons/collections4/IterableUtils.java | 3 +-
.../apache/commons/collections4/ListUtils.java | 2 +-
.../commons/collections4/MultiMapUtils.java | 6 +-
.../collections4/bidimap/TreeBidiMap.java | 6 +-
.../collection/PredicatedCollection.java | 2 +-
.../iterators/PermutationIterator.java | 6 +-
.../collections4/list/SetUniqueList.java | 2 +-
.../multimap/AbstractListValuedMap.java | 8 +-
.../multimap/AbstractMultiValuedMap.java | 28 ++++---
.../multimap/AbstractSetValuedMap.java | 2 +-
.../multimap/ArrayListValuedHashMap.java | 2 +-
.../multimap/TransformedMultiValuedMap.java | 4 +-
.../multiset/AbstractMapMultiSet.java | 4 +-
.../collections4/multiset/AbstractMultiSet.java | 8 +-
.../commons/collections4/set/CompositeSet.java | 2 +-
.../collections4/set/ListOrderedSet.java | 4 +-
.../collections4/trie/AbstractPatriciaTrie.java | 10 +--
.../commons/collections4/BagUtilsTest.java | 16 ++--
.../collections4/CollectionUtilsTest.java | 42 +++++-----
.../collections4/ComparatorUtilsTest.java | 18 ++---
.../commons/collections4/FactoryUtilsTest.java | 2 +-
.../collections4/FluentIterableTest.java | 82 ++++++++++----------
.../commons/collections4/IterableUtilsTest.java | 46 +++++------
.../commons/collections4/IteratorUtilsTest.java | 10 +--
.../commons/collections4/ListUtilsTest.java | 18 ++---
.../commons/collections4/MapUtilsTest.java | 4 +-
.../commons/collections4/MultiMapUtilsTest.java | 36 ++++-----
.../commons/collections4/QueueUtilsTest.java | 8 +-
.../commons/collections4/SetUtilsTest.java | 24 +++---
.../collections4/TransformerUtilsTest.java | 4 +-
.../commons/collections4/TrieUtilsTest.java | 2 +-
.../bidimap/DualTreeBidiMap2Test.java | 2 +-
.../collection/AbstractCollectionTest.java | 10 +--
.../PredicatedCollectionBuilderTest.java | 32 ++++----
.../comparators/TransformingComparatorTest.java | 6 +-
.../iterators/BoundedIteratorTest.java | 62 +++++++--------
.../iterators/IteratorEnumerationTest.java | 6 +-
.../iterators/PeekingIteratorTest.java | 16 ++--
.../iterators/PermutationIteratorTest.java | 44 +++++------
.../iterators/PushbackIteratorTest.java | 8 +-
.../iterators/SkippingIteratorTest.java | 52 ++++++-------
.../iterators/ZippingIteratorTest.java | 2 +-
.../collections4/list/AbstractListTest.java | 2 +-
.../collections4/list/SetUniqueListTest.java | 4 +-
.../commons/collections4/list/TreeListTest.java | 22 +++---
.../collections4/map/AbstractMapTest.java | 4 +-
.../collections4/map/AbstractSortedMapTest.java | 2 +-
.../commons/collections4/map/LRUMapTest.java | 14 ++--
.../collections4/map/ListOrderedMapTest.java | 16 ++--
.../collections4/map/MultiValueMapTest.java | 19 +++--
.../map/PassiveExpiringMapTest.java | 2 +-
.../multimap/AbstractMultiValuedMapTest.java | 70 ++++++++---------
.../multimap/ArrayListValuedHashMapTest.java | 14 ++--
.../multimap/HashSetValuedHashMapTest.java | 12 +--
.../multimap/TransformedMultiValuedMapTest.java | 6 +-
.../UnmodifiableMultiValuedMapTest.java | 70 ++++++++---------
.../collections4/queue/AbstractQueueTest.java | 2 +-
.../queue/CircularFifoQueueTest.java | 2 +-
.../sequence/SequencesComparatorTest.java | 2 +-
.../collections4/set/AbstractSetTest.java | 2 +-
.../collections4/trie/PatriciaTrieTest.java | 16 ++--
62 files changed, 464 insertions(+), 470 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/992ab3c9/src/main/java/org/apache/commons/collections4/CollectionUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/CollectionUtils.java b/src/main/java/org/apache/commons/collections4/CollectionUtils.java
index 7a92bf1..1b54be5 100644
--- a/src/main/java/org/apache/commons/collections4/CollectionUtils.java
+++ b/src/main/java/org/apache/commons/collections4/CollectionUtils.java
@@ -1245,7 +1245,7 @@ public class CollectionUtils {
* @throws IllegalArgumentException if the object type is invalid
*/
public static Object get(final Object object, final int index) {
- final int i = index;
+ int i = index;
if (i < 0) {
throw new IndexOutOfBoundsException("Index cannot be negative: " + i);
}
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/992ab3c9/src/main/java/org/apache/commons/collections4/IterableUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/IterableUtils.java b/src/main/java/org/apache/commons/collections4/IterableUtils.java
index 9a9dae8..15e50c2 100644
--- a/src/main/java/org/apache/commons/collections4/IterableUtils.java
+++ b/src/main/java/org/apache/commons/collections4/IterableUtils.java
@@ -548,7 +548,6 @@ public class IterableUtils {
@Override
public Iterator<E> iterator() {
@SuppressWarnings("unchecked") // safe
- final
Iterator<? extends E>[] iterators = new Iterator[others.length + 1];
iterators[0] = first.iterator();
for (int i = 0; i < others.length; i++) {
@@ -921,7 +920,7 @@ public class IterableUtils {
throw new NullPointerException("Predicates must not be null.");
}
- for (final Predicate<?> p : predicates) {
+ for (Predicate<?> p : predicates) {
if (p == null) {
throw new NullPointerException("Predicate must not be null.");
}
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/992ab3c9/src/main/java/org/apache/commons/collections4/ListUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/ListUtils.java b/src/main/java/org/apache/commons/collections4/ListUtils.java
index d615094..c5fe813 100644
--- a/src/main/java/org/apache/commons/collections4/ListUtils.java
+++ b/src/main/java/org/apache/commons/collections4/ListUtils.java
@@ -569,7 +569,7 @@ public class ListUtils {
}
final List<Character> lcs = longestCommonSubsequence(new CharSequenceAsList( a ), new CharSequenceAsList( b ));
final StringBuilder sb = new StringBuilder();
- for ( final Character ch : lcs ) {
+ for ( Character ch : lcs ) {
sb.append(ch);
}
return sb.toString();
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/992ab3c9/src/main/java/org/apache/commons/collections4/MultiMapUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/MultiMapUtils.java b/src/main/java/org/apache/commons/collections4/MultiMapUtils.java
index e523e1b..118f7e6 100644
--- a/src/main/java/org/apache/commons/collections4/MultiMapUtils.java
+++ b/src/main/java/org/apache/commons/collections4/MultiMapUtils.java
@@ -127,7 +127,7 @@ public class MultiMapUtils {
*/
public static <K, V> List<V> getValuesAsList(final MultiValuedMap<K, V> map, final K key) {
if (map != null) {
- final Collection<V> col = map.get(key);
+ Collection<V> col = map.get(key);
if (col instanceof List) {
return (List<V>) col;
}
@@ -147,7 +147,7 @@ public class MultiMapUtils {
*/
public static <K, V> Set<V> getValuesAsSet(final MultiValuedMap<K, V> map, final K key) {
if (map != null) {
- final Collection<V> col = map.get(key);
+ Collection<V> col = map.get(key);
if (col instanceof Set) {
return (Set<V>) col;
}
@@ -167,7 +167,7 @@ public class MultiMapUtils {
*/
public static <K, V> Bag<V> getValuesAsBag(final MultiValuedMap<K, V> map, final K key) {
if (map != null) {
- final Collection<V> col = map.get(key);
+ Collection<V> col = map.get(key);
if (col instanceof Bag) {
return (Bag<V>) col;
}
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/992ab3c9/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java
----------------------------------------------------------------------
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 2a2042f..1f48b9c 100644
--- a/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java
+++ b/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java
@@ -1439,10 +1439,10 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
private void readObject(final ObjectInputStream stream) throws IOException, ClassNotFoundException{
stream.defaultReadObject();
rootNode = new Node[2];
- final int size = stream.readInt();
+ int size = stream.readInt();
for(int i = 0; i < size; i++){
- final K k =(K) stream.readObject();
- final V v =(V) stream.readObject();
+ K k =(K) stream.readObject();
+ V v =(V) stream.readObject();
put(k, v);
}
}
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/992ab3c9/src/main/java/org/apache/commons/collections4/collection/PredicatedCollection.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/collection/PredicatedCollection.java b/src/main/java/org/apache/commons/collections4/collection/PredicatedCollection.java
index 2753964..3f14664 100644
--- a/src/main/java/org/apache/commons/collections4/collection/PredicatedCollection.java
+++ b/src/main/java/org/apache/commons/collections4/collection/PredicatedCollection.java
@@ -256,7 +256,7 @@ public class PredicatedCollection<E> extends AbstractCollectionDecorator<E> {
*/
public Builder<E> addAll(final Collection<? extends E> items) {
if (items != null) {
- for (final E item : items) {
+ for (E item : items) {
add(item);
}
}
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/992ab3c9/src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java b/src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java
index 1b7caa6..c0c5fe8 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java
@@ -82,7 +82,7 @@ public class PermutationIterator<E> implements Iterator<List<E>> {
Arrays.fill(direction, false);
int value = 1;
objectMap = new HashMap<>();
- for (final E e : coll) {
+ for (E e : coll) {
objectMap.put(Integer.valueOf(value), e);
keys[value - 1] = value;
value++;
@@ -123,7 +123,7 @@ public class PermutationIterator<E> implements Iterator<List<E>> {
}
}
if (largestKey == -1) {
- final List<E> toReturn = nextPermutation;
+ List<E> toReturn = nextPermutation;
nextPermutation = null;
return toReturn;
}
@@ -133,7 +133,7 @@ public class PermutationIterator<E> implements Iterator<List<E>> {
final int tmpKey = keys[indexOfLargestMobileInteger];
keys[indexOfLargestMobileInteger] = keys[indexOfLargestMobileInteger + offset];
keys[indexOfLargestMobileInteger + offset] = tmpKey;
- final boolean tmpDirection = direction[indexOfLargestMobileInteger];
+ boolean tmpDirection = direction[indexOfLargestMobileInteger];
direction[indexOfLargestMobileInteger] = direction[indexOfLargestMobileInteger + offset];
direction[indexOfLargestMobileInteger + offset] = tmpDirection;
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/992ab3c9/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java b/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java
index 8aa0815..3291145 100644
--- a/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java
+++ b/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java
@@ -261,7 +261,7 @@ public class SetUniqueList<E> extends AbstractSerializableListDecorator<E> {
*/
@Override
public boolean retainAll(final Collection<?> coll) {
- final boolean result = set.retainAll(coll);
+ boolean result = set.retainAll(coll);
if (result == false) {
return false;
}
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/992ab3c9/src/main/java/org/apache/commons/collections4/multimap/AbstractListValuedMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/multimap/AbstractListValuedMap.java b/src/main/java/org/apache/commons/collections4/multimap/AbstractListValuedMap.java
index a41631f..ffe6978 100644
--- a/src/main/java/org/apache/commons/collections4/multimap/AbstractListValuedMap.java
+++ b/src/main/java/org/apache/commons/collections4/multimap/AbstractListValuedMap.java
@@ -130,7 +130,7 @@ public abstract class AbstractListValuedMap<K, V> extends AbstractMultiValuedMap
List<V> list = getMapping();
if (list == null) {
list = createCollection();
- final boolean changed = list.addAll(index, c);
+ boolean changed = list.addAll(index, c);
if (changed) {
getMap().put(key, list);
}
@@ -170,7 +170,7 @@ public abstract class AbstractListValuedMap<K, V> extends AbstractMultiValuedMap
@Override
public V remove(final int index) {
final List<V> list = ListUtils.emptyIfNull(getMapping());
- final V value = list.remove(index);
+ V value = list.remove(index);
if (list.isEmpty()) {
AbstractListValuedMap.this.remove(key);
}
@@ -198,7 +198,7 @@ public abstract class AbstractListValuedMap<K, V> extends AbstractMultiValuedMap
if (!(other instanceof List)) {
return false;
}
- final List<?> otherList = (List<?>) other;
+ List<?> otherList = (List<?>) other;
return ListUtils.isEqualList(list, otherList);
}
@@ -232,7 +232,7 @@ public abstract class AbstractListValuedMap<K, V> extends AbstractMultiValuedMap
@Override
public void add(final V value) {
if (getMap().get(key) == null) {
- final List<V> list = createCollection();
+ List<V> list = createCollection();
getMap().put(key, list);
this.values = list;
this.iterator = list.listIterator();
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/992ab3c9/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java b/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java
index 2ca6611..8927185 100644
--- a/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java
+++ b/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java
@@ -128,7 +128,7 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K,
@Override
public boolean containsMapping(final Object key, final Object value) {
- final Collection<V> coll = getMap().get(key);
+ Collection<V> coll = getMap().get(key);
return coll != null && coll.contains(value);
}
@@ -186,7 +186,7 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K,
if (coll == null) {
return false;
}
- final boolean changed = coll.remove(value);
+ boolean changed = coll.remove(value);
if (coll.isEmpty()) {
getMap().remove(key);
}
@@ -285,7 +285,7 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K,
throw new NullPointerException("Map must not be null.");
}
boolean changed = false;
- for (final Map.Entry<? extends K, ? extends V> entry : map.entrySet()) {
+ for (Map.Entry<? extends K, ? extends V> entry : map.entrySet()) {
changed |= put(entry.getKey(), entry.getValue());
}
return changed;
@@ -309,7 +309,7 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K,
throw new NullPointerException("Map must not be null.");
}
boolean changed = false;
- for (final Map.Entry<? extends K, ? extends V> entry : map.entries()) {
+ for (Map.Entry<? extends K, ? extends V> entry : map.entries()) {
changed |= put(entry.getKey(), entry.getValue());
}
return changed;
@@ -353,10 +353,10 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K,
}
if (values instanceof Collection<?>) {
- final Collection<? extends V> valueCollection = (Collection<? extends V>) values;
+ Collection<? extends V> valueCollection = (Collection<? extends V>) values;
return !valueCollection.isEmpty() && get(key).addAll(valueCollection);
} else {
- final Iterator<? extends V> it = values.iterator();
+ Iterator<? extends V> it = values.iterator();
return it.hasNext() && CollectionUtils.addAll(get(key), it);
}
}
@@ -484,7 +484,7 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K,
return false;
}
- final boolean result = coll.remove(item);
+ boolean result = coll.remove(item);
if (coll.isEmpty()) {
AbstractMultiValuedMap.this.remove(key);
}
@@ -498,7 +498,7 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K,
return false;
}
- final boolean result = coll.removeAll(c);
+ boolean result = coll.removeAll(c);
if (coll.isEmpty()) {
AbstractMultiValuedMap.this.remove(key);
}
@@ -512,7 +512,7 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K,
return false;
}
- final boolean result = coll.retainAll(c);
+ boolean result = coll.retainAll(c);
if (coll.isEmpty()) {
AbstractMultiValuedMap.this.remove(key);
}
@@ -577,7 +577,7 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K,
@Override
public int getCount(final Object object) {
int count = 0;
- final Collection<V> col = AbstractMultiValuedMap.this.getMap().get(object);
+ Collection<V> col = AbstractMultiValuedMap.this.getMap().get(object);
if (col != null) {
count = col.size();
}
@@ -797,12 +797,11 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K,
@Override
public Collection<V> get(final Object key) {
- final Collection<V> collection = decoratedMap.get(key);
+ Collection<V> collection = decoratedMap.get(key);
if (collection == null) {
return null;
}
@SuppressWarnings("unchecked")
- final
K k = (K) key;
return wrappedCollection(k);
}
@@ -819,7 +818,7 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K,
@Override
public Collection<V> remove(final Object key) {
- final Collection<V> collection = decoratedMap.remove(key);
+ Collection<V> collection = decoratedMap.remove(key);
if (collection == null) {
return null;
}
@@ -877,7 +876,7 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K,
if (!contains(o)) {
return false;
}
- final Map.Entry<?, ?> entry = (Map.Entry<?, ?>) o;
+ Map.Entry<?, ?> entry = (Map.Entry<?, ?>) o;
AbstractMultiValuedMap.this.remove(entry.getKey());
return true;
}
@@ -935,7 +934,6 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K,
final int valueSize = in.readInt();
for (int j = 0; j < valueSize; j++) {
@SuppressWarnings("unchecked") // see above
- final
V value = (V) in.readObject();
values.add(value);
}
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/992ab3c9/src/main/java/org/apache/commons/collections4/multimap/AbstractSetValuedMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/multimap/AbstractSetValuedMap.java b/src/main/java/org/apache/commons/collections4/multimap/AbstractSetValuedMap.java
index d202b7d..88704f6 100644
--- a/src/main/java/org/apache/commons/collections4/multimap/AbstractSetValuedMap.java
+++ b/src/main/java/org/apache/commons/collections4/multimap/AbstractSetValuedMap.java
@@ -119,7 +119,7 @@ public abstract class AbstractSetValuedMap<K, V> extends AbstractMultiValuedMap<
if (!(other instanceof Set)) {
return false;
}
- final Set<?> otherSet = (Set<?>) other;
+ Set<?> otherSet = (Set<?>) other;
return SetUtils.isEqualSet(set, otherSet);
}
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/992ab3c9/src/main/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMap.java b/src/main/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMap.java
index 1ffa674..74255e3 100644
--- a/src/main/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMap.java
+++ b/src/main/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMap.java
@@ -121,7 +121,7 @@ public class ArrayListValuedHashMap<K, V> extends AbstractListValuedMap<K, V>
* Trims the capacity of all value collections to their current size.
*/
public void trimToSize() {
- for (final Collection<V> coll : getMap().values()) {
+ for (Collection<V> coll : getMap().values()) {
final ArrayList<V> list = (ArrayList<V>) coll;
list.trimToSize();
}
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/992ab3c9/src/main/java/org/apache/commons/collections4/multimap/TransformedMultiValuedMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/multimap/TransformedMultiValuedMap.java b/src/main/java/org/apache/commons/collections4/multimap/TransformedMultiValuedMap.java
index 51cc861..ed1e17a 100644
--- a/src/main/java/org/apache/commons/collections4/multimap/TransformedMultiValuedMap.java
+++ b/src/main/java/org/apache/commons/collections4/multimap/TransformedMultiValuedMap.java
@@ -169,7 +169,7 @@ public class TransformedMultiValuedMap<K, V> extends AbstractMultiValuedMapDecor
throw new NullPointerException("Map must not be null.");
}
boolean changed = false;
- for (final Map.Entry<? extends K, ? extends V> entry : map.entrySet()) {
+ for (Map.Entry<? extends K, ? extends V> entry : map.entrySet()) {
changed |= put(entry.getKey(), entry.getValue());
}
return changed;
@@ -181,7 +181,7 @@ public class TransformedMultiValuedMap<K, V> extends AbstractMultiValuedMapDecor
throw new NullPointerException("Map must not be null.");
}
boolean changed = false;
- for (final Map.Entry<? extends K, ? extends V> entry : map.entries()) {
+ for (Map.Entry<? extends K, ? extends V> entry : map.entries()) {
changed |= put(entry.getKey(), entry.getValue());
}
return changed;
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/992ab3c9/src/main/java/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java
----------------------------------------------------------------------
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 27560fb..f6a0cd8 100644
--- a/src/main/java/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java
+++ b/src/main/java/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java
@@ -220,7 +220,7 @@ public abstract class AbstractMapMultiSet<E> extends AbstractMultiSet<E> {
}
final MutableInteger mut = map.get(object);
- final int oldCount = mut != null ? mut.value : 0;
+ int oldCount = mut != null ? mut.value : 0;
if (occurrences > 0) {
modCount++;
@@ -255,7 +255,7 @@ public abstract class AbstractMapMultiSet<E> extends AbstractMultiSet<E> {
if (mut == null) {
return 0;
}
- final int oldCount = mut.value;
+ int oldCount = mut.value;
if (occurrences > 0) {
modCount++;
if (occurrences < mut.value) {
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/992ab3c9/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSet.java
----------------------------------------------------------------------
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 d3561cd..46624cc 100644
--- a/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSet.java
+++ b/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSet.java
@@ -58,7 +58,7 @@ public abstract class AbstractMultiSet<E> extends AbstractCollection<E> implemen
@Override
public int size() {
int totalSize = 0;
- for (final Entry<E> entry : entrySet()) {
+ for (Entry<E> entry : entrySet()) {
totalSize += entry.getCount();
}
return totalSize;
@@ -73,7 +73,7 @@ public abstract class AbstractMultiSet<E> extends AbstractCollection<E> implemen
*/
@Override
public int getCount(final Object object) {
- for (final Entry<E> entry : entrySet()) {
+ for (Entry<E> entry : entrySet()) {
final E element = entry.getElement();
if (element == object ||
element != null && element.equals(object)) {
@@ -89,7 +89,7 @@ public abstract class AbstractMultiSet<E> extends AbstractCollection<E> implemen
throw new IllegalArgumentException("Count must not be negative.");
}
- final int oldCount = getCount(object);
+ int oldCount = getCount(object);
if (oldCount < count) {
add(object, count - oldCount);
} else {
@@ -196,7 +196,7 @@ public abstract class AbstractMultiSet<E> extends AbstractCollection<E> implemen
*/
@Override
public void clear() {
- final Iterator<Entry<E>> it = entrySet().iterator();
+ Iterator<Entry<E>> it = entrySet().iterator();
while (it.hasNext()) {
it.next();
it.remove();
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/992ab3c9/src/main/java/org/apache/commons/collections4/set/CompositeSet.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/set/CompositeSet.java b/src/main/java/org/apache/commons/collections4/set/CompositeSet.java
index 2aeef90..104a179 100644
--- a/src/main/java/org/apache/commons/collections4/set/CompositeSet.java
+++ b/src/main/java/org/apache/commons/collections4/set/CompositeSet.java
@@ -387,7 +387,7 @@ public class CompositeSet<E> implements Set<E>, Serializable {
* @param sets the Sets to be appended to the composite
*/
public void addComposited(final Set<E>... sets) {
- for (final Set<E> set : sets) {
+ for (Set<E> set : sets) {
addComposited(set);
}
}
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/992ab3c9/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java b/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java
index 7075880..65f7184 100644
--- a/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java
+++ b/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java
@@ -235,14 +235,14 @@ public class ListOrderedSet<E>
*/
@Override
public boolean retainAll(final Collection<?> coll) {
- final boolean result = decorated().retainAll(coll);
+ boolean result = decorated().retainAll(coll);
if (result == false) {
return false;
}
if (decorated().size() == 0) {
setOrder.clear();
} else {
- for (final Iterator<E> it = setOrder.iterator(); it.hasNext();) {
+ for (Iterator<E> it = setOrder.iterator(); it.hasNext();) {
if (!decorated().contains(it.next())) {
it.remove();
}
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/992ab3c9/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java
----------------------------------------------------------------------
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 37da91e..8508a91 100644
--- a/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java
+++ b/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java
@@ -2260,8 +2260,8 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> {
@Override
public void clear() {
- final Iterator<Map.Entry<K, V>> it = AbstractPatriciaTrie.this.entrySet().iterator();
- final Set<K> currentKeys = keySet();
+ Iterator<Map.Entry<K, V>> it = AbstractPatriciaTrie.this.entrySet().iterator();
+ Set<K> currentKeys = keySet();
while (it.hasNext()) {
if (currentKeys.contains(it.next().getKey())) {
it.remove();
@@ -2427,10 +2427,10 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> {
private void readObject(final ObjectInputStream stream) throws IOException, ClassNotFoundException{
stream.defaultReadObject();
root = new TrieEntry<>(null, null, -1);
- final int size = stream.readInt();
+ int size = stream.readInt();
for(int i = 0; i < size; i++){
- final K k = (K) stream.readObject();
- final V v = (V) stream.readObject();
+ K k = (K) stream.readObject();
+ V v = (V) stream.readObject();
put(k, v);
}
}
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/992ab3c9/src/test/java/org/apache/commons/collections4/BagUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/collections4/BagUtilsTest.java b/src/test/java/org/apache/commons/collections4/BagUtilsTest.java
index caba278..6d0f856 100644
--- a/src/test/java/org/apache/commons/collections4/BagUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/BagUtilsTest.java
@@ -44,7 +44,7 @@ public class BagUtilsTest {
@Test
public void testSynchronizedBag() {
- final Bag<Object> bag = BagUtils.synchronizedBag(new HashBag<>());
+ Bag<Object> bag = BagUtils.synchronizedBag(new HashBag<>());
assertTrue("Returned object should be a SynchronizedBag.",
bag instanceof SynchronizedBag);
try {
@@ -57,7 +57,7 @@ public class BagUtilsTest {
@Test
public void testUnmodifiableBag() {
- final Bag<Object> bag = BagUtils.unmodifiableBag(new HashBag<>());
+ Bag<Object> bag = BagUtils.unmodifiableBag(new HashBag<>());
assertTrue("Returned object should be an UnmodifiableBag.",
bag instanceof UnmodifiableBag);
try {
@@ -72,7 +72,7 @@ public class BagUtilsTest {
@Test
public void testPredicatedBag() {
- final Bag<Object> bag = BagUtils.predicatedBag(new HashBag<>(), truePredicate);
+ Bag<Object> bag = BagUtils.predicatedBag(new HashBag<>(), truePredicate);
assertTrue("Returned object should be a PredicatedBag.",
bag instanceof PredicatedBag);
try {
@@ -91,7 +91,7 @@ public class BagUtilsTest {
@Test
public void testTransformedBag() {
- final Bag<Object> bag = BagUtils.transformingBag(new HashBag<>(), nopTransformer);
+ Bag<Object> bag = BagUtils.transformingBag(new HashBag<>(), nopTransformer);
assertTrue("Returned object should be an TransformedBag.",
bag instanceof TransformedBag);
try {
@@ -110,7 +110,7 @@ public class BagUtilsTest {
@Test
public void testSynchronizedSortedBag() {
- final Bag<Object> bag = BagUtils.synchronizedSortedBag(new TreeBag<>());
+ Bag<Object> bag = BagUtils.synchronizedSortedBag(new TreeBag<>());
assertTrue("Returned object should be a SynchronizedSortedBag.",
bag instanceof SynchronizedSortedBag);
try {
@@ -123,7 +123,7 @@ public class BagUtilsTest {
@Test
public void testUnmodifiableSortedBag() {
- final SortedBag<Object> bag = BagUtils.unmodifiableSortedBag(new TreeBag<>());
+ SortedBag<Object> bag = BagUtils.unmodifiableSortedBag(new TreeBag<>());
assertTrue("Returned object should be an UnmodifiableSortedBag.",
bag instanceof UnmodifiableSortedBag);
try {
@@ -138,7 +138,7 @@ public class BagUtilsTest {
@Test
public void testPredicatedSortedBag() {
- final Bag<Object> bag = BagUtils.predicatedSortedBag(new TreeBag<>(), truePredicate);
+ Bag<Object> bag = BagUtils.predicatedSortedBag(new TreeBag<>(), truePredicate);
assertTrue("Returned object should be a PredicatedSortedBag.",
bag instanceof PredicatedSortedBag);
try {
@@ -157,7 +157,7 @@ public class BagUtilsTest {
@Test
public void testTransformedSortedBag() {
- final Bag<Object> bag = BagUtils.transformingSortedBag(new TreeBag<>(), nopTransformer);
+ Bag<Object> bag = BagUtils.transformingSortedBag(new TreeBag<>(), nopTransformer);
assertTrue("Returned object should be an TransformedSortedBag",
bag instanceof TransformedSortedBag);
try {
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/992ab3c9/src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java b/src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java
index 866a4fd..60fc30c 100644
--- a/src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java
@@ -698,7 +698,7 @@ public class CollectionUtilsTest extends MockTestCase {
lastElement = CollectionUtils.forAllButLastDo(col, testClosure);
assertNull(lastElement);
- final Collection<String> strings = Arrays.asList("a", "b", "c");
+ Collection<String> strings = Arrays.asList("a", "b", "c");
final StringBuffer result = new StringBuffer();
result.append(CollectionUtils.forAllButLastDo(strings, new Closure<String>() {
@Override
@@ -708,7 +708,7 @@ public class CollectionUtilsTest extends MockTestCase {
}));
assertEquals("a;b;c", result.toString());
- final Collection<String> oneString = Arrays.asList("a");
+ Collection<String> oneString = Arrays.asList("a");
final StringBuffer resultOne = new StringBuffer();
resultOne.append(CollectionUtils.forAllButLastDo(oneString, new Closure<String>() {
@Override
@@ -728,7 +728,7 @@ public class CollectionUtilsTest extends MockTestCase {
final Collection<List<? extends Number>> col = new ArrayList<>();
col.add(collectionA);
col.add(collectionB);
- final List<? extends Number> lastElement = CollectionUtils.forAllButLastDo(col.iterator(), testClosure);
+ List<? extends Number> lastElement = CollectionUtils.forAllButLastDo(col.iterator(), testClosure);
assertSame(lastElement, collectionB);
assertTrue(collectionA.isEmpty() && !collectionB.isEmpty());
@@ -1178,14 +1178,14 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
public void selectWithOutputCollections() {
- final List<Integer> input = new ArrayList<>();
+ List<Integer> input = new ArrayList<>();
input.add(1);
input.add(2);
input.add(3);
input.add(4);
- final List<Integer> output = new ArrayList<>();
- final List<Integer> rejected = new ArrayList<>();
+ List<Integer> output = new ArrayList<>();
+ List<Integer> rejected = new ArrayList<>();
CollectionUtils.select(input, EQUALS_TWO, output, rejected);
@@ -1194,7 +1194,7 @@ public class CollectionUtilsTest extends MockTestCase {
assertEquals(2, CollectionUtils.extractSingleton(output).intValue());
// rejected contains 1, 3, and 4
- final Integer[] expected = {1, 3, 4};
+ Integer[] expected = {1, 3, 4};
Assert.assertArrayEquals(expected, rejected.toArray());
output.clear();
@@ -1330,7 +1330,7 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
public void predicatedCollection() {
final Predicate<Object> predicate = PredicateUtils.instanceofPredicate(Integer.class);
- final Collection<Number> collection = CollectionUtils.predicatedCollection(new ArrayList<Number>(), predicate);
+ Collection<Number> collection = CollectionUtils.predicatedCollection(new ArrayList<Number>(), predicate);
assertTrue("returned object should be a PredicatedCollection", collection instanceof PredicatedCollection);
try {
CollectionUtils.predicatedCollection(new ArrayList<Number>(), null);
@@ -1505,7 +1505,7 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
public void testTransformedCollection() {
final Transformer<Object, Object> transformer = TransformerUtils.nopTransformer();
- final Collection<Object> collection = CollectionUtils.transformingCollection(new ArrayList<>(), transformer);
+ Collection<Object> collection = CollectionUtils.transformingCollection(new ArrayList<>(), transformer);
assertTrue("returned object should be a TransformedCollection", collection instanceof TransformedCollection);
try {
CollectionUtils.transformingCollection(new ArrayList<>(), null);
@@ -1536,7 +1536,7 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
@Deprecated
public void testSynchronizedCollection() {
- final Collection<Object> col = CollectionUtils.synchronizedCollection(new ArrayList<>());
+ Collection<Object> col = CollectionUtils.synchronizedCollection(new ArrayList<>());
assertTrue("Returned object should be a SynchronizedCollection.", col instanceof SynchronizedCollection);
try {
CollectionUtils.synchronizedCollection(null);
@@ -1549,7 +1549,7 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
@Deprecated
public void testUnmodifiableCollection() {
- final Collection<Object> col = CollectionUtils.unmodifiableCollection(new ArrayList<>());
+ Collection<Object> col = CollectionUtils.unmodifiableCollection(new ArrayList<>());
assertTrue("Returned object should be a UnmodifiableCollection.", col instanceof UnmodifiableCollection);
try {
CollectionUtils.unmodifiableCollection(null);
@@ -1735,7 +1735,7 @@ public class CollectionUtilsTest extends MockTestCase {
List<Integer> result2 = CollectionUtils.collate(collectionE, collectionD);
assertEquals("Merge two lists 1", result1, result2);
- final List<Integer> combinedList = new ArrayList<>();
+ List<Integer> combinedList = new ArrayList<>();
combinedList.addAll(collectionD);
combinedList.addAll(collectionE);
Collections.sort(combinedList);
@@ -1760,14 +1760,14 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
public void testCollateIgnoreDuplicates() {
- final List<Integer> result1 = CollectionUtils.collate(collectionD, collectionE, false);
- final List<Integer> result2 = CollectionUtils.collate(collectionE, collectionD, false);
+ List<Integer> result1 = CollectionUtils.collate(collectionD, collectionE, false);
+ List<Integer> result2 = CollectionUtils.collate(collectionE, collectionD, false);
assertEquals("Merge two lists 1 - ignore duplicates", result1, result2);
- final Set<Integer> combinedSet = new HashSet<>();
+ Set<Integer> combinedSet = new HashSet<>();
combinedSet.addAll(collectionD);
combinedSet.addAll(collectionE);
- final List<Integer> combinedList = new ArrayList<>(combinedSet);
+ List<Integer> combinedList = new ArrayList<>(combinedSet);
Collections.sort(combinedList);
assertEquals("Merge two lists 2 - ignore duplicates", combinedList, result2);
@@ -1780,11 +1780,11 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
public void testPermutations() {
- final List<Integer> sample = collectionA.subList(0, 5);
- final Collection<List<Integer>> permutations = CollectionUtils.permutations(sample);
+ List<Integer> sample = collectionA.subList(0, 5);
+ Collection<List<Integer>> permutations = CollectionUtils.permutations(sample);
// result size = n!
- final int collSize = sample.size();
+ int collSize = sample.size();
int factorial = 1;
for (int i = 1; i <= collSize; i++) {
factorial *= i;
@@ -1798,7 +1798,7 @@ public class CollectionUtilsTest extends MockTestCase {
assertFalse(CollectionUtils.matchesAll(null, null));
assertFalse(CollectionUtils.matchesAll(collectionA, null));
- final Predicate<Integer> lessThanFive = new Predicate<Integer>() {
+ Predicate<Integer> lessThanFive = new Predicate<Integer>() {
@Override
public boolean evaluate(final Integer object) {
return object < 5;
@@ -1806,7 +1806,7 @@ public class CollectionUtilsTest extends MockTestCase {
};
assertTrue(CollectionUtils.matchesAll(collectionA, lessThanFive));
- final Predicate<Integer> lessThanFour = new Predicate<Integer>() {
+ Predicate<Integer> lessThanFour = new Predicate<Integer>() {
@Override
public boolean evaluate(final Integer object) {
return object < 4;
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/992ab3c9/src/test/java/org/apache/commons/collections4/ComparatorUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/collections4/ComparatorUtilsTest.java b/src/test/java/org/apache/commons/collections4/ComparatorUtilsTest.java
index a5aa3b7..4c4b1a9 100644
--- a/src/test/java/org/apache/commons/collections4/ComparatorUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/ComparatorUtilsTest.java
@@ -46,7 +46,7 @@ public class ComparatorUtilsTest {
@Test
public void chainedComparator() {
// simple test: chain 2 natural comparators
- final Comparator<Integer> comp = ComparatorUtils.chainedComparator(ComparatorUtils.<Integer>naturalComparator(),
+ Comparator<Integer> comp = ComparatorUtils.chainedComparator(ComparatorUtils.<Integer>naturalComparator(),
ComparatorUtils.<Integer>naturalComparator());
assertTrue(comp.compare(1, 2) < 0);
assertTrue(comp.compare(1, 1) == 0);
@@ -55,7 +55,7 @@ public class ComparatorUtilsTest {
@Test
public void max() {
- final Comparator<Integer> reversed =
+ Comparator<Integer> reversed =
ComparatorUtils.reversedComparator(ComparatorUtils.<Integer>naturalComparator());
assertEquals(Integer.valueOf(10), ComparatorUtils.max(1, 10, null));
@@ -67,21 +67,21 @@ public class ComparatorUtilsTest {
try {
ComparatorUtils.max(1, null, null);
fail("expecting NullPointerException");
- } catch (final NullPointerException npe) {
+ } catch (NullPointerException npe) {
// expected
}
try {
ComparatorUtils.max(null, 10, null);
fail("expecting NullPointerException");
- } catch (final NullPointerException npe) {
+ } catch (NullPointerException npe) {
// expected
}
}
@Test
public void min() {
- final Comparator<Integer> reversed =
+ Comparator<Integer> reversed =
ComparatorUtils.reversedComparator(ComparatorUtils.<Integer>naturalComparator());
assertEquals(Integer.valueOf(1), ComparatorUtils.min(1, 10, null));
@@ -93,21 +93,21 @@ public class ComparatorUtilsTest {
try {
ComparatorUtils.min(1, null, null);
fail("expecting NullPointerException");
- } catch (final NullPointerException npe) {
+ } catch (NullPointerException npe) {
// expected
}
try {
ComparatorUtils.min(null, 10, null);
fail("expecting NullPointerException");
- } catch (final NullPointerException npe) {
+ } catch (NullPointerException npe) {
// expected
}
}
@Test
public void nullLowComparator() {
- final Comparator<Integer> comp = ComparatorUtils.nullLowComparator(null);
+ Comparator<Integer> comp = ComparatorUtils.nullLowComparator(null);
assertTrue(comp.compare(null, 10) < 0);
assertTrue(comp.compare(null, null) == 0);
assertTrue(comp.compare(10, null) > 0);
@@ -115,7 +115,7 @@ public class ComparatorUtilsTest {
@Test
public void nullHighComparator() {
- final Comparator<Integer> comp = ComparatorUtils.nullHighComparator(null);
+ Comparator<Integer> comp = ComparatorUtils.nullHighComparator(null);
assertTrue(comp.compare(null, 10) > 0);
assertTrue(comp.compare(null, null) == 0);
assertTrue(comp.compare(10, null) < 0);
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/992ab3c9/src/test/java/org/apache/commons/collections4/FactoryUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/collections4/FactoryUtilsTest.java b/src/test/java/org/apache/commons/collections4/FactoryUtilsTest.java
index 5dcfcea..697caac 100644
--- a/src/test/java/org/apache/commons/collections4/FactoryUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/FactoryUtilsTest.java
@@ -110,7 +110,7 @@ public class FactoryUtilsTest {
@Test
public void testPrototypeFactoryPublicCopyConstructor() throws Exception {
final Mock1 proto = new Mock1(6);
- final Factory<Object> factory = FactoryUtils.<Object>prototypeFactory(proto);
+ Factory<Object> factory = FactoryUtils.<Object>prototypeFactory(proto);
assertNotNull(factory);
final Object created = factory.create();
assertTrue(proto != created);
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/992ab3c9/src/test/java/org/apache/commons/collections4/FluentIterableTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/collections4/FluentIterableTest.java b/src/test/java/org/apache/commons/collections4/FluentIterableTest.java
index c1d9de0..8c8addc 100644
--- a/src/test/java/org/apache/commons/collections4/FluentIterableTest.java
+++ b/src/test/java/org/apache/commons/collections4/FluentIterableTest.java
@@ -71,7 +71,7 @@ public class FluentIterableTest {
@Before
public void setUp() {
- final Collection<Integer> collectionA = new ArrayList<>();
+ Collection<Integer> collectionA = new ArrayList<>();
collectionA.add(1);
collectionA.add(2);
collectionA.add(2);
@@ -84,7 +84,7 @@ public class FluentIterableTest {
collectionA.add(4);
iterableA = collectionA;
- final Collection<Long> collectionB = new LinkedList<>();
+ Collection<Long> collectionB = new LinkedList<>();
collectionB.add(5L);
collectionB.add(4L);
collectionB.add(4L);
@@ -129,14 +129,14 @@ public class FluentIterableTest {
try {
FluentIterable.of(it).toList();
fail("expecting NullPointerException");
- } catch (final NullPointerException npe) {
+ } catch (NullPointerException npe) {
// expected
}
}
@Test
public void appendElements() {
- final FluentIterable<Integer> it = FluentIterable.of(iterableA).append(10, 20, 30);
+ FluentIterable<Integer> it = FluentIterable.of(iterableA).append(10, 20, 30);
assertEquals(IterableUtils.size(iterableA) + 3, IterableUtils.size(it));
assertTrue(IterableUtils.contains(it, 1));
assertTrue(IterableUtils.contains(it, 10));
@@ -144,14 +144,14 @@ public class FluentIterableTest {
assertTrue(IterableUtils.contains(it, 30));
assertFalse(IterableUtils.contains(it, 40));
- final FluentIterable<Integer> empty = FluentIterable.of(emptyIterable).append();
+ FluentIterable<Integer> empty = FluentIterable.of(emptyIterable).append();
assertTrue(IterableUtils.isEmpty(empty));
}
@Test
public void appendIterable() {
- final List<Integer> listB = Arrays.asList(10, 20, 30);
- final FluentIterable<Integer> it = FluentIterable.of(iterableA).append(listB);
+ List<Integer> listB = Arrays.asList(10, 20, 30);
+ FluentIterable<Integer> it = FluentIterable.of(iterableA).append(listB);
assertEquals(IterableUtils.size(iterableA) + listB.size(), IterableUtils.size(it));
assertTrue(IterableUtils.contains(it, 1));
assertTrue(IterableUtils.contains(it, 10));
@@ -162,8 +162,8 @@ public class FluentIterableTest {
@Test
public void collate() {
- final List<Integer> result = FluentIterable.of(iterableOdd).collate(iterableEven).toList();
- final List<Integer> combinedList = new ArrayList<>();
+ List<Integer> result = FluentIterable.of(iterableOdd).collate(iterableEven).toList();
+ List<Integer> combinedList = new ArrayList<>();
CollectionUtils.addAll(combinedList, iterableOdd);
CollectionUtils.addAll(combinedList, iterableEven);
Collections.sort(combinedList);
@@ -172,7 +172,7 @@ public class FluentIterableTest {
try {
FluentIterable.of(iterableOdd).collate(null).toList();
fail("expecting NullPointerException");
- } catch (final NullPointerException npe) {
+ } catch (NullPointerException npe) {
// expected
}
}
@@ -185,7 +185,7 @@ public class FluentIterableTest {
.collate(iterableEven, ComparatorUtils.<Integer>naturalComparator())
.toList();
- final List<Integer> combinedList = new ArrayList<>();
+ List<Integer> combinedList = new ArrayList<>();
CollectionUtils.addAll(combinedList, iterableOdd);
CollectionUtils.addAll(combinedList, iterableEven);
Collections.sort(combinedList);
@@ -198,7 +198,7 @@ public class FluentIterableTest {
@Test
public void filter() {
- final Predicate<Integer> smallerThan3 = new Predicate<Integer>() {
+ Predicate<Integer> smallerThan3 = new Predicate<Integer>() {
@Override
public boolean evaluate(final Integer object) {
return object.intValue() < 3;
@@ -215,7 +215,7 @@ public class FluentIterableTest {
try {
FluentIterable.of(iterableA).filter(null).toList();
fail("expecting NullPointerException");
- } catch (final NullPointerException npe) {
+ } catch (NullPointerException npe) {
// expected
}
}
@@ -223,7 +223,7 @@ public class FluentIterableTest {
@Test
public void forEach() {
final AtomicInteger sum = new AtomicInteger(0);
- final Closure<Integer> closure = new Closure<Integer>() {
+ Closure<Integer> closure = new Closure<Integer>() {
@Override
public void execute(final Integer input) {
sum.addAndGet(input);
@@ -232,7 +232,7 @@ public class FluentIterableTest {
FluentIterable.of(iterableA).forEach(closure);
int expectedSum = 0;
- for (final Integer i : iterableA) {
+ for (Integer i : iterableA) {
expectedSum += i;
}
assertEquals(expectedSum, sum.get());
@@ -240,7 +240,7 @@ public class FluentIterableTest {
try {
FluentIterable.of(iterableA).forEach((Closure<Integer>) null);
fail("expecting NullPointerException");
- } catch (final NullPointerException npe) {
+ } catch (NullPointerException npe) {
// expected
}
}
@@ -253,7 +253,7 @@ public class FluentIterableTest {
// limit larger than input
result = FluentIterable.of(iterableA).limit(100).toList();
- final List<Integer> expected = IterableUtils.toList(iterableA);
+ List<Integer> expected = IterableUtils.toList(iterableA);
assertEquals(expected.size(), result.size());
assertEquals(expected, result);
@@ -268,7 +268,7 @@ public class FluentIterableTest {
try {
FluentIterable.of(iterableA).limit(-2).toList();
fail("expecting IllegalArgumentException");
- } catch (final IllegalArgumentException iae) {
+ } catch (IllegalArgumentException iae) {
// expected
}
}
@@ -276,7 +276,7 @@ public class FluentIterableTest {
@Test
public void reverse() {
List<Integer> result = FluentIterable.of(iterableA).reverse().toList();
- final List<Integer> expected = IterableUtils.toList(iterableA);
+ List<Integer> expected = IterableUtils.toList(iterableA);
Collections.reverse(expected);
assertEquals(expected, result);
@@ -297,7 +297,7 @@ public class FluentIterableTest {
// skip 0 elements
result = FluentIterable.of(iterableA).skip(0).toList();
- final List<Integer> expected = IterableUtils.toList(iterableA);
+ List<Integer> expected = IterableUtils.toList(iterableA);
assertEquals(expected.size(), result.size());
assertEquals(expected, result);
@@ -308,14 +308,14 @@ public class FluentIterableTest {
try {
FluentIterable.of(iterableA).skip(-4).toList();
fail("expecting IllegalArgumentException");
- } catch (final IllegalArgumentException iae) {
+ } catch (IllegalArgumentException iae) {
// expected
}
}
@Test
public void transform() {
- final Transformer<Integer, Integer> squared = new Transformer<Integer, Integer>() {
+ Transformer<Integer, Integer> squared = new Transformer<Integer, Integer>() {
@Override
public Integer transform(final Integer object) {
return object * object;
@@ -332,7 +332,7 @@ public class FluentIterableTest {
try {
FluentIterable.of(iterableA).transform(null).toList();
fail("expecting NullPointerException");
- } catch (final NullPointerException npe) {
+ } catch (NullPointerException npe) {
// expected
}
}
@@ -350,18 +350,18 @@ public class FluentIterableTest {
@Test
public void unmodifiable() {
- final FluentIterable<Integer> iterable1 = FluentIterable.of(iterableA).unmodifiable();
- final Iterator<Integer> it = iterable1.iterator();
+ FluentIterable<Integer> iterable1 = FluentIterable.of(iterableA).unmodifiable();
+ Iterator<Integer> it = iterable1.iterator();
assertEquals(1, it.next().intValue());
try {
it.remove();
fail("expecting UnsupportedOperationException");
- } catch (final UnsupportedOperationException ise) {
+ } catch (UnsupportedOperationException ise) {
// expected
}
// calling unmodifiable on an already unmodifiable iterable shall return the same instance
- final FluentIterable<Integer> iterable2 = iterable1.unmodifiable();
+ FluentIterable<Integer> iterable2 = iterable1.unmodifiable();
assertSame(iterable1, iterable2);
}
@@ -378,7 +378,7 @@ public class FluentIterableTest {
try {
FluentIterable.of(iterableOdd).zip((Iterable<Integer>) null).toList();
fail("expecting NullPointerException");
- } catch (final NullPointerException npe) {
+ } catch (NullPointerException npe) {
// expected
}
@@ -393,7 +393,7 @@ public class FluentIterableTest {
@Test
public void asEnumeration() {
Enumeration<Long> enumeration = FluentIterable.of(iterableB).asEnumeration();
- final List<Long> result = EnumerationUtils.toList(enumeration);
+ List<Long> result = EnumerationUtils.toList(enumeration);
assertEquals(iterableB, result);
enumeration = FluentIterable.<Long>empty().asEnumeration();
@@ -409,7 +409,7 @@ public class FluentIterableTest {
try {
FluentIterable.of(iterableEven).allMatch(null);
fail("expecting NullPointerException");
- } catch (final NullPointerException npe) {
+ } catch (NullPointerException npe) {
// expected
}
}
@@ -423,7 +423,7 @@ public class FluentIterableTest {
try {
FluentIterable.of(iterableEven).anyMatch(null);
fail("expecting NullPointerException");
- } catch (final NullPointerException npe) {
+ } catch (NullPointerException npe) {
// expected
}
}
@@ -439,7 +439,7 @@ public class FluentIterableTest {
try {
FluentIterable.of((Iterable<?>) null).size();
fail("expecting NullPointerException");
- } catch (final NullPointerException npe) {
+ } catch (NullPointerException npe) {
// expected
}
assertEquals(0, FluentIterable.of(emptyIterable).size());
@@ -448,10 +448,10 @@ public class FluentIterableTest {
@Test
public void eval() {
- final List<Integer> listNumbers = new ArrayList<>();
+ List<Integer> listNumbers = new ArrayList<>();
listNumbers.addAll(Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10));
- final FluentIterable<Integer> iterable = FluentIterable.of(listNumbers).filter(EVEN);
- final FluentIterable<Integer> materialized = iterable.eval();
+ FluentIterable<Integer> iterable = FluentIterable.of(listNumbers).filter(EVEN);
+ FluentIterable<Integer> materialized = iterable.eval();
listNumbers.addAll(Arrays.asList(11, 12, 13, 14, 15, 16, 17, 18, 19, 20));
assertEquals(5, materialized.size());
@@ -493,7 +493,7 @@ public class FluentIterableTest {
try {
FluentIterable.of(iterableA).copyInto(null);
fail("expecting NullPointerException");
- } catch (final NullPointerException npe) {
+ } catch (NullPointerException npe) {
// expected
}
}
@@ -514,14 +514,14 @@ public class FluentIterableTest {
try {
FluentIterable.of(iterableEven).get(-1);
fail("expecting IndexOutOfBoundsException");
- } catch (final IndexOutOfBoundsException ioe) {
+ } catch (IndexOutOfBoundsException ioe) {
// expected
}
try {
FluentIterable.of(iterableEven).get(IterableUtils.size(iterableEven));
fail("expecting IndexOutOfBoundsException");
- } catch (final IndexOutOfBoundsException ioe) {
+ } catch (IndexOutOfBoundsException ioe) {
// expected
}
}
@@ -529,14 +529,14 @@ public class FluentIterableTest {
@SuppressWarnings({ "rawtypes", "unchecked" })
@Test
public void toArray() {
- final Long[] arr = new Long[] {1L, 2L, 3L, 4L, 5L};
- final Long[] result = FluentIterable.of(arr).toArray(Long.class);
+ Long[] arr = new Long[] {1L, 2L, 3L, 4L, 5L};
+ Long[] result = FluentIterable.of(arr).toArray(Long.class);
assertNotNull(result);
assertArrayEquals(arr, result);
try {
FluentIterable.of(arr).toArray((Class) String.class);
- } catch (final ArrayStoreException ase) {
+ } catch (ArrayStoreException ase) {
// expected
}
}
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/992ab3c9/src/test/java/org/apache/commons/collections4/IterableUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/collections4/IterableUtilsTest.java b/src/test/java/org/apache/commons/collections4/IterableUtilsTest.java
index f2538f2..33f18fb 100644
--- a/src/test/java/org/apache/commons/collections4/IterableUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/IterableUtilsTest.java
@@ -62,7 +62,7 @@ public class IterableUtilsTest {
@Before
public void setUp() {
- final Collection<Integer> collectionA = new ArrayList<>();
+ Collection<Integer> collectionA = new ArrayList<>();
collectionA.add(1);
collectionA.add(2);
collectionA.add(2);
@@ -75,7 +75,7 @@ public class IterableUtilsTest {
collectionA.add(4);
iterableA = collectionA;
- final Collection<Long> collectionB = new LinkedList<>();
+ Collection<Long> collectionB = new LinkedList<>();
collectionB.add(5L);
collectionB.add(4L);
collectionB.add(4L);
@@ -123,7 +123,7 @@ public class IterableUtilsTest {
try {
IterableUtils.forEach(col, null);
fail("expecting NullPointerException");
- } catch (final NullPointerException npe) {
+ } catch (NullPointerException npe) {
// expected
}
@@ -161,7 +161,7 @@ public class IterableUtilsTest {
try {
IterableUtils.forEachButLast(col, null);
fail("expecting NullPointerException");
- } catch (final NullPointerException npe) {
+ } catch (NullPointerException npe) {
// expected
}
@@ -228,8 +228,8 @@ public class IterableUtilsTest {
// Ensure that generic bounds accept valid parameters, but return
// expected results
// e.g. no longs in the "int" Iterable<Number>, and vice versa.
- final Iterable<Number> iterableIntAsNumber = Arrays.<Number>asList(1, 2, 3, 4, 5);
- final Iterable<Number> iterableLongAsNumber = Arrays.<Number>asList(1L, 2L, 3L, 4L, 5L);
+ Iterable<Number> iterableIntAsNumber = Arrays.<Number>asList(1, 2, 3, 4, 5);
+ Iterable<Number> iterableLongAsNumber = Arrays.<Number>asList(1L, 2L, 3L, 4L, 5L);
assertEquals(0, IterableUtils.frequency(iterableIntAsNumber, 2L));
assertEquals(0, IterableUtils.frequency(iterableLongAsNumber, 2));
@@ -316,14 +316,14 @@ public class IterableUtilsTest {
try {
assertEquals(0, IterableUtils.countMatches(iterableA, null));
fail("predicate must not be null");
- } catch (final NullPointerException ex) {
+ } catch (NullPointerException ex) {
// expected
}
try {
assertEquals(0, IterableUtils.countMatches(null, null));
fail("predicate must not be null");
- } catch (final NullPointerException ex) {
+ } catch (NullPointerException ex) {
// expected
}
}
@@ -335,14 +335,14 @@ public class IterableUtilsTest {
try {
assertFalse(IterableUtils.matchesAny(null, null));
fail("predicate must not be null");
- } catch (final NullPointerException ex) {
+ } catch (NullPointerException ex) {
// expected
}
try {
assertFalse(IterableUtils.matchesAny(list, null));
fail("predicate must not be null");
- } catch (final NullPointerException ex) {
+ } catch (NullPointerException ex) {
// expected
}
@@ -362,18 +362,18 @@ public class IterableUtilsTest {
try {
assertFalse(IterableUtils.matchesAll(null, null));
fail("predicate must not be null");
- } catch (final NullPointerException ex) {
+ } catch (NullPointerException ex) {
// expected
}
try {
assertFalse(IterableUtils.matchesAll(iterableA, null));
fail("predicate must not be null");
- } catch (final NullPointerException ex) {
+ } catch (NullPointerException ex) {
// expected
}
- final Predicate<Integer> lessThanFive = new Predicate<Integer>() {
+ Predicate<Integer> lessThanFive = new Predicate<Integer>() {
@Override
public boolean evaluate(final Integer object) {
return object < 5;
@@ -381,7 +381,7 @@ public class IterableUtilsTest {
};
assertTrue(IterableUtils.matchesAll(iterableA, lessThanFive));
- final Predicate<Integer> lessThanFour = new Predicate<Integer>() {
+ Predicate<Integer> lessThanFour = new Predicate<Integer>() {
@Override
public boolean evaluate(final Integer object) {
return object < 4;
@@ -407,7 +407,7 @@ public class IterableUtilsTest {
@SuppressWarnings("unchecked")
@Test
public void partition() {
- final List<Integer> input = new ArrayList<>();
+ List<Integer> input = new ArrayList<>();
input.add(1);
input.add(2);
input.add(3);
@@ -421,7 +421,7 @@ public class IterableUtilsTest {
assertEquals(2, CollectionUtils.extractSingleton(partition).intValue());
// second partition contains 1, 3, and 4
- final Integer[] expected = {1, 3, 4};
+ Integer[] expected = {1, 3, 4};
partition = partitions.get(1);
Assert.assertArrayEquals(expected, partition.toArray());
@@ -437,7 +437,7 @@ public class IterableUtilsTest {
try {
IterableUtils.partition(input, (Predicate<Integer>) null);
fail("expecting NullPointerException");
- } catch (final NullPointerException npe) {
+ } catch (NullPointerException npe) {
// expected
}
}
@@ -445,12 +445,12 @@ public class IterableUtilsTest {
@SuppressWarnings("unchecked")
@Test
public void partitionMultiplePredicates() {
- final List<Integer> input = new ArrayList<>();
+ List<Integer> input = new ArrayList<>();
input.add(1);
input.add(2);
input.add(3);
input.add(4);
- final List<List<Integer>> partitions = IterableUtils.partition(input, EQUALS_TWO, EVEN);
+ List<List<Integer>> partitions = IterableUtils.partition(input, EQUALS_TWO, EVEN);
// first partition contains 2
Collection<Integer> partition = partitions.get(0);
@@ -463,13 +463,13 @@ public class IterableUtilsTest {
assertEquals(4, partition.iterator().next().intValue());
// third partition contains 1 and 3
- final Integer[] expected = {1, 3};
+ Integer[] expected = {1, 3};
partition = partitions.get(2);
Assert.assertArrayEquals(expected, partition.toArray());
try {
IterableUtils.partition(input, EQUALS_TWO, null);
- } catch (final NullPointerException npe) {
+ } catch (NullPointerException npe) {
// expected
}
}
@@ -515,7 +515,7 @@ public class IterableUtilsTest {
@Test
public void testToStringDelimiter() {
- final Transformer<Integer, String> transformer = new Transformer<Integer, String>() {
+ Transformer<Integer, String> transformer = new Transformer<Integer, String>() {
@Override
public String transform(final Integer input) {
return new Integer(input * 2).toString();
@@ -552,7 +552,7 @@ public class IterableUtilsTest {
@Test
public void testToStringWithNullArguments() {
- final String result = IterableUtils.toString(null, new Transformer<Integer, String>() {
+ String result = IterableUtils.toString(null, new Transformer<Integer, String>() {
@Override
public String transform(final Integer input) {
fail("not supposed to reach here");
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/992ab3c9/src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java b/src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java
index acf44dc..d31ea02 100644
--- a/src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java
@@ -960,14 +960,14 @@ public class IteratorUtilsTest {
try {
IteratorUtils.collatedIterator(null, collectionOdd.iterator(), null);
fail("expecting NullPointerException");
- } catch (final NullPointerException npe) {
+ } catch (NullPointerException npe) {
// expected
}
try {
IteratorUtils.collatedIterator(null, null, collectionEven.iterator());
fail("expecting NullPointerException");
- } catch (final NullPointerException npe) {
+ } catch (NullPointerException npe) {
// expected
}
@@ -978,7 +978,7 @@ public class IteratorUtilsTest {
List<Integer> result = IteratorUtils.toList(it);
assertEquals(12, result.size());
- final List<Integer> combinedList = new ArrayList<>();
+ List<Integer> combinedList = new ArrayList<>();
combinedList.addAll(collectionOdd);
combinedList.addAll(collectionEven);
Collections.sort(combinedList);
@@ -1021,7 +1021,7 @@ public class IteratorUtilsTest {
try {
IteratorUtils.forEach(col.iterator(), null);
fail("expecting NullPointerException");
- } catch (final NullPointerException npe) {
+ } catch (NullPointerException npe) {
// expected
}
@@ -1051,7 +1051,7 @@ public class IteratorUtilsTest {
try {
IteratorUtils.forEachButLast(col.iterator(), null);
fail("expecting NullPointerException");
- } catch (final NullPointerException npe) {
+ } catch (NullPointerException npe) {
// expected
}
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/992ab3c9/src/test/java/org/apache/commons/collections4/ListUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/collections4/ListUtilsTest.java b/src/test/java/org/apache/commons/collections4/ListUtilsTest.java
index 69747b7..fee6460 100644
--- a/src/test/java/org/apache/commons/collections4/ListUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/ListUtilsTest.java
@@ -128,7 +128,7 @@ public class ListUtilsTest {
return o instanceof String;
}
};
- final List<Object> list = ListUtils.predicatedList(new ArrayList<>(), predicate);
+ List<Object> list = ListUtils.predicatedList(new ArrayList<>(), predicate);
assertTrue("returned object should be a PredicatedList", list instanceof PredicatedList);
try {
ListUtils.predicatedList(new ArrayList<>(), null);
@@ -339,20 +339,20 @@ public class ListUtilsTest {
List<Character> lcs = ListUtils.longestCommonSubsequence(Collections.EMPTY_LIST, Collections.EMPTY_LIST);
assertEquals(0, lcs.size());
- final List<Character> list1 = Arrays.asList('B', 'A', 'N', 'A', 'N', 'A');
- final List<Character> list2 = Arrays.asList('A', 'N', 'A', 'N', 'A', 'S');
+ List<Character> list1 = Arrays.asList('B', 'A', 'N', 'A', 'N', 'A');
+ List<Character> list2 = Arrays.asList('A', 'N', 'A', 'N', 'A', 'S');
lcs = ListUtils.longestCommonSubsequence(list1, list2);
List<Character> expected = Arrays.asList('A', 'N', 'A', 'N', 'A');
assertEquals(expected, lcs);
- final List<Character> list3 = Arrays.asList('A', 'T', 'A', 'N', 'A');
+ List<Character> list3 = Arrays.asList('A', 'T', 'A', 'N', 'A');
lcs = ListUtils.longestCommonSubsequence(list1, list3);
expected = Arrays.asList('A', 'A', 'N', 'A');
assertEquals(expected, lcs);
- final List<Character> listZorro = Arrays.asList('Z', 'O', 'R', 'R', 'O');
+ List<Character> listZorro = Arrays.asList('Z', 'O', 'R', 'R', 'O');
lcs = ListUtils.longestCommonSubsequence(list1, listZorro);
assertTrue(lcs.isEmpty());
@@ -379,18 +379,18 @@ public class ListUtilsTest {
String lcs = ListUtils.longestCommonSubsequence("", "");
assertEquals(0, lcs.length());
- final String banana = "BANANA";
- final String ananas = "ANANAS";
+ String banana = "BANANA";
+ String ananas = "ANANAS";
lcs = ListUtils.longestCommonSubsequence(banana, ananas);
assertEquals("ANANA", lcs);
- final String atana = "ATANA";
+ String atana = "ATANA";
lcs = ListUtils.longestCommonSubsequence(banana, atana);
assertEquals("AANA", lcs);
- final String zorro = "ZORRO";
+ String zorro = "ZORRO";
lcs = ListUtils.longestCommonSubsequence(banana, zorro);
assertEquals(0, lcs.length());
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/992ab3c9/src/test/java/org/apache/commons/collections4/MapUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/collections4/MapUtilsTest.java b/src/test/java/org/apache/commons/collections4/MapUtilsTest.java
index f0e24fc..e6b9b84 100644
--- a/src/test/java/org/apache/commons/collections4/MapUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/MapUtilsTest.java
@@ -65,7 +65,7 @@ public class MapUtilsTest {
@Test
public void testPredicatedMap() {
final Predicate<Object> p = getPredicate();
- final Map<Object, Object> map = MapUtils.predicatedMap(new HashMap<>(), p, p);
+ Map<Object, Object> map = MapUtils.predicatedMap(new HashMap<>(), p, p);
assertTrue("returned object should be a PredicatedMap", map instanceof PredicatedMap);
try {
MapUtils.predicatedMap(null, p, p);
@@ -1142,7 +1142,7 @@ public class MapUtilsTest {
final Map<String, String> inMap = new HashMap<String, String>();
inMap.put("key1", "value1");
inMap.put("key2", "value2");
- final Map<String, String> map = MapUtils.orderedMap(inMap);
+ Map<String, String> map = MapUtils.orderedMap(inMap);
assertTrue("returned object should be a OrderedMap", map instanceof OrderedMap);
}
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/992ab3c9/src/test/java/org/apache/commons/collections4/MultiMapUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/collections4/MultiMapUtilsTest.java b/src/test/java/org/apache/commons/collections4/MultiMapUtilsTest.java
index 4806ba0..4e14559 100644
--- a/src/test/java/org/apache/commons/collections4/MultiMapUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/MultiMapUtilsTest.java
@@ -44,7 +44,7 @@ public class MultiMapUtilsTest {
try {
map.put("key", "value");
fail("Should throw UnsupportedOperationException");
- } catch (final UnsupportedOperationException e) {
+ } catch (UnsupportedOperationException e) {
}
}
@@ -55,7 +55,7 @@ public class MultiMapUtilsTest {
try {
map.put("key", "value");
fail("Should throw UnsupportedOperationException");
- } catch (final UnsupportedOperationException e) {
+ } catch (UnsupportedOperationException e) {
}
}
@@ -91,14 +91,14 @@ public class MultiMapUtilsTest {
public void testGetCollection() {
assertNull(MultiMapUtils.getCollection(null, "key1"));
- final String values[] = { "v1", "v2", "v3" };
+ String values[] = { "v1", "v2", "v3" };
final MultiValuedMap<String, String> map = new ArrayListValuedHashMap<>();
- for (final String val : values) {
+ for (String val : values) {
map.put("key1", val);
}
- final Collection<String> col = MultiMapUtils.getCollection(map, "key1");
- for (final String val : values) {
+ Collection<String> col = MultiMapUtils.getCollection(map, "key1");
+ for (String val : values) {
assertTrue(col.contains(val));
}
}
@@ -107,15 +107,15 @@ public class MultiMapUtilsTest {
public void testGetValuesAsList() {
assertNull(MultiMapUtils.getValuesAsList(null, "key1"));
- final String values[] = { "v1", "v2", "v3" };
+ String values[] = { "v1", "v2", "v3" };
final MultiValuedMap<String, String> map = new ArrayListValuedHashMap<>();
- for (final String val : values) {
+ for (String val : values) {
map.put("key1", val);
}
- final List<String> list = MultiMapUtils.getValuesAsList(map, "key1");
+ List<String> list = MultiMapUtils.getValuesAsList(map, "key1");
int i = 0;
- for (final String val : list) {
+ for (String val : list) {
assertTrue(val.equals(values[i++]));
}
}
@@ -124,16 +124,16 @@ public class MultiMapUtilsTest {
public void testGetValuesAsSet() {
assertNull(MultiMapUtils.getValuesAsList(null, "key1"));
- final String values[] = { "v1", "v2", "v3" };
+ String values[] = { "v1", "v2", "v3" };
final MultiValuedMap<String, String> map = new ArrayListValuedHashMap<>();
- for (final String val : values) {
+ for (String val : values) {
map.put("key1", val);
map.put("key1", val);
}
- final Set<String> set = MultiMapUtils.getValuesAsSet(map, "key1");
+ Set<String> set = MultiMapUtils.getValuesAsSet(map, "key1");
assertEquals(3, set.size());
- for (final String val : values) {
+ for (String val : values) {
assertTrue(set.contains(val));
}
}
@@ -142,16 +142,16 @@ public class MultiMapUtilsTest {
public void testGetValuesAsBag() {
assertNull(MultiMapUtils.getValuesAsBag(null, "key1"));
- final String values[] = { "v1", "v2", "v3" };
+ String values[] = { "v1", "v2", "v3" };
final MultiValuedMap<String, String> map = new ArrayListValuedHashMap<>();
- for (final String val : values) {
+ for (String val : values) {
map.put("key1", val);
map.put("key1", val);
}
- final Bag<String> bag = MultiMapUtils.getValuesAsBag(map, "key1");
+ Bag<String> bag = MultiMapUtils.getValuesAsBag(map, "key1");
assertEquals(6, bag.size());
- for (final String val : values) {
+ for (String val : values) {
assertTrue(bag.contains(val));
assertEquals(2, bag.getCount(val));
}
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/992ab3c9/src/test/java/org/apache/commons/collections4/QueueUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/collections4/QueueUtilsTest.java b/src/test/java/org/apache/commons/collections4/QueueUtilsTest.java
index a3ba0b7..e4a3fa0 100644
--- a/src/test/java/org/apache/commons/collections4/QueueUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/QueueUtilsTest.java
@@ -40,7 +40,7 @@ public class QueueUtilsTest {
@Test
public void testUnmodifiableQueue() {
- final Queue<Object> queue = QueueUtils.unmodifiableQueue(new LinkedList<>());
+ Queue<Object> queue = QueueUtils.unmodifiableQueue(new LinkedList<>());
assertTrue("Returned object should be an UnmodifiableQueue.", queue instanceof UnmodifiableQueue);
try {
QueueUtils.unmodifiableQueue(null);
@@ -54,7 +54,7 @@ public class QueueUtilsTest {
@Test
public void testPredicatedQueue() {
- final Queue<Object> queue = QueueUtils.predicatedQueue(new LinkedList<>(), truePredicate);
+ Queue<Object> queue = QueueUtils.predicatedQueue(new LinkedList<>(), truePredicate);
assertTrue("Returned object should be a PredicatedQueue.", queue instanceof PredicatedQueue);
try {
QueueUtils.predicatedQueue(null, truePredicate);
@@ -72,7 +72,7 @@ public class QueueUtilsTest {
@Test
public void testTransformedQueue() {
- final Queue<Object> queue = QueueUtils.transformingQueue(new LinkedList<>(), nopTransformer);
+ Queue<Object> queue = QueueUtils.transformingQueue(new LinkedList<>(), nopTransformer);
assertTrue("Returned object should be an TransformedQueue.", queue instanceof TransformedQueue);
try {
QueueUtils.transformingQueue(null, nopTransformer);
@@ -90,7 +90,7 @@ public class QueueUtilsTest {
@Test
public void testEmptyQueue() {
- final Queue<Object> queue = QueueUtils.emptyQueue();
+ Queue<Object> queue = QueueUtils.emptyQueue();
assertTrue("Returned object should be an UnmodifiableQueue.", queue instanceof UnmodifiableQueue);
assertTrue("Returned queue is not empty.", queue.isEmpty());
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/992ab3c9/src/test/java/org/apache/commons/collections4/SetUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/collections4/SetUtilsTest.java b/src/test/java/org/apache/commons/collections4/SetUtilsTest.java
index a743e2e..bff4203 100644
--- a/src/test/java/org/apache/commons/collections4/SetUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/SetUtilsTest.java
@@ -68,7 +68,7 @@ public class SetUtilsTest {
return o instanceof String;
}
};
- final Set<Object> set = SetUtils.predicatedSet(new HashSet<>(), predicate);
+ Set<Object> set = SetUtils.predicatedSet(new HashSet<>(), predicate);
assertTrue("returned object should be a PredicatedSet", set instanceof PredicatedSet);
try {
SetUtils.predicatedSet(new HashSet<>(), null);
@@ -126,8 +126,8 @@ public class SetUtilsTest {
@Test
public void testNewIdentityHashSet() {
- final Set<String> set = SetUtils.newIdentityHashSet();
- final String a = new String("a");
+ Set<String> set = SetUtils.newIdentityHashSet();
+ String a = new String("a");
set.add(a);
set.add(new String("b"));
set.add(a);
@@ -154,14 +154,14 @@ public class SetUtilsTest {
try {
SetUtils.union(setA, null);
fail("Expecting NullPointerException");
- } catch (final NullPointerException npe) {
+ } catch (NullPointerException npe) {
// expected
}
try {
SetUtils.union(null, setA);
fail("Expecting NullPointerException");
- } catch (final NullPointerException npe) {
+ } catch (NullPointerException npe) {
// expected
}
}
@@ -172,7 +172,7 @@ public class SetUtilsTest {
assertEquals(2, set.size());
assertTrue(set.contains(1));
assertTrue(set.contains(2));
- for (final Integer i : setB) {
+ for (Integer i : setB) {
assertFalse(set.contains(i));
}
@@ -182,14 +182,14 @@ public class SetUtilsTest {
try {
SetUtils.difference(setA, null);
fail("Expecting NullPointerException");
- } catch (final NullPointerException npe) {
+ } catch (NullPointerException npe) {
// expected
}
try {
SetUtils.difference(null, setA);
fail("Expecting NullPointerException");
- } catch (final NullPointerException npe) {
+ } catch (NullPointerException npe) {
// expected
}
}
@@ -212,14 +212,14 @@ public class SetUtilsTest {
try {
SetUtils.intersection(setA, null);
fail("Expecting NullPointerException");
- } catch (final NullPointerException npe) {
+ } catch (NullPointerException npe) {
// expected
}
try {
SetUtils.intersection(null, setA);
fail("Expecting NullPointerException");
- } catch (final NullPointerException npe) {
+ } catch (NullPointerException npe) {
// expected
}
}
@@ -242,14 +242,14 @@ public class SetUtilsTest {
try {
SetUtils.disjunction(setA, null);
fail("Expecting NullPointerException");
- } catch (final NullPointerException npe) {
+ } catch (NullPointerException npe) {
// expected
}
try {
SetUtils.disjunction(null, setA);
fail("Expecting NullPointerException");
- } catch (final NullPointerException npe) {
+ } catch (NullPointerException npe) {
// expected
}
}