You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2017/07/27 06:43:26 UTC
[6/9] commons-collections git commit: Remove redundant type arguments.
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/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 5e26869..22191af 100644
--- a/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSet.java
+++ b/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSet.java
@@ -120,7 +120,7 @@ public abstract class AbstractMultiSet<E> extends AbstractCollection<E> implemen
*/
@Override
public Iterator<E> iterator() {
- return new MultiSetIterator<E>(this);
+ return new MultiSetIterator<>(this);
}
/**
@@ -246,7 +246,7 @@ public abstract class AbstractMultiSet<E> extends AbstractCollection<E> implemen
* @return a view of the set of unique elements
*/
protected Set<E> createUniqueSet() {
- return new UniqueSet<E>(this);
+ return new UniqueSet<>(this);
}
/**
@@ -284,7 +284,7 @@ public abstract class AbstractMultiSet<E> extends AbstractCollection<E> implemen
* @return a view of the set of entries
*/
protected Set<Entry<E>> createEntrySet() {
- return new EntrySet<E>(this);
+ return new EntrySet<>(this);
}
/**
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/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 9ffce1b..420677a 100644
--- a/src/main/java/org/apache/commons/collections4/multiset/PredicatedMultiSet.java
+++ b/src/main/java/org/apache/commons/collections4/multiset/PredicatedMultiSet.java
@@ -61,7 +61,7 @@ public class PredicatedMultiSet<E> extends PredicatedCollection<E> implements Mu
*/
public static <E> PredicatedMultiSet<E> predicatedMultiSet(final MultiSet<E> multiset,
final Predicate<? super E> predicate) {
- return new PredicatedMultiSet<E>(multiset, predicate);
+ return new PredicatedMultiSet<>(multiset, predicate);
}
//-----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/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 68729ed..33ca710 100644
--- a/src/main/java/org/apache/commons/collections4/multiset/SynchronizedMultiSet.java
+++ b/src/main/java/org/apache/commons/collections4/multiset/SynchronizedMultiSet.java
@@ -45,7 +45,7 @@ public class SynchronizedMultiSet<E> extends SynchronizedCollection<E> implement
* @throws NullPointerException if multiset is null
*/
public static <E> SynchronizedMultiSet<E> synchronizedMultiSet(final MultiSet<E> multiset) {
- return new SynchronizedMultiSet<E>(multiset);
+ return new SynchronizedMultiSet<>(multiset);
}
//-----------------------------------------------------------------------
@@ -131,7 +131,7 @@ public class SynchronizedMultiSet<E> extends SynchronizedCollection<E> implement
public Set<E> uniqueSet() {
synchronized (lock) {
final Set<E> set = decorated().uniqueSet();
- return new SynchronizedSet<E>(set, lock);
+ return new SynchronizedSet<>(set, lock);
}
}
@@ -139,7 +139,7 @@ public class SynchronizedMultiSet<E> extends SynchronizedCollection<E> implement
public Set<Entry<E>> entrySet() {
synchronized (lock) {
final Set<MultiSet.Entry<E>> set = decorated().entrySet();
- return new SynchronizedSet<MultiSet.Entry<E>>(set, lock);
+ return new SynchronizedSet<>(set, lock);
}
}
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/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 43095eb..5398521 100644
--- a/src/main/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSet.java
+++ b/src/main/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSet.java
@@ -58,7 +58,7 @@ public final class UnmodifiableMultiSet<E>
final MultiSet<E> tmpMultiSet = (MultiSet<E>) multiset;
return tmpMultiSet;
}
- return new UnmodifiableMultiSet<E>(multiset);
+ return new UnmodifiableMultiSet<>(multiset);
}
//-----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/main/java/org/apache/commons/collections4/properties/SortedProperties.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/properties/SortedProperties.java b/src/main/java/org/apache/commons/collections4/properties/SortedProperties.java
index a9c196c..e5c9f19 100644
--- a/src/main/java/org/apache/commons/collections4/properties/SortedProperties.java
+++ b/src/main/java/org/apache/commons/collections4/properties/SortedProperties.java
@@ -41,7 +41,7 @@ public class SortedProperties extends Properties {
@Override
public synchronized Enumeration<Object> keys() {
final Set<Object> keySet = keySet();
- final List<String> keys = new ArrayList<String>(keySet.size());
+ final List<String> keys = new ArrayList<>(keySet.size());
for (final Object key : keySet) {
keys.add(key.toString());
}
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/main/java/org/apache/commons/collections4/queue/PredicatedQueue.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/queue/PredicatedQueue.java b/src/main/java/org/apache/commons/collections4/queue/PredicatedQueue.java
index 334edd3..507ab59 100644
--- a/src/main/java/org/apache/commons/collections4/queue/PredicatedQueue.java
+++ b/src/main/java/org/apache/commons/collections4/queue/PredicatedQueue.java
@@ -55,7 +55,7 @@ public class PredicatedQueue<E> extends PredicatedCollection<E> implements Queue
*/
public static <E> PredicatedQueue<E> predicatedQueue(final Queue<E> Queue,
final Predicate<? super E> predicate) {
- return new PredicatedQueue<E>(Queue, predicate);
+ return new PredicatedQueue<>(Queue, predicate);
}
//-----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/main/java/org/apache/commons/collections4/queue/TransformedQueue.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/queue/TransformedQueue.java b/src/main/java/org/apache/commons/collections4/queue/TransformedQueue.java
index 0f321d7..b2ac4df 100644
--- a/src/main/java/org/apache/commons/collections4/queue/TransformedQueue.java
+++ b/src/main/java/org/apache/commons/collections4/queue/TransformedQueue.java
@@ -52,7 +52,7 @@ public class TransformedQueue<E> extends TransformedCollection<E> implements Que
*/
public static <E> TransformedQueue<E> transformingQueue(final Queue<E> queue,
final Transformer<? super E, ? extends E> transformer) {
- return new TransformedQueue<E>(queue, transformer);
+ return new TransformedQueue<>(queue, transformer);
}
/**
@@ -73,7 +73,7 @@ public class TransformedQueue<E> extends TransformedCollection<E> implements Que
public static <E> TransformedQueue<E> transformedQueue(final Queue<E> queue,
final Transformer<? super E, ? extends E> transformer) {
// throws IAE if queue or transformer is null
- final TransformedQueue<E> decorated = new TransformedQueue<E>(queue, transformer);
+ final TransformedQueue<E> decorated = new TransformedQueue<>(queue, transformer);
if (queue.size() > 0) {
@SuppressWarnings("unchecked") // queue is type <E>
final E[] values = (E[]) queue.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/queue/UnmodifiableQueue.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/queue/UnmodifiableQueue.java b/src/main/java/org/apache/commons/collections4/queue/UnmodifiableQueue.java
index 05451c9..5c8384b 100644
--- a/src/main/java/org/apache/commons/collections4/queue/UnmodifiableQueue.java
+++ b/src/main/java/org/apache/commons/collections4/queue/UnmodifiableQueue.java
@@ -57,7 +57,7 @@ public final class UnmodifiableQueue<E>
final Queue<E> tmpQueue = (Queue<E>) queue;
return tmpQueue;
}
- return new UnmodifiableQueue<E>(queue);
+ return new UnmodifiableQueue<>(queue);
}
//-----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/main/java/org/apache/commons/collections4/sequence/EditScript.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/sequence/EditScript.java b/src/main/java/org/apache/commons/collections4/sequence/EditScript.java
index b3e7313..9e4bbe9 100644
--- a/src/main/java/org/apache/commons/collections4/sequence/EditScript.java
+++ b/src/main/java/org/apache/commons/collections4/sequence/EditScript.java
@@ -58,7 +58,7 @@ public class EditScript<T> {
* Simple constructor. Creates a new empty script.
*/
public EditScript() {
- commands = new ArrayList<EditCommand<T>>();
+ commands = new ArrayList<>();
lcsLength = 0;
modifications = 0;
}
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/main/java/org/apache/commons/collections4/sequence/ReplacementsFinder.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/sequence/ReplacementsFinder.java b/src/main/java/org/apache/commons/collections4/sequence/ReplacementsFinder.java
index 35e562e..d9e8201 100644
--- a/src/main/java/org/apache/commons/collections4/sequence/ReplacementsFinder.java
+++ b/src/main/java/org/apache/commons/collections4/sequence/ReplacementsFinder.java
@@ -63,8 +63,8 @@ public class ReplacementsFinder<T> implements CommandVisitor<T> {
* @param handler handler to call when synchronized sequences are found
*/
public ReplacementsFinder(final ReplacementsHandler<T> handler) {
- pendingInsertions = new ArrayList<T>();
- pendingDeletions = new ArrayList<T>();
+ pendingInsertions = new ArrayList<>();
+ pendingDeletions = new ArrayList<>();
skipped = 0;
this.handler = handler;
}
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/main/java/org/apache/commons/collections4/sequence/SequencesComparator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/sequence/SequencesComparator.java b/src/main/java/org/apache/commons/collections4/sequence/SequencesComparator.java
index 690a5e9..908faf8 100644
--- a/src/main/java/org/apache/commons/collections4/sequence/SequencesComparator.java
+++ b/src/main/java/org/apache/commons/collections4/sequence/SequencesComparator.java
@@ -126,7 +126,7 @@ public class SequencesComparator<T> {
* sequences
*/
public EditScript<T> getScript() {
- final EditScript<T> script = new EditScript<T>();
+ final EditScript<T> script = new EditScript<>();
buildScript(0, sequence1.size(), 0, sequence2.size(), script);
return script;
}
@@ -262,15 +262,15 @@ public class SequencesComparator<T> {
int j = start2;
while (i < end1 || j < end2) {
if (i < end1 && j < end2 && equator.equate(sequence1.get(i), sequence2.get(j))) {
- script.append(new KeepCommand<T>(sequence1.get(i)));
+ script.append(new KeepCommand<>(sequence1.get(i)));
++i;
++j;
} else {
if (end1 - start1 > end2 - start2) {
- script.append(new DeleteCommand<T>(sequence1.get(i)));
+ script.append(new DeleteCommand<>(sequence1.get(i)));
++i;
} else {
- script.append(new InsertCommand<T>(sequence2.get(j)));
+ script.append(new InsertCommand<>(sequence2.get(j)));
++j;
}
}
@@ -282,7 +282,7 @@ public class SequencesComparator<T> {
start2, middle.getStart() - middle.getDiag(),
script);
for (int i = middle.getStart(); i < middle.getEnd(); ++i) {
- script.append(new KeepCommand<T>(sequence1.get(i)));
+ script.append(new KeepCommand<>(sequence1.get(i)));
}
buildScript(middle.getEnd(), end1,
middle.getEnd() - middle.getDiag(), end2,
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/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 22eccc1..b711918 100644
--- a/src/main/java/org/apache/commons/collections4/set/CompositeSet.java
+++ b/src/main/java/org/apache/commons/collections4/set/CompositeSet.java
@@ -55,7 +55,7 @@ public class CompositeSet<E> implements Set<E>, Serializable {
private SetMutator<E> mutator;
/** Sets in the composite */
- private final List<Set<E>> all = new ArrayList<Set<E>>();
+ private final List<Set<E>> all = new ArrayList<>();
/**
* Create an empty CompositeSet.
@@ -151,7 +151,7 @@ public class CompositeSet<E> implements Set<E>, Serializable {
if (all.isEmpty()) {
return EmptyIterator.<E>emptyIterator();
}
- final IteratorChain<E> chain = new IteratorChain<E>();
+ final IteratorChain<E> chain = new IteratorChain<>();
for (final Set<E> item : all) {
chain.addIterator(item.iterator());
}
@@ -410,7 +410,7 @@ public class CompositeSet<E> implements Set<E>, Serializable {
* The new collection is <i>not</i> backed by this composite.
*/
public Set<E> toSet() {
- return new HashSet<E>(this);
+ return new HashSet<>(this);
}
/**
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/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 41f6315..80fea76 100644
--- a/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java
+++ b/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java
@@ -84,7 +84,7 @@ public class ListOrderedSet<E>
if (set.size() > 0 || list.size() > 0) {
throw new IllegalArgumentException("Set and List must be empty");
}
- return new ListOrderedSet<E>(set, list);
+ return new ListOrderedSet<>(set, list);
}
/**
@@ -99,7 +99,7 @@ public class ListOrderedSet<E>
* @since 4.0
*/
public static <E> ListOrderedSet<E> listOrderedSet(final Set<E> set) {
- return new ListOrderedSet<E>(set);
+ return new ListOrderedSet<>(set);
}
/**
@@ -121,9 +121,9 @@ public class ListOrderedSet<E>
throw new NullPointerException("List must not be null");
}
CollectionUtils.filter(list, UniquePredicate.uniquePredicate());
- final Set<E> set = new HashSet<E>(list);
+ final Set<E> set = new HashSet<>(list);
- return new ListOrderedSet<E>(set, list);
+ return new ListOrderedSet<>(set, list);
}
// -----------------------------------------------------------------------
@@ -135,7 +135,7 @@ public class ListOrderedSet<E>
*/
public ListOrderedSet() {
super(new HashSet<E>());
- setOrder = new ArrayList<E>();
+ setOrder = new ArrayList<>();
}
/**
@@ -146,7 +146,7 @@ public class ListOrderedSet<E>
*/
protected ListOrderedSet(final Set<E> set) {
super(set);
- setOrder = new ArrayList<E>(set);
+ setOrder = new ArrayList<>(set);
}
/**
@@ -186,7 +186,7 @@ public class ListOrderedSet<E>
@Override
public OrderedIterator<E> iterator() {
- return new OrderedSetIterator<E>(setOrder.listIterator(), decorated());
+ return new OrderedSetIterator<>(setOrder.listIterator(), decorated());
}
@Override
@@ -320,7 +320,7 @@ public class ListOrderedSet<E>
public boolean addAll(final int index, final Collection<? extends E> coll) {
boolean changed = false;
// collect all elements to be added for performance reasons
- final List<E> toAdd = new ArrayList<E>();
+ final List<E> toAdd = new ArrayList<>();
for (final E e : coll) {
if (contains(e)) {
continue;
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/main/java/org/apache/commons/collections4/set/MapBackedSet.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/set/MapBackedSet.java b/src/main/java/org/apache/commons/collections4/set/MapBackedSet.java
index 0b6182c..1b5c549 100644
--- a/src/main/java/org/apache/commons/collections4/set/MapBackedSet.java
+++ b/src/main/java/org/apache/commons/collections4/set/MapBackedSet.java
@@ -72,7 +72,7 @@ public final class MapBackedSet<E, V> implements Set<E>, Serializable {
* @since 4.0
*/
public static <E, V> MapBackedSet<E, V> mapBackedSet(final Map<E, ? super V> map, final V dummyValue) {
- return new MapBackedSet<E, V>(map, dummyValue);
+ return new MapBackedSet<>(map, dummyValue);
}
//-----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/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 265c8c8..8fd2b3b 100644
--- a/src/main/java/org/apache/commons/collections4/set/PredicatedNavigableSet.java
+++ b/src/main/java/org/apache/commons/collections4/set/PredicatedNavigableSet.java
@@ -60,7 +60,7 @@ public class PredicatedNavigableSet<E> extends PredicatedSortedSet<E> implements
*/
public static <E> PredicatedNavigableSet<E> predicatedNavigableSet(final NavigableSet<E> set,
final Predicate<? super E> predicate) {
- return new PredicatedNavigableSet<E>(set, predicate);
+ return new PredicatedNavigableSet<>(set, predicate);
}
//-----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/main/java/org/apache/commons/collections4/set/PredicatedSet.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/set/PredicatedSet.java b/src/main/java/org/apache/commons/collections4/set/PredicatedSet.java
index 6ad3c87..709eed1 100644
--- a/src/main/java/org/apache/commons/collections4/set/PredicatedSet.java
+++ b/src/main/java/org/apache/commons/collections4/set/PredicatedSet.java
@@ -57,7 +57,7 @@ public class PredicatedSet<E> extends PredicatedCollection<E> implements Set<E>
* @since 4.0
*/
public static <E> PredicatedSet<E> predicatedSet(final Set<E> set, final Predicate<? super E> predicate) {
- return new PredicatedSet<E>(set, predicate);
+ return new PredicatedSet<>(set, predicate);
}
//-----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/main/java/org/apache/commons/collections4/set/PredicatedSortedSet.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/set/PredicatedSortedSet.java b/src/main/java/org/apache/commons/collections4/set/PredicatedSortedSet.java
index 631a451..d44c3f7 100644
--- a/src/main/java/org/apache/commons/collections4/set/PredicatedSortedSet.java
+++ b/src/main/java/org/apache/commons/collections4/set/PredicatedSortedSet.java
@@ -62,7 +62,7 @@ public class PredicatedSortedSet<E> extends PredicatedSet<E> implements SortedSe
*/
public static <E> PredicatedSortedSet<E> predicatedSortedSet(final SortedSet<E> set,
final Predicate<? super E> predicate) {
- return new PredicatedSortedSet<E>(set, predicate);
+ return new PredicatedSortedSet<>(set, predicate);
}
//-----------------------------------------------------------------------
@@ -110,19 +110,19 @@ public class PredicatedSortedSet<E> extends PredicatedSet<E> implements SortedSe
@Override
public SortedSet<E> subSet(final E fromElement, final E toElement) {
final SortedSet<E> sub = decorated().subSet(fromElement, toElement);
- return new PredicatedSortedSet<E>(sub, predicate);
+ return new PredicatedSortedSet<>(sub, predicate);
}
@Override
public SortedSet<E> headSet(final E toElement) {
final SortedSet<E> head = decorated().headSet(toElement);
- return new PredicatedSortedSet<E>(head, predicate);
+ return new PredicatedSortedSet<>(head, predicate);
}
@Override
public SortedSet<E> tailSet(final E fromElement) {
final SortedSet<E> tail = decorated().tailSet(fromElement);
- return new PredicatedSortedSet<E>(tail, predicate);
+ return new PredicatedSortedSet<>(tail, predicate);
}
}
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/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 9d431dc..29c046f 100644
--- a/src/main/java/org/apache/commons/collections4/set/TransformedNavigableSet.java
+++ b/src/main/java/org/apache/commons/collections4/set/TransformedNavigableSet.java
@@ -52,7 +52,7 @@ public class TransformedNavigableSet<E> extends TransformedSortedSet<E> implemen
*/
public static <E> TransformedNavigableSet<E> transformingNavigableSet(final NavigableSet<E> set,
final Transformer<? super E, ? extends E> transformer) {
- return new TransformedNavigableSet<E>(set, transformer);
+ return new TransformedNavigableSet<>(set, transformer);
}
/**
@@ -72,7 +72,7 @@ public class TransformedNavigableSet<E> extends TransformedSortedSet<E> implemen
public static <E> TransformedNavigableSet<E> transformedNavigableSet(final NavigableSet<E> set,
final Transformer<? super E, ? extends E> transformer) {
- final TransformedNavigableSet<E> decorated = new TransformedNavigableSet<E>(set, transformer);
+ final TransformedNavigableSet<E> decorated = new TransformedNavigableSet<>(set, transformer);
if (set.size() > 0) {
@SuppressWarnings("unchecked") // set is type E
final E[] values = (E[]) set.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/set/TransformedSet.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/set/TransformedSet.java b/src/main/java/org/apache/commons/collections4/set/TransformedSet.java
index f0603d0..ad9c375 100644
--- a/src/main/java/org/apache/commons/collections4/set/TransformedSet.java
+++ b/src/main/java/org/apache/commons/collections4/set/TransformedSet.java
@@ -55,7 +55,7 @@ public class TransformedSet<E> extends TransformedCollection<E> implements Set<E
*/
public static <E> TransformedSet<E> transformingSet(final Set<E> set,
final Transformer<? super E, ? extends E> transformer) {
- return new TransformedSet<E>(set, transformer);
+ return new TransformedSet<>(set, transformer);
}
/**
@@ -74,7 +74,7 @@ public class TransformedSet<E> extends TransformedCollection<E> implements Set<E
* @since 4.0
*/
public static <E> Set<E> transformedSet(final Set<E> set, final Transformer<? super E, ? extends E> transformer) {
- final TransformedSet<E> decorated = new TransformedSet<E>(set, transformer);
+ final TransformedSet<E> decorated = new TransformedSet<>(set, transformer);
if (set.size() > 0) {
@SuppressWarnings("unchecked") // set is type E
final E[] values = (E[]) set.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/set/TransformedSortedSet.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/set/TransformedSortedSet.java b/src/main/java/org/apache/commons/collections4/set/TransformedSortedSet.java
index 05d8fdd..aaa9a4a 100644
--- a/src/main/java/org/apache/commons/collections4/set/TransformedSortedSet.java
+++ b/src/main/java/org/apache/commons/collections4/set/TransformedSortedSet.java
@@ -55,7 +55,7 @@ public class TransformedSortedSet<E> extends TransformedSet<E> implements Sorted
*/
public static <E> TransformedSortedSet<E> transformingSortedSet(final SortedSet<E> set,
final Transformer<? super E, ? extends E> transformer) {
- return new TransformedSortedSet<E>(set, transformer);
+ return new TransformedSortedSet<>(set, transformer);
}
/**
@@ -76,7 +76,7 @@ public class TransformedSortedSet<E> extends TransformedSet<E> implements Sorted
public static <E> TransformedSortedSet<E> transformedSortedSet(final SortedSet<E> set,
final Transformer<? super E, ? extends E> transformer) {
- final TransformedSortedSet<E> decorated = new TransformedSortedSet<E>(set, transformer);
+ final TransformedSortedSet<E> decorated = new TransformedSortedSet<>(set, transformer);
if (set.size() > 0) {
@SuppressWarnings("unchecked") // set is type E
final E[] values = (E[]) set.toArray(); // NOPMD - false positive for generics
@@ -132,19 +132,19 @@ public class TransformedSortedSet<E> extends TransformedSet<E> implements Sorted
@Override
public SortedSet<E> subSet(final E fromElement, final E toElement) {
final SortedSet<E> set = getSortedSet().subSet(fromElement, toElement);
- return new TransformedSortedSet<E>(set, transformer);
+ return new TransformedSortedSet<>(set, transformer);
}
@Override
public SortedSet<E> headSet(final E toElement) {
final SortedSet<E> set = getSortedSet().headSet(toElement);
- return new TransformedSortedSet<E>(set, transformer);
+ return new TransformedSortedSet<>(set, transformer);
}
@Override
public SortedSet<E> tailSet(final E fromElement) {
final SortedSet<E> set = getSortedSet().tailSet(fromElement);
- return new TransformedSortedSet<E>(set, transformer);
+ return new TransformedSortedSet<>(set, transformer);
}
}
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/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 ec96f33..3cf0ca8 100644
--- a/src/main/java/org/apache/commons/collections4/set/UnmodifiableNavigableSet.java
+++ b/src/main/java/org/apache/commons/collections4/set/UnmodifiableNavigableSet.java
@@ -54,7 +54,7 @@ public final class UnmodifiableNavigableSet<E>
if (set instanceof Unmodifiable) {
return set;
}
- return new UnmodifiableNavigableSet<E>(set);
+ return new UnmodifiableNavigableSet<>(set);
}
//-----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/main/java/org/apache/commons/collections4/set/UnmodifiableSet.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/set/UnmodifiableSet.java b/src/main/java/org/apache/commons/collections4/set/UnmodifiableSet.java
index 40287e5..3837804 100644
--- a/src/main/java/org/apache/commons/collections4/set/UnmodifiableSet.java
+++ b/src/main/java/org/apache/commons/collections4/set/UnmodifiableSet.java
@@ -55,7 +55,7 @@ public final class UnmodifiableSet<E>
final Set<E> tmpSet = (Set<E>) set;
return tmpSet;
}
- return new UnmodifiableSet<E>(set);
+ return new UnmodifiableSet<>(set);
}
//-----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/main/java/org/apache/commons/collections4/set/UnmodifiableSortedSet.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/set/UnmodifiableSortedSet.java b/src/main/java/org/apache/commons/collections4/set/UnmodifiableSortedSet.java
index 26f6d8f..81d669c 100644
--- a/src/main/java/org/apache/commons/collections4/set/UnmodifiableSortedSet.java
+++ b/src/main/java/org/apache/commons/collections4/set/UnmodifiableSortedSet.java
@@ -56,7 +56,7 @@ public final class UnmodifiableSortedSet<E>
if (set instanceof Unmodifiable) {
return set;
}
- return new UnmodifiableSortedSet<E>(set);
+ return new UnmodifiableSortedSet<>(set);
}
//-----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java b/src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java
index 22ebfc5..8aa11dd 100644
--- a/src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java
@@ -115,7 +115,7 @@ public class AbstractIterableGetMapDecorator<K, V> implements IterableGet<K, V>
*/
@Override
public MapIterator<K, V> mapIterator() {
- return new EntrySetToMapIteratorAdapter<K, V>(entrySet());
+ return new EntrySetToMapIteratorAdapter<>(entrySet());
}
@Override
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/main/java/org/apache/commons/collections4/splitmap/TransformedSplitMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/splitmap/TransformedSplitMap.java b/src/main/java/org/apache/commons/collections4/splitmap/TransformedSplitMap.java
index 35e7491..38f779a 100644
--- a/src/main/java/org/apache/commons/collections4/splitmap/TransformedSplitMap.java
+++ b/src/main/java/org/apache/commons/collections4/splitmap/TransformedSplitMap.java
@@ -88,7 +88,7 @@ public class TransformedSplitMap<J, K, U, V> extends AbstractIterableGetMapDecor
public static <J, K, U, V> TransformedSplitMap<J, K, U, V> transformingMap(final Map<K, V> map,
final Transformer<? super J, ? extends K> keyTransformer,
final Transformer<? super U, ? extends V> valueTransformer) {
- return new TransformedSplitMap<J, K, U, V>(map, keyTransformer, valueTransformer);
+ return new TransformedSplitMap<>(map, keyTransformer, valueTransformer);
}
//-----------------------------------------------------------------------
@@ -180,7 +180,7 @@ public class TransformedSplitMap<J, K, U, V> extends AbstractIterableGetMapDecor
if (map.isEmpty()) {
return (Map<K, V>) map;
}
- final Map<K, V> result = new LinkedMap<K, V>(map.size());
+ final Map<K, V> result = new LinkedMap<>(map.size());
for (final Map.Entry<? extends J, ? extends U> entry : map.entrySet()) {
result.put(transformKey(entry.getKey()), transformValue(entry.getValue()));
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/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 bd11f75..3dd8d99 100644
--- a/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java
+++ b/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java
@@ -46,7 +46,7 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> {
private static final long serialVersionUID = 5155253417231339498L;
/** The root node of the {@link Trie}. */
- private transient TrieEntry<K, V> root = new TrieEntry<K, V>(null, null, -1);
+ private transient TrieEntry<K, V> root = new TrieEntry<>(null, null, -1);
/**
* Each of these fields are initialized to contain an instance of the
@@ -158,7 +158,7 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> {
if (!KeyAnalyzer.isOutOfBoundsIndex(bitIndex)) {
if (KeyAnalyzer.isValidBitIndex(bitIndex)) { // in 99.999...9% the case
/* NEW KEY+VALUE TUPLE */
- final TrieEntry<K, V> t = new TrieEntry<K, V>(key, value, bitIndex);
+ final TrieEntry<K, V> t = new TrieEntry<>(key, value, bitIndex);
addEntry(t, lengthInBits);
incrementSize();
return null;
@@ -281,7 +281,7 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> {
*/
public Map.Entry<K, V> select(final K key) {
final int lengthInBits = lengthInBits(key);
- final Reference<Map.Entry<K, V>> reference = new Reference<Map.Entry<K,V>>();
+ final Reference<Map.Entry<K, V>> reference = new Reference<>();
if (!selectR(root.left, -1, key, lengthInBits, reference)) {
return reference.get();
}
@@ -910,7 +910,7 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> {
final int bitIndex = bitIndex(key, found.key);
if (KeyAnalyzer.isValidBitIndex(bitIndex)) {
- final TrieEntry<K, V> added = new TrieEntry<K, V>(key, null, bitIndex);
+ final TrieEntry<K, V> added = new TrieEntry<>(key, null, bitIndex);
addEntry(added, lengthInBits);
incrementSize(); // must increment because remove will decrement
final TrieEntry<K, V> ceil = nextEntry(added);
@@ -972,7 +972,7 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> {
final int bitIndex = bitIndex(key, found.key);
if (KeyAnalyzer.isValidBitIndex(bitIndex)) {
- final TrieEntry<K, V> added = new TrieEntry<K, V>(key, null, bitIndex);
+ final TrieEntry<K, V> added = new TrieEntry<>(key, null, bitIndex);
addEntry(added, lengthInBits);
incrementSize(); // must increment because remove will decrement
final TrieEntry<K, V> ceil = nextEntry(added);
@@ -1027,7 +1027,7 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> {
final int bitIndex = bitIndex(key, found.key);
if (KeyAnalyzer.isValidBitIndex(bitIndex)) {
- final TrieEntry<K, V> added = new TrieEntry<K, V>(key, null, bitIndex);
+ final TrieEntry<K, V> added = new TrieEntry<>(key, null, bitIndex);
addEntry(added, lengthInBits);
incrementSize(); // must increment because remove will decrement
final TrieEntry<K, V> prior = previousEntry(added);
@@ -1068,7 +1068,7 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> {
final int bitIndex = bitIndex(key, found.key);
if (KeyAnalyzer.isValidBitIndex(bitIndex)) {
- final TrieEntry<K, V> added = new TrieEntry<K, V>(key, null, bitIndex);
+ final TrieEntry<K, V> added = new TrieEntry<>(key, null, bitIndex);
addEntry(added, lengthInBits);
incrementSize(); // must increment because remove will decrement
final TrieEntry<K, V> floor = previousEntry(added);
@@ -2427,7 +2427,7 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> {
@SuppressWarnings("unchecked") // This will fail at runtime if the stream is incorrect
private void readObject(final ObjectInputStream stream) throws IOException, ClassNotFoundException{
stream.defaultReadObject();
- root = new TrieEntry<K, V>(null, null, -1);
+ root = new TrieEntry<>(null, null, -1);
int size = stream.readInt();
for(int i = 0; i < size; i++){
K k = (K) stream.readObject();
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/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 596abf6..e550e3b 100644
--- a/src/main/java/org/apache/commons/collections4/trie/UnmodifiableTrie.java
+++ b/src/main/java/org/apache/commons/collections4/trie/UnmodifiableTrie.java
@@ -57,7 +57,7 @@ public class UnmodifiableTrie<K, V> implements Trie<K, V>, Serializable, Unmodif
final Trie<K, V> tmpTrie = (Trie<K, V>) trie;
return tmpTrie;
}
- return new UnmodifiableTrie<K, V>(trie);
+ return new UnmodifiableTrie<>(trie);
}
//-----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/test/java/org/apache/commons/collections4/AbstractLinkedListTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/collections4/AbstractLinkedListTest.java b/src/test/java/org/apache/commons/collections4/AbstractLinkedListTest.java
index 0a1455e..a51536e 100644
--- a/src/test/java/org/apache/commons/collections4/AbstractLinkedListTest.java
+++ b/src/test/java/org/apache/commons/collections4/AbstractLinkedListTest.java
@@ -207,7 +207,7 @@ public abstract class AbstractLinkedListTest<T> extends AbstractListTest<T> {
*/
@Override
public Collection<T> makeConfirmedCollection() {
- return new LinkedList<T>();
+ return new LinkedList<>();
}
/**
@@ -215,7 +215,7 @@ public abstract class AbstractLinkedListTest<T> extends AbstractListTest<T> {
*/
@Override
public Collection<T> makeConfirmedFullCollection() {
- final List<T> list = new LinkedList<T>();
+ final List<T> list = new LinkedList<>();
list.addAll(Arrays.asList(getFullElements()));
return list;
}
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/test/java/org/apache/commons/collections4/ArrayStackTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/collections4/ArrayStackTest.java b/src/test/java/org/apache/commons/collections4/ArrayStackTest.java
index 6df55e3..f5db98f 100644
--- a/src/test/java/org/apache/commons/collections4/ArrayStackTest.java
+++ b/src/test/java/org/apache/commons/collections4/ArrayStackTest.java
@@ -38,7 +38,7 @@ public class ArrayStackTest<E> extends AbstractArrayListTest<E> {
@Override
public ArrayStack<E> makeObject() {
- return new ArrayStack<E>();
+ return new ArrayStack<>();
}
//-----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/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 a7f36ae..04187b4 100644
--- a/src/test/java/org/apache/commons/collections4/BagUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/BagUtilsTest.java
@@ -45,7 +45,7 @@ public class BagUtilsTest {
@Test
public void testSynchronizedBag() {
- Bag<Object> bag = BagUtils.synchronizedBag(new HashBag<Object>());
+ Bag<Object> bag = BagUtils.synchronizedBag(new HashBag<>());
assertTrue("Returned object should be a SynchronizedBag.",
bag instanceof SynchronizedBag);
try {
@@ -58,7 +58,7 @@ public class BagUtilsTest {
@Test
public void testUnmodifiableBag() {
- Bag<Object> bag = BagUtils.unmodifiableBag(new HashBag<Object>());
+ Bag<Object> bag = BagUtils.unmodifiableBag(new HashBag<>());
assertTrue("Returned object should be an UnmodifiableBag.",
bag instanceof UnmodifiableBag);
try {
@@ -73,7 +73,7 @@ public class BagUtilsTest {
@Test
public void testPredicatedBag() {
- Bag<Object> bag = BagUtils.predicatedBag(new HashBag<Object>(), truePredicate);
+ Bag<Object> bag = BagUtils.predicatedBag(new HashBag<>(), truePredicate);
assertTrue("Returned object should be a PredicatedBag.",
bag instanceof PredicatedBag);
try {
@@ -83,7 +83,7 @@ public class BagUtilsTest {
// expected
}
try {
- BagUtils.predicatedBag(new HashBag<Object>(), null);
+ BagUtils.predicatedBag(new HashBag<>(), null);
fail("Expecting NullPointerException for null predicate.");
} catch (final NullPointerException ex) {
// expected
@@ -92,7 +92,7 @@ public class BagUtilsTest {
@Test
public void testTransformedBag() {
- Bag<Object> bag = BagUtils.transformingBag(new HashBag<Object>(), nopTransformer);
+ Bag<Object> bag = BagUtils.transformingBag(new HashBag<>(), nopTransformer);
assertTrue("Returned object should be an TransformedBag.",
bag instanceof TransformedBag);
try {
@@ -102,7 +102,7 @@ public class BagUtilsTest {
// expected
}
try {
- BagUtils.transformingBag(new HashBag<Object>(), null);
+ BagUtils.transformingBag(new HashBag<>(), null);
fail("Expecting NullPointerException for null transformer.");
} catch (final NullPointerException ex) {
// expected
@@ -111,7 +111,7 @@ public class BagUtilsTest {
@Test
public void testSynchronizedSortedBag() {
- Bag<Object> bag = BagUtils.synchronizedSortedBag(new TreeBag<Object>());
+ Bag<Object> bag = BagUtils.synchronizedSortedBag(new TreeBag<>());
assertTrue("Returned object should be a SynchronizedSortedBag.",
bag instanceof SynchronizedSortedBag);
try {
@@ -124,7 +124,7 @@ public class BagUtilsTest {
@Test
public void testUnmodifiableSortedBag() {
- SortedBag<Object> bag = BagUtils.unmodifiableSortedBag(new TreeBag<Object>());
+ SortedBag<Object> bag = BagUtils.unmodifiableSortedBag(new TreeBag<>());
assertTrue("Returned object should be an UnmodifiableSortedBag.",
bag instanceof UnmodifiableSortedBag);
try {
@@ -139,7 +139,7 @@ public class BagUtilsTest {
@Test
public void testPredicatedSortedBag() {
- Bag<Object> bag = BagUtils.predicatedSortedBag(new TreeBag<Object>(), truePredicate);
+ Bag<Object> bag = BagUtils.predicatedSortedBag(new TreeBag<>(), truePredicate);
assertTrue("Returned object should be a PredicatedSortedBag.",
bag instanceof PredicatedSortedBag);
try {
@@ -149,7 +149,7 @@ public class BagUtilsTest {
// expected
}
try {
- BagUtils.predicatedSortedBag(new TreeBag<Object>(), null);
+ BagUtils.predicatedSortedBag(new TreeBag<>(), null);
fail("Expecting NullPointerException for null predicate.");
} catch (final NullPointerException ex) {
// expected
@@ -158,7 +158,7 @@ public class BagUtilsTest {
@Test
public void testTransformedSortedBag() {
- Bag<Object> bag = BagUtils.transformingSortedBag(new TreeBag<Object>(), nopTransformer);
+ Bag<Object> bag = BagUtils.transformingSortedBag(new TreeBag<>(), nopTransformer);
assertTrue("Returned object should be an TransformedSortedBag",
bag instanceof TransformedSortedBag);
try {
@@ -168,7 +168,7 @@ public class BagUtilsTest {
// expected
}
try {
- BagUtils.transformingSortedBag(new TreeBag<Object>(), null);
+ BagUtils.transformingSortedBag(new TreeBag<>(), null);
fail("Expecting NullPointerException for null transformer.");
} catch (final NullPointerException ex) {
// expected
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/test/java/org/apache/commons/collections4/BulkTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/collections4/BulkTest.java b/src/test/java/org/apache/commons/collections4/BulkTest.java
index e21c5e9..38c5fd4 100644
--- a/src/test/java/org/apache/commons/collections4/BulkTest.java
+++ b/src/test/java/org/apache/commons/collections4/BulkTest.java
@@ -314,7 +314,7 @@ class BulkTestSuiteMaker {
result.setName(prefix);
final BulkTest bulk = makeFirstTestCase(startingClass);
- ignored = new ArrayList<String>();
+ ignored = new ArrayList<>();
final String[] s = bulk.ignoredTests();
if (s != null) {
ignored.addAll(Arrays.asList(s));
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/test/java/org/apache/commons/collections4/ClosureUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/collections4/ClosureUtilsTest.java b/src/test/java/org/apache/commons/collections4/ClosureUtilsTest.java
index 7307e7c..7f66bd2 100644
--- a/src/test/java/org/apache/commons/collections4/ClosureUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/ClosureUtilsTest.java
@@ -113,11 +113,11 @@ public class ClosureUtilsTest {
@Test
public void testForClosure() {
- final MockClosure<Object> cmd = new MockClosure<Object>();
+ final MockClosure<Object> cmd = new MockClosure<>();
ClosureUtils.forClosure(5, cmd).execute(null);
assertEquals(5, cmd.count);
- assertSame(NOPClosure.INSTANCE, ClosureUtils.forClosure(0, new MockClosure<Object>()));
- assertSame(NOPClosure.INSTANCE, ClosureUtils.forClosure(-1, new MockClosure<Object>()));
+ assertSame(NOPClosure.INSTANCE, ClosureUtils.forClosure(0, new MockClosure<>()));
+ assertSame(NOPClosure.INSTANCE, ClosureUtils.forClosure(-1, new MockClosure<>()));
assertSame(NOPClosure.INSTANCE, ClosureUtils.forClosure(1, null));
assertSame(NOPClosure.INSTANCE, ClosureUtils.forClosure(3, null));
assertSame(cmd, ClosureUtils.forClosure(1, cmd));
@@ -128,11 +128,11 @@ public class ClosureUtilsTest {
@Test
public void testWhileClosure() {
- MockClosure<Object> cmd = new MockClosure<Object>();
+ MockClosure<Object> cmd = new MockClosure<>();
ClosureUtils.whileClosure(FalsePredicate.falsePredicate(), cmd).execute(null);
assertEquals(0, cmd.count);
- cmd = new MockClosure<Object>();
+ cmd = new MockClosure<>();
ClosureUtils.whileClosure(PredicateUtils.uniquePredicate(), cmd).execute(null);
assertEquals(1, cmd.count);
@@ -155,11 +155,11 @@ public class ClosureUtilsTest {
@Test
public void testDoWhileClosure() {
- MockClosure<Object> cmd = new MockClosure<Object>();
+ MockClosure<Object> cmd = new MockClosure<>();
ClosureUtils.doWhileClosure(cmd, FalsePredicate.falsePredicate()).execute(null);
assertEquals(1, cmd.count);
- cmd = new MockClosure<Object>();
+ cmd = new MockClosure<>();
ClosureUtils.doWhileClosure(cmd, PredicateUtils.uniquePredicate()).execute(null);
assertEquals(2, cmd.count);
@@ -175,21 +175,21 @@ public class ClosureUtilsTest {
@Test
@SuppressWarnings("unchecked")
public void testChainedClosure() {
- MockClosure<Object> a = new MockClosure<Object>();
- MockClosure<Object> b = new MockClosure<Object>();
+ MockClosure<Object> a = new MockClosure<>();
+ MockClosure<Object> b = new MockClosure<>();
ClosureUtils.chainedClosure(a, b).execute(null);
assertEquals(1, a.count);
assertEquals(1, b.count);
- a = new MockClosure<Object>();
- b = new MockClosure<Object>();
+ a = new MockClosure<>();
+ b = new MockClosure<>();
ClosureUtils.<Object>chainedClosure(new Closure[] {a, b, a}).execute(null);
assertEquals(2, a.count);
assertEquals(1, b.count);
- a = new MockClosure<Object>();
- b = new MockClosure<Object>();
- Collection<Closure<Object>> coll = new ArrayList<Closure<Object>>();
+ a = new MockClosure<>();
+ b = new MockClosure<>();
+ Collection<Closure<Object>> coll = new ArrayList<>();
coll.add(b);
coll.add(a);
coll.add(b);
@@ -217,7 +217,7 @@ public class ClosureUtilsTest {
fail();
} catch (final NullPointerException ex) {}
try {
- coll = new ArrayList<Closure<Object>>();
+ coll = new ArrayList<>();
coll.add(null);
coll.add(null);
ClosureUtils.chainedClosure(coll);
@@ -230,23 +230,23 @@ public class ClosureUtilsTest {
@Test
public void testIfClosure() {
- MockClosure<Object> a = new MockClosure<Object>();
+ MockClosure<Object> a = new MockClosure<>();
MockClosure<Object> b = null;
ClosureUtils.ifClosure(TruePredicate.truePredicate(), a).execute(null);
assertEquals(1, a.count);
- a = new MockClosure<Object>();
+ a = new MockClosure<>();
ClosureUtils.ifClosure(FalsePredicate.<Object>falsePredicate(), a).execute(null);
assertEquals(0, a.count);
- a = new MockClosure<Object>();
- b = new MockClosure<Object>();
+ a = new MockClosure<>();
+ b = new MockClosure<>();
ClosureUtils.ifClosure(TruePredicate.<Object>truePredicate(), a, b).execute(null);
assertEquals(1, a.count);
assertEquals(0, b.count);
- a = new MockClosure<Object>();
- b = new MockClosure<Object>();
+ a = new MockClosure<>();
+ b = new MockClosure<>();
ClosureUtils.ifClosure(FalsePredicate.<Object>falsePredicate(), a, b).execute(null);
assertEquals(0, a.count);
assertEquals(1, b.count);
@@ -258,8 +258,8 @@ public class ClosureUtilsTest {
@Test
@SuppressWarnings("unchecked")
public void testSwitchClosure() {
- final MockClosure<String> a = new MockClosure<String>();
- final MockClosure<String> b = new MockClosure<String>();
+ final MockClosure<String> a = new MockClosure<>();
+ final MockClosure<String> b = new MockClosure<>();
ClosureUtils.<String>switchClosure(
new Predicate[] { EqualPredicate.equalPredicate("HELLO"), EqualPredicate.equalPredicate("THERE") },
new Closure[] { a, b }).execute("WELL");
@@ -276,7 +276,7 @@ public class ClosureUtilsTest {
a.reset();
b.reset();
- final MockClosure<String> c = new MockClosure<String>();
+ final MockClosure<String> c = new MockClosure<>();
ClosureUtils.<String>switchClosure(
new Predicate[] { EqualPredicate.equalPredicate("HELLO"), EqualPredicate.equalPredicate("THERE") },
new Closure[] { a, b }, c).execute("WELL");
@@ -286,7 +286,7 @@ public class ClosureUtilsTest {
a.reset();
b.reset();
- final Map<Predicate<String>, Closure<String>> map = new HashMap<Predicate<String>, Closure<String>>();
+ final Map<Predicate<String>, Closure<String>> map = new HashMap<>();
map.put(EqualPredicate.equalPredicate("HELLO"), a);
map.put(EqualPredicate.equalPredicate("THERE"), b);
ClosureUtils.<String>switchClosure(map).execute(null);
@@ -349,9 +349,9 @@ public class ClosureUtilsTest {
@Test
public void testSwitchMapClosure() {
- final MockClosure<String> a = new MockClosure<String>();
- final MockClosure<String> b = new MockClosure<String>();
- final Map<String, Closure<String>> map = new HashMap<String, Closure<String>>();
+ final MockClosure<String> a = new MockClosure<>();
+ final MockClosure<String> b = new MockClosure<>();
+ final Map<String, Closure<String>> map = new HashMap<>();
map.put("HELLO", a);
map.put("THERE", b);
ClosureUtils.switchMapClosure(map).execute(null);
@@ -370,7 +370,7 @@ public class ClosureUtilsTest {
a.reset();
b.reset();
map.clear();
- final MockClosure<String> c = new MockClosure<String>();
+ final MockClosure<String> c = new MockClosure<>();
map.put("HELLO", a);
map.put("THERE", b);
map.put(null, c);
@@ -392,7 +392,7 @@ public class ClosureUtilsTest {
@Test
public void testTransformerClosure() {
- final MockTransformer<Object> mock = new MockTransformer<Object>();
+ final MockTransformer<Object> mock = new MockTransformer<>();
final Closure<Object> closure = ClosureUtils.asClosure(mock);
closure.execute(null);
assertEquals(1, mock.count);
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/eef8f1a0/src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java b/src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java
index 0765dca..b6c0171 100644
--- a/src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java
@@ -114,11 +114,11 @@ public class CollectionUtilsTest extends MockTestCase {
private Iterable<Number> iterableB2 = null;
- private final Collection<Integer> emptyCollection = new ArrayList<Integer>(1);
+ private final Collection<Integer> emptyCollection = new ArrayList<>(1);
@Before
public void setUp() {
- collectionA = new ArrayList<Integer>();
+ collectionA = new ArrayList<>();
collectionA.add(1);
collectionA.add(2);
collectionA.add(2);
@@ -129,7 +129,7 @@ public class CollectionUtilsTest extends MockTestCase {
collectionA.add(4);
collectionA.add(4);
collectionA.add(4);
- collectionB = new LinkedList<Long>();
+ collectionB = new LinkedList<>();
collectionB.add(5L);
collectionB.add(4L);
collectionB.add(4L);
@@ -141,7 +141,7 @@ public class CollectionUtilsTest extends MockTestCase {
collectionB.add(2L);
collectionB.add(2L);
- collectionC = new ArrayList<Integer>();
+ collectionC = new ArrayList<>();
for (final Long l : collectionB) {
collectionC.add(l.intValue());
}
@@ -155,7 +155,7 @@ public class CollectionUtilsTest extends MockTestCase {
iterableA2 = collectionA2;
iterableB2 = collectionB2;
- collectionD = new ArrayList<Integer>();
+ collectionD = new ArrayList<>();
collectionD.add(1);
collectionD.add(3);
collectionD.add(3);
@@ -165,7 +165,7 @@ public class CollectionUtilsTest extends MockTestCase {
collectionD.add(7);
collectionD.add(10);
- collectionE = new ArrayList<Integer>();
+ collectionE = new ArrayList<>();
collectionE.add(2);
collectionE.add(4);
collectionE.add(4);
@@ -213,7 +213,7 @@ public class CollectionUtilsTest extends MockTestCase {
assertEquals(0, CollectionUtils.cardinality(2L, iterableA2));
assertEquals(0, CollectionUtils.cardinality(2, iterableB2));
- final Set<String> set = new HashSet<String>();
+ final Set<String> set = new HashSet<>();
set.add("A");
set.add("C");
set.add("E");
@@ -224,7 +224,7 @@ public class CollectionUtilsTest extends MockTestCase {
assertEquals(0, CollectionUtils.cardinality("D", set));
assertEquals(1, CollectionUtils.cardinality("E", set));
- final Bag<String> bag = new HashBag<String>();
+ final Bag<String> bag = new HashBag<>();
bag.add("A", 3);
bag.add("C");
bag.add("E");
@@ -239,7 +239,7 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
@Deprecated
public void cardinalityOfNull() {
- final List<String> list = new ArrayList<String>();
+ final List<String> list = new ArrayList<>();
assertEquals(0, CollectionUtils.cardinality(null, list));
{
final Map<String, Integer> freq = CollectionUtils.getCardinalityMap(list);
@@ -285,17 +285,17 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
public void containsAll() {
- final Collection<String> empty = new ArrayList<String>(0);
- final Collection<String> one = new ArrayList<String>(1);
+ final Collection<String> empty = new ArrayList<>(0);
+ final Collection<String> one = new ArrayList<>(1);
one.add("1");
- final Collection<String> two = new ArrayList<String>(1);
+ final Collection<String> two = new ArrayList<>(1);
two.add("2");
- final Collection<String> three = new ArrayList<String>(1);
+ final Collection<String> three = new ArrayList<>(1);
three.add("3");
- final Collection<String> odds = new ArrayList<String>(2);
+ final Collection<String> odds = new ArrayList<>(2);
odds.add("1");
odds.add("3");
- final Collection<String> multiples = new ArrayList<String>(3);
+ final Collection<String> multiples = new ArrayList<>(3);
multiples.add("1");
multiples.add("3");
multiples.add("1");
@@ -321,14 +321,14 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
public void containsAny() {
- final Collection<String> empty = new ArrayList<String>(0);
- final Collection<String> one = new ArrayList<String>(1);
+ final Collection<String> empty = new ArrayList<>(0);
+ final Collection<String> one = new ArrayList<>(1);
one.add("1");
- final Collection<String> two = new ArrayList<String>(1);
+ final Collection<String> two = new ArrayList<>(1);
two.add("2");
- final Collection<String> three = new ArrayList<String>(1);
+ final Collection<String> three = new ArrayList<>(1);
three.add("3");
- final Collection<String> odds = new ArrayList<String>(2);
+ final Collection<String> odds = new ArrayList<>(2);
odds.add("1");
odds.add("3");
@@ -473,7 +473,7 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
public void testIsSubCollection2() {
- final Collection<Integer> c = new ArrayList<Integer>();
+ final Collection<Integer> c = new ArrayList<>();
assertTrue(CollectionUtils.isSubCollection(c, collectionA));
assertTrue(!CollectionUtils.isSubCollection(collectionA, c));
c.add(1);
@@ -525,7 +525,7 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
public void testIsEqualCollectionReturnsFalse() {
- final List<Integer> b = new ArrayList<Integer>(collectionA);
+ final List<Integer> b = new ArrayList<>(collectionA);
// remove an extra '2', and add a 5. This will increase the size of the cardinality
b.remove(1);
b.add(5);
@@ -535,8 +535,8 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
public void testIsEqualCollection2() {
- final Collection<String> a = new ArrayList<String>();
- final Collection<String> b = new ArrayList<String>();
+ final Collection<String> a = new ArrayList<>();
+ final Collection<String> b = new ArrayList<>();
assertTrue(CollectionUtils.isEqualCollection(a, b));
assertTrue(CollectionUtils.isEqualCollection(b, a));
a.add("1");
@@ -596,8 +596,8 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
public void testIsProperSubCollection() {
- final Collection<String> a = new ArrayList<String>();
- final Collection<String> b = new ArrayList<String>();
+ final Collection<String> a = new ArrayList<>();
+ final Collection<String> b = new ArrayList<>();
assertTrue(!CollectionUtils.isProperSubCollection(a, b));
b.add("1");
assertTrue(CollectionUtils.isProperSubCollection(a, b));
@@ -633,7 +633,7 @@ public class CollectionUtilsTest extends MockTestCase {
@Deprecated
public void forAllDoCollection() {
final Closure<Collection<Integer>> testClosure = ClosureUtils.invokerClosure("clear");
- final Collection<Collection<Integer>> col = new ArrayList<Collection<Integer>>();
+ final Collection<Collection<Integer>> col = new ArrayList<>();
col.add(collectionA);
col.add(collectionC);
Closure<Collection<Integer>> resultClosure = CollectionUtils.forAllDo(col, testClosure);
@@ -653,7 +653,7 @@ public class CollectionUtilsTest extends MockTestCase {
@Deprecated
public void forAllDoIterator() {
final Closure<Collection<Integer>> testClosure = ClosureUtils.invokerClosure("clear");
- final Collection<Collection<Integer>> col = new ArrayList<Collection<Integer>>();
+ final Collection<Collection<Integer>> col = new ArrayList<>();
col.add(collectionA);
col.add(collectionC);
Closure<Collection<Integer>> resultClosure = CollectionUtils.forAllDo(col.iterator(), testClosure);
@@ -673,7 +673,7 @@ public class CollectionUtilsTest extends MockTestCase {
@Deprecated
public void forAllDoFailure() {
final Closure<String> testClosure = ClosureUtils.invokerClosure("clear");
- final Collection<String> col = new ArrayList<String>();
+ final Collection<String> col = new ArrayList<>();
col.add("x");
CollectionUtils.forAllDo(col, testClosure);
}
@@ -682,7 +682,7 @@ public class CollectionUtilsTest extends MockTestCase {
@Deprecated
public void forAllButLastDoCollection() {
final Closure<List<? extends Number>> testClosure = ClosureUtils.invokerClosure("clear");
- final Collection<List<? extends Number>> col = new ArrayList<List<? extends Number>>();
+ final Collection<List<? extends Number>> col = new ArrayList<>();
col.add(collectionA);
col.add(collectionB);
List<? extends Number> lastElement = CollectionUtils.forAllButLastDo(col, testClosure);
@@ -726,7 +726,7 @@ public class CollectionUtilsTest extends MockTestCase {
@Deprecated
public void forAllButLastDoIterator() {
final Closure<List<? extends Number>> testClosure = ClosureUtils.invokerClosure("clear");
- final Collection<List<? extends Number>> col = new ArrayList<List<? extends Number>>();
+ final Collection<List<? extends Number>> col = new ArrayList<>();
col.add(collectionA);
col.add(collectionB);
List<? extends Number> lastElement = CollectionUtils.forAllButLastDo(col.iterator(), testClosure);
@@ -740,11 +740,11 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
public void getFromMap() {
// Unordered map, entries exist
- final Map<String, String> expected = new HashMap<String, String>();
+ final Map<String, String> expected = new HashMap<>();
expected.put("zeroKey", "zero");
expected.put("oneKey", "one");
- final Map<String, String> found = new HashMap<String, String>();
+ final Map<String, String> found = new HashMap<>();
Map.Entry<String, String> entry = CollectionUtils.get(expected, 0);
found.put(entry.getKey(), entry.getValue());
entry = CollectionUtils.get(expected, 1);
@@ -766,7 +766,7 @@ public class CollectionUtilsTest extends MockTestCase {
}
// Sorted map, entries exist, should respect order
- final SortedMap<String, String> map = new TreeMap<String, String>();
+ final SortedMap<String, String> map = new TreeMap<>();
map.put("zeroKey", "zero");
map.put("oneKey", "one");
Map.Entry<String, String> test = CollectionUtils.get(map, 1);
@@ -792,7 +792,7 @@ public class CollectionUtilsTest extends MockTestCase {
assertEquals("zero", string);
assertEquals("one", CollectionUtils.get(list, 1));
// list, non-existent entry -- IndexOutOfBoundsException
- CollectionUtils.get(new ArrayList<Object>(), 2);
+ CollectionUtils.get(new ArrayList<>(), 2);
}
@Test
@@ -818,7 +818,7 @@ public class CollectionUtilsTest extends MockTestCase {
@Deprecated
public void getFromEnumeration() throws Exception {
// Enumeration, entry exists
- final Vector<String> vector = new Vector<String>();
+ final Vector<String> vector = new Vector<>();
vector.addElement("zero");
vector.addElement("one");
Enumeration<String> en = vector.elements();
@@ -840,7 +840,7 @@ public class CollectionUtilsTest extends MockTestCase {
@Deprecated
public void getFromIterable() throws Exception {
// Collection, entry exists
- final Bag<String> bag = new HashBag<String>();
+ final Bag<String> bag = new HashBag<>();
bag.add("element", 1);
assertEquals("element", CollectionUtils.get(bag, 0));
@@ -888,7 +888,7 @@ public class CollectionUtilsTest extends MockTestCase {
public void testSize_List() {
List<String> list = null;
assertEquals(0, CollectionUtils.size(list));
- list = new ArrayList<String>();
+ list = new ArrayList<>();
assertEquals(0, CollectionUtils.size(list));
list.add("a");
assertEquals(1, CollectionUtils.size(list));
@@ -898,7 +898,7 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
public void testSize_Map() {
- final Map<String, String> map = new HashMap<String, String>();
+ final Map<String, String> map = new HashMap<>();
assertEquals(0, CollectionUtils.size(map));
map.put("1", "a");
assertEquals(1, CollectionUtils.size(map));
@@ -934,7 +934,7 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
public void testSize_Enumeration() {
- final Vector<String> list = new Vector<String>();
+ final Vector<String> list = new Vector<>();
assertEquals(0, CollectionUtils.size(list.elements()));
list.add("a");
assertEquals(1, CollectionUtils.size(list.elements()));
@@ -944,7 +944,7 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
public void testSize_Iterator() {
- final List<String> list = new ArrayList<String>();
+ final List<String> list = new ArrayList<>();
assertEquals(0, CollectionUtils.size(list.iterator()));
list.add("a");
assertEquals(1, CollectionUtils.size(list.iterator()));
@@ -965,7 +965,7 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
public void testSizeIsEmpty_List() {
- final List<String> list = new ArrayList<String>();
+ final List<String> list = new ArrayList<>();
assertEquals(true, CollectionUtils.sizeIsEmpty(list));
list.add("a");
assertEquals(false, CollectionUtils.sizeIsEmpty(list));
@@ -973,7 +973,7 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
public void testSizeIsEmpty_Map() {
- final Map<String, String> map = new HashMap<String, String>();
+ final Map<String, String> map = new HashMap<>();
assertEquals(true, CollectionUtils.sizeIsEmpty(map));
map.put("1", "a");
assertEquals(false, CollectionUtils.sizeIsEmpty(map));
@@ -1007,7 +1007,7 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
public void testSizeIsEmpty_Enumeration() {
- final Vector<String> list = new Vector<String>();
+ final Vector<String> list = new Vector<>();
assertEquals(true, CollectionUtils.sizeIsEmpty(list.elements()));
list.add("a");
assertEquals(false, CollectionUtils.sizeIsEmpty(list.elements()));
@@ -1018,7 +1018,7 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
public void testSizeIsEmpty_Iterator() {
- final List<String> list = new ArrayList<String>();
+ final List<String> list = new ArrayList<>();
assertEquals(true, CollectionUtils.sizeIsEmpty(list.iterator()));
list.add("a");
assertEquals(false, CollectionUtils.sizeIsEmpty(list.iterator()));
@@ -1039,13 +1039,13 @@ public class CollectionUtilsTest extends MockTestCase {
// -----------------------------------------------------------------------
@Test
public void testIsEmptyWithEmptyCollection() {
- final Collection<Object> coll = new ArrayList<Object>();
+ final Collection<Object> coll = new ArrayList<>();
assertEquals(true, CollectionUtils.isEmpty(coll));
}
@Test
public void testIsEmptyWithNonEmptyCollection() {
- final Collection<String> coll = new ArrayList<String>();
+ final Collection<String> coll = new ArrayList<>();
coll.add("item");
assertEquals(false, CollectionUtils.isEmpty(coll));
}
@@ -1058,13 +1058,13 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
public void testIsNotEmptyWithEmptyCollection() {
- final Collection<Object> coll = new ArrayList<Object>();
+ final Collection<Object> coll = new ArrayList<>();
assertEquals(false, CollectionUtils.isNotEmpty(coll));
}
@Test
public void testIsNotEmptyWithNonEmptyCollection() {
- final Collection<String> coll = new ArrayList<String>();
+ final Collection<String> coll = new ArrayList<>();
coll.add("item");
assertEquals(true, CollectionUtils.isNotEmpty(coll));
}
@@ -1086,7 +1086,7 @@ public class CollectionUtilsTest extends MockTestCase {
//Up to here
@Test
public void filter() {
- final List<Integer> ints = new ArrayList<Integer>();
+ final List<Integer> ints = new ArrayList<>();
ints.add(1);
ints.add(2);
ints.add(3);
@@ -1110,7 +1110,7 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
public void filterInverse() {
- final List<Integer> ints = new ArrayList<Integer>();
+ final List<Integer> ints = new ArrayList<>();
ints.add(1);
ints.add(2);
ints.add(3);
@@ -1146,7 +1146,7 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
@Deprecated
public void exists() {
- final List<Integer> list = new ArrayList<Integer>();
+ final List<Integer> list = new ArrayList<>();
assertFalse(CollectionUtils.exists(null, null));
assertFalse(CollectionUtils.exists(list, null));
assertFalse(CollectionUtils.exists(null, EQUALS_TWO));
@@ -1162,7 +1162,7 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
public void select() {
- final List<Integer> list = new ArrayList<Integer>();
+ final List<Integer> list = new ArrayList<>();
list.add(1);
list.add(2);
list.add(3);
@@ -1179,14 +1179,14 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
public void selectWithOutputCollections() {
- List<Integer> input = new ArrayList<Integer>();
+ List<Integer> input = new ArrayList<>();
input.add(1);
input.add(2);
input.add(3);
input.add(4);
- List<Integer> output = new ArrayList<Integer>();
- List<Integer> rejected = new ArrayList<Integer>();
+ List<Integer> output = new ArrayList<>();
+ List<Integer> rejected = new ArrayList<>();
CollectionUtils.select(input, EQUALS_TWO, output, rejected);
@@ -1207,7 +1207,7 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
public void selectRejected() {
- final List<Long> list = new ArrayList<Long>();
+ final List<Long> list = new ArrayList<>();
list.add(1L);
list.add(2L);
list.add(3L);
@@ -1273,7 +1273,7 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
public void transform1() {
- List<Number> list = new ArrayList<Number>();
+ List<Number> list = new ArrayList<>();
list.add(1L);
list.add(2L);
list.add(3L);
@@ -1283,7 +1283,7 @@ public class CollectionUtilsTest extends MockTestCase {
assertEquals(2, list.get(1));
assertEquals(3, list.get(2));
- list = new ArrayList<Number>();
+ list = new ArrayList<>();
list.add(1L);
list.add(2L);
list.add(3L);
@@ -1297,7 +1297,7 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
public void transform2() {
- final Set<Number> set = new HashSet<Number>();
+ final Set<Number> set = new HashSet<>();
set.add(1L);
set.add(2L);
set.add(3L);
@@ -1314,7 +1314,7 @@ public class CollectionUtilsTest extends MockTestCase {
// -----------------------------------------------------------------------
@Test
public void addIgnoreNull() {
- final Set<String> set = new HashSet<String>();
+ final Set<String> set = new HashSet<>();
set.add("1");
set.add("2");
set.add("3");
@@ -1349,7 +1349,7 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
public void isFull() {
- final Set<String> set = new HashSet<String>();
+ final Set<String> set = new HashSet<>();
set.add("1");
set.add("2");
set.add("3");
@@ -1360,7 +1360,7 @@ public class CollectionUtilsTest extends MockTestCase {
}
assertFalse(CollectionUtils.isFull(set));
- final CircularFifoQueue<String> buf = new CircularFifoQueue<String>(set);
+ final CircularFifoQueue<String> buf = new CircularFifoQueue<>(set);
assertEquals(false, CollectionUtils.isFull(buf));
buf.remove("2");
assertFalse(CollectionUtils.isFull(buf));
@@ -1376,7 +1376,7 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
public void maxSize() {
- final Set<String> set = new HashSet<String>();
+ final Set<String> set = new HashSet<>();
set.add("1");
set.add("2");
set.add("3");
@@ -1387,7 +1387,7 @@ public class CollectionUtilsTest extends MockTestCase {
}
assertEquals(-1, CollectionUtils.maxSize(set));
- final Queue<String> buf = new CircularFifoQueue<String>(set);
+ final Queue<String> buf = new CircularFifoQueue<>(set);
assertEquals(3, CollectionUtils.maxSize(buf));
buf.remove("2");
assertEquals(3, CollectionUtils.maxSize(buf));
@@ -1409,8 +1409,8 @@ public class CollectionUtilsTest extends MockTestCase {
assertTrue(elta != eltb);
// Let cola and colb be collections...
- final Collection<Number> cola = new ArrayList<Number>();
- final Collection<Integer> colb = new ArrayList<Integer>();
+ final Collection<Number> cola = new ArrayList<>();
+ final Collection<Integer> colb = new ArrayList<>();
// ...which contain elta and eltb,
// respectively.
@@ -1440,11 +1440,11 @@ public class CollectionUtilsTest extends MockTestCase {
//Up to here
@Test
public void testRetainAll() {
- final List<String> base = new ArrayList<String>();
+ final List<String> base = new ArrayList<>();
base.add("A");
base.add("B");
base.add("C");
- final List<Object> sub = new ArrayList<Object>();
+ final List<Object> sub = new ArrayList<>();
sub.add("A");
sub.add("C");
sub.add("X");
@@ -1472,11 +1472,11 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
public void testRemoveAll() {
- final List<String> base = new ArrayList<String>();
+ final List<String> base = new ArrayList<>();
base.add("A");
base.add("B");
base.add("C");
- final List<String> sub = new ArrayList<String>();
+ final List<String> sub = new ArrayList<>();
sub.add("A");
sub.add("C");
sub.add("X");
@@ -1506,10 +1506,10 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
public void testTransformedCollection() {
final Transformer<Object, Object> transformer = TransformerUtils.nopTransformer();
- Collection<Object> collection = CollectionUtils.transformingCollection(new ArrayList<Object>(), transformer);
+ Collection<Object> collection = CollectionUtils.transformingCollection(new ArrayList<>(), transformer);
assertTrue("returned object should be a TransformedCollection", collection instanceof TransformedCollection);
try {
- CollectionUtils.transformingCollection(new ArrayList<Object>(), null);
+ CollectionUtils.transformingCollection(new ArrayList<>(), null);
fail("Expecting NullPointerException for null transformer.");
} catch (final NullPointerException ex) {
// expected
@@ -1524,7 +1524,7 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
public void testTransformedCollection_2() {
- final List<Object> list = new ArrayList<Object>();
+ final List<Object> list = new ArrayList<>();
list.add("1");
list.add("2");
list.add("3");
@@ -1537,7 +1537,7 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
@Deprecated
public void testSynchronizedCollection() {
- Collection<Object> col = CollectionUtils.synchronizedCollection(new ArrayList<Object>());
+ Collection<Object> col = CollectionUtils.synchronizedCollection(new ArrayList<>());
assertTrue("Returned object should be a SynchronizedCollection.", col instanceof SynchronizedCollection);
try {
CollectionUtils.synchronizedCollection(null);
@@ -1550,7 +1550,7 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
@Deprecated
public void testUnmodifiableCollection() {
- Collection<Object> col = CollectionUtils.unmodifiableCollection(new ArrayList<Object>());
+ Collection<Object> col = CollectionUtils.unmodifiableCollection(new ArrayList<>());
assertTrue("Returned object should be a UnmodifiableCollection.", col instanceof UnmodifiableCollection);
try {
CollectionUtils.unmodifiableCollection(null);
@@ -1569,7 +1569,7 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
public void emptyIfNull() {
assertTrue(CollectionUtils.emptyIfNull(null).isEmpty());
- final Collection<Object> collection = new ArrayList<Object>();
+ final Collection<Object> collection = new ArrayList<>();
assertSame(collection, CollectionUtils.emptyIfNull(collection));
}
@@ -1617,7 +1617,7 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
public void addAllForEnumeration() {
- final Hashtable<Integer, Integer> h = new Hashtable<Integer, Integer>();
+ final Hashtable<Integer, Integer> h = new Hashtable<>();
h.put(5, 5);
final Enumeration<? extends Integer> enumeration = h.keys();
CollectionUtils.addAll(collectionA, enumeration);
@@ -1664,7 +1664,7 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
public void getEnumeration() {
- final Vector<Integer> vectorA = new Vector<Integer>(collectionA);
+ final Vector<Integer> vectorA = new Vector<>(collectionA);
final Enumeration<Integer> e = vectorA.elements();
assertEquals(Integer.valueOf(2), CollectionUtils.get(e, 2));
assertTrue(e.hasMoreElements());
@@ -1690,7 +1690,7 @@ public class CollectionUtilsTest extends MockTestCase {
fail("expected NullPointerException from extractSingleton(null)");
} catch (final NullPointerException e) {
}
- coll = new ArrayList<String>();
+ coll = new ArrayList<>();
try {
CollectionUtils.extractSingleton(coll);
fail("expected IllegalArgumentException from extractSingleton(empty)");
@@ -1736,7 +1736,7 @@ public class CollectionUtilsTest extends MockTestCase {
List<Integer> result2 = CollectionUtils.collate(collectionE, collectionD);
assertEquals("Merge two lists 1", result1, result2);
- List<Integer> combinedList = new ArrayList<Integer>();
+ List<Integer> combinedList = new ArrayList<>();
combinedList.addAll(collectionD);
combinedList.addAll(collectionE);
Collections.sort(combinedList);
@@ -1765,10 +1765,10 @@ public class CollectionUtilsTest extends MockTestCase {
List<Integer> result2 = CollectionUtils.collate(collectionE, collectionD, false);
assertEquals("Merge two lists 1 - ignore duplicates", result1, result2);
- Set<Integer> combinedSet = new HashSet<Integer>();
+ Set<Integer> combinedSet = new HashSet<>();
combinedSet.addAll(collectionD);
combinedSet.addAll(collectionE);
- List<Integer> combinedList = new ArrayList<Integer>(combinedSet);
+ List<Integer> combinedList = new ArrayList<>(combinedSet);
Collections.sort(combinedList);
assertEquals("Merge two lists 2 - ignore duplicates", combinedList, result2);
@@ -1821,12 +1821,12 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
public void testRemoveAllWithEquator() {
- final List<String> base = new ArrayList<String>();
+ final List<String> base = new ArrayList<>();
base.add("AC");
base.add("BB");
base.add("CA");
- final List<String> remove = new ArrayList<String>();
+ final List<String> remove = new ArrayList<>();
remove.add("AA");
remove.add("CX");
remove.add("XZ");
@@ -1873,12 +1873,12 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
public void testRetainAllWithEquator() {
- final List<String> base = new ArrayList<String>();
+ final List<String> base = new ArrayList<>();
base.add("AC");
base.add("BB");
base.add("CA");
- final List<String> retain = new ArrayList<String>();
+ final List<String> retain = new ArrayList<>();
retain.add("AA");
retain.add("CX");
retain.add("XZ");