Use final. Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/059c468f Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/059c468f Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/059c468f
Branch: refs/heads/master Commit: 059c468f73aaf76ee7118e0167142d556dd9453b Parents: 9e62a0e Author: Gary Gregory <ggreg...@apache.org> Authored: Tue Jan 2 19:51:56 2018 -0700 Committer: Gary Gregory <ggreg...@apache.org> Committed: Tue Jan 2 19:51:56 2018 -0700 ---------------------------------------------------------------------- .../commons/collections4/CollectionUtils.java | 12 +-- .../commons/collections4/IterableUtils.java | 7 +- .../commons/collections4/IteratorUtils.java | 6 +- .../apache/commons/collections4/ListUtils.java | 4 +- .../apache/commons/collections4/MapUtils.java | 2 +- .../commons/collections4/MultiMapUtils.java | 6 +- .../apache/commons/collections4/SetUtils.java | 12 +-- .../collections4/bidimap/TreeBidiMap.java | 6 +- .../collection/PredicatedCollection.java | 2 +- .../iterators/PermutationIterator.java | 6 +- .../collections4/keyvalue/AbstractKeyValue.java | 4 +- .../collections4/list/SetUniqueList.java | 2 +- .../collections4/map/AbstractReferenceMap.java | 2 +- .../commons/collections4/map/MultiValueMap.java | 6 +- .../multimap/AbstractListValuedMap.java | 36 ++++---- .../multimap/AbstractMultiValuedMap.java | 80 +++++++++--------- .../AbstractMultiValuedMapDecorator.java | 8 +- .../multimap/AbstractSetValuedMap.java | 8 +- .../multimap/ArrayListValuedHashMap.java | 10 +-- .../multimap/HashSetValuedHashMap.java | 8 +- .../multimap/TransformedMultiValuedMap.java | 4 +- .../multimap/UnmodifiableMultiValuedMap.java | 2 +- .../multiset/AbstractMapMultiSet.java | 6 +- .../collections4/multiset/AbstractMultiSet.java | 12 +-- .../multiset/AbstractMultiSetDecorator.java | 2 +- .../multiset/PredicatedMultiSet.java | 2 +- .../multiset/SynchronizedMultiSet.java | 2 +- .../multiset/UnmodifiableMultiSet.java | 2 +- .../collections4/queue/CircularFifoQueue.java | 2 +- .../set/AbstractNavigableSetDecorator.java | 14 ++-- .../commons/collections4/set/CompositeSet.java | 2 +- .../collections4/set/ListOrderedSet.java | 4 +- .../set/PredicatedNavigableSet.java | 14 ++-- .../set/TransformedNavigableSet.java | 14 ++-- .../set/UnmodifiableNavigableSet.java | 6 +- .../collections4/trie/AbstractPatriciaTrie.java | 10 +-- .../collections4/trie/UnmodifiableTrie.java | 4 +- .../commons/collections4/BagUtilsTest.java | 16 ++-- .../collections4/CollectionUtilsTest.java | 58 ++++++------- .../collections4/ComparatorUtilsTest.java | 18 ++-- .../commons/collections4/FactoryUtilsTest.java | 2 +- .../collections4/FluentIterableTest.java | 88 ++++++++++---------- .../commons/collections4/IterableUtilsTest.java | 70 ++++++++-------- .../commons/collections4/IteratorUtilsTest.java | 10 +-- .../commons/collections4/ListUtilsTest.java | 18 ++-- .../commons/collections4/MapUtilsTest.java | 18 ++-- .../commons/collections4/MultiMapUtilsTest.java | 36 ++++---- .../commons/collections4/QueueUtilsTest.java | 10 +-- .../commons/collections4/SetUtilsTest.java | 24 +++--- .../collections4/TransformerUtilsTest.java | 6 +- .../commons/collections4/TrieUtilsTest.java | 2 +- .../commons/collections4/bag/TreeBagTest.java | 2 +- .../bidimap/DualTreeBidiMap2Test.java | 2 +- .../collection/AbstractCollectionTest.java | 10 +-- .../PredicatedCollectionBuilderTest.java | 34 ++++---- .../comparators/TransformingComparatorTest.java | 6 +- .../iterators/BoundedIteratorTest.java | 62 +++++++------- .../iterators/IteratorEnumerationTest.java | 6 +- .../iterators/PeekingIteratorTest.java | 18 ++-- .../iterators/PermutationIteratorTest.java | 44 +++++----- .../iterators/PushbackIteratorTest.java | 10 +-- .../iterators/SkippingIteratorTest.java | 52 ++++++------ .../iterators/ZippingIteratorTest.java | 2 +- .../collections4/keyvalue/MultiKeyTest.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 | 23 ++--- .../map/PassiveExpiringMapTest.java | 4 +- .../multimap/ArrayListValuedHashMapTest.java | 16 ++-- .../multimap/HashSetValuedHashMapTest.java | 14 ++-- .../multimap/TransformedMultiValuedMapTest.java | 8 +- .../UnmodifiableMultiValuedMapTest.java | 72 ++++++++-------- .../collections4/queue/AbstractQueueTest.java | 2 +- .../queue/CircularFifoQueueTest.java | 2 +- .../sequence/SequencesComparatorTest.java | 2 +- .../collections4/set/AbstractSetTest.java | 2 +- .../collections4/trie/PatriciaTrieTest.java | 16 ++-- 82 files changed, 592 insertions(+), 588 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-collections/blob/059c468f/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 55be039..99bf328 100644 --- a/src/main/java/org/apache/commons/collections4/CollectionUtils.java +++ b/src/main/java/org/apache/commons/collections4/CollectionUtils.java @@ -951,7 +951,7 @@ public class CollectionUtils { * @since 4.1 */ public static <O, R extends Collection<? super O>> R select(final Iterable<? extends O> inputCollection, - final Predicate<? super O> predicate, R outputCollection, R rejectedCollection) { + final Predicate<? super O> predicate, final R outputCollection, final R rejectedCollection) { if (inputCollection != null && predicate != null) { for (final O element : inputCollection) { @@ -1273,7 +1273,7 @@ public class CollectionUtils { * @throws IllegalArgumentException if the object type is invalid */ public static Object get(final Object object, final int index) { - int i = index; + final int i = index; if (i < 0) { throw new IndexOutOfBoundsException("Index cannot be negative: " + i); } @@ -1534,8 +1534,8 @@ public class CollectionUtils { * @throws NullPointerException if either collection is null * @since 4.0 */ - public static <O extends Comparable<? super O>> List<O> collate(Iterable<? extends O> a, - Iterable<? extends O> b) { + public static <O extends Comparable<? super O>> List<O> collate(final Iterable<? extends O> a, + final Iterable<? extends O> b) { return collate(a, b, ComparatorUtils.<O>naturalComparator(), true); } @@ -1715,7 +1715,7 @@ public class CollectionUtils { final Transformer<E, EquatorWrapper<E>> transformer = new Transformer<E, EquatorWrapper<E>>() { @Override - public EquatorWrapper<E> transform(E input) { + public EquatorWrapper<E> transform(final E input) { return new EquatorWrapper<>(equator, input); } }; @@ -1791,7 +1791,7 @@ public class CollectionUtils { final Transformer<E, EquatorWrapper<E>> transformer = new Transformer<E, EquatorWrapper<E>>() { @Override - public EquatorWrapper<E> transform(E input) { + public EquatorWrapper<E> transform(final E input) { return new EquatorWrapper<>(equator, input); } }; http://git-wip-us.apache.org/repos/asf/commons-collections/blob/059c468f/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 1783641..d87a5a4 100644 --- a/src/main/java/org/apache/commons/collections4/IterableUtils.java +++ b/src/main/java/org/apache/commons/collections4/IterableUtils.java @@ -172,7 +172,7 @@ public class IterableUtils { public Iterator<E> iterator() { return new LazyIteratorChain<E>() { @Override - protected Iterator<? extends E> nextIterator(int count) { + protected Iterator<? extends E> nextIterator(final int count) { if (count > iterables.length) { return null; } @@ -324,7 +324,7 @@ public class IterableUtils { public Iterator<E> iterator() { return new LazyIteratorChain<E>() { @Override - protected Iterator<? extends E> nextIterator(int count) { + protected Iterator<? extends E> nextIterator(final int count) { if (IterableUtils.isEmpty(iterable)) { return null; } @@ -546,6 +546,7 @@ 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++) { @@ -915,7 +916,7 @@ public class IterableUtils { throw new NullPointerException("Predicates must not be null."); } - for (Predicate<?> p : predicates) { + for (final 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/059c468f/src/main/java/org/apache/commons/collections4/IteratorUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/IteratorUtils.java b/src/main/java/org/apache/commons/collections4/IteratorUtils.java index cfce5b3..e4b30d3 100644 --- a/src/main/java/org/apache/commons/collections4/IteratorUtils.java +++ b/src/main/java/org/apache/commons/collections4/IteratorUtils.java @@ -433,7 +433,7 @@ public class IteratorUtils { * @throws IllegalArgumentException if max is negative * @since 4.1 */ - public static <E> BoundedIterator<E> boundedIterator(final Iterator<? extends E> iterator, long max) { + public static <E> BoundedIterator<E> boundedIterator(final Iterator<? extends E> iterator, final long max) { return boundedIterator(iterator, 0, max); } @@ -455,7 +455,7 @@ public class IteratorUtils { * @since 4.1 */ public static <E> BoundedIterator<E> boundedIterator(final Iterator<? extends E> iterator, - long offset, long max) { + final long offset, final long max) { return new BoundedIterator<>(iterator, offset, max); } @@ -890,7 +890,7 @@ public class IteratorUtils { * @throws IllegalArgumentException if offset is negative * @since 4.1 */ - public static <E> SkippingIterator<E> skippingIterator(final Iterator<E> iterator, long offset) { + public static <E> SkippingIterator<E> skippingIterator(final Iterator<E> iterator, final long offset) { return new SkippingIterator<>(iterator, offset); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/059c468f/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 4798588..12201a6 100644 --- a/src/main/java/org/apache/commons/collections4/ListUtils.java +++ b/src/main/java/org/apache/commons/collections4/ListUtils.java @@ -570,7 +570,7 @@ public class ListUtils { } final List<Character> lcs = longestCommonSubsequence(new CharSequenceAsList( a ), new CharSequenceAsList( b )); final StringBuilder sb = new StringBuilder(); - for ( Character ch : lcs ) { + for ( final Character ch : lcs ) { sb.append(ch); } return sb.toString(); @@ -614,7 +614,7 @@ public class ListUtils { } @Override - public Character get( int index ) { + public Character get( final int index ) { return Character.valueOf(sequence.charAt( index )); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/059c468f/src/main/java/org/apache/commons/collections4/MapUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/MapUtils.java b/src/main/java/org/apache/commons/collections4/MapUtils.java index 15dfe82..30a084e 100644 --- a/src/main/java/org/apache/commons/collections4/MapUtils.java +++ b/src/main/java/org/apache/commons/collections4/MapUtils.java @@ -1798,7 +1798,7 @@ public class MapUtils { * @param map a Map or null * @return the given map size or 0 if the map is null */ - public static int size(Map<?, ?> map) { + public static int size(final Map<?, ?> map) { return map == null ? 0 : map.size(); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/059c468f/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 118f7e6..e523e1b 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) { - Collection<V> col = map.get(key); + final 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) { - Collection<V> col = map.get(key); + final 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) { - Collection<V> col = map.get(key); + final 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/059c468f/src/main/java/org/apache/commons/collections4/SetUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/SetUtils.java b/src/main/java/org/apache/commons/collections4/SetUtils.java index e97b9c6..3d24cb2 100644 --- a/src/main/java/org/apache/commons/collections4/SetUtils.java +++ b/src/main/java/org/apache/commons/collections4/SetUtils.java @@ -446,7 +446,7 @@ public class SetUtils { return new SetView<E>() { @Override - public boolean contains(Object o) { + public boolean contains(final Object o) { return a.contains(o) || b.contains(o); } @@ -488,14 +488,14 @@ public class SetUtils { final Predicate<E> notContainedInB = new Predicate<E>() { @Override - public boolean evaluate(E object) { + public boolean evaluate(final E object) { return !b.contains(object); } }; return new SetView<E>() { @Override - public boolean contains(Object o) { + public boolean contains(final Object o) { return a.contains(o) && !b.contains(o); } @@ -526,14 +526,14 @@ public class SetUtils { final Predicate<E> containedInB = new Predicate<E>() { @Override - public boolean evaluate(E object) { + public boolean evaluate(final E object) { return b.contains(object); } }; return new SetView<E>() { @Override - public boolean contains(Object o) { + public boolean contains(final Object o) { return a.contains(o) && b.contains(o); } @@ -570,7 +570,7 @@ public class SetUtils { return new SetView<E>() { @Override - public boolean contains(Object o) { + public boolean contains(final Object o) { return a.contains(o) ^ b.contains(o); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/059c468f/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 b85b7c3..c281f94 100644 --- a/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java +++ b/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java @@ -1441,10 +1441,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]; - int size = stream.readInt(); + final int size = stream.readInt(); for(int i = 0; i < size; i++){ - K k =(K) stream.readObject(); - V v =(V) stream.readObject(); + final K k =(K) stream.readObject(); + final V v =(V) stream.readObject(); put(k, v); } } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/059c468f/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 3f14664..2753964 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 (E item : items) { + for (final E item : items) { add(item); } } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/059c468f/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 c0c5fe8..1b7caa6 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 (E e : coll) { + for (final 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) { - List<E> toReturn = nextPermutation; + final 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; - boolean tmpDirection = direction[indexOfLargestMobileInteger]; + final boolean tmpDirection = direction[indexOfLargestMobileInteger]; direction[indexOfLargestMobileInteger] = direction[indexOfLargestMobileInteger + offset]; direction[indexOfLargestMobileInteger + offset] = tmpDirection; http://git-wip-us.apache.org/repos/asf/commons-collections/blob/059c468f/src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java index f816561..6f7a5e1 100644 --- a/src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java +++ b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java @@ -53,7 +53,7 @@ public abstract class AbstractKeyValue<K, V> implements KeyValue<K, V> { return key; } - protected K setKey(K key) { + protected K setKey(final K key) { final K old = this.key; this.key = key; return old; @@ -69,7 +69,7 @@ public abstract class AbstractKeyValue<K, V> implements KeyValue<K, V> { return value; } - protected V setValue(V value) { + protected V setValue(final V value) { final V old = this.value; this.value = value; return old; http://git-wip-us.apache.org/repos/asf/commons-collections/blob/059c468f/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 3291145..8aa0815 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) { - boolean result = set.retainAll(coll); + final boolean result = set.retainAll(coll); if (result == false) { return false; } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/059c468f/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java b/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java index d2caeee..f114083 100644 --- a/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java +++ b/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java @@ -1062,7 +1062,7 @@ public abstract class AbstractReferenceMap<K, V> extends AbstractHashedMap<K, V> * @param type the type to check against. * @return true if keyType has the specified type */ - protected boolean isKeyType(ReferenceStrength type) { + protected boolean isKeyType(final ReferenceStrength type) { return this.keyType == type; } } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/059c468f/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java b/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java index f500bfa..2480a5f 100644 --- a/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java +++ b/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java @@ -429,7 +429,7 @@ public class MultiValueMap<K, V> extends AbstractMapDecorator<K, Object> impleme return new LazyIteratorChain<Entry<K, V>>() { @Override - protected Iterator<? extends Entry<K, V>> nextIterator(int count) { + protected Iterator<? extends Entry<K, V>> nextIterator(final int count) { if ( ! keyIterator.hasNext() ) { return null; } @@ -447,7 +447,7 @@ public class MultiValueMap<K, V> extends AbstractMapDecorator<K, Object> impleme return input; } @Override - public V setValue(V value) { + public V setValue(final V value) { throw new UnsupportedOperationException(); } }; @@ -566,7 +566,7 @@ public class MultiValueMap<K, V> extends AbstractMapDecorator<K, Object> impleme } } - private void readObject(ObjectInputStream is) throws IOException, ClassNotFoundException { + private void readObject(final ObjectInputStream is) throws IOException, ClassNotFoundException { is.defaultReadObject(); // ensure that the de-serialized class is a Collection, COLLECTIONS-580 if (clazz != null && !Collection.class.isAssignableFrom(clazz)) { http://git-wip-us.apache.org/repos/asf/commons-collections/blob/059c468f/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 248f0ad..362b0bc 100644 --- a/src/main/java/org/apache/commons/collections4/multimap/AbstractListValuedMap.java +++ b/src/main/java/org/apache/commons/collections4/multimap/AbstractListValuedMap.java @@ -98,7 +98,7 @@ public abstract class AbstractListValuedMap<K, V> extends AbstractMultiValuedMap * unmodifiable list for no mapping found. */ @Override - public List<V> remove(Object key) { + public List<V> remove(final Object key) { return ListUtils.emptyIfNull(getMap().remove(key)); } @@ -118,7 +118,7 @@ public abstract class AbstractListValuedMap<K, V> extends AbstractMultiValuedMap } @Override - public void add(int index, V value) { + public void add(final int index, final V value) { List<V> list = getMapping(); if (list == null) { list = createCollection(); @@ -128,11 +128,11 @@ public abstract class AbstractListValuedMap<K, V> extends AbstractMultiValuedMap } @Override - public boolean addAll(int index, Collection<? extends V> c) { + public boolean addAll(final int index, final Collection<? extends V> c) { List<V> list = getMapping(); if (list == null) { list = createCollection(); - boolean changed = list.addAll(index, c); + final boolean changed = list.addAll(index, c); if (changed) { getMap().put(key, list); } @@ -142,19 +142,19 @@ public abstract class AbstractListValuedMap<K, V> extends AbstractMultiValuedMap } @Override - public V get(int index) { + public V get(final int index) { final List<V> list = ListUtils.emptyIfNull(getMapping()); return list.get(index); } @Override - public int indexOf(Object o) { + public int indexOf(final Object o) { final List<V> list = ListUtils.emptyIfNull(getMapping()); return list.indexOf(o); } @Override - public int lastIndexOf(Object o) { + public int lastIndexOf(final Object o) { final List<V> list = ListUtils.emptyIfNull(getMapping()); return list.lastIndexOf(o); } @@ -165,14 +165,14 @@ public abstract class AbstractListValuedMap<K, V> extends AbstractMultiValuedMap } @Override - public ListIterator<V> listIterator(int index) { + public ListIterator<V> listIterator(final int index) { return new ValuesListIterator(key, index); } @Override - public V remove(int index) { + public V remove(final int index) { final List<V> list = ListUtils.emptyIfNull(getMapping()); - V value = list.remove(index); + final V value = list.remove(index); if (list.isEmpty()) { AbstractListValuedMap.this.remove(key); } @@ -180,19 +180,19 @@ public abstract class AbstractListValuedMap<K, V> extends AbstractMultiValuedMap } @Override - public V set(int index, V value) { + public V set(final int index, final V value) { final List<V> list = ListUtils.emptyIfNull(getMapping()); return list.set(index, value); } @Override - public List<V> subList(int fromIndex, int toIndex) { + public List<V> subList(final int fromIndex, final int toIndex) { final List<V> list = ListUtils.emptyIfNull(getMapping()); return list.subList(fromIndex, toIndex); } @Override - public boolean equals(Object other) { + public boolean equals(final Object other) { final List<V> list = getMapping(); if (list == null) { return Collections.emptyList().equals(other); @@ -200,7 +200,7 @@ public abstract class AbstractListValuedMap<K, V> extends AbstractMultiValuedMap if (!(other instanceof List)) { return false; } - List<?> otherList = (List<?>) other; + final List<?> otherList = (List<?>) other; return ListUtils.isEqualList(list, otherList); } @@ -225,16 +225,16 @@ public abstract class AbstractListValuedMap<K, V> extends AbstractMultiValuedMap this.iterator = values.listIterator(); } - public ValuesListIterator(final K key, int index) { + public ValuesListIterator(final K key, final int index) { this.key = key; this.values = ListUtils.emptyIfNull(getMap().get(key)); this.iterator = values.listIterator(index); } @Override - public void add(V value) { + public void add(final V value) { if (getMap().get(key) == null) { - List<V> list = createCollection(); + final List<V> list = createCollection(); getMap().put(key, list); this.values = list; this.iterator = list.listIterator(); @@ -281,7 +281,7 @@ public abstract class AbstractListValuedMap<K, V> extends AbstractMultiValuedMap } @Override - public void set(V value) { + public void set(final V value) { iterator.set(value); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/059c468f/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 13ca69b..7bee60e 100644 --- a/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java +++ b/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java @@ -111,7 +111,7 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K, * @param map the map to wrap */ @SuppressWarnings("unchecked") - protected void setMap(Map<K, ? extends Collection<V>> map) { + protected void setMap(final Map<K, ? extends Collection<V>> map) { this.map = (Map<K, Collection<V>>) map; } @@ -119,7 +119,7 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K, // ----------------------------------------------------------------------- @Override - public boolean containsKey(Object key) { + public boolean containsKey(final Object key) { return getMap().containsKey(key); } @@ -129,8 +129,8 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K, } @Override - public boolean containsMapping(Object key, Object value) { - Collection<V> coll = getMap().get(key); + public boolean containsMapping(final Object key, final Object value) { + final Collection<V> coll = getMap().get(key); return coll != null && coll.contains(value); } @@ -165,7 +165,7 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K, * empty, unmodifiable collection for no mapping found */ @Override - public Collection<V> remove(Object key) { + public Collection<V> remove(final Object key) { return CollectionUtils.emptyIfNull(getMap().remove(key)); } @@ -188,7 +188,7 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K, if (coll == null) { return false; } - boolean changed = coll.remove(value); + final 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 (Map.Entry<? extends K, ? extends V> entry : map.entrySet()) { + for (final 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 (Map.Entry<? extends K, ? extends V> entry : map.entries()) { + for (final 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<?>) { - Collection<? extends V> valueCollection = (Collection<? extends V>) values; + final Collection<? extends V> valueCollection = (Collection<? extends V>) values; return !valueCollection.isEmpty() && get(key).addAll(valueCollection); } - Iterator<? extends V> it = values.iterator(); + final Iterator<? extends V> it = values.iterator(); return it.hasNext() && CollectionUtils.addAll(get(key), it); } @@ -369,7 +369,7 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K, } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } @@ -414,7 +414,7 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K, } @Override - public boolean add(V value) { + public boolean add(final V value) { Collection<V> coll = getMapping(); if (coll == null) { coll = createCollection(); @@ -424,7 +424,7 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K, } @Override - public boolean addAll(Collection<? extends V> other) { + public boolean addAll(final Collection<? extends V> other) { Collection<V> coll = getMapping(); if (coll == null) { coll = createCollection(); @@ -459,13 +459,13 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K, } @Override - public boolean contains(Object obj) { + public boolean contains(final Object obj) { final Collection<V> coll = getMapping(); return coll == null ? false : coll.contains(obj); } @Override - public boolean containsAll(Collection<?> other) { + public boolean containsAll(final Collection<?> other) { final Collection<V> coll = getMapping(); return coll == null ? false : coll.containsAll(other); } @@ -477,13 +477,13 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K, } @Override - public boolean remove(Object item) { + public boolean remove(final Object item) { final Collection<V> coll = getMapping(); if (coll == null) { return false; } - boolean result = coll.remove(item); + final boolean result = coll.remove(item); if (coll.isEmpty()) { AbstractMultiValuedMap.this.remove(key); } @@ -491,13 +491,13 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K, } @Override - public boolean removeAll(Collection<?> c) { + public boolean removeAll(final Collection<?> c) { final Collection<V> coll = getMapping(); if (coll == null) { return false; } - boolean result = coll.removeAll(c); + final boolean result = coll.removeAll(c); if (coll.isEmpty()) { AbstractMultiValuedMap.this.remove(key); } @@ -505,13 +505,13 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K, } @Override - public boolean retainAll(Collection<?> c) { + public boolean retainAll(final Collection<?> c) { final Collection<V> coll = getMapping(); if (coll == null) { return false; } - boolean result = coll.retainAll(c); + final boolean result = coll.retainAll(c); if (coll.isEmpty()) { AbstractMultiValuedMap.this.remove(key); } @@ -529,7 +529,7 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K, @Override @SuppressWarnings("unchecked") - public <T> T[] toArray(T[] a) { + public <T> T[] toArray(final T[] a) { final Collection<V> coll = getMapping(); if (coll == null) { return (T[]) CollectionUtils.EMPTY_COLLECTION.toArray(a); @@ -554,7 +554,7 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K, private class KeysMultiSet extends AbstractMultiSet<K> { @Override - public boolean contains(Object o) { + public boolean contains(final Object o) { return getMap().containsKey(o); } @@ -574,9 +574,9 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K, } @Override - public int getCount(Object object) { + public int getCount(final Object object) { int count = 0; - Collection<V> col = AbstractMultiValuedMap.this.getMap().get(object); + final Collection<V> col = AbstractMultiValuedMap.this.getMap().get(object); if (col != null) { count = col.size(); } @@ -621,7 +621,7 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K, final Iterator<K> keyIterator = keysCol.iterator(); @Override - protected Iterator<? extends Entry<K, V>> nextIterator(int count) { + protected Iterator<? extends Entry<K, V>> nextIterator(final int count) { if (!keyIterator.hasNext()) { return null; } @@ -651,12 +651,12 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K, */ private class MultiValuedMapEntry extends AbstractMapEntry<K, V> { - public MultiValuedMapEntry(K key, V value) { + public MultiValuedMapEntry(final K key, final V value) { super(key, value); } @Override - public V setValue(V value) { + public V setValue(final V value) { throw new UnsupportedOperationException(); } @@ -708,7 +708,7 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K, } @Override - public V setValue(V value) { + public V setValue(final V value) { if (current == null) { throw new IllegalStateException(); } @@ -790,17 +790,18 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K, } @Override - public boolean containsKey(Object key) { + public boolean containsKey(final Object key) { return decoratedMap.containsKey(key); } @Override - public Collection<V> get(Object key) { - Collection<V> collection = decoratedMap.get(key); + public Collection<V> get(final Object key) { + final Collection<V> collection = decoratedMap.get(key); if (collection == null) { return null; } @SuppressWarnings("unchecked") + final K k = (K) key; return wrappedCollection(k); } @@ -816,8 +817,8 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K, } @Override - public Collection<V> remove(Object key) { - Collection<V> collection = decoratedMap.remove(key); + public Collection<V> remove(final Object key) { + final Collection<V> collection = decoratedMap.remove(key); if (collection == null) { return null; } @@ -829,7 +830,7 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K, } @Override - public boolean equals(Object object) { + public boolean equals(final Object object) { return this == object || decoratedMap.equals(object); } @@ -866,16 +867,16 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K, } @Override - public boolean contains(Object o) { + public boolean contains(final Object o) { return decoratedMap.entrySet().contains(o); } @Override - public boolean remove(Object o) { + public boolean remove(final Object o) { if (!contains(o)) { return false; } - Map.Entry<?, ?> entry = (Map.Entry<?, ?>) o; + final Map.Entry<?, ?> entry = (Map.Entry<?, ?>) o; AbstractMultiValuedMap.this.remove(entry.getKey()); return true; } @@ -886,7 +887,7 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K, */ class AsMapEntrySetIterator extends AbstractIteratorDecorator<Map.Entry<K, Collection<V>>> { - AsMapEntrySetIterator(Iterator<Map.Entry<K, Collection<V>>> iterator) { + AsMapEntrySetIterator(final Iterator<Map.Entry<K, Collection<V>>> iterator) { super(iterator); } @@ -933,6 +934,7 @@ 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/059c468f/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapDecorator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapDecorator.java b/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapDecorator.java index d49e7a0..8a6ff63 100644 --- a/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapDecorator.java +++ b/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapDecorator.java @@ -117,7 +117,7 @@ public abstract class AbstractMultiValuedMapDecorator<K, V> } @Override - public boolean put(K key, V value) { + public boolean put(final K key, final V value) { return decorated().put(key, value); } @@ -147,17 +147,17 @@ public abstract class AbstractMultiValuedMapDecorator<K, V> } @Override - public boolean putAll(K key, Iterable<? extends V> values) { + public boolean putAll(final K key, final Iterable<? extends V> values) { return decorated().putAll(key, values); } @Override - public boolean putAll(Map<? extends K, ? extends V> map) { + public boolean putAll(final Map<? extends K, ? extends V> map) { return decorated().putAll(map); } @Override - public boolean putAll(MultiValuedMap<? extends K, ? extends V> map) { + public boolean putAll(final MultiValuedMap<? extends K, ? extends V> map) { return decorated().putAll(map); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/059c468f/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 7785cd9..67d9576 100644 --- a/src/main/java/org/apache/commons/collections4/multimap/AbstractSetValuedMap.java +++ b/src/main/java/org/apache/commons/collections4/multimap/AbstractSetValuedMap.java @@ -50,7 +50,7 @@ public abstract class AbstractSetValuedMap<K, V> extends AbstractMultiValuedMap< * @param map the map to wrap, must not be null * @throws NullPointerException if the map is null */ - protected AbstractSetValuedMap(Map<K, ? extends Set<V>> map) { + protected AbstractSetValuedMap(final Map<K, ? extends Set<V>> map) { super(map); } @@ -97,7 +97,7 @@ public abstract class AbstractSetValuedMap<K, V> extends AbstractMultiValuedMap< * unmodifiable set for no mapping found. */ @Override - public Set<V> remove(Object key) { + public Set<V> remove(final Object key) { return SetUtils.emptyIfNull(getMap().remove(key)); } @@ -113,7 +113,7 @@ public abstract class AbstractSetValuedMap<K, V> extends AbstractMultiValuedMap< } @Override - public boolean equals(Object other) { + public boolean equals(final Object other) { final Set<V> set = (Set<V>) getMapping(); if (set == null) { return Collections.emptySet().equals(other); @@ -121,7 +121,7 @@ public abstract class AbstractSetValuedMap<K, V> extends AbstractMultiValuedMap< if (!(other instanceof Set)) { return false; } - Set<?> otherSet = (Set<?>) other; + final Set<?> otherSet = (Set<?>) other; return SetUtils.isEqualSet(set, otherSet); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/059c468f/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 cc9d710..9dbc9ca 100644 --- a/src/main/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMap.java +++ b/src/main/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMap.java @@ -76,7 +76,7 @@ public class ArrayListValuedHashMap<K, V> extends AbstractListValuedMap<K, V> * * @param initialListCapacity the initial capacity used for value collections */ - public ArrayListValuedHashMap(int initialListCapacity) { + public ArrayListValuedHashMap(final int initialListCapacity) { this(DEFAULT_INITIAL_MAP_CAPACITY, initialListCapacity); } @@ -87,7 +87,7 @@ public class ArrayListValuedHashMap<K, V> extends AbstractListValuedMap<K, V> * @param initialMapCapacity the initial hashmap capacity * @param initialListCapacity the initial capacity used for value collections */ - public ArrayListValuedHashMap(int initialMapCapacity, int initialListCapacity) { + public ArrayListValuedHashMap(final int initialMapCapacity, final int initialListCapacity) { super(new HashMap<K, ArrayList<V>>(initialMapCapacity)); this.initialListCapacity = initialListCapacity; } @@ -123,19 +123,19 @@ public class ArrayListValuedHashMap<K, V> extends AbstractListValuedMap<K, V> * Trims the capacity of all value collections to their current size. */ public void trimToSize() { - for (Collection<V> coll : getMap().values()) { + for (final Collection<V> coll : getMap().values()) { final ArrayList<V> list = (ArrayList<V>) coll; list.trimToSize(); } } // ----------------------------------------------------------------------- - private void writeObject(ObjectOutputStream oos) throws IOException { + private void writeObject(final ObjectOutputStream oos) throws IOException { oos.defaultWriteObject(); doWriteObject(oos); } - private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException { + private void readObject(final ObjectInputStream ois) throws IOException, ClassNotFoundException { ois.defaultReadObject(); setMap(new HashMap<K, ArrayList<V>>()); doReadObject(ois); http://git-wip-us.apache.org/repos/asf/commons-collections/blob/059c468f/src/main/java/org/apache/commons/collections4/multimap/HashSetValuedHashMap.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/multimap/HashSetValuedHashMap.java b/src/main/java/org/apache/commons/collections4/multimap/HashSetValuedHashMap.java index 8a0c4dc..9d7cfb7 100644 --- a/src/main/java/org/apache/commons/collections4/multimap/HashSetValuedHashMap.java +++ b/src/main/java/org/apache/commons/collections4/multimap/HashSetValuedHashMap.java @@ -75,7 +75,7 @@ public class HashSetValuedHashMap<K, V> extends AbstractSetValuedMap<K, V> * * @param initialSetCapacity the initial capacity used for value collections */ - public HashSetValuedHashMap(int initialSetCapacity) { + public HashSetValuedHashMap(final int initialSetCapacity) { this(DEFAULT_INITIAL_MAP_CAPACITY, initialSetCapacity); } @@ -86,7 +86,7 @@ public class HashSetValuedHashMap<K, V> extends AbstractSetValuedMap<K, V> * @param initialMapCapacity the initial hashmap capacity * @param initialSetCapacity the initial capacity used for value collections */ - public HashSetValuedHashMap(int initialMapCapacity, int initialSetCapacity) { + public HashSetValuedHashMap(final int initialMapCapacity, final int initialSetCapacity) { super(new HashMap<K, HashSet<V>>(initialMapCapacity)); this.initialSetCapacity = initialSetCapacity; } @@ -118,12 +118,12 @@ public class HashSetValuedHashMap<K, V> extends AbstractSetValuedMap<K, V> } // ----------------------------------------------------------------------- - private void writeObject(ObjectOutputStream oos) throws IOException { + private void writeObject(final ObjectOutputStream oos) throws IOException { oos.defaultWriteObject(); doWriteObject(oos); } - private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException { + private void readObject(final ObjectInputStream ois) throws IOException, ClassNotFoundException { ois.defaultReadObject(); setMap(new HashMap<K, HashSet<V>>()); doReadObject(ois); http://git-wip-us.apache.org/repos/asf/commons-collections/blob/059c468f/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 b15a1de..1522054 100644 --- a/src/main/java/org/apache/commons/collections4/multimap/TransformedMultiValuedMap.java +++ b/src/main/java/org/apache/commons/collections4/multimap/TransformedMultiValuedMap.java @@ -171,7 +171,7 @@ public class TransformedMultiValuedMap<K, V> extends AbstractMultiValuedMapDecor throw new NullPointerException("Map must not be null."); } boolean changed = false; - for (Map.Entry<? extends K, ? extends V> entry : map.entrySet()) { + for (final Map.Entry<? extends K, ? extends V> entry : map.entrySet()) { changed |= put(entry.getKey(), entry.getValue()); } return changed; @@ -183,7 +183,7 @@ public class TransformedMultiValuedMap<K, V> extends AbstractMultiValuedMapDecor throw new NullPointerException("Map must not be null."); } boolean changed = false; - for (Map.Entry<? extends K, ? extends V> entry : map.entries()) { + for (final 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/059c468f/src/main/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMap.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMap.java b/src/main/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMap.java index 1bd629f..d8932bb 100644 --- a/src/main/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMap.java +++ b/src/main/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMap.java @@ -60,7 +60,7 @@ public final class UnmodifiableMultiValuedMap<K, V> */ @SuppressWarnings("unchecked") public static <K, V> UnmodifiableMultiValuedMap<K, V> unmodifiableMultiValuedMap( - MultiValuedMap<? extends K, ? extends V> map) { + final MultiValuedMap<? extends K, ? extends V> map) { if (map instanceof Unmodifiable) { return (UnmodifiableMultiValuedMap<K, V>) map; } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/059c468f/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 4ae4d81..97bcc3a 100644 --- a/src/main/java/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java +++ b/src/main/java/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java @@ -82,7 +82,7 @@ public abstract class AbstractMapMultiSet<E> extends AbstractMultiSet<E> { * * @param map the map to wrap */ - protected void setMap(Map<E, MutableInteger> map) { + protected void setMap(final Map<E, MutableInteger> map) { this.map = map; } @@ -221,7 +221,7 @@ public abstract class AbstractMapMultiSet<E> extends AbstractMultiSet<E> { } final MutableInteger mut = map.get(object); - int oldCount = mut != null ? mut.value : 0; + final int oldCount = mut != null ? mut.value : 0; if (occurrences > 0) { modCount++; @@ -256,7 +256,7 @@ public abstract class AbstractMapMultiSet<E> extends AbstractMultiSet<E> { if (mut == null) { return 0; } - int oldCount = mut.value; + final int oldCount = mut.value; if (occurrences > 0) { modCount++; if (occurrences < mut.value) { http://git-wip-us.apache.org/repos/asf/commons-collections/blob/059c468f/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 8386ee5..8a5f532 100644 --- a/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSet.java +++ b/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSet.java @@ -59,7 +59,7 @@ public abstract class AbstractMultiSet<E> extends AbstractCollection<E> implemen @Override public int size() { int totalSize = 0; - for (Entry<E> entry : entrySet()) { + for (final Entry<E> entry : entrySet()) { totalSize += entry.getCount(); } return totalSize; @@ -74,7 +74,7 @@ public abstract class AbstractMultiSet<E> extends AbstractCollection<E> implemen */ @Override public int getCount(final Object object) { - for (Entry<E> entry : entrySet()) { + for (final Entry<E> entry : entrySet()) { final E element = entry.getElement(); if (element == object || element != null && element.equals(object)) { @@ -90,7 +90,7 @@ public abstract class AbstractMultiSet<E> extends AbstractCollection<E> implemen throw new IllegalArgumentException("Count must not be negative."); } - int oldCount = getCount(object); + final int oldCount = getCount(object); if (oldCount < count) { add(object, count - oldCount); } else { @@ -197,7 +197,7 @@ public abstract class AbstractMultiSet<E> extends AbstractCollection<E> implemen */ @Override public void clear() { - Iterator<Entry<E>> it = entrySet().iterator(); + final Iterator<Entry<E>> it = entrySet().iterator(); while (it.hasNext()) { it.next(); it.remove(); @@ -258,7 +258,7 @@ public abstract class AbstractMultiSet<E> extends AbstractCollection<E> implemen protected Iterator<E> createUniqueSetIterator() { final Transformer<Entry<E>, E> transformer = new Transformer<Entry<E>, E>() { @Override - public E transform(Entry<E> entry) { + public E transform(final Entry<E> entry) { return entry.getElement(); } }; @@ -412,7 +412,7 @@ public abstract class AbstractMultiSet<E> extends AbstractCollection<E> implemen protected static abstract class AbstractEntry<E> implements Entry<E> { @Override - public boolean equals(Object object) { + public boolean equals(final Object object) { if (object instanceof Entry) { final Entry<?> other = (Entry<?>) object; final E element = this.getElement(); http://git-wip-us.apache.org/repos/asf/commons-collections/blob/059c468f/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSetDecorator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSetDecorator.java b/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSetDecorator.java index 10394a2..115cb09 100644 --- a/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSetDecorator.java +++ b/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSetDecorator.java @@ -80,7 +80,7 @@ public abstract class AbstractMultiSetDecorator<E> } @Override - public int setCount(E object, int count) { + public int setCount(final E object, final int count) { return decorated().setCount(object, count); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/059c468f/src/main/java/org/apache/commons/collections4/multiset/PredicatedMultiSet.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/multiset/PredicatedMultiSet.java b/src/main/java/org/apache/commons/collections4/multiset/PredicatedMultiSet.java index 4483039..9bf7efb 100644 --- a/src/main/java/org/apache/commons/collections4/multiset/PredicatedMultiSet.java +++ b/src/main/java/org/apache/commons/collections4/multiset/PredicatedMultiSet.java @@ -119,7 +119,7 @@ public class PredicatedMultiSet<E> extends PredicatedCollection<E> implements Mu } @Override - public int setCount(E object, int count) { + public int setCount(final E object, final int count) { validate(object); return decorated().setCount(object, count); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/059c468f/src/main/java/org/apache/commons/collections4/multiset/SynchronizedMultiSet.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/multiset/SynchronizedMultiSet.java b/src/main/java/org/apache/commons/collections4/multiset/SynchronizedMultiSet.java index 297d836..dcec8c6 100644 --- a/src/main/java/org/apache/commons/collections4/multiset/SynchronizedMultiSet.java +++ b/src/main/java/org/apache/commons/collections4/multiset/SynchronizedMultiSet.java @@ -121,7 +121,7 @@ public class SynchronizedMultiSet<E> extends SynchronizedCollection<E> implement } @Override - public int setCount(E object, int count) { + public int setCount(final E object, final int count) { synchronized (lock) { return decorated().setCount(object, count); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/059c468f/src/main/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSet.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSet.java b/src/main/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSet.java index beb9454..069978c 100644 --- a/src/main/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSet.java +++ b/src/main/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSet.java @@ -137,7 +137,7 @@ public final class UnmodifiableMultiSet<E> //----------------------------------------------------------------------- @Override - public int setCount(E object, int count) { + public int setCount(final E object, final int count) { throw new UnsupportedOperationException(); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/059c468f/src/main/java/org/apache/commons/collections4/queue/CircularFifoQueue.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/queue/CircularFifoQueue.java b/src/main/java/org/apache/commons/collections4/queue/CircularFifoQueue.java index b8bfe40..539eb9e 100644 --- a/src/main/java/org/apache/commons/collections4/queue/CircularFifoQueue.java +++ b/src/main/java/org/apache/commons/collections4/queue/CircularFifoQueue.java @@ -283,7 +283,7 @@ public class CircularFifoQueue<E> extends AbstractCollection<E> * @throws NullPointerException if the given element is null */ @Override - public boolean offer(E element) { + public boolean offer(final E element) { return add(element); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/059c468f/src/main/java/org/apache/commons/collections4/set/AbstractNavigableSetDecorator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/set/AbstractNavigableSetDecorator.java b/src/main/java/org/apache/commons/collections4/set/AbstractNavigableSetDecorator.java index 01ff705..42fa406 100644 --- a/src/main/java/org/apache/commons/collections4/set/AbstractNavigableSetDecorator.java +++ b/src/main/java/org/apache/commons/collections4/set/AbstractNavigableSetDecorator.java @@ -64,22 +64,22 @@ public abstract class AbstractNavigableSetDecorator<E> //----------------------------------------------------------------------- @Override - public E lower(E e) { + public E lower(final E e) { return decorated().lower(e); } @Override - public E floor(E e) { + public E floor(final E e) { return decorated().floor(e); } @Override - public E ceiling(E e) { + public E ceiling(final E e) { return decorated().ceiling(e); } @Override - public E higher(E e) { + public E higher(final E e) { return decorated().higher(e); } @@ -104,17 +104,17 @@ public abstract class AbstractNavigableSetDecorator<E> } @Override - public NavigableSet<E> subSet(E fromElement, boolean fromInclusive, E toElement, boolean toInclusive) { + public NavigableSet<E> subSet(final E fromElement, final boolean fromInclusive, final E toElement, final boolean toInclusive) { return decorated().subSet(fromElement, fromInclusive, toElement, toInclusive); } @Override - public NavigableSet<E> headSet(E toElement, boolean inclusive) { + public NavigableSet<E> headSet(final E toElement, final boolean inclusive) { return decorated().headSet(toElement, inclusive); } @Override - public NavigableSet<E> tailSet(E fromElement, boolean inclusive) { + public NavigableSet<E> tailSet(final E fromElement, final boolean inclusive) { return decorated().tailSet(fromElement, inclusive); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/059c468f/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 a7ccf11..bcff3cb 100644 --- a/src/main/java/org/apache/commons/collections4/set/CompositeSet.java +++ b/src/main/java/org/apache/commons/collections4/set/CompositeSet.java @@ -388,7 +388,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 (Set<E> set : sets) { + for (final Set<E> set : sets) { addComposited(set); } } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/059c468f/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 4c9cc35..5b87bca 100644 --- a/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java +++ b/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java @@ -236,14 +236,14 @@ public class ListOrderedSet<E> */ @Override public boolean retainAll(final Collection<?> coll) { - boolean result = decorated().retainAll(coll); + final boolean result = decorated().retainAll(coll); if (result == false) { return false; } if (decorated().size() == 0) { setOrder.clear(); } else { - for (Iterator<E> it = setOrder.iterator(); it.hasNext();) { + for (final 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/059c468f/src/main/java/org/apache/commons/collections4/set/PredicatedNavigableSet.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/set/PredicatedNavigableSet.java b/src/main/java/org/apache/commons/collections4/set/PredicatedNavigableSet.java index dda2a5f..655faba 100644 --- a/src/main/java/org/apache/commons/collections4/set/PredicatedNavigableSet.java +++ b/src/main/java/org/apache/commons/collections4/set/PredicatedNavigableSet.java @@ -92,22 +92,22 @@ public class PredicatedNavigableSet<E> extends PredicatedSortedSet<E> implements //----------------------------------------------------------------------- @Override - public E lower(E e) { + public E lower(final E e) { return decorated().lower(e); } @Override - public E floor(E e) { + public E floor(final E e) { return decorated().floor(e); } @Override - public E ceiling(E e) { + public E ceiling(final E e) { return decorated().ceiling(e); } @Override - public E higher(E e) { + public E higher(final E e) { return decorated().higher(e); } @@ -132,19 +132,19 @@ public class PredicatedNavigableSet<E> extends PredicatedSortedSet<E> implements } @Override - public NavigableSet<E> subSet(E fromElement, boolean fromInclusive, E toElement, boolean toInclusive) { + public NavigableSet<E> subSet(final E fromElement, final boolean fromInclusive, final E toElement, final boolean toInclusive) { final NavigableSet<E> sub = decorated().subSet(fromElement, fromInclusive, toElement, toInclusive); return predicatedNavigableSet(sub, predicate); } @Override - public NavigableSet<E> headSet(E toElement, boolean inclusive) { + public NavigableSet<E> headSet(final E toElement, final boolean inclusive) { final NavigableSet<E> head = decorated().headSet(toElement, inclusive); return predicatedNavigableSet(head, predicate); } @Override - public NavigableSet<E> tailSet(E fromElement, boolean inclusive) { + public NavigableSet<E> tailSet(final E fromElement, final boolean inclusive) { final NavigableSet<E> tail = decorated().tailSet(fromElement, inclusive); return predicatedNavigableSet(tail, predicate); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/059c468f/src/main/java/org/apache/commons/collections4/set/TransformedNavigableSet.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/set/TransformedNavigableSet.java b/src/main/java/org/apache/commons/collections4/set/TransformedNavigableSet.java index 3c1ec54..e9185a2 100644 --- a/src/main/java/org/apache/commons/collections4/set/TransformedNavigableSet.java +++ b/src/main/java/org/apache/commons/collections4/set/TransformedNavigableSet.java @@ -113,22 +113,22 @@ public class TransformedNavigableSet<E> extends TransformedSortedSet<E> implemen //----------------------------------------------------------------------- @Override - public E lower(E e) { + public E lower(final E e) { return decorated().lower(e); } @Override - public E floor(E e) { + public E floor(final E e) { return decorated().floor(e); } @Override - public E ceiling(E e) { + public E ceiling(final E e) { return decorated().ceiling(e); } @Override - public E higher(E e) { + public E higher(final E e) { return decorated().higher(e); } @@ -153,19 +153,19 @@ public class TransformedNavigableSet<E> extends TransformedSortedSet<E> implemen } @Override - public NavigableSet<E> subSet(E fromElement, boolean fromInclusive, E toElement, boolean toInclusive) { + public NavigableSet<E> subSet(final E fromElement, final boolean fromInclusive, final E toElement, final boolean toInclusive) { final NavigableSet<E> sub = decorated().subSet(fromElement, fromInclusive, toElement, toInclusive); return transformingNavigableSet(sub, transformer); } @Override - public NavigableSet<E> headSet(E toElement, boolean inclusive) { + public NavigableSet<E> headSet(final E toElement, final boolean inclusive) { final NavigableSet<E> head = decorated().headSet(toElement, inclusive); return transformingNavigableSet(head, transformer); } @Override - public NavigableSet<E> tailSet(E fromElement, boolean inclusive) { + public NavigableSet<E> tailSet(final E fromElement, final boolean inclusive) { final NavigableSet<E> tail = decorated().tailSet(fromElement, inclusive); return transformingNavigableSet(tail, transformer); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/059c468f/src/main/java/org/apache/commons/collections4/set/UnmodifiableNavigableSet.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/set/UnmodifiableNavigableSet.java b/src/main/java/org/apache/commons/collections4/set/UnmodifiableNavigableSet.java index 6c09a6a..8f86b78 100644 --- a/src/main/java/org/apache/commons/collections4/set/UnmodifiableNavigableSet.java +++ b/src/main/java/org/apache/commons/collections4/set/UnmodifiableNavigableSet.java @@ -137,19 +137,19 @@ public final class UnmodifiableNavigableSet<E> } @Override - public NavigableSet<E> subSet(E fromElement, boolean fromInclusive, E toElement, boolean toInclusive) { + public NavigableSet<E> subSet(final E fromElement, final boolean fromInclusive, final E toElement, final boolean toInclusive) { final NavigableSet<E> sub = decorated().subSet(fromElement, fromInclusive, toElement, toInclusive); return unmodifiableNavigableSet(sub); } @Override - public NavigableSet<E> headSet(E toElement, boolean inclusive) { + public NavigableSet<E> headSet(final E toElement, final boolean inclusive) { final NavigableSet<E> head = decorated().headSet(toElement, inclusive); return unmodifiableNavigableSet(head); } @Override - public NavigableSet<E> tailSet(E fromElement, boolean inclusive) { + public NavigableSet<E> tailSet(final E fromElement, final boolean inclusive) { final NavigableSet<E> tail = decorated().tailSet(fromElement, inclusive); return unmodifiableNavigableSet(tail); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/059c468f/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 8508a91..37da91e 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() { - Iterator<Map.Entry<K, V>> it = AbstractPatriciaTrie.this.entrySet().iterator(); - Set<K> currentKeys = keySet(); + final Iterator<Map.Entry<K, V>> it = AbstractPatriciaTrie.this.entrySet().iterator(); + final 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); - int size = stream.readInt(); + final int size = stream.readInt(); for(int i = 0; i < size; i++){ - K k = (K) stream.readObject(); - V v = (V) stream.readObject(); + final K k = (K) stream.readObject(); + final V v = (V) stream.readObject(); put(k, v); } } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/059c468f/src/main/java/org/apache/commons/collections4/trie/UnmodifiableTrie.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/trie/UnmodifiableTrie.java b/src/main/java/org/apache/commons/collections4/trie/UnmodifiableTrie.java index d8041d4..95d4ee4 100644 --- a/src/main/java/org/apache/commons/collections4/trie/UnmodifiableTrie.java +++ b/src/main/java/org/apache/commons/collections4/trie/UnmodifiableTrie.java @@ -182,12 +182,12 @@ public class UnmodifiableTrie<K, V> implements Trie<K, V>, Serializable, Unmodif } @Override - public K nextKey(K key) { + public K nextKey(final K key) { return delegate.nextKey(key); } @Override - public K previousKey(K key) { + public K previousKey(final K key) { return delegate.previousKey(key); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/059c468f/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 4c90700..f3471dc 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() { - Bag<Object> bag = BagUtils.synchronizedBag(new HashBag<>()); + final 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() { - Bag<Object> bag = BagUtils.unmodifiableBag(new HashBag<>()); + final 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() { - Bag<Object> bag = BagUtils.predicatedBag(new HashBag<>(), truePredicate); + final 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() { - Bag<Object> bag = BagUtils.transformingBag(new HashBag<>(), nopTransformer); + final 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() { - Bag<Object> bag = BagUtils.synchronizedSortedBag(new TreeBag<>()); + final 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() { - SortedBag<Object> bag = BagUtils.unmodifiableSortedBag(new TreeBag<>()); + final 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() { - Bag<Object> bag = BagUtils.predicatedSortedBag(new TreeBag<>(), truePredicate); + final 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() { - Bag<Object> bag = BagUtils.transformingSortedBag(new TreeBag<>(), nopTransformer); + final Bag<Object> bag = BagUtils.transformingSortedBag(new TreeBag<>(), nopTransformer); assertTrue("Returned object should be an TransformedSortedBag", bag instanceof TransformedSortedBag); try {
