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 2016/03/11 22:12:23 UTC
svn commit: r1734633 [4/4] - in /commons/proper/collections/trunk/src:
main/java/org/apache/commons/collections4/
main/java/org/apache/commons/collections4/functors/
main/java/org/apache/commons/collections4/iterators/
main/java/org/apache/commons/coll...
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/MapUtilsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/MapUtilsTest.java?rev=1734633&r1=1734632&r2=1734633&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/MapUtilsTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/MapUtilsTest.java Fri Mar 11 21:12:21 2016
@@ -51,6 +51,7 @@ public class MapUtilsTest {
public Predicate<Object> getPredicate() {
return new Predicate<Object>() {
+ @Override
public boolean evaluate(final Object o) {
return o instanceof String;
}
@@ -107,6 +108,7 @@ public class MapUtilsTest {
@Test
public void testLazyMapTransformer() {
final Map<Object, Object> map = MapUtils.lazyMap(new HashMap<Object, Object>(), new Transformer<Object, Object>() {
+ @Override
public Object transform(final Object mapKey) {
if (mapKey instanceof String) {
return Integer.valueOf((String) mapKey);
@@ -820,6 +822,7 @@ public class MapUtilsTest {
this.name = name;
}
+ @Override
public int compareTo(X o) {
return key - o.key | name.compareTo(o.name);
}
@@ -839,6 +842,7 @@ public class MapUtilsTest {
// Now test key transform population
final MultiValueMap<Integer, X> map = MultiValueMap.multiValueMap(new TreeMap<Integer, Collection<X>>());
MapUtils.populateMap(map, list, new Transformer<X, Integer>() {
+ @Override
public Integer transform(X input) {
return input.key;
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/SplitMapUtilsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/SplitMapUtilsTest.java?rev=1734633&r1=1734632&r2=1734633&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/SplitMapUtilsTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/SplitMapUtilsTest.java Fri Mar 11 21:12:21 2016
@@ -43,6 +43,7 @@ public class SplitMapUtilsTest {
private TransformedSplitMap<String, String, String, Integer> transformedMap;
private final Transformer<String, Integer> stringToInt = new Transformer<String, Integer>() {
+ @Override
public Integer transform(final String input) {
return Integer.valueOf(input);
}
@@ -85,6 +86,7 @@ public class SplitMapUtilsTest {
int sz = map.size();
attemptPutOperation(new Runnable() {
+ @Override
public void run() {
map.clear();
}
@@ -93,6 +95,7 @@ public class SplitMapUtilsTest {
assertEquals(sz, map.size());
attemptPutOperation(new Runnable() {
+ @Override
public void run() {
map.put("foo", 100);
}
@@ -103,6 +106,7 @@ public class SplitMapUtilsTest {
m.put("bar", 200);
m.put("baz", 300);
attemptPutOperation(new Runnable() {
+ @Override
public void run() {
map.putAll(m);
}
@@ -133,46 +137,55 @@ public class SplitMapUtilsTest {
public void testWritableMap() {
final Map<String, String> map = SplitMapUtils.writableMap(transformedMap);
attemptGetOperation(new Runnable() {
+ @Override
public void run() {
map.get(null);
}
});
attemptGetOperation(new Runnable() {
+ @Override
public void run() {
map.entrySet();
}
});
attemptGetOperation(new Runnable() {
+ @Override
public void run() {
map.keySet();
}
});
attemptGetOperation(new Runnable() {
+ @Override
public void run() {
map.values();
}
});
attemptGetOperation(new Runnable() {
+ @Override
public void run() {
map.size();
}
});
attemptGetOperation(new Runnable() {
+ @Override
public void run() {
map.isEmpty();
}
});
attemptGetOperation(new Runnable() {
+ @Override
public void run() {
map.containsKey(null);
}
});
attemptGetOperation(new Runnable() {
+ @Override
public void run() {
map.containsValue(null);
}
});
attemptGetOperation(new Runnable() {
+ @Override
public void run() {
map.remove(null);
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/PredicatedBagTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/PredicatedBagTest.java?rev=1734633&r1=1734632&r2=1734633&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/PredicatedBagTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/PredicatedBagTest.java Fri Mar 11 21:12:21 2016
@@ -46,6 +46,7 @@ public class PredicatedBagTest<T> extend
protected Predicate<T> stringPredicate() {
return new Predicate<T>() {
+ @Override
public boolean evaluate(final T o) {
return o instanceof String;
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/PredicatedSortedBagTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/PredicatedSortedBagTest.java?rev=1734633&r1=1734632&r2=1734633&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/PredicatedSortedBagTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/PredicatedSortedBagTest.java Fri Mar 11 21:12:21 2016
@@ -48,6 +48,7 @@ public class PredicatedSortedBagTest<T>
protected Predicate<T> stringPredicate() {
return new Predicate<T>() {
+ @Override
public boolean evaluate(final T o) {
return o instanceof String;
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/TreeBagTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/TreeBagTest.java?rev=1734633&r1=1734632&r2=1734633&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/TreeBagTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/TreeBagTest.java Fri Mar 11 21:12:21 2016
@@ -77,6 +77,7 @@ public class TreeBagTest<T> extends Abst
}
final Bag<String> bag2 = new TreeBag<String>(new Comparator<String>() {
+ @Override
public int compare(String o1, String o2) {
return o1.compareTo(o2);
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java?rev=1734633&r1=1734632&r2=1734633&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java Fri Mar 11 21:12:21 2016
@@ -100,6 +100,7 @@ public class DualTreeBidiMap2Test<K exte
private static class IntegerComparator implements Comparator<Integer>, Serializable{
private static final long serialVersionUID = 1L;
+ @Override
public int compare(final Integer o1, final Integer o2) {
return o1.compareTo(o2);
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/CompositeCollectionTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/CompositeCollectionTest.java?rev=1734633&r1=1734632&r2=1734633&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/CompositeCollectionTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/CompositeCollectionTest.java Fri Mar 11 21:12:21 2016
@@ -127,6 +127,7 @@ public class CompositeCollectionTest<E>
setUpTest();
c.setMutator(new CompositeCollection.CollectionMutator<E>() {
+ @Override
public boolean add(final CompositeCollection<E> composite, final List<Collection<E>> collections, final E obj) {
for (final Collection<E> coll : collections) {
coll.add(obj);
@@ -134,6 +135,7 @@ public class CompositeCollectionTest<E>
return true;
}
+ @Override
public boolean addAll(final CompositeCollection<E> composite,
final List<Collection<E>> collections, final Collection<? extends E> coll) {
for (final Collection<E> collection : collections) {
@@ -142,6 +144,7 @@ public class CompositeCollectionTest<E>
return true;
}
+ @Override
public boolean remove(final CompositeCollection<E> composite,
final List<Collection<E>> collections, final Object obj) {
for (final Collection<E> collection : collections) {
@@ -243,6 +246,7 @@ public class CompositeCollectionTest<E>
public void testAddAllMutator() {
setUpTest();
c.setMutator(new CompositeCollection.CollectionMutator<E>() {
+ @Override
public boolean add(final CompositeCollection<E> composite,
final List<Collection<E>> collections, final E obj) {
for (final Collection<E> collection : collections) {
@@ -251,6 +255,7 @@ public class CompositeCollectionTest<E>
return true;
}
+ @Override
public boolean addAll(final CompositeCollection<E> composite,
final List<Collection<E>> collections, final Collection<? extends E> coll) {
for (final Collection<E> collection : collections) {
@@ -259,6 +264,7 @@ public class CompositeCollectionTest<E>
return true;
}
+ @Override
public boolean remove(final CompositeCollection<E> composite,
final List<Collection<E>> collections, final Object obj) {
return false;
@@ -276,6 +282,7 @@ public class CompositeCollectionTest<E>
public void testAddMutator() {
setUpTest();
c.setMutator(new CompositeCollection.CollectionMutator<E>() {
+ @Override
public boolean add(final CompositeCollection<E> composite,
final List<Collection<E>> collections, final E obj) {
for (final Collection<E> collection : collections) {
@@ -284,6 +291,7 @@ public class CompositeCollectionTest<E>
return true;
}
+ @Override
public boolean addAll(final CompositeCollection<E> composite,
final List<Collection<E>> collections, final Collection<? extends E> coll) {
for (final Collection<E> collection : collections) {
@@ -292,6 +300,7 @@ public class CompositeCollectionTest<E>
return true;
}
+ @Override
public boolean remove(final CompositeCollection<E> composite,
final List<Collection<E>> collections, final Object obj) {
return false;
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/IndexedCollectionTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/IndexedCollectionTest.java?rev=1734633&r1=1734632&r2=1734633&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/IndexedCollectionTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/IndexedCollectionTest.java Fri Mar 11 21:12:21 2016
@@ -53,6 +53,7 @@ public class IndexedCollectionTest exten
private static final class IntegerTransformer implements Transformer<String, Integer>, Serializable {
private static final long serialVersionUID = 809439581555072949L;
+ @Override
public Integer transform(final String input) {
return Integer.valueOf(input);
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionBuilderTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionBuilderTest.java?rev=1734633&r1=1734632&r2=1734633&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionBuilderTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionBuilderTest.java Fri Mar 11 21:12:21 2016
@@ -137,6 +137,7 @@ public class PredicatedCollectionBuilder
}
private static class OddPredicate implements Predicate<Integer> {
+ @Override
public boolean evaluate(Integer value) {
return value % 2 == 1;
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionTest.java?rev=1734633&r1=1734632&r2=1734633&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionTest.java Fri Mar 11 21:12:21 2016
@@ -78,6 +78,7 @@ public class PredicatedCollectionTest<E>
//-----------------------------------------------------------------------
protected Predicate<E> testPredicate =
new Predicate<E>() {
+ @Override
public boolean evaluate(final E o) {
return o instanceof String;
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/TransformedCollectionTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/TransformedCollectionTest.java?rev=1734633&r1=1734632&r2=1734633&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/TransformedCollectionTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/TransformedCollectionTest.java Fri Mar 11 21:12:21 2016
@@ -35,6 +35,7 @@ import org.apache.commons.collections4.T
public class TransformedCollectionTest extends AbstractCollectionTest<Object> {
private static class StringToInteger implements Transformer<Object, Object> {
+ @Override
public Object transform(final Object input) {
return Integer.valueOf((String) input);
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/ComparatorChainTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/ComparatorChainTest.java?rev=1734633&r1=1734632&r2=1734633&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/ComparatorChainTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/ComparatorChainTest.java Fri Mar 11 21:12:21 2016
@@ -105,6 +105,7 @@ public class ComparatorChainTest extends
// test that ComparatorChain handles this edge case correctly
final ComparatorChain<Integer> chain = new ComparatorChain<Integer>();
chain.addComparator(new Comparator<Integer>() {
+ @Override
public int compare(final Integer a, final Integer b) {
final int result = a.compareTo(b);
if (result < 0) {
@@ -201,6 +202,7 @@ public class ComparatorChainTest extends
this.colIndex = colIndex;
}
+ @Override
public int compare(final PseudoRow o1, final PseudoRow o2) {
final int col1 = o1.getColumn(colIndex);
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/ComparatorPredicateTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/ComparatorPredicateTest.java?rev=1734633&r1=1734632&r2=1734633&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/ComparatorPredicateTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/ComparatorPredicateTest.java Fri Mar 11 21:12:21 2016
@@ -26,6 +26,7 @@ import org.junit.Test;
public class ComparatorPredicateTest extends AbstractPredicateTest {
private class TestComparator<T extends Comparable<T>> implements Comparator<T> {
+ @Override
public int compare(final T first, final T second) {
return first.compareTo(second);
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/BoundedIteratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/BoundedIteratorTest.java?rev=1734633&r1=1734632&r2=1734633&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/BoundedIteratorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/BoundedIteratorTest.java Fri Mar 11 21:12:21 2016
@@ -353,6 +353,7 @@ public class BoundedIteratorTest<E> exte
@Test
public void testRemoveUnsupported() {
Iterator<E> mockIterator = new AbstractIteratorDecorator<E>(testList.iterator()) {
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/FilterIteratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/FilterIteratorTest.java?rev=1734633&r1=1734632&r2=1734633&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/FilterIteratorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/FilterIteratorTest.java Fri Mar 11 21:12:21 2016
@@ -159,6 +159,7 @@ public class FilterIteratorTest<E> exten
private void verifyElementsInPredicate(final String[] elements) {
final Predicate<E> pred = new Predicate<E>() {
+ @Override
public boolean evaluate(final E x) {
for (final String element : elements) {
if (element.equals(x)) {
@@ -200,6 +201,7 @@ public class FilterIteratorTest<E> exten
*/
protected FilterIterator<E> makePassThroughFilter(final Iterator<E> i) {
final Predicate<E> pred = new Predicate<E>() {
+ @Override
public boolean evaluate(final E x) { return true; }
};
return new FilterIterator<E>(i, pred);
@@ -214,6 +216,7 @@ public class FilterIteratorTest<E> exten
*/
protected FilterIterator<E> makeBlockAllFilter(final Iterator<E> i) {
final Predicate<E> pred = new Predicate<E>() {
+ @Override
public boolean evaluate(final E x) { return false; }
};
return new FilterIterator<E>(i, pred);
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/FilterListIteratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/FilterListIteratorTest.java?rev=1734633&r1=1734632&r2=1734633&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/FilterListIteratorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/FilterListIteratorTest.java Fri Mar 11 21:12:21 2016
@@ -68,36 +68,42 @@ public class FilterListIteratorTest exte
}
truePred = new Predicate<Integer>() {
+ @Override
public boolean evaluate(final Integer x) {
return true;
}
};
falsePred = new Predicate<Integer>() {
+ @Override
public boolean evaluate(final Integer x) {
return true;
}
};
evenPred = new Predicate<Integer>() {
+ @Override
public boolean evaluate(final Integer x) {
return x % 2 == 0;
}
};
oddPred = new Predicate<Integer>() {
+ @Override
public boolean evaluate(final Integer x) {
return x % 2 != 0; //works for all numbers, not just >= 0 as is the case for "x % 2 == 1"
}
};
threePred = new Predicate<Integer>() {
+ @Override
public boolean evaluate(final Integer x) {
return x % 3 == 0;
}
};
fourPred = new Predicate<Integer>() {
+ @Override
public boolean evaluate(final Integer x) {
return x % 4 == 0;
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/IteratorChainTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/IteratorChainTest.java?rev=1734633&r1=1734632&r2=1734633&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/IteratorChainTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/IteratorChainTest.java Fri Mar 11 21:12:21 2016
@@ -93,6 +93,7 @@ public class IteratorChainTest extends A
public void testRemoveFromFilteredIterator() {
final Predicate<Integer> myPredicate = new Predicate<Integer>() {
+ @Override
public boolean evaluate(final Integer i) {
return i.compareTo(Integer.valueOf(4)) < 0;
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/LazyIteratorChainTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/LazyIteratorChainTest.java?rev=1734633&r1=1734632&r2=1734633&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/LazyIteratorChainTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/LazyIteratorChainTest.java Fri Mar 11 21:12:21 2016
@@ -107,6 +107,7 @@ public class LazyIteratorChainTest exten
public void testRemoveFromFilteredIterator() {
final Predicate<Integer> myPredicate = new Predicate<Integer>() {
+ @Override
public boolean evaluate(final Integer i) {
return i.compareTo(Integer.valueOf(4)) < 0;
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/NodeListIteratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/NodeListIteratorTest.java?rev=1734633&r1=1734632&r2=1734633&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/NodeListIteratorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/NodeListIteratorTest.java Fri Mar 11 21:12:21 2016
@@ -68,9 +68,11 @@ public class NodeListIteratorTest extend
@Override
public Iterator<Node> makeEmptyIterator() {
final NodeList emptyNodeList = new NodeList() {
+ @Override
public Node item(final int index) {
throw new IndexOutOfBoundsException();
}
+ @Override
public int getLength() {
return 0;
}
@@ -90,9 +92,11 @@ public class NodeListIteratorTest extend
@Override
public Iterator<Node> makeObject() {
final NodeList nodeList = new NodeList() {
+ @Override
public Node item(final int index) {
return nodes[index];
}
+ @Override
public int getLength() {
return nodes.length;
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ObjectGraphIteratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ObjectGraphIteratorTest.java?rev=1734633&r1=1734632&r2=1734633&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ObjectGraphIteratorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ObjectGraphIteratorTest.java Fri Mar 11 21:12:21 2016
@@ -353,6 +353,7 @@ public class ObjectGraphIteratorTest ext
//-----------------------------------------------------------------------
static class LeafFinder implements Transformer<Object, Object> {
+ @Override
public Object transform(final Object input) {
if (input instanceof Forest) {
return ((Forest) input).treeIterator();
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/PredicatedListTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/PredicatedListTest.java?rev=1734633&r1=1734632&r2=1734633&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/PredicatedListTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/PredicatedListTest.java Fri Mar 11 21:12:21 2016
@@ -58,6 +58,7 @@ public class PredicatedListTest<E> exten
protected Predicate<E> testPredicate =
new Predicate<E>() {
+ @Override
public boolean evaluate(final E o) {
return o instanceof String;
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/CompositeMapTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/CompositeMapTest.java?rev=1734633&r1=1734632&r2=1734633&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/CompositeMapTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/CompositeMapTest.java Fri Mar 11 21:12:21 2016
@@ -133,6 +133,7 @@ public class CompositeMapTest<K, V> exte
new CompositeMap.MapMutator<K, V>() {
private static final long serialVersionUID = 1L;
+ @Override
public void resolveCollision(final CompositeMap<K, V> composite,
final Map<K, V> existing,
final Map<K, V> added,
@@ -140,11 +141,13 @@ public class CompositeMapTest<K, V> exte
pass = true;
}
+ @Override
public V put(final CompositeMap<K, V> map, final Map<K, V>[] composited, final K key,
final V value) {
throw new UnsupportedOperationException();
}
+ @Override
public void putAll(final CompositeMap<K, V> map, final Map<K, V>[] composited, final Map<? extends K, ? extends V> t) {
throw new UnsupportedOperationException();
}
@@ -159,6 +162,7 @@ public class CompositeMapTest<K, V> exte
final CompositeMap<K, V> map = new CompositeMap<K, V>(buildOne(), buildTwo(),
new CompositeMap.MapMutator<K, V>() {
private static final long serialVersionUID = 1L;
+ @Override
public void resolveCollision(final CompositeMap<K, V> composite,
final Map<K, V> existing,
final Map<K, V> added,
@@ -166,12 +170,14 @@ public class CompositeMapTest<K, V> exte
throw new UnsupportedOperationException();
}
+ @Override
public V put(final CompositeMap<K, V> map, final Map<K, V>[] composited, final K key,
final V value) {
pass = true;
return (V) "foo";
}
+ @Override
public void putAll(final CompositeMap<K, V> map, final Map<K, V>[] composited, final Map<? extends K, ? extends V> t) {
throw new UnsupportedOperationException();
}
@@ -185,6 +191,7 @@ public class CompositeMapTest<K, V> exte
final CompositeMap<K, V> map = new CompositeMap<K, V>(buildOne(), buildTwo(),
new CompositeMap.MapMutator<K, V>() {
private static final long serialVersionUID = 1L;
+ @Override
public void resolveCollision(final CompositeMap<K, V> composite,
final Map<K, V> existing,
final Map<K, V> added,
@@ -192,11 +199,13 @@ public class CompositeMapTest<K, V> exte
throw new UnsupportedOperationException();
}
+ @Override
public V put(final CompositeMap<K, V> map, final Map<K, V>[] composited, final K key,
final V value) {
throw new UnsupportedOperationException();
}
+ @Override
public void putAll(final CompositeMap<K, V> map, final Map<K, V>[] composited, final Map<? extends K, ? extends V> t) {
pass = true;
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/DefaultedMapTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/DefaultedMapTest.java?rev=1734633&r1=1734632&r2=1734633&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/DefaultedMapTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/DefaultedMapTest.java Fri Mar 11 21:12:21 2016
@@ -106,6 +106,7 @@ public class DefaultedMapTest<K, V> exte
public void testMapGet4() {
final HashMap<K, V> base = new HashMap<K, V>();
final Map<K, V> map = DefaultedMap.defaultedMap(base, new Transformer<K, V>() {
+ @Override
public V transform(final K input) {
if (input instanceof String) {
return (V) "NULL";
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/EmptyMapMutator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/EmptyMapMutator.java?rev=1734633&r1=1734632&r2=1734633&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/EmptyMapMutator.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/EmptyMapMutator.java Fri Mar 11 21:12:21 2016
@@ -28,6 +28,7 @@ class EmptyMapMutator<K,V> implements Co
/** Serialization version */
private static final long serialVersionUID = -2729718980002476794L;
+ @Override
public void resolveCollision(final CompositeMap<K,V> composite,
final Map<K,V> existing,
final Map<K,V> added,
@@ -35,10 +36,12 @@ class EmptyMapMutator<K,V> implements Co
// Do nothing
}
+ @Override
public V put(final CompositeMap<K, V> map, final Map<K, V>[] composited, final K key, final V value) {
return composited[0].put(key, value);
}
+ @Override
public void putAll(final CompositeMap<K, V> map, final Map<K, V>[] composited, final Map<? extends K, ? extends V> t) {
composited[0].putAll(t);
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/LazyMapTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/LazyMapTest.java?rev=1734633&r1=1734632&r2=1734633&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/LazyMapTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/LazyMapTest.java Fri Mar 11 21:12:21 2016
@@ -74,6 +74,7 @@ public class LazyMapTest<K, V> extends A
@Test
public void mapGetWithTransformer() {
final Transformer<Number, Integer> intConverter = new Transformer<Number, Integer>(){
+ @Override
public Integer transform(final Number input) {
return input.intValue();
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/PassiveExpiringMapTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/PassiveExpiringMapTest.java?rev=1734633&r1=1734632&r2=1734633&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/PassiveExpiringMapTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/PassiveExpiringMapTest.java Fri Mar 11 21:12:21 2016
@@ -38,6 +38,7 @@ public class PassiveExpiringMapTest<K, V
private static final long serialVersionUID = 1L;
+ @Override
public long expirationTime(final Integer key, final String value) {
// odd keys expire immediately, even keys never expire
if (key == null) {
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/PredicatedMapTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/PredicatedMapTest.java?rev=1734633&r1=1734632&r2=1734633&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/PredicatedMapTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/PredicatedMapTest.java Fri Mar 11 21:12:21 2016
@@ -36,6 +36,7 @@ public class PredicatedMapTest<K, V> ext
protected static final Predicate<Object> truePredicate = TruePredicate.<Object>truePredicate();
protected static final Predicate<Object> testPredicate = new Predicate<Object>() {
+ @Override
public boolean evaluate(final Object o) {
return o instanceof String;
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/PredicatedSortedMapTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/PredicatedSortedMapTest.java?rev=1734633&r1=1734632&r2=1734633&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/PredicatedSortedMapTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/PredicatedSortedMapTest.java Fri Mar 11 21:12:21 2016
@@ -38,6 +38,7 @@ public class PredicatedSortedMapTest<K,
protected static final Predicate<Object> truePredicate = TruePredicate.truePredicate();
protected static final Predicate<Object> testPredicate = new Predicate<Object>() {
+ @Override
public boolean evaluate(final Object o) {
return o instanceof String;
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/queue/PredicatedQueueTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/queue/PredicatedQueueTest.java?rev=1734633&r1=1734632&r2=1734633&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/queue/PredicatedQueueTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/queue/PredicatedQueueTest.java Fri Mar 11 21:12:21 2016
@@ -75,6 +75,7 @@ public class PredicatedQueueTest<E> exte
protected Predicate<E> testPredicate =
new Predicate<E>() {
+ @Override
public boolean evaluate(final E o) {
return o instanceof String;
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/sequence/SequencesComparatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/sequence/SequencesComparatorTest.java?rev=1734633&r1=1734632&r2=1734633&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/sequence/SequencesComparatorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/sequence/SequencesComparatorTest.java Fri Mar 11 21:12:21 2016
@@ -162,14 +162,17 @@ public class SequencesComparatorTest {
index = 0;
}
+ @Override
public void visitInsertCommand(final T object) {
v.add(index++, object);
}
+ @Override
public void visitKeepCommand(final T object) {
++index;
}
+ @Override
public void visitDeleteCommand(final T object) {
v.remove(index);
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/CompositeSetTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/CompositeSetTest.java?rev=1734633&r1=1734632&r2=1734633&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/CompositeSetTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/CompositeSetTest.java Fri Mar 11 21:12:21 2016
@@ -97,16 +97,19 @@ public class CompositeSetTest<E> extends
set.setMutator(new SetMutator<E>() {
private static final long serialVersionUID = 1L;
+ @Override
public void resolveCollision(final CompositeSet<E> comp, final Set<E> existing,
final Set<E> added, final Collection<E> intersects) {
//noop
}
+ @Override
public boolean add(final CompositeSet<E> composite,
final List<Set<E>> collections, final E obj) {
throw new UnsupportedOperationException();
}
+ @Override
public boolean addAll(final CompositeSet<E> composite,
final List<Set<E>> collections, final Collection<? extends E> coll) {
throw new UnsupportedOperationException();
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/EmptySetMutator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/EmptySetMutator.java?rev=1734633&r1=1734632&r2=1734633&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/EmptySetMutator.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/EmptySetMutator.java Fri Mar 11 21:12:21 2016
@@ -36,14 +36,17 @@ class EmptySetMutator<E> implements Comp
this.contained = set;
}
+ @Override
public void resolveCollision(final CompositeSet<E> comp, final Set<E> existing, final Set<E> added, final Collection<E> intersects) {
throw new IllegalArgumentException();
}
+ @Override
public boolean add(final CompositeSet<E> composite, final List<Set<E>> collections, final E obj) {
return contained.add(obj);
}
+ @Override
public boolean addAll(final CompositeSet<E> composite, final List<Set<E>> collections, final Collection<? extends E> coll) {
return contained.addAll(coll);
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/PredicatedNavigableSetTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/PredicatedNavigableSetTest.java?rev=1734633&r1=1734632&r2=1734633&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/PredicatedNavigableSetTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/PredicatedNavigableSetTest.java Fri Mar 11 21:12:21 2016
@@ -64,6 +64,7 @@ public class PredicatedNavigableSetTest<
//--------------------------------------------------------------------
protected Predicate<E> testPredicate =
new Predicate<E>() {
+ @Override
public boolean evaluate(final E o) {
return o instanceof String && ((String) o).startsWith("A");
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/PredicatedSetTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/PredicatedSetTest.java?rev=1734633&r1=1734632&r2=1734633&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/PredicatedSetTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/PredicatedSetTest.java Fri Mar 11 21:12:21 2016
@@ -58,6 +58,7 @@ public class PredicatedSetTest<E> extend
protected Predicate<E> testPredicate =
new Predicate<E>() {
+ @Override
public boolean evaluate(final E o) {
return o instanceof String;
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/PredicatedSortedSetTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/PredicatedSortedSetTest.java?rev=1734633&r1=1734632&r2=1734633&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/PredicatedSortedSetTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/PredicatedSortedSetTest.java Fri Mar 11 21:12:21 2016
@@ -64,6 +64,7 @@ public class PredicatedSortedSetTest<E>
//--------------------------------------------------------------------
protected Predicate<E> testPredicate =
new Predicate<E>() {
+ @Override
public boolean evaluate(final E o) {
return o instanceof String && ((String) o).startsWith("A");
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/splitmap/TransformedSplitMapTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/splitmap/TransformedSplitMapTest.java?rev=1734633&r1=1734632&r2=1734633&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/splitmap/TransformedSplitMapTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/splitmap/TransformedSplitMapTest.java Fri Mar 11 21:12:21 2016
@@ -37,18 +37,21 @@ import org.apache.commons.collections4.f
public class TransformedSplitMapTest extends BulkTest {
private final Transformer<Integer, String> intToString = new Transformer<Integer, String>() {
+ @Override
public String transform(final Integer input) {
return String.valueOf(input);
}
};
private final Transformer<Object, Class<?>> objectToClass = new Transformer<Object, Class<?>>() {
+ @Override
public java.lang.Class<?> transform(final Object input) {
return input == null ? null : input.getClass();
}
};
private final Transformer<String, Integer> stringToInt = new Transformer<String, Integer>() {
+ @Override
public Integer transform(final String input) {
return Integer.valueOf(input);
}