Remove redundant type arguments. Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/eef8f1a0 Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/eef8f1a0 Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/eef8f1a0
Branch: refs/heads/master Commit: eef8f1a0aa2bc6083dc5d0ed5458c830816c5bad Parents: f4a63c4 Author: Gary Gregory <ggreg...@apache.org> Authored: Wed Jul 26 23:43:14 2017 -0700 Committer: Gary Gregory <ggreg...@apache.org> Committed: Wed Jul 26 23:43:14 2017 -0700 ---------------------------------------------------------------------- .../apache/commons/collections4/BagUtils.java | 4 +- .../commons/collections4/CollectionUtils.java | 42 ++--- .../commons/collections4/ComparatorUtils.java | 10 +- .../commons/collections4/EnumerationUtils.java | 4 +- .../commons/collections4/FluentIterable.java | 4 +- .../commons/collections4/IterableUtils.java | 8 +- .../commons/collections4/IteratorUtils.java | 84 ++++----- .../apache/commons/collections4/ListUtils.java | 22 +-- .../apache/commons/collections4/MapUtils.java | 6 +- .../commons/collections4/MultiMapUtils.java | 10 +- .../commons/collections4/MultiSetUtils.java | 2 +- .../apache/commons/collections4/QueueUtils.java | 2 +- .../apache/commons/collections4/SetUtils.java | 4 +- .../commons/collections4/SplitMapUtils.java | 6 +- .../collections4/bag/AbstractMapBag.java | 8 +- .../commons/collections4/bag/CollectionBag.java | 2 +- .../collections4/bag/CollectionSortedBag.java | 2 +- .../commons/collections4/bag/PredicatedBag.java | 2 +- .../collections4/bag/PredicatedSortedBag.java | 2 +- .../collections4/bag/SynchronizedBag.java | 2 +- .../collections4/bag/SynchronizedSortedBag.java | 2 +- .../collections4/bag/TransformedBag.java | 4 +- .../collections4/bag/TransformedSortedBag.java | 4 +- .../collections4/bag/UnmodifiableBag.java | 2 +- .../collections4/bag/UnmodifiableSortedBag.java | 2 +- .../bidimap/AbstractDualBidiMap.java | 16 +- .../collections4/bidimap/DualHashBidiMap.java | 6 +- .../bidimap/DualLinkedHashBidiMap.java | 6 +- .../collections4/bidimap/DualTreeBidiMap.java | 26 +-- .../collections4/bidimap/TreeBidiMap.java | 8 +- .../bidimap/UnmodifiableBidiMap.java | 4 +- .../bidimap/UnmodifiableOrderedBidiMap.java | 4 +- .../bidimap/UnmodifiableSortedBidiMap.java | 4 +- .../collection/CompositeCollection.java | 6 +- .../collection/IndexedCollection.java | 4 +- .../collection/PredicatedCollection.java | 10 +- .../collection/SynchronizedCollection.java | 2 +- .../collection/TransformedCollection.java | 6 +- .../UnmodifiableBoundedCollection.java | 4 +- .../collection/UnmodifiableCollection.java | 2 +- .../comparators/ComparatorChain.java | 2 +- .../comparators/FixedOrderComparator.java | 2 +- .../collections4/functors/AllPredicate.java | 4 +- .../collections4/functors/AndPredicate.java | 2 +- .../collections4/functors/AnyPredicate.java | 4 +- .../collections4/functors/ChainedClosure.java | 4 +- .../functors/ChainedTransformer.java | 4 +- .../collections4/functors/CloneTransformer.java | 2 +- .../functors/ClosureTransformer.java | 2 +- .../functors/ComparatorPredicate.java | 2 +- .../collections4/functors/ConstantFactory.java | 4 +- .../functors/ConstantTransformer.java | 4 +- .../collections4/functors/DefaultEquator.java | 2 +- .../collections4/functors/EqualPredicate.java | 4 +- .../collections4/functors/ExceptionClosure.java | 2 +- .../collections4/functors/ExceptionFactory.java | 2 +- .../functors/ExceptionPredicate.java | 2 +- .../functors/ExceptionTransformer.java | 2 +- .../functors/FactoryTransformer.java | 2 +- .../collections4/functors/FalsePredicate.java | 2 +- .../collections4/functors/ForClosure.java | 2 +- .../functors/IdentityPredicate.java | 2 +- .../collections4/functors/IfClosure.java | 2 +- .../collections4/functors/IfTransformer.java | 4 +- .../functors/InstantiateFactory.java | 4 +- .../functors/InstantiateTransformer.java | 6 +- .../functors/InvokerTransformer.java | 6 +- .../collections4/functors/MapTransformer.java | 2 +- .../collections4/functors/NOPClosure.java | 2 +- .../collections4/functors/NOPTransformer.java | 2 +- .../collections4/functors/NonePredicate.java | 4 +- .../collections4/functors/NotNullPredicate.java | 2 +- .../collections4/functors/NotPredicate.java | 2 +- .../functors/NullIsExceptionPredicate.java | 2 +- .../functors/NullIsFalsePredicate.java | 2 +- .../functors/NullIsTruePredicate.java | 2 +- .../collections4/functors/NullPredicate.java | 2 +- .../collections4/functors/OnePredicate.java | 4 +- .../collections4/functors/OrPredicate.java | 2 +- .../functors/PredicateTransformer.java | 2 +- .../collections4/functors/PrototypeFactory.java | 6 +- .../functors/StringValueTransformer.java | 2 +- .../collections4/functors/SwitchClosure.java | 4 +- .../functors/SwitchTransformer.java | 4 +- .../functors/TransformedPredicate.java | 2 +- .../functors/TransformerClosure.java | 2 +- .../functors/TransformerPredicate.java | 2 +- .../collections4/functors/TruePredicate.java | 2 +- .../collections4/functors/UniquePredicate.java | 4 +- .../collections4/functors/WhileClosure.java | 2 +- .../iterators/CollatingIterator.java | 4 +- .../collections4/iterators/EmptyIterator.java | 2 +- .../iterators/EmptyListIterator.java | 2 +- .../iterators/EmptyMapIterator.java | 2 +- .../iterators/EmptyOrderedIterator.java | 2 +- .../iterators/EmptyOrderedMapIterator.java | 2 +- .../collections4/iterators/IteratorChain.java | 2 +- .../iterators/IteratorIterable.java | 2 +- .../iterators/ListIteratorWrapper.java | 2 +- .../iterators/ObjectGraphIterator.java | 2 +- .../collections4/iterators/PeekingIterator.java | 2 +- .../iterators/PermutationIterator.java | 6 +- .../iterators/PushbackIterator.java | 4 +- .../iterators/UnmodifiableIterator.java | 2 +- .../iterators/UnmodifiableListIterator.java | 2 +- .../iterators/UnmodifiableMapIterator.java | 2 +- .../UnmodifiableOrderedMapIterator.java | 2 +- .../collections4/iterators/ZippingIterator.java | 2 +- .../collections4/keyvalue/DefaultKeyValue.java | 2 +- .../collections4/list/AbstractLinkedList.java | 14 +- .../collections4/list/CursorableLinkedList.java | 8 +- .../collections4/list/FixedSizeList.java | 4 +- .../commons/collections4/list/GrowthList.java | 2 +- .../commons/collections4/list/LazyList.java | 4 +- .../collections4/list/PredicatedList.java | 4 +- .../collections4/list/SetUniqueList.java | 22 +-- .../collections4/list/TransformedList.java | 6 +- .../commons/collections4/list/TreeList.java | 20 +-- .../collections4/list/UnmodifiableList.java | 4 +- .../collections4/map/AbstractHashedMap.java | 16 +- .../collections4/map/AbstractIterableMap.java | 2 +- .../collections4/map/AbstractLinkedMap.java | 10 +- .../collections4/map/AbstractReferenceMap.java | 30 ++-- .../map/AbstractSortedMapDecorator.java | 4 +- .../commons/collections4/map/CompositeMap.java | 6 +- .../commons/collections4/map/DefaultedMap.java | 6 +- .../commons/collections4/map/FixedSizeMap.java | 2 +- .../collections4/map/FixedSizeSortedMap.java | 8 +- .../commons/collections4/map/Flat3Map.java | 18 +- .../commons/collections4/map/LazyMap.java | 4 +- .../commons/collections4/map/LazySortedMap.java | 10 +- .../commons/collections4/map/LinkedMap.java | 2 +- .../collections4/map/ListOrderedMap.java | 18 +- .../commons/collections4/map/MultiKeyMap.java | 10 +- .../commons/collections4/map/MultiValueMap.java | 10 +- .../collections4/map/PassiveExpiringMap.java | 2 +- .../commons/collections4/map/PredicatedMap.java | 2 +- .../collections4/map/PredicatedSortedMap.java | 8 +- .../commons/collections4/map/SingletonMap.java | 8 +- .../collections4/map/StaticBucketMap.java | 6 +- .../collections4/map/TransformedMap.java | 6 +- .../collections4/map/TransformedSortedMap.java | 10 +- .../collections4/map/UnmodifiableEntrySet.java | 2 +- .../collections4/map/UnmodifiableMap.java | 4 +- .../map/UnmodifiableOrderedMap.java | 2 +- .../collections4/map/UnmodifiableSortedMap.java | 8 +- .../multimap/AbstractMultiValuedMap.java | 8 +- .../multimap/ArrayListValuedHashMap.java | 2 +- .../multimap/HashSetValuedHashMap.java | 2 +- .../multimap/TransformedMultiValuedMap.java | 6 +- .../multimap/UnmodifiableMultiValuedMap.java | 2 +- .../multiset/AbstractMapMultiSet.java | 8 +- .../collections4/multiset/AbstractMultiSet.java | 6 +- .../multiset/PredicatedMultiSet.java | 2 +- .../multiset/SynchronizedMultiSet.java | 6 +- .../multiset/UnmodifiableMultiSet.java | 2 +- .../properties/SortedProperties.java | 2 +- .../collections4/queue/PredicatedQueue.java | 2 +- .../collections4/queue/TransformedQueue.java | 4 +- .../collections4/queue/UnmodifiableQueue.java | 2 +- .../collections4/sequence/EditScript.java | 2 +- .../sequence/ReplacementsFinder.java | 4 +- .../sequence/SequencesComparator.java | 10 +- .../commons/collections4/set/CompositeSet.java | 6 +- .../collections4/set/ListOrderedSet.java | 16 +- .../commons/collections4/set/MapBackedSet.java | 2 +- .../set/PredicatedNavigableSet.java | 2 +- .../commons/collections4/set/PredicatedSet.java | 2 +- .../collections4/set/PredicatedSortedSet.java | 8 +- .../set/TransformedNavigableSet.java | 4 +- .../collections4/set/TransformedSet.java | 4 +- .../collections4/set/TransformedSortedSet.java | 10 +- .../set/UnmodifiableNavigableSet.java | 2 +- .../collections4/set/UnmodifiableSet.java | 2 +- .../collections4/set/UnmodifiableSortedSet.java | 2 +- .../AbstractIterableGetMapDecorator.java | 2 +- .../splitmap/TransformedSplitMap.java | 4 +- .../collections4/trie/AbstractPatriciaTrie.java | 16 +- .../collections4/trie/UnmodifiableTrie.java | 2 +- .../collections4/AbstractLinkedListTest.java | 4 +- .../commons/collections4/ArrayStackTest.java | 2 +- .../commons/collections4/BagUtilsTest.java | 24 +-- .../apache/commons/collections4/BulkTest.java | 2 +- .../commons/collections4/ClosureUtilsTest.java | 60 +++---- .../collections4/CollectionUtilsTest.java | 174 +++++++++---------- .../collections4/EnumerationUtilsTest.java | 12 +- .../collections4/FluentIterableTest.java | 18 +- .../commons/collections4/IterableUtilsTest.java | 34 ++-- .../commons/collections4/IteratorUtilsTest.java | 32 ++-- .../commons/collections4/ListUtilsTest.java | 46 ++--- .../commons/collections4/MapPerformance.java | 6 +- .../commons/collections4/MapUtilsTest.java | 112 ++++++------ .../commons/collections4/MockTestCase.java | 2 +- .../commons/collections4/MultiMapUtilsTest.java | 14 +- .../collections4/PredicateUtilsTest.java | 22 +-- .../commons/collections4/QueueUtilsTest.java | 10 +- .../commons/collections4/SetUtilsTest.java | 18 +- .../commons/collections4/SplitMapUtilsTest.java | 10 +- .../collections4/TransformerUtilsTest.java | 18 +- .../commons/collections4/TrieUtilsTest.java | 2 +- .../collections4/bag/AbstractBagTest.java | 22 +-- .../collections4/bag/AbstractSortedBagTest.java | 2 +- .../collections4/bag/CollectionBagTest.java | 2 +- .../bag/CollectionSortedBagTest.java | 2 +- .../commons/collections4/bag/HashBagTest.java | 2 +- .../collections4/bag/PredicatedBagTest.java | 2 +- .../collections4/bag/TransformedBagTest.java | 2 +- .../bag/TransformedSortedBagTest.java | 2 +- .../commons/collections4/bag/TreeBagTest.java | 8 +- .../collections4/bag/UnmodifiableBagTest.java | 2 +- .../bag/UnmodifiableSortedBagTest.java | 2 +- .../bidimap/AbstractBidiMapTest.java | 6 +- .../AbstractOrderedBidiMapDecoratorTest.java | 6 +- .../bidimap/AbstractOrderedBidiMapTest.java | 2 +- .../bidimap/AbstractSortedBidiMapTest.java | 14 +- .../bidimap/DualHashBidiMapTest.java | 2 +- .../bidimap/DualLinkedHashBidiMapTest.java | 2 +- .../bidimap/DualTreeBidiMap2Test.java | 14 +- .../bidimap/DualTreeBidiMapTest.java | 2 +- .../collections4/bidimap/TreeBidiMapTest.java | 4 +- .../bidimap/UnmodifiableBidiMapTest.java | 4 +- .../bidimap/UnmodifiableOrderedBidiMapTest.java | 4 +- .../bidimap/UnmodifiableSortedBidiMapTest.java | 4 +- .../collection/AbstractCollectionTest.java | 20 +-- .../collection/CompositeCollectionTest.java | 28 +-- .../collection/IndexedCollectionTest.java | 8 +- .../collection/PredicatedCollectionTest.java | 8 +- .../collection/SynchronizedCollectionTest.java | 4 +- .../collection/TransformedCollectionTest.java | 12 +- .../UnmodifiableBoundedCollectionTest.java | 6 +- .../collection/UnmodifiableCollectionTest.java | 6 +- .../comparators/AbstractComparatorTest.java | 4 +- .../comparators/AbstractNullComparatorTest.java | 8 +- .../comparators/BooleanComparatorTest.java | 2 +- .../comparators/ComparableComparatorTest.java | 4 +- .../comparators/ComparatorChainTest.java | 18 +- .../comparators/FixedOrderComparatorTest.java | 24 +-- .../comparators/ReverseComparatorTest.java | 6 +- .../comparators/TransformingComparatorTest.java | 8 +- .../AbstractCompositePredicateTest.java | 4 +- .../functors/AbstractMockPredicateTest.java | 2 +- .../iterators/AbstractListIteratorTest.java | 2 +- .../iterators/AbstractMapIteratorTest.java | 2 +- .../AbstractOrderedMapIteratorTest.java | 6 +- .../iterators/ArrayIterator2Test.java | 10 +- .../iterators/ArrayIteratorTest.java | 6 +- .../iterators/ArrayListIterator2Test.java | 10 +- .../iterators/ArrayListIteratorTest.java | 6 +- .../iterators/BoundedIteratorTest.java | 40 ++--- .../iterators/CollatingIteratorTest.java | 32 ++-- .../iterators/FilterIteratorTest.java | 10 +- .../iterators/FilterListIteratorTest.java | 56 +++--- .../iterators/IteratorChainTest.java | 24 +-- .../iterators/IteratorEnumerationTest.java | 2 +- .../iterators/IteratorIterableTest.java | 2 +- .../iterators/LazyIteratorChainTest.java | 14 +- .../iterators/ListIteratorWrapper2Test.java | 8 +- .../iterators/ListIteratorWrapperTest.java | 8 +- .../iterators/LoopingIteratorTest.java | 22 +-- .../iterators/LoopingListIteratorTest.java | 36 ++-- .../iterators/ObjectArrayIteratorTest.java | 12 +- .../iterators/ObjectArrayListIterator2Test.java | 6 +- .../iterators/ObjectArrayListIteratorTest.java | 6 +- .../iterators/ObjectGraphIteratorTest.java | 46 ++--- .../iterators/PeekingIteratorTest.java | 2 +- .../iterators/PermutationIteratorTest.java | 30 ++-- .../iterators/PushbackIteratorTest.java | 2 +- .../iterators/ReverseListIteratorTest.java | 8 +- .../iterators/SingletonIterator2Test.java | 4 +- .../iterators/SingletonIteratorTest.java | 4 +- .../iterators/SingletonListIteratorTest.java | 2 +- .../iterators/SkippingIteratorTest.java | 34 ++-- .../iterators/UniqueFilterIteratorTest.java | 8 +- .../iterators/UnmodifiableIteratorTest.java | 2 +- .../iterators/UnmodifiableListIteratorTest.java | 2 +- .../iterators/UnmodifiableMapIteratorTest.java | 4 +- .../UnmodifiableOrderedMapIteratorTest.java | 2 +- .../iterators/ZippingIteratorTest.java | 24 +-- .../keyvalue/AbstractMapEntryTest.java | 2 +- .../keyvalue/DefaultKeyValueTest.java | 16 +- .../keyvalue/DefaultMapEntryTest.java | 10 +- .../collections4/keyvalue/MultiKeyTest.java | 70 ++++---- .../collections4/keyvalue/TiedMapEntryTest.java | 12 +- .../keyvalue/UnmodifiableMapEntryTest.java | 12 +- .../collections4/list/AbstractListTest.java | 8 +- .../list/CursorableLinkedListTest.java | 18 +- .../collections4/list/FixedSizeListTest.java | 2 +- .../collections4/list/GrowthListTest.java | 14 +- .../list/NodeCachingLinkedListTest.java | 6 +- .../collections4/list/PredicatedListTest.java | 4 +- .../collections4/list/SetUniqueListTest.java | 52 +++--- .../collections4/list/TransformedListTest.java | 10 +- .../commons/collections4/list/TreeListTest.java | 14 +- .../collections4/list/UnmodifiableListTest.java | 8 +- .../collections4/map/AbstractMapTest.java | 20 +-- .../map/AbstractOrderedMapTest.java | 6 +- .../collections4/map/AbstractSortedMapTest.java | 14 +- .../map/CaseInsensitiveMapTest.java | 12 +- .../collections4/map/CompositeMapTest.java | 30 ++-- .../collections4/map/DefaultedMapTest.java | 8 +- .../collections4/map/FixedSizeMapTest.java | 2 +- .../map/FixedSizeSortedMapTest.java | 2 +- .../commons/collections4/map/Flat3MapTest.java | 6 +- .../commons/collections4/map/HashedMapTest.java | 8 +- .../commons/collections4/map/IdentityMap.java | 2 +- .../commons/collections4/map/LRUMapTest.java | 36 ++-- .../commons/collections4/map/LinkedMapTest.java | 12 +- .../collections4/map/ListOrderedMap2Test.java | 6 +- .../collections4/map/ListOrderedMapTest.java | 18 +- .../collections4/map/MultiKeyMapTest.java | 52 +++--- .../collections4/map/MultiValueMapTest.java | 36 ++-- .../map/PassiveExpiringMapTest.java | 18 +- .../collections4/map/PredicatedMapTest.java | 2 +- .../map/PredicatedSortedMapTest.java | 2 +- .../map/ReferenceIdentityMapTest.java | 14 +- .../collections4/map/ReferenceMapTest.java | 8 +- .../collections4/map/SingletonMapTest.java | 2 +- .../collections4/map/StaticBucketMapTest.java | 8 +- .../collections4/map/TransformedMapTest.java | 4 +- .../map/TransformedSortedMapTest.java | 4 +- .../collections4/map/UnmodifiableMapTest.java | 2 +- .../map/UnmodifiableSortedMapTest.java | 2 +- .../multimap/AbstractMultiValuedMapTest.java | 18 +- .../multimap/ArrayListValuedHashMapTest.java | 2 +- .../multimap/HashSetValuedHashMapTest.java | 4 +- .../multimap/TransformedMultiValuedMapTest.java | 4 +- .../UnmodifiableMultiValuedMapTest.java | 2 +- .../multiset/AbstractMultiSetTest.java | 22 +-- .../collections4/multiset/HashMultiSetTest.java | 2 +- .../multiset/PredicatedMultiSetTest.java | 2 +- .../multiset/UnmodifiableMultiSetTest.java | 2 +- .../collections4/queue/AbstractQueueTest.java | 4 +- .../queue/CircularFifoQueueTest.java | 28 +-- .../collections4/queue/PredicatedQueueTest.java | 6 +- .../queue/TransformedQueueTest.java | 8 +- .../queue/UnmodifiableQueueTest.java | 6 +- .../sequence/SequencesComparatorTest.java | 26 +-- .../set/AbstractNavigableSetTest.java | 2 +- .../collections4/set/AbstractSetTest.java | 2 +- .../collections4/set/AbstractSortedSetTest.java | 2 +- .../collections4/set/CompositeSetTest.java | 36 ++-- .../collections4/set/ListOrderedSet2Test.java | 4 +- .../collections4/set/ListOrderedSetTest.java | 10 +- .../set/PredicatedNavigableSetTest.java | 4 +- .../collections4/set/PredicatedSetTest.java | 2 +- .../set/PredicatedSortedSetTest.java | 4 +- .../set/TransformedNavigableSetTest.java | 4 +- .../collections4/set/TransformedSetTest.java | 8 +- .../set/TransformedSortedSetTest.java | 4 +- .../set/UnmodifiableNavigableSetTest.java | 4 +- .../collections4/set/UnmodifiableSetTest.java | 2 +- .../set/UnmodifiableSortedSetTest.java | 4 +- .../splitmap/TransformedSplitMapTest.java | 2 +- .../collections4/trie/PatriciaTrie2Test.java | 2 +- .../collections4/trie/PatriciaTrieTest.java | 38 ++-- .../collections4/trie/UnmodifiableTrieTest.java | 2 +- 356 files changed, 1628 insertions(+), 1628 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/main/java/org/apache/commons/collections4/BagUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/BagUtils.java b/src/main/java/org/apache/commons/collections4/BagUtils.java index c0e3963..ac60e47 100644 --- a/src/main/java/org/apache/commons/collections4/BagUtils.java +++ b/src/main/java/org/apache/commons/collections4/BagUtils.java @@ -40,14 +40,14 @@ public class BagUtils { * An empty unmodifiable bag. */ @SuppressWarnings("rawtypes") // OK, empty bag is compatible with any type - public static final Bag EMPTY_BAG = UnmodifiableBag.unmodifiableBag(new HashBag<Object>()); + public static final Bag EMPTY_BAG = UnmodifiableBag.unmodifiableBag(new HashBag<>()); /** * An empty unmodifiable sorted bag. */ @SuppressWarnings("rawtypes") // OK, empty bag is compatible with any type public static final Bag EMPTY_SORTED_BAG = - UnmodifiableSortedBag.unmodifiableSortedBag(new TreeBag<Object>()); + UnmodifiableSortedBag.unmodifiableSortedBag(new TreeBag<>()); /** * Instantiation of BagUtils is not intended or required. http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/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 5bab383..fb99785 100644 --- a/src/main/java/org/apache/commons/collections4/CollectionUtils.java +++ b/src/main/java/org/apache/commons/collections4/CollectionUtils.java @@ -140,11 +140,11 @@ public class CollectionUtils { */ public SetOperationCardinalityHelper(final Iterable<? extends O> a, final Iterable<? extends O> b) { super(a, b); - elements = new HashSet<O>(); + elements = new HashSet<>(); addAll(elements, a); addAll(elements, b); // the resulting list must contain at least each unique element, but may grow - newList = new ArrayList<O>(elements.size()); + newList = new ArrayList<>(elements.size()); } @Override @@ -228,7 +228,7 @@ public class CollectionUtils { * @see Collection#addAll */ public static <O> Collection<O> union(final Iterable<? extends O> a, final Iterable<? extends O> b) { - final SetOperationCardinalityHelper<O> helper = new SetOperationCardinalityHelper<O>(a, b); + final SetOperationCardinalityHelper<O> helper = new SetOperationCardinalityHelper<>(a, b); for (final O obj : helper) { helper.setCardinality(obj, helper.max(obj)); } @@ -252,7 +252,7 @@ public class CollectionUtils { * @see #containsAny */ public static <O> Collection<O> intersection(final Iterable<? extends O> a, final Iterable<? extends O> b) { - final SetOperationCardinalityHelper<O> helper = new SetOperationCardinalityHelper<O>(a, b); + final SetOperationCardinalityHelper<O> helper = new SetOperationCardinalityHelper<>(a, b); for (final O obj : helper) { helper.setCardinality(obj, helper.min(obj)); } @@ -280,7 +280,7 @@ public class CollectionUtils { * @return the symmetric difference of the two collections */ public static <O> Collection<O> disjunction(final Iterable<? extends O> a, final Iterable<? extends O> b) { - final SetOperationCardinalityHelper<O> helper = new SetOperationCardinalityHelper<O>(a, b); + final SetOperationCardinalityHelper<O> helper = new SetOperationCardinalityHelper<>(a, b); for (final O obj : helper) { helper.setCardinality(obj, helper.max(obj) - helper.min(obj)); } @@ -329,8 +329,8 @@ public class CollectionUtils { public static <O> Collection<O> subtract(final Iterable<? extends O> a, final Iterable<? extends O> b, final Predicate<O> p) { - final ArrayList<O> list = new ArrayList<O>(); - final HashBag<O> bag = new HashBag<O>(); + final ArrayList<O> list = new ArrayList<>(); + final HashBag<O> bag = new HashBag<>(); for (final O element : b) { if (p.evaluate(element)) { bag.add(element); @@ -371,7 +371,7 @@ public class CollectionUtils { return true; } else { final Iterator<?> it = coll1.iterator(); - final Set<Object> elementsAlreadySeen = new HashSet<Object>(); + final Set<Object> elementsAlreadySeen = new HashSet<>(); for (final Object nextElement : coll2) { if (elementsAlreadySeen.contains(nextElement)) { continue; @@ -437,7 +437,7 @@ public class CollectionUtils { * @return the populated cardinality map */ public static <O> Map<O, Integer> getCardinalityMap(final Iterable<? extends O> coll) { - final Map<O, Integer> count = new HashMap<O, Integer>(); + final Map<O, Integer> count = new HashMap<>(); for (final O obj : coll) { final Integer c = count.get(obj); if (c == null) { @@ -462,7 +462,7 @@ public class CollectionUtils { * @see Collection#containsAll */ public static boolean isSubCollection(final Collection<?> a, final Collection<?> b) { - final CardinalityHelper<Object> helper = new CardinalityHelper<Object>(a, b); + final CardinalityHelper<Object> helper = new CardinalityHelper<>(a, b); for (final Object obj : a) { if (helper.freqA(obj) > helper.freqB(obj)) { return false; @@ -512,7 +512,7 @@ public class CollectionUtils { if(a.size() != b.size()) { return false; } - final CardinalityHelper<Object> helper = new CardinalityHelper<Object>(a, b); + final CardinalityHelper<Object> helper = new CardinalityHelper<>(a, b); if(helper.cardinalityA.size() != helper.cardinalityB.size()) { return false; } @@ -1582,11 +1582,11 @@ public class CollectionUtils { final int totalSize = a instanceof Collection<?> && b instanceof Collection<?> ? Math.max(1, ((Collection<?>) a).size() + ((Collection<?>) b).size()) : 10; - final Iterator<O> iterator = new CollatingIterator<O>(c, a.iterator(), b.iterator()); + final Iterator<O> iterator = new CollatingIterator<>(c, a.iterator(), b.iterator()); if (includeDuplicates) { return IteratorUtils.toList(iterator, totalSize); } else { - final ArrayList<O> mergedList = new ArrayList<O>(totalSize); + final ArrayList<O> mergedList = new ArrayList<>(totalSize); O lastItem = null; while (iterator.hasNext()) { @@ -1623,8 +1623,8 @@ public class CollectionUtils { * @since 4.0 */ public static <E> Collection<List<E>> permutations(final Collection<E> collection) { - final PermutationIterator<E> it = new PermutationIterator<E>(collection); - final Collection<List<E>> result = new ArrayList<List<E>>(); + final PermutationIterator<E> it = new PermutationIterator<>(collection); + final Collection<List<E>> result = new ArrayList<>(); while (it.hasNext()) { result.add(it.next()); } @@ -1690,16 +1690,16 @@ public class CollectionUtils { final Transformer<E, EquatorWrapper<E>> transformer = new Transformer<E, EquatorWrapper<E>>() { @Override public EquatorWrapper<E> transform(E input) { - return new EquatorWrapper<E>(equator, input); + return new EquatorWrapper<>(equator, input); } }; final Set<EquatorWrapper<E>> retainSet = collect(retain, transformer, new HashSet<EquatorWrapper<E>>()); - final List<E> list = new ArrayList<E>(); + final List<E> list = new ArrayList<>(); for (final E element : collection) { - if (retainSet.contains(new EquatorWrapper<E>(equator, element))) { + if (retainSet.contains(new EquatorWrapper<>(equator, element))) { list.add(element); } } @@ -1766,16 +1766,16 @@ public class CollectionUtils { final Transformer<E, EquatorWrapper<E>> transformer = new Transformer<E, EquatorWrapper<E>>() { @Override public EquatorWrapper<E> transform(E input) { - return new EquatorWrapper<E>(equator, input); + return new EquatorWrapper<>(equator, input); } }; final Set<EquatorWrapper<E>> removeSet = collect(remove, transformer, new HashSet<EquatorWrapper<E>>()); - final List<E> list = new ArrayList<E>(); + final List<E> list = new ArrayList<>(); for (final E element : collection) { - if (!removeSet.contains(new EquatorWrapper<E>(equator, element))) { + if (!removeSet.contains(new EquatorWrapper<>(equator, element))) { list.add(element); } } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/main/java/org/apache/commons/collections4/ComparatorUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/ComparatorUtils.java b/src/main/java/org/apache/commons/collections4/ComparatorUtils.java index e17a3d8..fa7da43 100644 --- a/src/main/java/org/apache/commons/collections4/ComparatorUtils.java +++ b/src/main/java/org/apache/commons/collections4/ComparatorUtils.java @@ -75,7 +75,7 @@ public class ComparatorUtils { * @see ComparatorChain */ public static <E> Comparator<E> chainedComparator(final Comparator<E>... comparators) { - final ComparatorChain<E> chain = new ComparatorChain<E>(); + final ComparatorChain<E> chain = new ComparatorChain<>(); for (final Comparator<E> comparator : comparators) { if (comparator == null) { throw new NullPointerException("Comparator cannot be null"); @@ -113,7 +113,7 @@ public class ComparatorUtils { * @see ReverseComparator */ public static <E> Comparator<E> reversedComparator(final Comparator<E> comparator) { - return new ReverseComparator<E>(comparator); + return new ReverseComparator<>(comparator); } /** @@ -149,7 +149,7 @@ public class ComparatorUtils { if (comparator == null) { comparator = NATURAL_COMPARATOR; } - return new NullComparator<E>(comparator, false); + return new NullComparator<>(comparator, false); } /** @@ -169,7 +169,7 @@ public class ComparatorUtils { if (comparator == null) { comparator = NATURAL_COMPARATOR; } - return new NullComparator<E>(comparator, true); + return new NullComparator<>(comparator, true); } /** @@ -193,7 +193,7 @@ public class ComparatorUtils { if (comparator == null) { comparator = NATURAL_COMPARATOR; } - return new TransformingComparator<I, O>(transformer, comparator); + return new TransformingComparator<>(transformer, comparator); } /** http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/main/java/org/apache/commons/collections4/EnumerationUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/EnumerationUtils.java b/src/main/java/org/apache/commons/collections4/EnumerationUtils.java index 69aa63f..301abec 100644 --- a/src/main/java/org/apache/commons/collections4/EnumerationUtils.java +++ b/src/main/java/org/apache/commons/collections4/EnumerationUtils.java @@ -77,7 +77,7 @@ public class EnumerationUtils { * @throws NullPointerException if the enumeration parameter is <code>null</code>. */ public static <E> List<E> toList(final Enumeration<? extends E> enumeration) { - return IteratorUtils.toList(new EnumerationIterator<E>(enumeration)); + return IteratorUtils.toList(new EnumerationIterator<>(enumeration)); } /** @@ -88,7 +88,7 @@ public class EnumerationUtils { * @return a list containing all tokens of the given StringTokenizer */ public static List<String> toList(final StringTokenizer stringTokenizer) { - final List<String> result = new ArrayList<String>(stringTokenizer.countTokens()); + final List<String> result = new ArrayList<>(stringTokenizer.countTokens()); while (stringTokenizer.hasMoreTokens()) { result.add(stringTokenizer.nextToken()); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/main/java/org/apache/commons/collections4/FluentIterable.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/FluentIterable.java b/src/main/java/org/apache/commons/collections4/FluentIterable.java index 4900598..b6de3c0 100644 --- a/src/main/java/org/apache/commons/collections4/FluentIterable.java +++ b/src/main/java/org/apache/commons/collections4/FluentIterable.java @@ -92,7 +92,7 @@ public class FluentIterable<E> implements Iterable<E> { * @return a new FluentIterable containing the singleton */ public static <T> FluentIterable<T> of(final T singleton) { - return of(IteratorUtils.asIterable(new SingletonIterator<T>(singleton, false))); + return of(IteratorUtils.asIterable(new SingletonIterator<>(singleton, false))); } /** @@ -126,7 +126,7 @@ public class FluentIterable<E> implements Iterable<E> { if (iterable instanceof FluentIterable<?>) { return (FluentIterable<T>) iterable; } else { - return new FluentIterable<T>(iterable); + return new FluentIterable<>(iterable); } } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/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 845332e..d7ec92c 100644 --- a/src/main/java/org/apache/commons/collections4/IterableUtils.java +++ b/src/main/java/org/apache/commons/collections4/IterableUtils.java @@ -365,7 +365,7 @@ public class IterableUtils { final List<E> list = (iterable instanceof List<?>) ? (List<E>) iterable : IteratorUtils.toList(iterable.iterator()); - return new ReverseListIterator<E>(list); + return new ReverseListIterator<>(list); } }; } @@ -451,7 +451,7 @@ public class IterableUtils { return new FluentIterable<E>() { @Override public Iterator<E> iterator() { - return new UniqueFilterIterator<E>(iterable.iterator()); + return new UniqueFilterIterator<>(iterable.iterator()); } }; } @@ -474,7 +474,7 @@ public class IterableUtils { if (iterable instanceof UnmodifiableIterable<?>) { return iterable; } - return new UnmodifiableIterable<E>(iterable); + return new UnmodifiableIterable<>(iterable); } /** @@ -937,7 +937,7 @@ public class IterableUtils { // create the empty partitions final int numberOfPredicates = predicates.length; final int numberOfPartitions = numberOfPredicates + 1; - final List<R> partitions = new ArrayList<R>(numberOfPartitions); + final List<R> partitions = new ArrayList<>(numberOfPartitions); for (int i = 0; i < numberOfPartitions; ++i) { partitions.add(partitionFactory.create()); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/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 6a7e354..c603b7c 100644 --- a/src/main/java/org/apache/commons/collections4/IteratorUtils.java +++ b/src/main/java/org/apache/commons/collections4/IteratorUtils.java @@ -208,7 +208,7 @@ public class IteratorUtils { * @return a singleton iterator over the object */ public static <E> ResettableIterator<E> singletonIterator(final E object) { - return new SingletonIterator<E>(object); + return new SingletonIterator<>(object); } /** @@ -222,7 +222,7 @@ public class IteratorUtils { * @return a singleton list iterator over the object */ public static <E> ListIterator<E> singletonListIterator(final E object) { - return new SingletonListIterator<E>(object); + return new SingletonListIterator<>(object); } // Arrays @@ -236,7 +236,7 @@ public class IteratorUtils { * @throws NullPointerException if array is null */ public static <E> ResettableIterator<E> arrayIterator(final E... array) { - return new ObjectArrayIterator<E>(array); + return new ObjectArrayIterator<>(array); } /** @@ -252,7 +252,7 @@ public class IteratorUtils { * @throws NullPointerException if array is null */ public static <E> ResettableIterator<E> arrayIterator(final Object array) { - return new ArrayIterator<E>(array); + return new ArrayIterator<>(array); } /** @@ -267,7 +267,7 @@ public class IteratorUtils { * @throws NullPointerException if array is null */ public static <E> ResettableIterator<E> arrayIterator(final E[] array, final int start) { - return new ObjectArrayIterator<E>(array, start); + return new ObjectArrayIterator<>(array, start); } /** @@ -286,7 +286,7 @@ public class IteratorUtils { * @throws NullPointerException if array is null */ public static <E> ResettableIterator<E> arrayIterator(final Object array, final int start) { - return new ArrayIterator<E>(array, start); + return new ArrayIterator<>(array, start); } /** @@ -302,7 +302,7 @@ public class IteratorUtils { * @throws NullPointerException if array is null */ public static <E> ResettableIterator<E> arrayIterator(final E[] array, final int start, final int end) { - return new ObjectArrayIterator<E>(array, start, end); + return new ObjectArrayIterator<>(array, start, end); } /** @@ -321,7 +321,7 @@ public class IteratorUtils { * @throws NullPointerException if array is null */ public static <E> ResettableIterator<E> arrayIterator(final Object array, final int start, final int end) { - return new ArrayIterator<E>(array, start, end); + return new ArrayIterator<>(array, start, end); } //----------------------------------------------------------------------- @@ -334,7 +334,7 @@ public class IteratorUtils { * @throws NullPointerException if array is null */ public static <E> ResettableListIterator<E> arrayListIterator(final E... array) { - return new ObjectArrayListIterator<E>(array); + return new ObjectArrayListIterator<>(array); } /** @@ -350,7 +350,7 @@ public class IteratorUtils { * @throws NullPointerException if array is null */ public static <E> ResettableListIterator<E> arrayListIterator(final Object array) { - return new ArrayListIterator<E>(array); + return new ArrayListIterator<>(array); } /** @@ -364,7 +364,7 @@ public class IteratorUtils { * @throws NullPointerException if array is null */ public static <E> ResettableListIterator<E> arrayListIterator(final E[] array, final int start) { - return new ObjectArrayListIterator<E>(array, start); + return new ObjectArrayListIterator<>(array, start); } /** @@ -382,7 +382,7 @@ public class IteratorUtils { * @throws NullPointerException if array is null */ public static <E> ResettableListIterator<E> arrayListIterator(final Object array, final int start) { - return new ArrayListIterator<E>(array, start); + return new ArrayListIterator<>(array, start); } /** @@ -398,7 +398,7 @@ public class IteratorUtils { * @throws NullPointerException if array is null */ public static <E> ResettableListIterator<E> arrayListIterator(final E[] array, final int start, final int end) { - return new ObjectArrayListIterator<E>(array, start, end); + return new ObjectArrayListIterator<>(array, start, end); } /** @@ -417,7 +417,7 @@ public class IteratorUtils { * @throws NullPointerException if array is null */ public static <E> ResettableListIterator<E> arrayListIterator(final Object array, final int start, final int end) { - return new ArrayListIterator<E>(array, start, end); + return new ArrayListIterator<>(array, start, end); } // Bounded @@ -457,7 +457,7 @@ public class IteratorUtils { */ public static <E> BoundedIterator<E> boundedIterator(final Iterator<? extends E> iterator, long offset, long max) { - return new BoundedIterator<E>(iterator, offset, max); + return new BoundedIterator<>(iterator, offset, max); } // Unmodifiable @@ -520,7 +520,7 @@ public class IteratorUtils { final Iterator<? extends E> iterator2) { // keep a version with two iterators to avoid the following warning in client code (Java 5 & 6) // "A generic array of E is created for a varargs parameter" - return new IteratorChain<E>(iterator1, iterator2); + return new IteratorChain<>(iterator1, iterator2); } /** @@ -533,7 +533,7 @@ public class IteratorUtils { * @throws NullPointerException if iterators array is null or contains a null */ public static <E> Iterator<E> chainedIterator(final Iterator<? extends E>... iterators) { - return new IteratorChain<E>(iterators); + return new IteratorChain<>(iterators); } /** @@ -547,7 +547,7 @@ public class IteratorUtils { * @throws ClassCastException if the iterators collection contains the wrong object type */ public static <E> Iterator<E> chainedIterator(final Collection<Iterator<? extends E>> iterators) { - return new IteratorChain<E>(iterators); + return new IteratorChain<>(iterators); } // Collated @@ -575,7 +575,7 @@ public class IteratorUtils { @SuppressWarnings("unchecked") final Comparator<E> comp = comparator == null ? ComparatorUtils.NATURAL_COMPARATOR : (Comparator<E>) comparator; - return new CollatingIterator<E>(comp, iterator1, iterator2); + return new CollatingIterator<>(comp, iterator1, iterator2); } /** @@ -599,7 +599,7 @@ public class IteratorUtils { @SuppressWarnings("unchecked") final Comparator<E> comp = comparator == null ? ComparatorUtils.NATURAL_COMPARATOR : (Comparator<E>) comparator; - return new CollatingIterator<E>(comp, iterators); + return new CollatingIterator<>(comp, iterators); } /** @@ -624,7 +624,7 @@ public class IteratorUtils { @SuppressWarnings("unchecked") final Comparator<E> comp = comparator == null ? ComparatorUtils.NATURAL_COMPARATOR : (Comparator<E>) comparator; - return new CollatingIterator<E>(comp, iterators); + return new CollatingIterator<>(comp, iterators); } // Object Graph @@ -685,7 +685,7 @@ public class IteratorUtils { */ public static <E> Iterator<E> objectGraphIterator(final E root, final Transformer<? super E, ? extends E> transformer) { - return new ObjectGraphIterator<E>(root, transformer); + return new ObjectGraphIterator<>(root, transformer); } // Transformed @@ -712,7 +712,7 @@ public class IteratorUtils { if (transform == null) { throw new NullPointerException("Transformer must not be null"); } - return new TransformIterator<I, O>(iterator, transform); + return new TransformIterator<>(iterator, transform); } // Filtered @@ -737,7 +737,7 @@ public class IteratorUtils { if (predicate == null) { throw new NullPointerException("Predicate must not be null"); } - return new FilterIterator<E>(iterator, predicate); + return new FilterIterator<>(iterator, predicate); } /** @@ -761,7 +761,7 @@ public class IteratorUtils { if (predicate == null) { throw new NullPointerException("Predicate must not be null"); } - return new FilterListIterator<E>(listIterator, predicate); + return new FilterListIterator<>(listIterator, predicate); } // Looping @@ -782,7 +782,7 @@ public class IteratorUtils { if (coll == null) { throw new NullPointerException("Collection must not be null"); } - return new LoopingIterator<E>(coll); + return new LoopingIterator<>(coll); } /** @@ -801,7 +801,7 @@ public class IteratorUtils { if (list == null) { throw new NullPointerException("List must not be null"); } - return new LoopingListIterator<E>(list); + return new LoopingListIterator<>(list); } // org.w3c.dom.NodeList iterators @@ -892,7 +892,7 @@ public class IteratorUtils { * @since 4.1 */ public static <E> SkippingIterator<E> skippingIterator(final Iterator<E> iterator, long offset) { - return new SkippingIterator<E>(iterator, offset); + return new SkippingIterator<>(iterator, offset); } // Zipping @@ -909,7 +909,7 @@ public class IteratorUtils { */ public static <E> ZippingIterator<E> zippingIterator(final Iterator<? extends E> a, final Iterator<? extends E> b) { - return new ZippingIterator<E>(a, b); + return new ZippingIterator<>(a, b); } /** @@ -926,7 +926,7 @@ public class IteratorUtils { public static <E> ZippingIterator<E> zippingIterator(final Iterator<? extends E> a, final Iterator<? extends E> b, final Iterator<? extends E> c) { - return new ZippingIterator<E>(a, b, c); + return new ZippingIterator<>(a, b, c); } /** @@ -939,7 +939,7 @@ public class IteratorUtils { * @since 4.1 */ public static <E> ZippingIterator<E> zippingIterator(final Iterator<? extends E>... iterators) { - return new ZippingIterator<E>(iterators); + return new ZippingIterator<>(iterators); } // Views @@ -956,7 +956,7 @@ public class IteratorUtils { if (enumeration == null) { throw new NullPointerException("Enumeration must not be null"); } - return new EnumerationIterator<E>(enumeration); + return new EnumerationIterator<>(enumeration); } /** @@ -977,7 +977,7 @@ public class IteratorUtils { if (removeCollection == null) { throw new NullPointerException("Collection must not be null"); } - return new EnumerationIterator<E>(enumeration, removeCollection); + return new EnumerationIterator<>(enumeration, removeCollection); } /** @@ -992,7 +992,7 @@ public class IteratorUtils { if (iterator == null) { throw new NullPointerException("Iterator must not be null"); } - return new IteratorEnumeration<E>(iterator); + return new IteratorEnumeration<>(iterator); } /** @@ -1008,7 +1008,7 @@ public class IteratorUtils { if (iterator == null) { throw new NullPointerException("Iterator must not be null"); } - return new IteratorIterable<E>(iterator, false); + return new IteratorIterable<>(iterator, false); } /** @@ -1024,7 +1024,7 @@ public class IteratorUtils { if (iterator == null) { throw new NullPointerException("Iterator must not be null"); } - return new IteratorIterable<E>(iterator, true); + return new IteratorIterable<>(iterator, true); } /** @@ -1042,7 +1042,7 @@ public class IteratorUtils { if (iterator == null) { throw new NullPointerException("Iterator must not be null"); } - return new ListIteratorWrapper<E>(iterator); + return new ListIteratorWrapper<>(iterator); } /** @@ -1124,7 +1124,7 @@ public class IteratorUtils { if (estimatedSize < 1) { throw new IllegalArgumentException("Estimated size must be greater than 0"); } - final List<E> list = new ArrayList<E>(estimatedSize); + final List<E> list = new ArrayList<>(estimatedSize); while (iterator.hasNext()) { list.add(iterator.next()); } @@ -1163,10 +1163,10 @@ public class IteratorUtils { return ((Iterable<?>) obj).iterator(); } if (obj instanceof Object[]) { - return new ObjectArrayIterator<Object>((Object[]) obj); + return new ObjectArrayIterator<>((Object[]) obj); } if (obj instanceof Enumeration) { - return new EnumerationIterator<Object>((Enumeration<?>) obj); + return new EnumerationIterator<>((Enumeration<?>) obj); } if (obj instanceof Map) { return ((Map<?, ?>) obj).values().iterator(); @@ -1178,9 +1178,9 @@ public class IteratorUtils { return new NodeListIterator((Node) obj); } if (obj instanceof Dictionary) { - return new EnumerationIterator<Object>(((Dictionary<?, ?>) obj).elements()); + return new EnumerationIterator<>(((Dictionary<?, ?>) obj).elements()); } else if (obj.getClass().isArray()) { - return new ArrayIterator<Object>(obj); + return new ArrayIterator<>(obj); } try { final Method method = obj.getClass().getMethod("iterator", (Class[]) null); http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/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 3b0e7bc..8daf118 100644 --- a/src/main/java/org/apache/commons/collections4/ListUtils.java +++ b/src/main/java/org/apache/commons/collections4/ListUtils.java @@ -87,7 +87,7 @@ public class ListUtils { * @throws NullPointerException if either list is null */ public static <E> List<E> intersection(final List<? extends E> list1, final List<? extends E> list2) { - final List<E> result = new ArrayList<E>(); + final List<E> result = new ArrayList<>(); List<? extends E> smaller = list1; List<? extends E> larger = list2; @@ -96,7 +96,7 @@ public class ListUtils { larger = list1; } - final HashSet<E> hashSet = new HashSet<E>(smaller); + final HashSet<E> hashSet = new HashSet<>(smaller); for (final E e : larger) { if (hashSet.contains(e)) { @@ -124,8 +124,8 @@ public class ListUtils { * @throws NullPointerException if either list is null */ public static <E> List<E> subtract(final List<E> list1, final List<? extends E> list2) { - final ArrayList<E> result = new ArrayList<E>(); - final HashBag<E> bag = new HashBag<E>(list2); + final ArrayList<E> result = new ArrayList<>(); + final HashBag<E> bag = new HashBag<>(list2); for (final E e : list1) { if (!bag.remove(e, 1)) { result.add(e); @@ -160,7 +160,7 @@ public class ListUtils { * @throws NullPointerException if either list is null */ public static <E> List<E> union(final List<? extends E> list1, final List<? extends E> list2) { - final ArrayList<E> result = new ArrayList<E>(list1); + final ArrayList<E> result = new ArrayList<>(list1); result.addAll(list2); return result; } @@ -309,7 +309,7 @@ public class ListUtils { * @since 3.2 */ public static <E> List<E> retainAll(final Collection<E> collection, final Collection<?> retain) { - final List<E> list = new ArrayList<E>(Math.min(collection.size(), retain.size())); + final List<E> list = new ArrayList<>(Math.min(collection.size(), retain.size())); for (final E obj : collection) { if (retain.contains(obj)) { @@ -343,7 +343,7 @@ public class ListUtils { * @since 3.2 */ public static <E> List<E> removeAll(final Collection<E> collection, final Collection<?> remove) { - final List<E> list = new ArrayList<E>(); + final List<E> list = new ArrayList<>(); for (final E obj : collection) { if (!remove.contains(obj)) { list.add(obj); @@ -545,9 +545,9 @@ public class ListUtils { throw new NullPointerException("Equator must not be null"); } - final SequencesComparator<E> comparator = new SequencesComparator<E>(a, b, equator); + final SequencesComparator<E> comparator = new SequencesComparator<>(a, b, equator); final EditScript<E> script = comparator.getScript(); - final LcsVisitor<E> visitor = new LcsVisitor<E>(); + final LcsVisitor<E> visitor = new LcsVisitor<>(); script.visit(visitor); return visitor.getSubSequence(); } @@ -583,7 +583,7 @@ public class ListUtils { private final ArrayList<E> sequence; public LcsVisitor() { - sequence = new ArrayList<E>(); + sequence = new ArrayList<>(); } @Override @@ -655,7 +655,7 @@ public class ListUtils { if (size <= 0) { throw new IllegalArgumentException("Size must be greater than 0"); } - return new Partition<T>(list, size); + return new Partition<>(list, size); } /** http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/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 2b0c65c..c11437e 100644 --- a/src/main/java/org/apache/commons/collections4/MapUtils.java +++ b/src/main/java/org/apache/commons/collections4/MapUtils.java @@ -85,7 +85,7 @@ public class MapUtils { */ @SuppressWarnings("rawtypes") public static final SortedMap EMPTY_SORTED_MAP = - UnmodifiableSortedMap.unmodifiableSortedMap(new TreeMap<Object, Object>()); + UnmodifiableSortedMap.unmodifiableSortedMap(new TreeMap<>()); /** * String used to indent the verbose and debug Map prints. @@ -888,7 +888,7 @@ public class MapUtils { */ public static Map<String, Object> toMap(final ResourceBundle resourceBundle) { final Enumeration<String> enumeration = resourceBundle.getKeys(); - final Map<String, Object> map = new HashMap<String, Object>(); + final Map<String, Object> map = new HashMap<>(); while (enumeration.hasMoreElements()) { final String key = enumeration.nextElement(); @@ -1065,7 +1065,7 @@ public class MapUtils { * @throws NullPointerException if the map is null */ public static <K, V> Map<V, K> invertMap(final Map<K, V> map) { - final Map<V, K> out = new HashMap<V, K>(map.size()); + final Map<V, K> out = new HashMap<>(map.size()); for (final Entry<K, V> entry : map.entrySet()) { out.put(entry.getValue(), entry.getKey()); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/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 5fdee52..928a2f9 100644 --- a/src/main/java/org/apache/commons/collections4/MultiMapUtils.java +++ b/src/main/java/org/apache/commons/collections4/MultiMapUtils.java @@ -132,7 +132,7 @@ public class MultiMapUtils { if (col instanceof List) { return (List<V>) col; } - return new ArrayList<V>(col); + return new ArrayList<>(col); } return null; } @@ -152,7 +152,7 @@ public class MultiMapUtils { if (col instanceof Set) { return (Set<V>) col; } - return new HashSet<V>(col); + return new HashSet<>(col); } return null; } @@ -172,7 +172,7 @@ public class MultiMapUtils { if (col instanceof Bag) { return (Bag<V>) col; } - return new HashBag<V>(col); + return new HashBag<>(col); } return null; } @@ -189,7 +189,7 @@ public class MultiMapUtils { * @return a new <code>ListValuedMap</code> */ public static <K, V> ListValuedMap<K, V> newListValuedHashMap() { - return new ArrayListValuedHashMap<K, V>(); + return new ArrayListValuedHashMap<>(); } /** @@ -201,7 +201,7 @@ public class MultiMapUtils { * @return a new {@link SetValuedMap} */ public static <K, V> SetValuedMap<K, V> newSetValuedHashMap() { - return new HashSetValuedHashMap<K, V>(); + return new HashSetValuedHashMap<>(); } // MultiValuedMap Decorators http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/main/java/org/apache/commons/collections4/MultiSetUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/MultiSetUtils.java b/src/main/java/org/apache/commons/collections4/MultiSetUtils.java index a88a3e0..aa5078e 100644 --- a/src/main/java/org/apache/commons/collections4/MultiSetUtils.java +++ b/src/main/java/org/apache/commons/collections4/MultiSetUtils.java @@ -34,7 +34,7 @@ public class MultiSetUtils { */ @SuppressWarnings("rawtypes") // OK, empty multiset is compatible with any type public static final MultiSet EMPTY_MULTISET = - UnmodifiableMultiSet.unmodifiableMultiSet(new HashMultiSet<Object>()); + UnmodifiableMultiSet.unmodifiableMultiSet(new HashMultiSet<>()); /** * Instantiation of MultiSetUtils is not intended or required. http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/main/java/org/apache/commons/collections4/QueueUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/QueueUtils.java b/src/main/java/org/apache/commons/collections4/QueueUtils.java index d317708..7c1d62e 100644 --- a/src/main/java/org/apache/commons/collections4/QueueUtils.java +++ b/src/main/java/org/apache/commons/collections4/QueueUtils.java @@ -35,7 +35,7 @@ public class QueueUtils { * An empty unmodifiable queue. */ @SuppressWarnings("rawtypes") // OK, empty queue is compatible with any type - public static final Queue EMPTY_QUEUE = UnmodifiableQueue.unmodifiableQueue(new LinkedList<Object>()); + public static final Queue EMPTY_QUEUE = UnmodifiableQueue.unmodifiableQueue(new LinkedList<>()); /** * <code>QueueUtils</code> should not normally be instantiated. http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/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 352bcaa..5d305c2 100644 --- a/src/main/java/org/apache/commons/collections4/SetUtils.java +++ b/src/main/java/org/apache/commons/collections4/SetUtils.java @@ -62,7 +62,7 @@ public class SetUtils { */ @SuppressWarnings("rawtypes") public static final SortedSet EMPTY_SORTED_SET = - UnmodifiableSortedSet.unmodifiableSortedSet(new TreeSet<Object>()); + UnmodifiableSortedSet.unmodifiableSortedSet(new TreeSet<>()); /** * Get a typed empty unmodifiable sorted set. @@ -637,7 +637,7 @@ public class SetUtils { * @return a new set containing all elements of this view */ public Set<E> toSet() { - final Set<E> set = new HashSet<E>(size()); + final Set<E> set = new HashSet<>(size()); copyInto(set); return set; } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/main/java/org/apache/commons/collections4/SplitMapUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/SplitMapUtils.java b/src/main/java/org/apache/commons/collections4/SplitMapUtils.java index d6822df..3bbc494 100644 --- a/src/main/java/org/apache/commons/collections4/SplitMapUtils.java +++ b/src/main/java/org/apache/commons/collections4/SplitMapUtils.java @@ -131,7 +131,7 @@ public class SplitMapUtils { if (get instanceof IterableGet) { it = ((IterableGet<K, V>) get).mapIterator(); } else { - it = new EntrySetToMapIteratorAdapter<K, V>(get.entrySet()); + it = new EntrySetToMapIteratorAdapter<>(get.entrySet()); } return UnmodifiableMapIterator.unmodifiableMapIterator(it); } @@ -242,7 +242,7 @@ public class SplitMapUtils { ((IterableMap<K, V>) get) : MapUtils.iterableMap((Map<K, V>) get); } - return new WrappedGet<K, V>(get); + return new WrappedGet<>(get); } /** @@ -266,7 +266,7 @@ public class SplitMapUtils { if (put instanceof Map) { return (Map<K, V>) put; } - return new WrappedPut<K, V>(put); + return new WrappedPut<>(put); } } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java b/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java index 6970d2b..859fafc 100644 --- a/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java +++ b/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java @@ -141,7 +141,7 @@ public abstract class AbstractMapBag<E> implements Bag<E> { if (coll instanceof Bag) { return containsAll((Bag<?>) coll); } - return containsAll(new HashBag<Object>(coll)); + return containsAll(new HashBag<>(coll)); } /** @@ -171,7 +171,7 @@ public abstract class AbstractMapBag<E> implements Bag<E> { */ @Override public Iterator<E> iterator() { - return new BagIterator<E>(this); + return new BagIterator<>(this); } /** @@ -379,7 +379,7 @@ public abstract class AbstractMapBag<E> implements Bag<E> { if (coll instanceof Bag) { return retainAll((Bag<?>) coll); } - return retainAll(new HashBag<Object>(coll)); + return retainAll(new HashBag<>(coll)); } /** @@ -392,7 +392,7 @@ public abstract class AbstractMapBag<E> implements Bag<E> { */ boolean retainAll(final Bag<?> other) { boolean result = false; - final Bag<E> excess = new HashBag<E>(); + final Bag<E> excess = new HashBag<>(); final Iterator<E> i = uniqueSet().iterator(); while (i.hasNext()) { final E current = i.next(); http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/main/java/org/apache/commons/collections4/bag/CollectionBag.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/bag/CollectionBag.java b/src/main/java/org/apache/commons/collections4/bag/CollectionBag.java index ceb7c51..28c4b7d 100644 --- a/src/main/java/org/apache/commons/collections4/bag/CollectionBag.java +++ b/src/main/java/org/apache/commons/collections4/bag/CollectionBag.java @@ -52,7 +52,7 @@ public final class CollectionBag<E> extends AbstractBagDecorator<E> { * @throws NullPointerException if bag is null */ public static <E> Bag<E> collectionBag(final Bag<E> bag) { - return new CollectionBag<E>(bag); + return new CollectionBag<>(bag); } //----------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/main/java/org/apache/commons/collections4/bag/CollectionSortedBag.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/bag/CollectionSortedBag.java b/src/main/java/org/apache/commons/collections4/bag/CollectionSortedBag.java index 1b2c8ff..1baea2d 100644 --- a/src/main/java/org/apache/commons/collections4/bag/CollectionSortedBag.java +++ b/src/main/java/org/apache/commons/collections4/bag/CollectionSortedBag.java @@ -44,7 +44,7 @@ public final class CollectionSortedBag<E> extends AbstractSortedBagDecorator<E> * @throws NullPointerException if bag is null */ public static <E> SortedBag<E> collectionSortedBag(final SortedBag<E> bag) { - return new CollectionSortedBag<E>(bag); + return new CollectionSortedBag<>(bag); } //----------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/main/java/org/apache/commons/collections4/bag/PredicatedBag.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/bag/PredicatedBag.java b/src/main/java/org/apache/commons/collections4/bag/PredicatedBag.java index 46501fb..0e6d2db 100644 --- a/src/main/java/org/apache/commons/collections4/bag/PredicatedBag.java +++ b/src/main/java/org/apache/commons/collections4/bag/PredicatedBag.java @@ -60,7 +60,7 @@ public class PredicatedBag<E> extends PredicatedCollection<E> implements Bag<E> * @since 4.0 */ public static <E> PredicatedBag<E> predicatedBag(final Bag<E> bag, final Predicate<? super E> predicate) { - return new PredicatedBag<E>(bag, predicate); + return new PredicatedBag<>(bag, predicate); } //----------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/main/java/org/apache/commons/collections4/bag/PredicatedSortedBag.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/bag/PredicatedSortedBag.java b/src/main/java/org/apache/commons/collections4/bag/PredicatedSortedBag.java index 404ea77..1903761 100644 --- a/src/main/java/org/apache/commons/collections4/bag/PredicatedSortedBag.java +++ b/src/main/java/org/apache/commons/collections4/bag/PredicatedSortedBag.java @@ -60,7 +60,7 @@ public class PredicatedSortedBag<E> extends PredicatedBag<E> implements SortedBa */ public static <E> PredicatedSortedBag<E> predicatedSortedBag(final SortedBag<E> bag, final Predicate<? super E> predicate) { - return new PredicatedSortedBag<E>(bag, predicate); + return new PredicatedSortedBag<>(bag, predicate); } //----------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java b/src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java index 07a7ab9..04e20d1 100644 --- a/src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java +++ b/src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java @@ -48,7 +48,7 @@ public class SynchronizedBag<E> extends SynchronizedCollection<E> implements Bag * @since 4.0 */ public static <E> SynchronizedBag<E> synchronizedBag(final Bag<E> bag) { - return new SynchronizedBag<E>(bag); + return new SynchronizedBag<>(bag); } //----------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java b/src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java index 5f8e803..fd0a4e1 100644 --- a/src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java +++ b/src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java @@ -48,7 +48,7 @@ public class SynchronizedSortedBag<E> extends SynchronizedBag<E> implements Sort * @since 4.0 */ public static <E> SynchronizedSortedBag<E> synchronizedSortedBag(final SortedBag<E> bag) { - return new SynchronizedSortedBag<E>(bag); + return new SynchronizedSortedBag<>(bag); } //----------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/main/java/org/apache/commons/collections4/bag/TransformedBag.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/bag/TransformedBag.java b/src/main/java/org/apache/commons/collections4/bag/TransformedBag.java index 1cb603a..f1e6146 100644 --- a/src/main/java/org/apache/commons/collections4/bag/TransformedBag.java +++ b/src/main/java/org/apache/commons/collections4/bag/TransformedBag.java @@ -55,7 +55,7 @@ public class TransformedBag<E> extends TransformedCollection<E> implements Bag<E * @since 4.0 */ public static <E> Bag<E> transformingBag(final Bag<E> bag, final Transformer<? super E, ? extends E> transformer) { - return new TransformedBag<E>(bag, transformer); + return new TransformedBag<>(bag, transformer); } /** @@ -74,7 +74,7 @@ public class TransformedBag<E> extends TransformedCollection<E> implements Bag<E * @since 4.0 */ public static <E> Bag<E> transformedBag(final Bag<E> bag, final Transformer<? super E, ? extends E> transformer) { - final TransformedBag<E> decorated = new TransformedBag<E>(bag, transformer); + final TransformedBag<E> decorated = new TransformedBag<>(bag, transformer); if (bag.size() > 0) { @SuppressWarnings("unchecked") // Bag is of type E final E[] values = (E[]) bag.toArray(); // NOPMD - false positive for generics http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/main/java/org/apache/commons/collections4/bag/TransformedSortedBag.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/bag/TransformedSortedBag.java b/src/main/java/org/apache/commons/collections4/bag/TransformedSortedBag.java index 14ee634..feb2891 100644 --- a/src/main/java/org/apache/commons/collections4/bag/TransformedSortedBag.java +++ b/src/main/java/org/apache/commons/collections4/bag/TransformedSortedBag.java @@ -54,7 +54,7 @@ public class TransformedSortedBag<E> extends TransformedBag<E> implements Sorted */ public static <E> TransformedSortedBag<E> transformingSortedBag(final SortedBag<E> bag, final Transformer<? super E, ? extends E> transformer) { - return new TransformedSortedBag<E>(bag, transformer); + return new TransformedSortedBag<>(bag, transformer); } /** @@ -75,7 +75,7 @@ public class TransformedSortedBag<E> extends TransformedBag<E> implements Sorted public static <E> TransformedSortedBag<E> transformedSortedBag(final SortedBag<E> bag, final Transformer<? super E, ? extends E> transformer) { - final TransformedSortedBag<E> decorated = new TransformedSortedBag<E>(bag, transformer); + final TransformedSortedBag<E> decorated = new TransformedSortedBag<>(bag, transformer); if (bag.size() > 0) { @SuppressWarnings("unchecked") // bag is type E final E[] values = (E[]) bag.toArray(); // NOPMD - false positive for generics http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/main/java/org/apache/commons/collections4/bag/UnmodifiableBag.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/bag/UnmodifiableBag.java b/src/main/java/org/apache/commons/collections4/bag/UnmodifiableBag.java index b01043d..0f500e4 100644 --- a/src/main/java/org/apache/commons/collections4/bag/UnmodifiableBag.java +++ b/src/main/java/org/apache/commons/collections4/bag/UnmodifiableBag.java @@ -61,7 +61,7 @@ public final class UnmodifiableBag<E> final Bag<E> tmpBag = (Bag<E>) bag; return tmpBag; } - return new UnmodifiableBag<E>(bag); + return new UnmodifiableBag<>(bag); } //----------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/main/java/org/apache/commons/collections4/bag/UnmodifiableSortedBag.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/bag/UnmodifiableSortedBag.java b/src/main/java/org/apache/commons/collections4/bag/UnmodifiableSortedBag.java index 1439988..3560f3e 100644 --- a/src/main/java/org/apache/commons/collections4/bag/UnmodifiableSortedBag.java +++ b/src/main/java/org/apache/commons/collections4/bag/UnmodifiableSortedBag.java @@ -59,7 +59,7 @@ public final class UnmodifiableSortedBag<E> if (bag instanceof Unmodifiable) { return bag; } - return new UnmodifiableSortedBag<E>(bag); + return new UnmodifiableSortedBag<>(bag); } //----------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java index a3a1c20..d332a89 100644 --- a/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java +++ b/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java @@ -225,7 +225,7 @@ public abstract class AbstractDualBidiMap<K, V> implements BidiMap<K, V> { */ @Override public MapIterator<K, V> mapIterator() { - return new BidiMapIterator<K, V>(this); + return new BidiMapIterator<>(this); } @Override @@ -263,7 +263,7 @@ public abstract class AbstractDualBidiMap<K, V> implements BidiMap<K, V> { @Override public Set<K> keySet() { if (keySet == null) { - keySet = new KeySet<K>(this); + keySet = new KeySet<>(this); } return keySet; } @@ -276,7 +276,7 @@ public abstract class AbstractDualBidiMap<K, V> implements BidiMap<K, V> { * @return the keySet iterator */ protected Iterator<K> createKeySetIterator(final Iterator<K> iterator) { - return new KeySetIterator<K>(iterator, this); + return new KeySetIterator<>(iterator, this); } /** @@ -289,7 +289,7 @@ public abstract class AbstractDualBidiMap<K, V> implements BidiMap<K, V> { @Override public Set<V> values() { if (values == null) { - values = new Values<V>(this); + values = new Values<>(this); } return values; } @@ -302,7 +302,7 @@ public abstract class AbstractDualBidiMap<K, V> implements BidiMap<K, V> { * @return the values iterator */ protected Iterator<V> createValuesIterator(final Iterator<V> iterator) { - return new ValuesIterator<V>(iterator, this); + return new ValuesIterator<>(iterator, this); } /** @@ -319,7 +319,7 @@ public abstract class AbstractDualBidiMap<K, V> implements BidiMap<K, V> { @Override public Set<Map.Entry<K, V>> entrySet() { if (entrySet == null) { - entrySet = new EntrySet<K, V>(this); + entrySet = new EntrySet<>(this); } return entrySet; } @@ -332,7 +332,7 @@ public abstract class AbstractDualBidiMap<K, V> implements BidiMap<K, V> { * @return the entrySet iterator */ protected Iterator<Map.Entry<K, V>> createEntrySetIterator(final Iterator<Map.Entry<K, V>> iterator) { - return new EntrySetIterator<K, V>(iterator, this); + return new EntrySetIterator<>(iterator, this); } //----------------------------------------------------------------------- @@ -652,7 +652,7 @@ public abstract class AbstractDualBidiMap<K, V> implements BidiMap<K, V> { @Override public Map.Entry<K, V> next() { - last = new MapEntry<K, V>(super.next(), parent); + last = new MapEntry<>(super.next(), parent); canRemove = true; return last; } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/main/java/org/apache/commons/collections4/bidimap/DualHashBidiMap.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/bidimap/DualHashBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/DualHashBidiMap.java index 269cf3f..e11f553 100644 --- a/src/main/java/org/apache/commons/collections4/bidimap/DualHashBidiMap.java +++ b/src/main/java/org/apache/commons/collections4/bidimap/DualHashBidiMap.java @@ -85,7 +85,7 @@ public class DualHashBidiMap<K, V> extends AbstractDualBidiMap<K, V> implements @Override protected BidiMap<V, K> createBidiMap(final Map<V, K> normalMap, final Map<K, V> reverseMap, final BidiMap<K, V> inverseBidiMap) { - return new DualHashBidiMap<V, K>(normalMap, reverseMap, inverseBidiMap); + return new DualHashBidiMap<>(normalMap, reverseMap, inverseBidiMap); } // Serialization @@ -97,8 +97,8 @@ public class DualHashBidiMap<K, V> extends AbstractDualBidiMap<K, V> implements private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException { in.defaultReadObject(); - normalMap = new HashMap<K, V>(); - reverseMap = new HashMap<V, K>(); + normalMap = new HashMap<>(); + reverseMap = new HashMap<>(); @SuppressWarnings("unchecked") // will fail at runtime if stream is incorrect final Map<K, V> map = (Map<K, V>) in.readObject(); putAll(map); http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/main/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMap.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMap.java index fdec37e..2f26793 100644 --- a/src/main/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMap.java +++ b/src/main/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMap.java @@ -80,7 +80,7 @@ public class DualLinkedHashBidiMap<K, V> extends AbstractDualBidiMap<K, V> imple @Override protected BidiMap<V, K> createBidiMap(final Map<V, K> normalMap, final Map<K, V> reverseMap, final BidiMap<K, V> inverseBidiMap) { - return new DualLinkedHashBidiMap<V, K>(normalMap, reverseMap, inverseBidiMap); + return new DualLinkedHashBidiMap<>(normalMap, reverseMap, inverseBidiMap); } // Serialization @@ -92,8 +92,8 @@ public class DualLinkedHashBidiMap<K, V> extends AbstractDualBidiMap<K, V> imple private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException { in.defaultReadObject(); - normalMap = new LinkedHashMap<K, V>(); - reverseMap = new LinkedHashMap<V, K>(); + normalMap = new LinkedHashMap<>(); + reverseMap = new LinkedHashMap<>(); @SuppressWarnings("unchecked") // will fail at runtime if stream is incorrect final Map<K, V> map = (Map<K, V>) in.readObject(); putAll(map); http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java index 92978ce..9e6418e 100644 --- a/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java +++ b/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java @@ -123,7 +123,7 @@ public class DualTreeBidiMap<K, V> extends AbstractDualBidiMap<K, V> @Override protected DualTreeBidiMap<V, K> createBidiMap(final Map<V, K> normalMap, final Map<K, V> reverseMap, final BidiMap<K, V> inverseMap) { - return new DualTreeBidiMap<V, K>(normalMap, reverseMap, inverseMap); + return new DualTreeBidiMap<>(normalMap, reverseMap, inverseMap); } //----------------------------------------------------------------------- @@ -192,7 +192,7 @@ public class DualTreeBidiMap<K, V> extends AbstractDualBidiMap<K, V> */ @Override public OrderedMapIterator<K, V> mapIterator() { - return new BidiOrderedMapIterator<K, V>(this); + return new BidiOrderedMapIterator<>(this); } public SortedBidiMap<V, K> inverseSortedBidiMap() { @@ -208,19 +208,19 @@ public class DualTreeBidiMap<K, V> extends AbstractDualBidiMap<K, V> @Override public SortedMap<K, V> headMap(final K toKey) { final SortedMap<K, V> sub = ((SortedMap<K, V>) normalMap).headMap(toKey); - return new ViewMap<K, V>(this, sub); + return new ViewMap<>(this, sub); } @Override public SortedMap<K, V> tailMap(final K fromKey) { final SortedMap<K, V> sub = ((SortedMap<K, V>) normalMap).tailMap(fromKey); - return new ViewMap<K, V>(this, sub); + return new ViewMap<>(this, sub); } @Override public SortedMap<K, V> subMap(final K fromKey, final K toKey) { final SortedMap<K, V> sub = ((SortedMap<K, V>) normalMap).subMap(fromKey, toKey); - return new ViewMap<K, V>(this, sub); + return new ViewMap<>(this, sub); } @Override @@ -242,7 +242,7 @@ public class DualTreeBidiMap<K, V> extends AbstractDualBidiMap<K, V> // the implementation is not great here... // use the normalMap as the filtered map, but reverseMap as the full map // this forces containsValue and clear to be overridden - super(new DualTreeBidiMap<K, V>(sm, bidi.reverseMap, bidi.inverseBidiMap)); + super(new DualTreeBidiMap<>(sm, bidi.reverseMap, bidi.inverseBidiMap)); } @Override @@ -262,17 +262,17 @@ public class DualTreeBidiMap<K, V> extends AbstractDualBidiMap<K, V> @Override public SortedMap<K, V> headMap(final K toKey) { - return new ViewMap<K, V>(decorated(), super.headMap(toKey)); + return new ViewMap<>(decorated(), super.headMap(toKey)); } @Override public SortedMap<K, V> tailMap(final K fromKey) { - return new ViewMap<K, V>(decorated(), super.tailMap(fromKey)); + return new ViewMap<>(decorated(), super.tailMap(fromKey)); } @Override public SortedMap<K, V> subMap(final K fromKey, final K toKey) { - return new ViewMap<K, V>(decorated(), super.subMap(fromKey, toKey)); + return new ViewMap<>(decorated(), super.subMap(fromKey, toKey)); } @Override @@ -313,7 +313,7 @@ public class DualTreeBidiMap<K, V> extends AbstractDualBidiMap<K, V> protected BidiOrderedMapIterator(final AbstractDualBidiMap<K, V> parent) { super(); this.parent = parent; - iterator = new ArrayList<Map.Entry<K, V>>(parent.entrySet()).listIterator(); + iterator = new ArrayList<>(parent.entrySet()).listIterator(); } @Override @@ -384,7 +384,7 @@ public class DualTreeBidiMap<K, V> extends AbstractDualBidiMap<K, V> @Override public void reset() { - iterator = new ArrayList<Map.Entry<K, V>>(parent.entrySet()).listIterator(); + iterator = new ArrayList<>(parent.entrySet()).listIterator(); last = null; } @@ -406,8 +406,8 @@ public class DualTreeBidiMap<K, V> extends AbstractDualBidiMap<K, V> private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException { in.defaultReadObject(); - normalMap = new TreeMap<K, V>(comparator); - reverseMap = new TreeMap<V, K>(valueComparator); + normalMap = new TreeMap<>(comparator); + reverseMap = new TreeMap<>(valueComparator); @SuppressWarnings("unchecked") // will fail at runtime if the stream is incorrect final Map<K, V> map = (Map<K, V>) in.readObject(); putAll(map);
