From 5cabc0f86f8ee622f22fa5b2a2f04b083e22e6ad Mon Sep 17 00:00:00 2001 From: Sebastian Bazley Date: Wed, 21 Jul 2010 17:39:49 +0000 Subject: [PATCH] Add missing @Override markers git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/trunk@966327 13f79535-47bb-0310-9956-ffa450edef68 --- .../collections/ExtendedProperties.java | 5 +++ .../collections/bag/AbstractBagDecorator.java | 1 + .../collections/bag/AbstractMapBag.java | 5 +++ .../bag/AbstractSortedBagDecorator.java | 1 + .../collections/bag/PredicatedBag.java | 1 + .../collections/bag/PredicatedSortedBag.java | 1 + .../commons/collections/bag/TreeBag.java | 1 + .../collections/bag/UnmodifiableBag.java | 10 ++++++ .../bag/UnmodifiableSortedBag.java | 10 ++++++ .../bidimap/AbstractBidiMapDecorator.java | 2 ++ .../AbstractSortedBidiMapDecorator.java | 1 + .../collections/bidimap/DualTreeBidiMap.java | 10 ++++++ .../collections/bidimap/TreeBidiMap.java | 14 ++++++++ .../bidimap/UnmodifiableBidiMap.java | 10 ++++++ .../bidimap/UnmodifiableOrderedBidiMap.java | 10 ++++++ .../bidimap/UnmodifiableSortedBidiMap.java | 13 +++++++ .../buffer/AbstractBufferDecorator.java | 1 + .../collections/buffer/BlockingBuffer.java | 4 +++ .../collections/buffer/BoundedBuffer.java | 5 +++ .../collections/buffer/BoundedFifoBuffer.java | 5 +++ .../buffer/CircularFifoBuffer.java | 1 + .../collections/buffer/PredicatedBuffer.java | 1 + .../collections/buffer/PriorityBuffer.java | 5 +++ .../buffer/SynchronizedBuffer.java | 1 + .../buffer/UnboundedFifoBuffer.java | 4 +++ .../buffer/UnmodifiableBuffer.java | 8 +++++ .../AbstractCollectionDecorator.java | 3 ++ .../AbstractUntypedCollectionDecorator.java | 3 ++ .../collection/PredicatedCollection.java | 2 ++ .../collection/SynchronizedCollection.java | 3 ++ .../collection/TransformedCollection.java | 2 ++ .../UnmodifiableBoundedCollection.java | 7 ++++ .../collection/UnmodifiableCollection.java | 7 ++++ .../comparators/BooleanComparator.java | 2 ++ .../comparators/ComparableComparator.java | 2 ++ .../comparators/ComparatorChain.java | 2 ++ .../comparators/NullComparator.java | 2 ++ .../comparators/ReverseComparator.java | 2 ++ .../iterators/ArrayListIterator.java | 2 ++ .../iterators/EntrySetMapIterator.java | 1 + .../iterators/ObjectArrayListIterator.java | 2 ++ .../keyvalue/AbstractKeyValue.java | 1 + .../keyvalue/AbstractMapEntry.java | 2 ++ .../keyvalue/AbstractMapEntryDecorator.java | 3 ++ .../collections/keyvalue/DefaultKeyValue.java | 2 ++ .../collections/keyvalue/MultiKey.java | 3 ++ .../collections/keyvalue/TiedMapEntry.java | 3 ++ .../keyvalue/UnmodifiableMapEntry.java | 1 + .../collections/list/AbstractLinkedList.java | 19 +++++++++++ .../list/AbstractListDecorator.java | 1 + .../commons/collections/list/GrowthList.java | 3 ++ .../commons/collections/list/LazyList.java | 2 ++ .../list/NodeCachingLinkedList.java | 3 ++ .../collections/list/SetUniqueList.java | 23 +++++++++++++ .../collections/list/TransformedList.java | 2 ++ .../commons/collections/list/TreeList.java | 13 +++++++ .../collections/list/UnmodifiableList.java | 14 ++++++++ .../collections/map/AbstractHashedMap.java | 34 +++++++++++++++++++ .../map/AbstractInputCheckedMapDecorator.java | 6 ++++ .../collections/map/AbstractLinkedMap.java | 12 +++++++ .../collections/map/AbstractMapDecorator.java | 3 ++ .../map/AbstractOrderedMapDecorator.java | 2 ++ .../collections/map/AbstractReferenceMap.java | 34 +++++++++++++++++++ .../map/AbstractSortedMapDecorator.java | 1 + .../collections/map/CaseInsensitiveMap.java | 2 ++ .../commons/collections/map/CompositeMap.java | 2 ++ .../commons/collections/map/DefaultedMap.java | 1 + .../commons/collections/map/FixedSizeMap.java | 7 ++++ .../collections/map/FixedSizeSortedMap.java | 10 ++++++ .../commons/collections/map/Flat3Map.java | 21 ++++++++++++ .../commons/collections/map/HashedMap.java | 1 + .../commons/collections/map/IdentityMap.java | 7 ++++ .../commons/collections/map/LRUMap.java | 6 ++++ .../commons/collections/map/LinkedMap.java | 18 ++++++++++ .../collections/map/ListOrderedMap.java | 34 +++++++++++++++++++ .../commons/collections/map/MultiKeyMap.java | 3 ++ .../collections/map/MultiValueMap.java | 8 +++++ .../collections/map/PredicatedMap.java | 4 +++ .../collections/map/ReferenceIdentityMap.java | 4 +++ .../commons/collections/map/SingletonMap.java | 10 ++++++ .../collections/map/TransformedMap.java | 4 +++ .../collections/map/UnmodifiableEntrySet.java | 12 +++++++ .../collections/map/UnmodifiableMap.java | 8 +++++ .../map/UnmodifiableOrderedMap.java | 8 +++++ .../map/UnmodifiableSortedMap.java | 13 +++++++ .../collections/set/AbstractSetDecorator.java | 1 + .../set/AbstractSortedSetDecorator.java | 1 + .../commons/collections/set/CompositeSet.java | 7 ++++ .../collections/set/ListOrderedSet.java | 12 +++++++ .../commons/collections/set/MapBackedSet.java | 2 ++ .../collections/set/PredicatedSet.java | 1 + .../collections/set/PredicatedSortedSet.java | 1 + .../collections/set/UnmodifiableSet.java | 7 ++++ .../set/UnmodifiableSortedSet.java | 10 ++++++ .../AbstractIterableGetMapDecorator.java | 3 ++ .../apache/commons/collections/BulkTest.java | 2 ++ .../commons/collections/LocalTestNode.java | 2 ++ .../commons/collections/TestArrayStack.java | 2 ++ .../commons/collections/TestClosureUtils.java | 2 ++ .../commons/collections/TestFactoryUtils.java | 4 +++ .../commons/collections/TestLinkedList.java | 4 +++ .../commons/collections/TestListUtils.java | 1 + .../commons/collections/TestMapUtils.java | 1 + .../collections/TestTransformerUtils.java | 2 ++ .../commons/collections/TestTreeMap.java | 1 + .../collections/bag/AbstractTestBag.java | 2 ++ .../commons/collections/bag/TestHashBag.java | 2 ++ .../collections/bag/TestPredicatedBag.java | 2 ++ .../bag/TestPredicatedSortedBag.java | 2 ++ .../collections/bag/TestTransformedBag.java | 2 ++ .../bag/TestTransformedSortedBag.java | 2 ++ .../commons/collections/bag/TestTreeBag.java | 2 ++ .../bidimap/AbstractTestBidiMap.java | 24 +++++++++++++ .../bidimap/AbstractTestOrderedBidiMap.java | 8 +++++ .../bidimap/AbstractTestSortedBidiMap.java | 3 ++ .../TestAbstractOrderedBidiMapDecorator.java | 5 +++ .../bidimap/TestDualHashBidiMap.java | 1 + .../bidimap/TestDualTreeBidiMap.java | 1 + .../bidimap/TestDualTreeBidiMap2.java | 4 +++ .../collections/bidimap/TestTreeBidiMap.java | 7 ++++ .../bidimap/TestUnmodifiableBidiMap.java | 7 ++++ .../TestUnmodifiableOrderedBidiMap.java | 9 +++++ .../TestUnmodifiableSortedBidiMap.java | 10 ++++++ .../buffer/TestBlockingBuffer.java | 7 ++++ .../collections/buffer/TestBoundedBuffer.java | 5 +++ .../buffer/TestBoundedFifoBuffer.java | 7 ++++ .../buffer/TestBoundedFifoBuffer2.java | 3 ++ .../buffer/TestCircularFifoBuffer.java | 7 ++++ .../buffer/TestPredicatedBuffer.java | 4 +++ .../buffer/TestPriorityBuffer.java | 8 +++++ .../buffer/TestSynchronizedBuffer.java | 6 ++++ .../buffer/TestUnboundedFifoBuffer.java | 7 ++++ .../buffer/TestUnmodifiableBuffer.java | 8 +++++ .../collection/AbstractTestCollection.java | 3 ++ .../collection/TestCompositeCollection.java | 9 +++++ .../collection/TestPredicatedCollection.java | 6 ++++ .../TestSynchronizedCollection.java | 4 +++ .../collection/TestTransformedCollection.java | 7 ++++ .../TestUnmodifiableCollection.java | 7 ++++ .../comparators/AbstractTestComparator.java | 4 +++ .../comparators/TestBooleanComparator.java | 3 ++ .../comparators/TestComparableComparator.java | 2 ++ .../comparators/TestComparatorChain.java | 6 ++++ .../comparators/TestNullComparator.java | 6 ++++ .../comparators/TestReverseComparator.java | 3 ++ .../functors/TestAnyAllOnePredicate.java | 2 ++ .../iterators/AbstractTestIterator.java | 1 + .../iterators/AbstractTestListIterator.java | 2 ++ .../iterators/AbstractTestMapIterator.java | 3 ++ .../AbstractTestOrderedMapIterator.java | 4 +++ .../iterators/TestArrayIterator.java | 3 ++ .../iterators/TestArrayIterator2.java | 3 ++ .../iterators/TestArrayListIterator.java | 3 ++ .../iterators/TestArrayListIterator2.java | 2 ++ .../iterators/TestCollatingIterator.java | 3 ++ .../iterators/TestFilterIterator.java | 4 +++ .../iterators/TestFilterListIterator.java | 2 ++ .../iterators/TestIteratorChain.java | 4 +++ .../iterators/TestListIteratorWrapper.java | 4 +++ .../iterators/TestListIteratorWrapper2.java | 4 +++ .../iterators/TestObjectArrayIterator.java | 3 ++ .../TestObjectArrayListIterator.java | 2 ++ .../TestObjectArrayListIterator2.java | 4 +++ .../iterators/TestObjectGraphIterator.java | 3 ++ .../iterators/TestReverseListIterator.java | 4 +++ .../iterators/TestSingletonIterator.java | 4 +++ .../iterators/TestSingletonIterator2.java | 4 +++ .../iterators/TestSingletonListIterator.java | 5 +++ .../iterators/TestUniqueFilterIterator.java | 3 ++ .../iterators/TestUnmodifiableIterator.java | 3 ++ .../TestUnmodifiableListIterator.java | 5 +++ .../TestUnmodifiableMapIterator.java | 6 ++++ .../TestUnmodifiableOrderedMapIterator.java | 6 ++++ .../keyvalue/TestDefaultMapEntry.java | 4 +++ .../collections/keyvalue/TestMultiKey.java | 4 +++ .../keyvalue/TestTiedMapEntry.java | 2 ++ .../keyvalue/TestUnmodifiableMapEntry.java | 5 +++ .../collections/list/AbstractTestList.java | 27 +++++++++++++++ .../list/TestCursorableLinkedList.java | 6 ++++ .../collections/list/TestFixedSizeList.java | 5 +++ .../collections/list/TestGrowthList.java | 7 ++++ .../list/TestNodeCachingLinkedList.java | 2 ++ .../collections/list/TestPredicatedList.java | 3 ++ .../collections/list/TestSetUniqueList.java | 9 +++++ .../list/TestSynchronizedList.java | 3 ++ .../collections/list/TestTransformedList.java | 5 +++ .../collections/list/TestTreeList.java | 1 + .../list/TestUnmodifiableList.java | 6 ++++ .../map/AbstractTestOrderedMap.java | 10 ++++++ .../collections/map/TestIdentityMap.java | 2 ++ .../commons/collections/map/TestLRUMap.java | 16 +++++++++ .../collections/map/TestLinkedMap.java | 10 ++++++ .../collections/map/TestListOrderedMap.java | 18 ++++++++++ .../collections/map/TestListOrderedMap2.java | 10 ++++++ .../collections/map/TestMultiKeyMap.java | 7 ++++ .../collections/map/TestMultiValueMap.java | 2 ++ .../collections/map/TestPredicatedMap.java | 2 ++ .../map/TestPredicatedSortedMap.java | 4 +++ .../map/TestReferenceIdentityMap.java | 5 +++ .../collections/map/TestReferenceMap.java | 4 +++ .../collections/map/TestSingletonMap.java | 9 +++++ .../collections/map/TestStaticBucketMap.java | 2 ++ .../collections/map/TestTransformedMap.java | 2 ++ .../collections/map/TestUnmodifiableMap.java | 6 ++++ .../map/TestUnmodifiableOrderedMap.java | 6 ++++ .../map/TestUnmodifiableSortedMap.java | 6 ++++ 206 files changed, 1129 insertions(+) diff --git a/src/java/org/apache/commons/collections/ExtendedProperties.java b/src/java/org/apache/commons/collections/ExtendedProperties.java index 5e85187af..52e5fc678 100644 --- a/src/java/org/apache/commons/collections/ExtendedProperties.java +++ b/src/java/org/apache/commons/collections/ExtendedProperties.java @@ -413,6 +413,7 @@ public class ExtendedProperties extends Hashtable { * * @return True if the object has more tokens. */ + @Override public boolean hasMoreTokens() { return super.hasMoreTokens(); } @@ -422,6 +423,7 @@ public class ExtendedProperties extends Hashtable { * * @return A String. */ + @Override public String nextToken() { StringBuilder buffer = new StringBuilder(); @@ -1708,6 +1710,7 @@ public class ExtendedProperties extends Hashtable { * @param value for the property * @return old value of the property */ + @Override public Object put(Object key, Object value) { String strKey = String.valueOf(key); Object ret = getProperty(strKey); @@ -1722,6 +1725,7 @@ public class ExtendedProperties extends Hashtable { * * @param map full of key/value pair data */ + @Override public void putAll(Map map) { if (map instanceof ExtendedProperties) { for (Iterator it = ((ExtendedProperties) map).getKeys(); it.hasNext(); ) { @@ -1744,6 +1748,7 @@ public class ExtendedProperties extends Hashtable { * @param key specifying the property * @return old value of the property */ + @Override public Object remove(Object key) { String strKey = String.valueOf(key); Object ret = getProperty(strKey); diff --git a/src/java/org/apache/commons/collections/bag/AbstractBagDecorator.java b/src/java/org/apache/commons/collections/bag/AbstractBagDecorator.java index 96a743c82..281aeab00 100644 --- a/src/java/org/apache/commons/collections/bag/AbstractBagDecorator.java +++ b/src/java/org/apache/commons/collections/bag/AbstractBagDecorator.java @@ -60,6 +60,7 @@ public abstract class AbstractBagDecorator * * @return the decorated bag */ + @Override protected Bag decorated() { return (Bag) super.decorated(); } diff --git a/src/java/org/apache/commons/collections/bag/AbstractMapBag.java b/src/java/org/apache/commons/collections/bag/AbstractMapBag.java index aa7e13e3d..0892d4acf 100644 --- a/src/java/org/apache/commons/collections/bag/AbstractMapBag.java +++ b/src/java/org/apache/commons/collections/bag/AbstractMapBag.java @@ -417,6 +417,7 @@ public abstract class AbstractMapBag implements Bag { this.value = value; } + @Override public boolean equals(Object obj) { if (obj instanceof MutableInteger == false) { return false; @@ -424,6 +425,7 @@ public abstract class AbstractMapBag implements Bag { return ((MutableInteger) obj).value == value; } + @Override public int hashCode() { return value; } @@ -530,6 +532,7 @@ public abstract class AbstractMapBag implements Bag { * @param object the Bag to compare to * @return true if equal */ + @Override public boolean equals(Object object) { if (object == this) { return true; @@ -559,6 +562,7 @@ public abstract class AbstractMapBag implements Bag { * * @return the hash code of the Bag */ + @Override public int hashCode() { int total = 0; for (Iterator> it = map.entrySet().iterator(); it.hasNext();) { @@ -575,6 +579,7 @@ public abstract class AbstractMapBag implements Bag { * * @return a debugging toString */ + @Override public String toString() { if (size() == 0) { return "[]"; diff --git a/src/java/org/apache/commons/collections/bag/AbstractSortedBagDecorator.java b/src/java/org/apache/commons/collections/bag/AbstractSortedBagDecorator.java index cc82ebe19..c510aab8f 100644 --- a/src/java/org/apache/commons/collections/bag/AbstractSortedBagDecorator.java +++ b/src/java/org/apache/commons/collections/bag/AbstractSortedBagDecorator.java @@ -59,6 +59,7 @@ public abstract class AbstractSortedBagDecorator * * @return the decorated bag */ + @Override protected SortedBag decorated() { return (SortedBag) super.decorated(); } diff --git a/src/java/org/apache/commons/collections/bag/PredicatedBag.java b/src/java/org/apache/commons/collections/bag/PredicatedBag.java index 3af6bc6ba..e1e1def29 100644 --- a/src/java/org/apache/commons/collections/bag/PredicatedBag.java +++ b/src/java/org/apache/commons/collections/bag/PredicatedBag.java @@ -84,6 +84,7 @@ public class PredicatedBag * * @return the decorated bag */ + @Override protected Bag decorated() { return (Bag) super.decorated(); } diff --git a/src/java/org/apache/commons/collections/bag/PredicatedSortedBag.java b/src/java/org/apache/commons/collections/bag/PredicatedSortedBag.java index c1460136e..c609e75f4 100644 --- a/src/java/org/apache/commons/collections/bag/PredicatedSortedBag.java +++ b/src/java/org/apache/commons/collections/bag/PredicatedSortedBag.java @@ -83,6 +83,7 @@ public class PredicatedSortedBag * * @return the decorated bag */ + @Override protected SortedBag decorated() { return (SortedBag) super.decorated(); } diff --git a/src/java/org/apache/commons/collections/bag/TreeBag.java b/src/java/org/apache/commons/collections/bag/TreeBag.java index 608cb4c7d..c49f2ad4b 100644 --- a/src/java/org/apache/commons/collections/bag/TreeBag.java +++ b/src/java/org/apache/commons/collections/bag/TreeBag.java @@ -81,6 +81,7 @@ public class TreeBag extends AbstractMapBag implements SortedBag, Seria //----------------------------------------------------------------------- // TODO: Generics - should this be E or some such? + @Override public boolean add(E object) { if(comparator() == null && !(object instanceof Comparable)) { throw new IllegalArgumentException("Objects of type " + object.getClass() + " cannot be added to " + diff --git a/src/java/org/apache/commons/collections/bag/UnmodifiableBag.java b/src/java/org/apache/commons/collections/bag/UnmodifiableBag.java index 77c171b71..60de96175 100644 --- a/src/java/org/apache/commons/collections/bag/UnmodifiableBag.java +++ b/src/java/org/apache/commons/collections/bag/UnmodifiableBag.java @@ -100,43 +100,53 @@ public final class UnmodifiableBag } //----------------------------------------------------------------------- + @Override public Iterator iterator() { return UnmodifiableIterator.decorate(decorated().iterator()); } + @Override public boolean add(E object) { throw new UnsupportedOperationException(); } + @Override public boolean addAll(Collection coll) { throw new UnsupportedOperationException(); } + @Override public void clear() { throw new UnsupportedOperationException(); } + @Override public boolean remove(Object object) { throw new UnsupportedOperationException(); } + @Override public boolean removeAll(Collection coll) { throw new UnsupportedOperationException(); } + @Override public boolean retainAll(Collection coll) { throw new UnsupportedOperationException(); } //----------------------------------------------------------------------- + @Override public boolean add(E object, int count) { throw new UnsupportedOperationException(); } + @Override public boolean remove(Object object, int count) { throw new UnsupportedOperationException(); } + @Override public Set uniqueSet() { Set set = decorated().uniqueSet(); return UnmodifiableSet.decorate(set); diff --git a/src/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java b/src/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java index ab9c58eba..1c812bbcc 100644 --- a/src/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java +++ b/src/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java @@ -100,43 +100,53 @@ public final class UnmodifiableSortedBag } //----------------------------------------------------------------------- + @Override public Iterator iterator() { return UnmodifiableIterator.decorate(decorated().iterator()); } + @Override public boolean add(E object) { throw new UnsupportedOperationException(); } + @Override public boolean addAll(Collection coll) { throw new UnsupportedOperationException(); } + @Override public void clear() { throw new UnsupportedOperationException(); } + @Override public boolean remove(Object object) { throw new UnsupportedOperationException(); } + @Override public boolean removeAll(Collection coll) { throw new UnsupportedOperationException(); } + @Override public boolean retainAll(Collection coll) { throw new UnsupportedOperationException(); } //----------------------------------------------------------------------- + @Override public boolean add(E object, int count) { throw new UnsupportedOperationException(); } + @Override public boolean remove(Object object, int count) { throw new UnsupportedOperationException(); } + @Override public Set uniqueSet() { Set set = decorated().uniqueSet(); return UnmodifiableSet.decorate(set); diff --git a/src/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java b/src/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java index 68a2805c4..c87a243b2 100644 --- a/src/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java +++ b/src/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java @@ -55,11 +55,13 @@ public abstract class AbstractBidiMapDecorator extends AbstractMapDecorato * * @return the decorated map */ + @Override protected BidiMap decorated() { return (BidiMap) super.decorated(); } //----------------------------------------------------------------------- + @Override public MapIterator mapIterator() { return decorated().mapIterator(); } diff --git a/src/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java b/src/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java index 29becea9f..f76aed31d 100644 --- a/src/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java +++ b/src/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java @@ -56,6 +56,7 @@ public abstract class AbstractSortedBidiMapDecorator extends * * @return the decorated map */ + @Override protected SortedBidiMap decorated() { return (SortedBidiMap) super.decorated(); } diff --git a/src/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java b/src/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java index b8fb0d733..d0ed3accc 100644 --- a/src/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java +++ b/src/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java @@ -121,6 +121,7 @@ public class DualTreeBidiMap extends AbstractDualBidiMap implements * @param inverseMap the inverse BidiMap * @return new bidi map */ + @Override protected DualTreeBidiMap createBidiMap(Map normalMap, Map reverseMap, BidiMap inverseMap) { return new DualTreeBidiMap(normalMap, reverseMap, inverseMap); } @@ -183,6 +184,7 @@ public class DualTreeBidiMap extends AbstractDualBidiMap implements * * @return a new ordered map iterator */ + @Override public OrderedMapIterator mapIterator() { return new BidiOrderedMapIterator(this); } @@ -240,11 +242,13 @@ public class DualTreeBidiMap extends AbstractDualBidiMap implements this.bidi = (DualTreeBidiMap) decorated(); } + @Override public boolean containsValue(Object value) { // override as default implementation uses reverseMap return decorated().normalMap.containsValue(value); } + @Override public void clear() { // override as default implementation uses reverseMap for (Iterator it = keySet().iterator(); it.hasNext();) { @@ -253,14 +257,17 @@ public class DualTreeBidiMap extends AbstractDualBidiMap implements } } + @Override public SortedMap headMap(K toKey) { return new ViewMap(decorated(), super.headMap(toKey)); } + @Override public SortedMap tailMap(K fromKey) { return new ViewMap(decorated(), super.tailMap(fromKey)); } + @Override public SortedMap subMap(K fromKey, K toKey) { return new ViewMap(decorated(), super.subMap(fromKey, toKey)); } @@ -270,10 +277,12 @@ public class DualTreeBidiMap extends AbstractDualBidiMap implements return (DualTreeBidiMap) super.decorated(); } + @Override public K previousKey(K key) { return decorated().previousKey(key); }; + @Override public K nextKey(K key) { return decorated().nextKey(key); }; @@ -358,6 +367,7 @@ public class DualTreeBidiMap extends AbstractDualBidiMap implements last = null; } + @Override public String toString() { if (last != null) { return "MapIterator[" + getKey() + "=" + getValue() + "]"; diff --git a/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java b/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java index e1aa8ef0e..fca84b5dd 100644 --- a/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java +++ b/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java @@ -447,6 +447,7 @@ public class TreeBidiMap, V extends Comparable> imple * @param obj the object to compare to * @return true if equal */ + @Override public boolean equals(Object obj) { return this.doEquals(obj, KEY); } @@ -456,6 +457,7 @@ public class TreeBidiMap, V extends Comparable> imple * * @return the hash code value for this map */ + @Override public int hashCode() { return this.doHashCode(KEY); } @@ -465,6 +467,7 @@ public class TreeBidiMap, V extends Comparable> imple * * @return a standard format string version of the map */ + @Override public String toString() { return this.doToString(KEY); } @@ -1423,10 +1426,12 @@ public class TreeBidiMap, V extends Comparable> imple this.orderType = orderType; } + @Override public int size() { return TreeBidiMap.this.size(); } + @Override public void clear() { TreeBidiMap.this.clear(); } @@ -1495,6 +1500,7 @@ public class TreeBidiMap, V extends Comparable> imple super(KEY); } + @Override public boolean contains(Object obj) { if (obj instanceof Map.Entry == false) { return false; @@ -1505,6 +1511,7 @@ public class TreeBidiMap, V extends Comparable> imple return node != null && node.getValue().equals(value); } + @Override public boolean remove(Object obj) { if (obj instanceof Map.Entry == false) { return false; @@ -1534,6 +1541,7 @@ public class TreeBidiMap, V extends Comparable> imple super(VALUE); } + @Override public boolean contains(Object obj) { if (obj instanceof Map.Entry == false) { return false; @@ -1544,6 +1552,7 @@ public class TreeBidiMap, V extends Comparable> imple return node != null && node.getKey().equals(value); } + @Override public boolean remove(Object obj) { if (obj instanceof Map.Entry == false) { return false; @@ -1966,6 +1975,7 @@ public class TreeBidiMap, V extends Comparable> imple * @param obj the object to be compared for equality with this entry. * @return true if the specified object is equal to this entry. */ + @Override public boolean equals(final Object obj) { if (obj == this) { return true; @@ -1980,6 +1990,7 @@ public class TreeBidiMap, V extends Comparable> imple /** * @return the hash code value for this map entry. */ + @Override public int hashCode() { if (!calculatedHashCode) { hashcodeValue = getKey().hashCode() ^ getValue().hashCode(); @@ -2108,14 +2119,17 @@ public class TreeBidiMap, V extends Comparable> imple return TreeBidiMap.this; } + @Override public boolean equals(Object obj) { return TreeBidiMap.this.doEquals(obj, DataElement.VALUE); } + @Override public int hashCode() { return TreeBidiMap.this.doHashCode(DataElement.VALUE); } + @Override public String toString() { return TreeBidiMap.this.doToString(DataElement.VALUE); } diff --git a/src/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java b/src/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java index b7ad0f014..f64086a8b 100644 --- a/src/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java +++ b/src/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java @@ -72,47 +72,57 @@ public final class UnmodifiableBidiMap } //----------------------------------------------------------------------- + @Override public void clear() { throw new UnsupportedOperationException(); } + @Override public V put(K key, V value) { throw new UnsupportedOperationException(); } + @Override public void putAll(Map mapToCopy) { throw new UnsupportedOperationException(); } + @Override public V remove(Object key) { throw new UnsupportedOperationException(); } + @Override public Set> entrySet() { Set> set = super.entrySet(); return UnmodifiableEntrySet.decorate(set); } + @Override public Set keySet() { Set set = super.keySet(); return UnmodifiableSet.decorate(set); } + @Override public Collection values() { Collection coll = super.values(); return UnmodifiableCollection.decorate(coll); } //----------------------------------------------------------------------- + @Override public K removeValue(Object value) { throw new UnsupportedOperationException(); } + @Override public MapIterator mapIterator() { MapIterator it = decorated().mapIterator(); return UnmodifiableMapIterator.decorate(it); } + @Override public synchronized BidiMap inverseBidiMap() { if (inverse == null) { inverse = new UnmodifiableBidiMap(decorated().inverseBidiMap()); diff --git a/src/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java b/src/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java index f452bba3e..6b8f0b3b1 100644 --- a/src/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java +++ b/src/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java @@ -72,47 +72,57 @@ public final class UnmodifiableOrderedBidiMap } //----------------------------------------------------------------------- + @Override public void clear() { throw new UnsupportedOperationException(); } + @Override public V put(K key, V value) { throw new UnsupportedOperationException(); } + @Override public void putAll(Map mapToCopy) { throw new UnsupportedOperationException(); } + @Override public V remove(Object key) { throw new UnsupportedOperationException(); } + @Override public Set> entrySet() { Set> set = super.entrySet(); return UnmodifiableEntrySet.decorate(set); } + @Override public Set keySet() { Set set = super.keySet(); return UnmodifiableSet.decorate(set); } + @Override public Collection values() { Collection coll = super.values(); return UnmodifiableCollection.decorate(coll); } //----------------------------------------------------------------------- + @Override public K removeValue(Object value) { throw new UnsupportedOperationException(); } + @Override public OrderedBidiMap inverseBidiMap() { return inverseOrderedBidiMap(); } //----------------------------------------------------------------------- + @Override public OrderedMapIterator mapIterator() { OrderedMapIterator it = decorated().mapIterator(); return UnmodifiableOrderedMapIterator.decorate(it); diff --git a/src/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java b/src/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java index 764a7ecba..79276be75 100644 --- a/src/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java +++ b/src/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java @@ -74,49 +74,59 @@ public final class UnmodifiableSortedBidiMap } //----------------------------------------------------------------------- + @Override public void clear() { throw new UnsupportedOperationException(); } + @Override public V put(K key, V value) { throw new UnsupportedOperationException(); } + @Override public void putAll(Map mapToCopy) { throw new UnsupportedOperationException(); } + @Override public V remove(Object key) { throw new UnsupportedOperationException(); } + @Override public Set> entrySet() { Set> set = super.entrySet(); return UnmodifiableEntrySet.decorate(set); } + @Override public Set keySet() { Set set = super.keySet(); return UnmodifiableSet.decorate(set); } + @Override public Collection values() { Collection coll = super.values(); return UnmodifiableCollection.decorate(coll); } //----------------------------------------------------------------------- + @Override public K removeValue(Object value) { throw new UnsupportedOperationException(); } //----------------------------------------------------------------------- + @Override public OrderedMapIterator mapIterator() { OrderedMapIterator it = decorated().mapIterator(); return UnmodifiableOrderedMapIterator.decorate(it); } //----------------------------------------------------------------------- + @Override public SortedBidiMap inverseBidiMap() { if (inverse == null) { inverse = new UnmodifiableSortedBidiMap(decorated().inverseBidiMap()); @@ -125,16 +135,19 @@ public final class UnmodifiableSortedBidiMap return inverse; } + @Override public SortedMap subMap(K fromKey, K toKey) { SortedMap sm = decorated().subMap(fromKey, toKey); return UnmodifiableSortedMap.decorate(sm); } + @Override public SortedMap headMap(K toKey) { SortedMap sm = decorated().headMap(toKey); return UnmodifiableSortedMap.decorate(sm); } + @Override public SortedMap tailMap(K fromKey) { SortedMap sm = decorated().tailMap(fromKey); return UnmodifiableSortedMap.decorate(sm); diff --git a/src/java/org/apache/commons/collections/buffer/AbstractBufferDecorator.java b/src/java/org/apache/commons/collections/buffer/AbstractBufferDecorator.java index 9ec65bc80..6e6dcc4d9 100644 --- a/src/java/org/apache/commons/collections/buffer/AbstractBufferDecorator.java +++ b/src/java/org/apache/commons/collections/buffer/AbstractBufferDecorator.java @@ -59,6 +59,7 @@ public abstract class AbstractBufferDecorator extends AbstractCollectionDecor * * @return the decorated buffer */ + @Override protected Buffer decorated() { return (Buffer) super.decorated(); } diff --git a/src/java/org/apache/commons/collections/buffer/BlockingBuffer.java b/src/java/org/apache/commons/collections/buffer/BlockingBuffer.java index 8c17f0ca3..83346db44 100644 --- a/src/java/org/apache/commons/collections/buffer/BlockingBuffer.java +++ b/src/java/org/apache/commons/collections/buffer/BlockingBuffer.java @@ -108,6 +108,7 @@ public class BlockingBuffer extends SynchronizedBuffer { } //----------------------------------------------------------------------- + @Override public boolean add(E o) { synchronized (lock) { boolean result = collection.add(o); @@ -116,6 +117,7 @@ public class BlockingBuffer extends SynchronizedBuffer { } } + @Override public boolean addAll(Collection c) { synchronized (lock) { boolean result = collection.addAll(c); @@ -131,6 +133,7 @@ public class BlockingBuffer extends SynchronizedBuffer { * * @throws BufferUnderflowException if an interrupt is received */ + @Override public E get() { synchronized (lock) { while (collection.isEmpty()) { @@ -187,6 +190,7 @@ public class BlockingBuffer extends SynchronizedBuffer { * * @throws BufferUnderflowException if an interrupt is received */ + @Override public E remove() { synchronized (lock) { while (collection.isEmpty()) { diff --git a/src/java/org/apache/commons/collections/buffer/BoundedBuffer.java b/src/java/org/apache/commons/collections/buffer/BoundedBuffer.java index 22f7a2424..92c1955b4 100644 --- a/src/java/org/apache/commons/collections/buffer/BoundedBuffer.java +++ b/src/java/org/apache/commons/collections/buffer/BoundedBuffer.java @@ -107,6 +107,7 @@ public class BoundedBuffer extends SynchronizedBuffer implements BoundedCo } //----------------------------------------------------------------------- + @Override public E remove() { synchronized (lock) { E returnValue = decorated().remove(); @@ -115,6 +116,7 @@ public class BoundedBuffer extends SynchronizedBuffer implements BoundedCo } } + @Override public boolean add(E o) { synchronized (lock) { timeoutWait(1); @@ -122,6 +124,7 @@ public class BoundedBuffer extends SynchronizedBuffer implements BoundedCo } } + @Override public boolean addAll(final Collection c) { synchronized (lock) { timeoutWait(c.size()); @@ -129,6 +132,7 @@ public class BoundedBuffer extends SynchronizedBuffer implements BoundedCo } } + @Override public Iterator iterator() { return new NotifyingIterator(collection.iterator()); } @@ -184,6 +188,7 @@ public class BoundedBuffer extends SynchronizedBuffer implements BoundedCo super(it); } + @Override public void remove() { synchronized (lock) { iterator.remove(); diff --git a/src/java/org/apache/commons/collections/buffer/BoundedFifoBuffer.java b/src/java/org/apache/commons/collections/buffer/BoundedFifoBuffer.java index 1fdab68ca..12e25c0ec 100644 --- a/src/java/org/apache/commons/collections/buffer/BoundedFifoBuffer.java +++ b/src/java/org/apache/commons/collections/buffer/BoundedFifoBuffer.java @@ -171,6 +171,7 @@ public class BoundedFifoBuffer extends AbstractCollection * * @return this buffer's size */ + @Override public int size() { int size = 0; @@ -190,6 +191,7 @@ public class BoundedFifoBuffer extends AbstractCollection * * @return true if this buffer is empty */ + @Override public boolean isEmpty() { return size() == 0; } @@ -215,6 +217,7 @@ public class BoundedFifoBuffer extends AbstractCollection /** * Clears this buffer. */ + @Override public void clear() { full = false; start = 0; @@ -230,6 +233,7 @@ public class BoundedFifoBuffer extends AbstractCollection * @throws NullPointerException if the given element is null * @throws BufferOverflowException if this buffer is full */ + @Override public boolean add(E element) { if (null == element) { throw new NullPointerException("Attempted to add null object to buffer"); @@ -322,6 +326,7 @@ public class BoundedFifoBuffer extends AbstractCollection * * @return an iterator over this buffer's elements */ + @Override public Iterator iterator() { return new Iterator() { diff --git a/src/java/org/apache/commons/collections/buffer/CircularFifoBuffer.java b/src/java/org/apache/commons/collections/buffer/CircularFifoBuffer.java index 1f354fd74..ed7287179 100644 --- a/src/java/org/apache/commons/collections/buffer/CircularFifoBuffer.java +++ b/src/java/org/apache/commons/collections/buffer/CircularFifoBuffer.java @@ -86,6 +86,7 @@ public class CircularFifoBuffer extends BoundedFifoBuffer { * @param element the element to add * @return true, always */ + @Override public boolean add(E element) { if (isFull()) { remove(); diff --git a/src/java/org/apache/commons/collections/buffer/PredicatedBuffer.java b/src/java/org/apache/commons/collections/buffer/PredicatedBuffer.java index 566283f11..a8172c7ff 100644 --- a/src/java/org/apache/commons/collections/buffer/PredicatedBuffer.java +++ b/src/java/org/apache/commons/collections/buffer/PredicatedBuffer.java @@ -81,6 +81,7 @@ public class PredicatedBuffer extends PredicatedCollection implements Buff * * @return the decorated buffer */ + @Override protected Buffer decorated() { return (Buffer) super.decorated(); } diff --git a/src/java/org/apache/commons/collections/buffer/PriorityBuffer.java b/src/java/org/apache/commons/collections/buffer/PriorityBuffer.java index b9b15a01f..d0a14bffd 100644 --- a/src/java/org/apache/commons/collections/buffer/PriorityBuffer.java +++ b/src/java/org/apache/commons/collections/buffer/PriorityBuffer.java @@ -224,6 +224,7 @@ public class PriorityBuffer extends AbstractCollection implements Buffer extends AbstractCollection implements Buffer extends AbstractCollection implements Buffer extends AbstractCollection implements Buffer iterator() { return new Iterator() { @@ -526,6 +530,7 @@ public class PriorityBuffer extends AbstractCollection implements Buffer * * @return the decorated buffer */ + @Override protected Buffer decorated() { return (Buffer) super.decorated(); } diff --git a/src/java/org/apache/commons/collections/buffer/UnboundedFifoBuffer.java b/src/java/org/apache/commons/collections/buffer/UnboundedFifoBuffer.java index c4b734053..be500beba 100644 --- a/src/java/org/apache/commons/collections/buffer/UnboundedFifoBuffer.java +++ b/src/java/org/apache/commons/collections/buffer/UnboundedFifoBuffer.java @@ -150,6 +150,7 @@ public class UnboundedFifoBuffer extends AbstractCollection implements Buf * * @return this buffer's size */ + @Override public int size() { int size = 0; @@ -167,6 +168,7 @@ public class UnboundedFifoBuffer extends AbstractCollection implements Buf * * @return true if this buffer is empty */ + @Override public boolean isEmpty() { return (size() == 0); } @@ -178,6 +180,7 @@ public class UnboundedFifoBuffer extends AbstractCollection implements Buf * @return true, always * @throws NullPointerException if the given element is null */ + @Override @SuppressWarnings("unchecked") public boolean add(final E obj) { if (obj == null) { @@ -272,6 +275,7 @@ public class UnboundedFifoBuffer extends AbstractCollection implements Buf * * @return an iterator over this buffer's elements */ + @Override public Iterator iterator() { return new Iterator() { diff --git a/src/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java b/src/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java index b54ff17a4..b843a8429 100644 --- a/src/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java +++ b/src/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java @@ -99,35 +99,43 @@ public final class UnmodifiableBuffer } //----------------------------------------------------------------------- + @Override public Iterator iterator() { return UnmodifiableIterator.decorate(decorated().iterator()); } + @Override public boolean add(Object object) { throw new UnsupportedOperationException(); } + @Override public boolean addAll(Collection coll) { throw new UnsupportedOperationException(); } + @Override public void clear() { throw new UnsupportedOperationException(); } + @Override public boolean remove(Object object) { throw new UnsupportedOperationException(); } + @Override public boolean removeAll(Collection coll) { throw new UnsupportedOperationException(); } + @Override public boolean retainAll(Collection coll) { throw new UnsupportedOperationException(); } //----------------------------------------------------------------------- + @Override public E remove() { throw new UnsupportedOperationException(); } diff --git a/src/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java b/src/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java index 7e2f3e2c6..94cf60564 100644 --- a/src/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java +++ b/src/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java @@ -135,14 +135,17 @@ public abstract class AbstractCollectionDecorator return decorated().retainAll(coll); } + @Override public boolean equals(Object object) { return object == this || decorated().equals(object); } + @Override public int hashCode() { return decorated().hashCode(); } + @Override public String toString() { return decorated().toString(); } diff --git a/src/java/org/apache/commons/collections/collection/AbstractUntypedCollectionDecorator.java b/src/java/org/apache/commons/collections/collection/AbstractUntypedCollectionDecorator.java index 6bc76c66d..008d4a0f6 100644 --- a/src/java/org/apache/commons/collections/collection/AbstractUntypedCollectionDecorator.java +++ b/src/java/org/apache/commons/collections/collection/AbstractUntypedCollectionDecorator.java @@ -110,14 +110,17 @@ public abstract class AbstractUntypedCollectionDecorator implements Collec return decorated().retainAll(coll); } + @Override public boolean equals(Object object) { return object == this || decorated().equals(object); } + @Override public int hashCode() { return decorated().hashCode(); } + @Override public String toString() { return decorated().toString(); } diff --git a/src/java/org/apache/commons/collections/collection/PredicatedCollection.java b/src/java/org/apache/commons/collections/collection/PredicatedCollection.java index d7360e4ee..43311dfea 100644 --- a/src/java/org/apache/commons/collections/collection/PredicatedCollection.java +++ b/src/java/org/apache/commons/collections/collection/PredicatedCollection.java @@ -112,6 +112,7 @@ public class PredicatedCollection extends AbstractCollectionDecorator { * @return the result of adding to the underlying collection * @throws IllegalArgumentException if the add is invalid */ + @Override public boolean add(E object) { validate(object); return decorated().add(object); @@ -126,6 +127,7 @@ public class PredicatedCollection extends AbstractCollectionDecorator { * @return the result of adding to the underlying collection * @throws IllegalArgumentException if the add is invalid */ + @Override public boolean addAll(Collection coll) { for (E item : coll) { validate(item); diff --git a/src/java/org/apache/commons/collections/collection/SynchronizedCollection.java b/src/java/org/apache/commons/collections/collection/SynchronizedCollection.java index c2dc64a81..b31392f8a 100644 --- a/src/java/org/apache/commons/collections/collection/SynchronizedCollection.java +++ b/src/java/org/apache/commons/collections/collection/SynchronizedCollection.java @@ -188,6 +188,7 @@ public class SynchronizedCollection implements Collection, Serializable { } } + @Override public boolean equals(Object object) { synchronized (lock) { if (object == this) { @@ -197,12 +198,14 @@ public class SynchronizedCollection implements Collection, Serializable { } } + @Override public int hashCode() { synchronized (lock) { return decorated().hashCode(); } } + @Override public String toString() { synchronized (lock) { return decorated().toString(); diff --git a/src/java/org/apache/commons/collections/collection/TransformedCollection.java b/src/java/org/apache/commons/collections/collection/TransformedCollection.java index a6e028788..e54188333 100644 --- a/src/java/org/apache/commons/collections/collection/TransformedCollection.java +++ b/src/java/org/apache/commons/collections/collection/TransformedCollection.java @@ -137,10 +137,12 @@ public class TransformedCollection extends AbstractCollectionDecorator { } //----------------------------------------------------------------------- + @Override public boolean add(E object) { return decorated().add(transform(object)); } + @Override public boolean addAll(Collection coll) { return decorated().addAll(transform(coll)); } diff --git a/src/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java b/src/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java index e6a0bbd2f..79dbbe968 100644 --- a/src/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java +++ b/src/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java @@ -103,30 +103,37 @@ public final class UnmodifiableBoundedCollection extends AbstractCollectionDe } //----------------------------------------------------------------------- + @Override public Iterator iterator() { return UnmodifiableIterator.decorate(decorated().iterator()); } + @Override public boolean add(E object) { throw new UnsupportedOperationException(); } + @Override public boolean addAll(Collection coll) { throw new UnsupportedOperationException(); } + @Override public void clear() { throw new UnsupportedOperationException(); } + @Override public boolean remove(Object object) { throw new UnsupportedOperationException(); } + @Override public boolean removeAll(Collection coll) { throw new UnsupportedOperationException(); } + @Override public boolean retainAll(Collection coll) { throw new UnsupportedOperationException(); } diff --git a/src/java/org/apache/commons/collections/collection/UnmodifiableCollection.java b/src/java/org/apache/commons/collections/collection/UnmodifiableCollection.java index 77f88b373..29aff0adf 100644 --- a/src/java/org/apache/commons/collections/collection/UnmodifiableCollection.java +++ b/src/java/org/apache/commons/collections/collection/UnmodifiableCollection.java @@ -71,30 +71,37 @@ public final class UnmodifiableCollection } //----------------------------------------------------------------------- + @Override public Iterator iterator() { return UnmodifiableIterator.decorate(decorated().iterator()); } + @Override public boolean add(E object) { throw new UnsupportedOperationException(); } + @Override public boolean addAll(Collection coll) { throw new UnsupportedOperationException(); } + @Override public void clear() { throw new UnsupportedOperationException(); } + @Override public boolean remove(Object object) { throw new UnsupportedOperationException(); } + @Override public boolean removeAll(Collection coll) { throw new UnsupportedOperationException(); } + @Override public boolean retainAll(Collection coll) { throw new UnsupportedOperationException(); } diff --git a/src/java/org/apache/commons/collections/comparators/BooleanComparator.java b/src/java/org/apache/commons/collections/comparators/BooleanComparator.java index cf4bf8216..8930c5647 100644 --- a/src/java/org/apache/commons/collections/comparators/BooleanComparator.java +++ b/src/java/org/apache/commons/collections/comparators/BooleanComparator.java @@ -149,6 +149,7 @@ public final class BooleanComparator implements Comparator, Serializabl * * @return a hash code for this comparator. */ + @Override public int hashCode() { int hash = "BooleanComparator".hashCode(); return trueFirst ? -1 * hash : hash; @@ -166,6 +167,7 @@ public final class BooleanComparator implements Comparator, Serializabl * @param object the object to compare to * @return true if equal */ + @Override public boolean equals(Object object) { return (this == object) || ((object instanceof BooleanComparator) && diff --git a/src/java/org/apache/commons/collections/comparators/ComparableComparator.java b/src/java/org/apache/commons/collections/comparators/ComparableComparator.java index ab463c731..97a42f7ee 100644 --- a/src/java/org/apache/commons/collections/comparators/ComparableComparator.java +++ b/src/java/org/apache/commons/collections/comparators/ComparableComparator.java @@ -100,6 +100,7 @@ public class ComparableComparator> implements Co * @return a hash code for this comparator. * @since Commons Collections 3.0 */ + @Override public int hashCode() { return "ComparableComparator".hashCode(); } @@ -119,6 +120,7 @@ public class ComparableComparator> implements Co * @return true if equal * @since Commons Collections 3.0 */ + @Override public boolean equals(Object object) { return (this == object) || ((null != object) && (object.getClass().equals(this.getClass()))); diff --git a/src/java/org/apache/commons/collections/comparators/ComparatorChain.java b/src/java/org/apache/commons/collections/comparators/ComparatorChain.java index 8e08e5f3e..048efeca5 100644 --- a/src/java/org/apache/commons/collections/comparators/ComparatorChain.java +++ b/src/java/org/apache/commons/collections/comparators/ComparatorChain.java @@ -299,6 +299,7 @@ public class ComparatorChain implements Comparator, Serializable { * @return a suitable hash code * @since Commons Collections 3.0 */ + @Override public int hashCode() { int hash = 0; if (null != comparatorChain) { @@ -326,6 +327,7 @@ public class ComparatorChain implements Comparator, Serializable { * @return true if equal * @since Commons Collections 3.0 */ + @Override public boolean equals(Object object) { if (this == object) { return true; diff --git a/src/java/org/apache/commons/collections/comparators/NullComparator.java b/src/java/org/apache/commons/collections/comparators/NullComparator.java index 1334ea496..52be45677 100644 --- a/src/java/org/apache/commons/collections/comparators/NullComparator.java +++ b/src/java/org/apache/commons/collections/comparators/NullComparator.java @@ -151,6 +151,7 @@ public class NullComparator implements Comparator, Serializable { * * @return a hash code for this comparator. **/ + @Override public int hashCode() { return (nullsAreHigh ? -1 : 1) * nonNullComparator.hashCode(); } @@ -166,6 +167,7 @@ public class NullComparator implements Comparator, Serializable { * (i.e. null high or low) and with equivalent underlying * non-null object comparators. **/ + @Override public boolean equals(Object obj) { if(obj == null) { return false; } if(obj == this) { return true; } diff --git a/src/java/org/apache/commons/collections/comparators/ReverseComparator.java b/src/java/org/apache/commons/collections/comparators/ReverseComparator.java index 2084bad4f..f67dd0109 100644 --- a/src/java/org/apache/commons/collections/comparators/ReverseComparator.java +++ b/src/java/org/apache/commons/collections/comparators/ReverseComparator.java @@ -87,6 +87,7 @@ public class ReverseComparator implements Comparator, Serializable { * @return a suitable hash code * @since Commons Collections 3.0 */ + @Override public int hashCode() { return "ReverseComparator".hashCode() ^ comparator.hashCode(); } @@ -107,6 +108,7 @@ public class ReverseComparator implements Comparator, Serializable { * @return true if equal * @since Commons Collections 3.0 */ + @Override public boolean equals(Object object) { if (this == object) { return true; diff --git a/src/java/org/apache/commons/collections/iterators/ArrayListIterator.java b/src/java/org/apache/commons/collections/iterators/ArrayListIterator.java index 8a2d9f674..4416edaf7 100644 --- a/src/java/org/apache/commons/collections/iterators/ArrayListIterator.java +++ b/src/java/org/apache/commons/collections/iterators/ArrayListIterator.java @@ -144,6 +144,7 @@ public class ArrayListIterator extends ArrayIterator * @return the next element * @throws NoSuchElementException if there is no next element */ + @Override @SuppressWarnings("unchecked") public E next() { if (hasNext() == false) { @@ -208,6 +209,7 @@ public class ArrayListIterator extends ArrayIterator /** * Resets the iterator back to the start index. */ + @Override public void reset() { super.reset(); this.lastItemIndex = -1; diff --git a/src/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java b/src/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java index da5ba733d..a0a333f1c 100644 --- a/src/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java +++ b/src/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java @@ -160,6 +160,7 @@ public class EntrySetMapIterator implements MapIterator, ResettableI * * @return a string version of the iterator */ + @Override public String toString() { if (last != null) { return "MapIterator[" + getKey() + "=" + getValue() + "]"; diff --git a/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java b/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java index 1c8fe3925..bb3397f95 100644 --- a/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java +++ b/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java @@ -133,6 +133,7 @@ public class ObjectArrayListIterator extends ObjectArrayIterator * @return the next element * @throws NoSuchElementException if there is no next element */ + @Override public E next() { if (hasNext() == false) { throw new NoSuchElementException(); @@ -198,6 +199,7 @@ public class ObjectArrayListIterator extends ObjectArrayIterator /** * Resets the iterator back to the start index. */ + @Override public void reset() { super.reset(); this.lastItemIndex = -1; diff --git a/src/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java b/src/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java index c9610f75a..31333691a 100644 --- a/src/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java +++ b/src/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java @@ -72,6 +72,7 @@ public abstract class AbstractKeyValue implements KeyValue { * * @return a String view of the entry */ + @Override public String toString() { return new StringBuilder() .append(getKey()) diff --git a/src/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java b/src/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java index 2f7c9ee12..d06d37512 100644 --- a/src/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java +++ b/src/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java @@ -67,6 +67,7 @@ public abstract class AbstractMapEntry extends AbstractKeyValue impl * @param obj the object to compare to * @return true if equal key and value */ + @Override @SuppressWarnings("unchecked") public boolean equals(Object obj) { if (obj == this) { @@ -88,6 +89,7 @@ public abstract class AbstractMapEntry extends AbstractKeyValue impl * * @return a suitable hash code */ + @Override public int hashCode() { return (getKey() == null ? 0 : getKey().hashCode()) ^ (getValue() == null ? 0 : getValue().hashCode()); diff --git a/src/java/org/apache/commons/collections/keyvalue/AbstractMapEntryDecorator.java b/src/java/org/apache/commons/collections/keyvalue/AbstractMapEntryDecorator.java index 6639ff99d..e23edd17b 100644 --- a/src/java/org/apache/commons/collections/keyvalue/AbstractMapEntryDecorator.java +++ b/src/java/org/apache/commons/collections/keyvalue/AbstractMapEntryDecorator.java @@ -69,6 +69,7 @@ public abstract class AbstractMapEntryDecorator implements Map.Entry return entry.setValue(object); } + @Override public boolean equals(Object object) { if (object == this) { return true; @@ -76,10 +77,12 @@ public abstract class AbstractMapEntryDecorator implements Map.Entry return entry.equals(object); } + @Override public int hashCode() { return entry.hashCode(); } + @Override public String toString() { return entry.toString(); } diff --git a/src/java/org/apache/commons/collections/keyvalue/DefaultKeyValue.java b/src/java/org/apache/commons/collections/keyvalue/DefaultKeyValue.java index f4514e79b..b0c160813 100644 --- a/src/java/org/apache/commons/collections/keyvalue/DefaultKeyValue.java +++ b/src/java/org/apache/commons/collections/keyvalue/DefaultKeyValue.java @@ -129,6 +129,7 @@ public class DefaultKeyValue extends AbstractKeyValue { * @param obj the object to compare to * @return true if equal key and value */ + @Override @SuppressWarnings("unchecked") public boolean equals(final Object obj) { if (obj == this) { @@ -152,6 +153,7 @@ public class DefaultKeyValue extends AbstractKeyValue { * * @return a suitable hash code */ + @Override public int hashCode() { return (getKey() == null ? 0 : getKey().hashCode()) ^ (getValue() == null ? 0 : getValue().hashCode()); diff --git a/src/java/org/apache/commons/collections/keyvalue/MultiKey.java b/src/java/org/apache/commons/collections/keyvalue/MultiKey.java index 1968f86d7..227eda4d5 100644 --- a/src/java/org/apache/commons/collections/keyvalue/MultiKey.java +++ b/src/java/org/apache/commons/collections/keyvalue/MultiKey.java @@ -219,6 +219,7 @@ public class MultiKey implements Serializable { * @param other the other object to compare to * @return true if equal */ + @Override public boolean equals(Object other) { if (other == this) { return true; @@ -240,6 +241,7 @@ public class MultiKey implements Serializable { * * @return the hash code */ + @Override public int hashCode() { return hashCode; } @@ -249,6 +251,7 @@ public class MultiKey implements Serializable { * * @return a debugging string */ + @Override public String toString() { return "MultiKey" + Arrays.asList(keys).toString(); } diff --git a/src/java/org/apache/commons/collections/keyvalue/TiedMapEntry.java b/src/java/org/apache/commons/collections/keyvalue/TiedMapEntry.java index 51340e310..0f974c051 100644 --- a/src/java/org/apache/commons/collections/keyvalue/TiedMapEntry.java +++ b/src/java/org/apache/commons/collections/keyvalue/TiedMapEntry.java @@ -97,6 +97,7 @@ public class TiedMapEntry implements Map.Entry, KeyValue, Seri * @param obj the object to compare to * @return true if equal key and value */ + @Override @SuppressWarnings("unchecked") public boolean equals(Object obj) { if (obj == this) { @@ -119,6 +120,7 @@ public class TiedMapEntry implements Map.Entry, KeyValue, Seri * * @return a suitable hash code */ + @Override public int hashCode() { Object value = getValue(); return (getKey() == null ? 0 : getKey().hashCode()) ^ @@ -130,6 +132,7 @@ public class TiedMapEntry implements Map.Entry, KeyValue, Seri * * @return entry as a string */ + @Override public String toString() { return getKey() + "=" + getValue(); } diff --git a/src/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntry.java b/src/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntry.java index a6a75cd9c..5162072e0 100644 --- a/src/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntry.java +++ b/src/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntry.java @@ -69,6 +69,7 @@ public final class UnmodifiableMapEntry extends AbstractMapEntry imp * @return the previous value * @throws UnsupportedOperationException always */ + @Override public V setValue(V value) { throw new UnsupportedOperationException("setValue() is not supported"); } diff --git a/src/java/org/apache/commons/collections/list/AbstractLinkedList.java b/src/java/org/apache/commons/collections/list/AbstractLinkedList.java index 9cbe6c77c..fd8d3d503 100644 --- a/src/java/org/apache/commons/collections/list/AbstractLinkedList.java +++ b/src/java/org/apache/commons/collections/list/AbstractLinkedList.java @@ -325,6 +325,7 @@ public abstract class AbstractLinkedList implements List { } //----------------------------------------------------------------------- + @Override @SuppressWarnings("unchecked") public boolean equals(Object obj) { if (obj == this) { @@ -348,6 +349,7 @@ public abstract class AbstractLinkedList implements List { return !(it1.hasNext() || it2.hasNext()); } + @Override public int hashCode() { int hashCode = 1; for (E e : this) { @@ -356,6 +358,7 @@ public abstract class AbstractLinkedList implements List { return hashCode; } + @Override public String toString() { if (size() == 0) { return "[]"; @@ -863,24 +866,29 @@ public abstract class AbstractLinkedList implements List { this.sub = sub; } + @Override public boolean hasNext() { return (nextIndex() < sub.size); } + @Override public boolean hasPrevious() { return (previousIndex() >= 0); } + @Override public int nextIndex() { return (super.nextIndex() - sub.offset); } + @Override public void add(E obj) { super.add(obj); sub.expectedModCount = parent.modCount; sub.size++; } + @Override public void remove() { super.remove(); sub.expectedModCount = parent.modCount; @@ -918,17 +926,20 @@ public abstract class AbstractLinkedList implements List { this.expectedModCount = parent.modCount; } + @Override public int size() { checkModCount(); return size; } + @Override public E get(int index) { rangeCheck(index, size); checkModCount(); return parent.get(index + offset); } + @Override public void add(int index, E obj) { rangeCheck(index, size + 1); checkModCount(); @@ -938,6 +949,7 @@ public abstract class AbstractLinkedList implements List { LinkedSubList.this.modCount++; } + @Override public E remove(int index) { rangeCheck(index, size); checkModCount(); @@ -948,10 +960,12 @@ public abstract class AbstractLinkedList implements List { return result; } + @Override public boolean addAll(Collection coll) { return addAll(size, coll); } + @Override public boolean addAll(int index, Collection coll) { rangeCheck(index, size + 1); int cSize = coll.size(); @@ -967,12 +981,14 @@ public abstract class AbstractLinkedList implements List { return true; } + @Override public E set(int index, E obj) { rangeCheck(index, size); checkModCount(); return parent.set(index + offset, obj); } + @Override public void clear() { checkModCount(); Iterator it = iterator(); @@ -982,17 +998,20 @@ public abstract class AbstractLinkedList implements List { } } + @Override public Iterator iterator() { checkModCount(); return parent.createSubListIterator(this); } + @Override public ListIterator listIterator(final int index) { rangeCheck(index, size + 1); checkModCount(); return parent.createSubListListIterator(this, index); } + @Override public List subList(int fromIndexInclusive, int toIndexExclusive) { return new LinkedSubList(parent, fromIndexInclusive + offset, toIndexExclusive + offset); } diff --git a/src/java/org/apache/commons/collections/list/AbstractListDecorator.java b/src/java/org/apache/commons/collections/list/AbstractListDecorator.java index e56d0cde3..fada24772 100644 --- a/src/java/org/apache/commons/collections/list/AbstractListDecorator.java +++ b/src/java/org/apache/commons/collections/list/AbstractListDecorator.java @@ -62,6 +62,7 @@ public abstract class AbstractListDecorator extends AbstractCollectionDecorat * * @return the decorated list */ + @Override protected List decorated() { return (List) super.decorated(); } diff --git a/src/java/org/apache/commons/collections/list/GrowthList.java b/src/java/org/apache/commons/collections/list/GrowthList.java index dbcc394ee..f31b750a7 100644 --- a/src/java/org/apache/commons/collections/list/GrowthList.java +++ b/src/java/org/apache/commons/collections/list/GrowthList.java @@ -117,6 +117,7 @@ public class GrowthList extends AbstractSerializableListDecorator { * @throws ClassCastException if the underlying list rejects the element * @throws IllegalArgumentException if the underlying list rejects the element */ + @Override public void add(int index, E element) { int size = decorated().size(); if (index > size) { @@ -145,6 +146,7 @@ public class GrowthList extends AbstractSerializableListDecorator { * @throws ClassCastException if the underlying list rejects the element * @throws IllegalArgumentException if the underlying list rejects the element */ + @Override public boolean addAll(int index, Collection coll) { int size = decorated().size(); boolean result = false; @@ -175,6 +177,7 @@ public class GrowthList extends AbstractSerializableListDecorator { * @throws ClassCastException if the underlying list rejects the element * @throws IllegalArgumentException if the underlying list rejects the element */ + @Override public E set(int index, E element) { int size = decorated().size(); if (index >= size) { diff --git a/src/java/org/apache/commons/collections/list/LazyList.java b/src/java/org/apache/commons/collections/list/LazyList.java index 9c6628417..167e858d2 100644 --- a/src/java/org/apache/commons/collections/list/LazyList.java +++ b/src/java/org/apache/commons/collections/list/LazyList.java @@ -107,6 +107,7 @@ public class LazyList extends AbstractSerializableListDecorator { * * @param index the index to retrieve */ + @Override public E get(int index) { int size = decorated().size(); if (index < size) { @@ -131,6 +132,7 @@ public class LazyList extends AbstractSerializableListDecorator { return object; } + @Override public List subList(int fromIndex, int toIndex) { List sub = decorated().subList(fromIndex, toIndex); return new LazyList(sub, factory); diff --git a/src/java/org/apache/commons/collections/list/NodeCachingLinkedList.java b/src/java/org/apache/commons/collections/list/NodeCachingLinkedList.java index 299cb3bdb..564f9a7e8 100644 --- a/src/java/org/apache/commons/collections/list/NodeCachingLinkedList.java +++ b/src/java/org/apache/commons/collections/list/NodeCachingLinkedList.java @@ -186,6 +186,7 @@ public class NodeCachingLinkedList extends AbstractLinkedList implements S * @param value value of the new node * @return the newly created node */ + @Override protected Node createNode(E value) { Node cachedNode = getNodeFromCache(); if (cachedNode == null) { @@ -201,6 +202,7 @@ public class NodeCachingLinkedList extends AbstractLinkedList implements S * * @param node the node to remove */ + @Override protected void removeNode(Node node) { super.removeNode(node); addNodeToCache(node); @@ -211,6 +213,7 @@ public class NodeCachingLinkedList extends AbstractLinkedList implements S * cache for reuse. * */ + @Override protected void removeAllNodes() { // Add the removed nodes to the cache, then remove the rest. // We can add them to the cache before removing them, since diff --git a/src/java/org/apache/commons/collections/list/SetUniqueList.java b/src/java/org/apache/commons/collections/list/SetUniqueList.java index d0bfd51cd..03eda0d26 100644 --- a/src/java/org/apache/commons/collections/list/SetUniqueList.java +++ b/src/java/org/apache/commons/collections/list/SetUniqueList.java @@ -124,6 +124,7 @@ public class SetUniqueList extends AbstractSerializableListDecorator { * @param object the object to add * @return true if object was added */ + @Override public boolean add(E object) { // gets initial size final int sizeBefore = size(); @@ -145,6 +146,7 @@ public class SetUniqueList extends AbstractSerializableListDecorator { * @param index the index to insert at * @param object the object to add */ + @Override public void add(int index, E object) { // adds element if it is not contained already if (set.contains(object) == false) { @@ -166,6 +168,7 @@ public class SetUniqueList extends AbstractSerializableListDecorator { * @param coll the collection to add in iterator order * @return true if this collection changed */ + @Override public boolean addAll(Collection coll) { return addAll(size(), coll); } @@ -185,6 +188,7 @@ public class SetUniqueList extends AbstractSerializableListDecorator { * @param coll the collection to add in iterator order * @return true if this collection changed */ + @Override public boolean addAll(int index, Collection coll) { HashSet temp = new HashSet(coll); temp.removeAll(set); @@ -213,6 +217,7 @@ public class SetUniqueList extends AbstractSerializableListDecorator { * @param object the object to set * @return the previous object */ + @Override public E set(int index, E object) { int pos = indexOf(object); E removed = super.set(index, object); @@ -229,55 +234,66 @@ public class SetUniqueList extends AbstractSerializableListDecorator { return removed; // return the item deleted by the set } + @Override public boolean remove(Object object) { boolean result = super.remove(object); set.remove(object); return result; } + @Override public E remove(int index) { E result = super.remove(index); set.remove(result); return result; } + @Override public boolean removeAll(Collection coll) { boolean result = super.removeAll(coll); set.removeAll(coll); return result; } + @Override public boolean retainAll(Collection coll) { boolean result = super.retainAll(coll); set.retainAll(coll); return result; } + @Override public void clear() { super.clear(); set.clear(); } + @Override public boolean contains(Object object) { return set.contains(object); } + @Override public boolean containsAll(Collection coll) { return set.containsAll(coll); } + @Override public Iterator iterator() { return new SetListIterator(super.iterator(), set); } + @Override public ListIterator listIterator() { return new SetListListIterator(super.listIterator(), set); } + @Override public ListIterator listIterator(int index) { return new SetListListIterator(super.listIterator(index), set); } + @Override public List subList(int fromIndex, int toIndex) { List superSubList = super.subList(fromIndex, toIndex); Set subSet = createSetBasedOnList(set, superSubList); @@ -316,11 +332,13 @@ public class SetUniqueList extends AbstractSerializableListDecorator { this.set = set; } + @Override public E next() { last = super.next(); return last; } + @Override public void remove() { super.remove(); set.remove(last); @@ -341,22 +359,26 @@ public class SetUniqueList extends AbstractSerializableListDecorator { this.set = set; } + @Override public E next() { last = super.next(); return last; } + @Override public E previous() { last = super.previous(); return last; } + @Override public void remove() { super.remove(); set.remove(last); last = null; } + @Override public void add(E object) { if (set.contains(object) == false) { super.add(object); @@ -364,6 +386,7 @@ public class SetUniqueList extends AbstractSerializableListDecorator { } } + @Override public void set(E object) { throw new UnsupportedOperationException("ListIterator does not support set"); } diff --git a/src/java/org/apache/commons/collections/list/TransformedList.java b/src/java/org/apache/commons/collections/list/TransformedList.java index e4068cac6..cae5a9289 100644 --- a/src/java/org/apache/commons/collections/list/TransformedList.java +++ b/src/java/org/apache/commons/collections/list/TransformedList.java @@ -165,11 +165,13 @@ public class TransformedList extends TransformedCollection implements List super(iterator); } + @Override public void add(E object) { object = transform(object); iterator.add(object); } + @Override public void set(E object) { object = transform(object); iterator.set(object); diff --git a/src/java/org/apache/commons/collections/list/TreeList.java b/src/java/org/apache/commons/collections/list/TreeList.java index b93c4e0ba..818387ca9 100644 --- a/src/java/org/apache/commons/collections/list/TreeList.java +++ b/src/java/org/apache/commons/collections/list/TreeList.java @@ -94,6 +94,7 @@ public class TreeList extends AbstractList { * @param index the index to retrieve * @return the element at the specified index */ + @Override public E get(int index) { checkInterval(index, 0, size() - 1); return root.get(index).getValue(); @@ -104,6 +105,7 @@ public class TreeList extends AbstractList { * * @return the current size */ + @Override public int size() { return size; } @@ -113,6 +115,7 @@ public class TreeList extends AbstractList { * * @return an iterator over the list */ + @Override public Iterator iterator() { // override to go 75% faster return listIterator(0); @@ -123,6 +126,7 @@ public class TreeList extends AbstractList { * * @return the new iterator */ + @Override public ListIterator listIterator() { // override to go 75% faster return listIterator(0); @@ -134,6 +138,7 @@ public class TreeList extends AbstractList { * @param fromIndex the index to start from * @return the new iterator */ + @Override public ListIterator listIterator(int fromIndex) { // override to go 75% faster // cannot use EmptyIterator as iterator.add() must work @@ -146,6 +151,7 @@ public class TreeList extends AbstractList { * * @return the index of the object, -1 if not found */ + @Override public int indexOf(Object object) { // override to go 75% faster if (root == null) { @@ -159,6 +165,7 @@ public class TreeList extends AbstractList { * * @return true if the object is found */ + @Override public boolean contains(Object object) { return (indexOf(object) >= 0); } @@ -168,6 +175,7 @@ public class TreeList extends AbstractList { * * @return the list as an array */ + @Override public Object[] toArray() { // override to go 20% faster Object[] array = new Object[size()]; @@ -184,6 +192,7 @@ public class TreeList extends AbstractList { * @param index the index to add before * @param obj the element to add */ + @Override public void add(int index, E obj) { modCount++; checkInterval(index, 0, size()); @@ -203,6 +212,7 @@ public class TreeList extends AbstractList { * @return the previous object at that index * @throws IndexOutOfBoundsException if the index is invalid */ + @Override public E set(int index, E obj) { checkInterval(index, 0, size() - 1); AVLNode node = root.get(index); @@ -217,6 +227,7 @@ public class TreeList extends AbstractList { * @param index the index to remove * @return the previous object at that index */ + @Override public E remove(int index) { modCount++; checkInterval(index, 0, size() - 1); @@ -229,6 +240,7 @@ public class TreeList extends AbstractList { /** * Clears the list, removing all entries. */ + @Override public void clear() { modCount++; root = null; @@ -763,6 +775,7 @@ public class TreeList extends AbstractList { /** * Used for debugging. */ + @Override public String toString() { return "AVLNode(" + relativePosition + "," + (left != null) + "," + value + "," + (getRightSubTree() != null) + ", faedelung " + rightIsNext + " )"; diff --git a/src/java/org/apache/commons/collections/list/UnmodifiableList.java b/src/java/org/apache/commons/collections/list/UnmodifiableList.java index 060bc1b23..207141d77 100644 --- a/src/java/org/apache/commons/collections/list/UnmodifiableList.java +++ b/src/java/org/apache/commons/collections/list/UnmodifiableList.java @@ -70,59 +70,73 @@ public final class UnmodifiableList } //----------------------------------------------------------------------- + @Override public Iterator iterator() { return UnmodifiableIterator.decorate(decorated().iterator()); } + @Override public boolean add(Object object) { throw new UnsupportedOperationException(); } + @Override public boolean addAll(Collection coll) { throw new UnsupportedOperationException(); } + @Override public void clear() { throw new UnsupportedOperationException(); } + @Override public boolean remove(Object object) { throw new UnsupportedOperationException(); } + @Override public boolean removeAll(Collection coll) { throw new UnsupportedOperationException(); } + @Override public boolean retainAll(Collection coll) { throw new UnsupportedOperationException(); } //----------------------------------------------------------------------- + @Override public ListIterator listIterator() { return UnmodifiableListIterator.decorate(decorated().listIterator()); } + @Override public ListIterator listIterator(int index) { return UnmodifiableListIterator.decorate(decorated().listIterator(index)); } + @Override public void add(int index, E object) { throw new UnsupportedOperationException(); } + @Override public boolean addAll(int index, Collection coll) { throw new UnsupportedOperationException(); } + @Override public E remove(int index) { throw new UnsupportedOperationException(); } + @Override public E set(int index, E object) { throw new UnsupportedOperationException(); } + @Override public List subList(int fromIndex, int toIndex) { List sub = decorated().subList(fromIndex, toIndex); return new UnmodifiableList(sub); diff --git a/src/java/org/apache/commons/collections/map/AbstractHashedMap.java b/src/java/org/apache/commons/collections/map/AbstractHashedMap.java index 5a27bef9e..d0956c13e 100644 --- a/src/java/org/apache/commons/collections/map/AbstractHashedMap.java +++ b/src/java/org/apache/commons/collections/map/AbstractHashedMap.java @@ -179,6 +179,7 @@ public class AbstractHashedMap extends AbstractMap implements Iterab * @param key the key * @return the mapped value, null if no match */ + @Override public V get(Object key) { key = convertKey(key); int hashCode = hash(key); @@ -197,6 +198,7 @@ public class AbstractHashedMap extends AbstractMap implements Iterab * * @return the size */ + @Override public int size() { return size; } @@ -206,6 +208,7 @@ public class AbstractHashedMap extends AbstractMap implements Iterab * * @return true if the map is currently size zero */ + @Override public boolean isEmpty() { return (size == 0); } @@ -217,6 +220,7 @@ public class AbstractHashedMap extends AbstractMap implements Iterab * @param key the key to search for * @return true if the map contains the key */ + @Override public boolean containsKey(Object key) { key = convertKey(key); int hashCode = hash(key); @@ -236,6 +240,7 @@ public class AbstractHashedMap extends AbstractMap implements Iterab * @param value the value to search for * @return true if the map contains the value */ + @Override public boolean containsValue(Object value) { if (value == null) { for (int i = 0, isize = data.length; i < isize; i++) { @@ -269,6 +274,7 @@ public class AbstractHashedMap extends AbstractMap implements Iterab * @param value the value to add * @return the value previously mapped to this key, null if none */ + @Override public V put(K key, V value) { Object convertedKey = convertKey(key); int hashCode = hash(convertedKey); @@ -296,6 +302,7 @@ public class AbstractHashedMap extends AbstractMap implements Iterab * @param map the map to add * @throws NullPointerException if the map is null */ + @Override public void putAll(Map map) { _putAll(map); } @@ -330,6 +337,7 @@ public class AbstractHashedMap extends AbstractMap implements Iterab * @param key the mapping to remove * @return the value mapped to the removed key, null if key not in map */ + @Override public V remove(Object key) { key = convertKey(key); int hashCode = hash(key); @@ -352,6 +360,7 @@ public class AbstractHashedMap extends AbstractMap implements Iterab * Clears the map, resetting the size to zero and nullifying references * to avoid garbage collection issues. */ + @Override public void clear() { modCount++; HashEntry[] data = this.data; @@ -799,6 +808,7 @@ public class AbstractHashedMap extends AbstractMap implements Iterab * * @return the entrySet view */ + @Override public Set> entrySet() { if (entrySet == null) { entrySet = new EntrySet(this); @@ -831,14 +841,17 @@ public class AbstractHashedMap extends AbstractMap implements Iterab this.parent = parent; } + @Override public int size() { return parent.size(); } + @Override public void clear() { parent.clear(); } + @Override public boolean contains(Object entry) { if (entry instanceof Map.Entry) { Map.Entry e = (Map.Entry) entry; @@ -848,6 +861,7 @@ public class AbstractHashedMap extends AbstractMap implements Iterab return false; } + @Override public boolean remove(Object obj) { if (obj instanceof Map.Entry == false) { return false; @@ -860,6 +874,7 @@ public class AbstractHashedMap extends AbstractMap implements Iterab return true; } + @Override public Iterator> iterator() { return parent.createEntrySetIterator(); } @@ -887,6 +902,7 @@ public class AbstractHashedMap extends AbstractMap implements Iterab * * @return the keySet view */ + @Override public Set keySet() { if (keySet == null) { keySet = new KeySet(this); @@ -919,24 +935,29 @@ public class AbstractHashedMap extends AbstractMap implements Iterab this.parent = parent; } + @Override public int size() { return parent.size(); } + @Override public void clear() { parent.clear(); } + @Override public boolean contains(Object key) { return parent.containsKey(key); } + @Override public boolean remove(Object key) { boolean result = parent.containsKey(key); parent.remove(key); return result; } + @Override public Iterator iterator() { return parent.createKeySetIterator(); } @@ -965,6 +986,7 @@ public class AbstractHashedMap extends AbstractMap implements Iterab * * @return the values view */ + @Override public Collection values() { if (values == null) { values = new Values(this); @@ -997,18 +1019,22 @@ public class AbstractHashedMap extends AbstractMap implements Iterab this.parent = parent; } + @Override public int size() { return parent.size(); } + @Override public void clear() { parent.clear(); } + @Override public boolean contains(Object value) { return parent.containsValue(value); } + @Override public Iterator iterator() { return parent.createValuesIterator(); } @@ -1076,6 +1102,7 @@ public class AbstractHashedMap extends AbstractMap implements Iterab return (V) old; } + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -1089,11 +1116,13 @@ public class AbstractHashedMap extends AbstractMap implements Iterab (getValue() == null ? other.getValue() == null : getValue().equals(other.getValue())); } + @Override public int hashCode() { return (getKey() == null ? 0 : getKey().hashCode()) ^ (getValue() == null ? 0 : getValue().hashCode()); } + @Override public String toString() { return new StringBuilder().append(getKey()).append('=').append(getValue()).toString(); } @@ -1169,6 +1198,7 @@ public class AbstractHashedMap extends AbstractMap implements Iterab expectedModCount = parent.modCount; } + @Override public String toString() { if (last != null) { return "Iterator[" + last.getKey() + "=" + last.getValue() + "]"; @@ -1249,6 +1279,7 @@ public class AbstractHashedMap extends AbstractMap implements Iterab * * @return a shallow clone */ + @Override @SuppressWarnings("unchecked") protected AbstractHashedMap clone() { try { @@ -1273,6 +1304,7 @@ public class AbstractHashedMap extends AbstractMap implements Iterab * @param obj the object to compare to * @return true if equal */ + @Override @SuppressWarnings("unchecked") public boolean equals(Object obj) { if (obj == this) { @@ -1313,6 +1345,7 @@ public class AbstractHashedMap extends AbstractMap implements Iterab * * @return the hash code defined in the Map interface */ + @Override public int hashCode() { int total = 0; Iterator> it = createEntrySetIterator(); @@ -1327,6 +1360,7 @@ public class AbstractHashedMap extends AbstractMap implements Iterab * * @return a string version of the map */ + @Override public String toString() { if (size() == 0) { return "{}"; diff --git a/src/java/org/apache/commons/collections/map/AbstractInputCheckedMapDecorator.java b/src/java/org/apache/commons/collections/map/AbstractInputCheckedMapDecorator.java index 4d62588e6..0961e5e91 100644 --- a/src/java/org/apache/commons/collections/map/AbstractInputCheckedMapDecorator.java +++ b/src/java/org/apache/commons/collections/map/AbstractInputCheckedMapDecorator.java @@ -96,6 +96,7 @@ abstract class AbstractInputCheckedMapDecorator } //----------------------------------------------------------------------- + @Override public Set> entrySet() { if (isSetValueChecking()) { return new EntrySet(map.entrySet(), this); @@ -118,10 +119,12 @@ abstract class AbstractInputCheckedMapDecorator this.parent = parent; } + @Override public Iterator> iterator() { return new EntrySetIterator(collection.iterator(), parent); } + @Override @SuppressWarnings("unchecked") public Object[] toArray() { Object[] array = collection.toArray(); @@ -131,6 +134,7 @@ abstract class AbstractInputCheckedMapDecorator return array; } + @Override @SuppressWarnings("unchecked") public T[] toArray(T[] array) { Object[] result = array; @@ -171,6 +175,7 @@ abstract class AbstractInputCheckedMapDecorator this.parent = parent; } + @Override public Map.Entry next() { Map.Entry entry = iterator.next(); return new MapEntry(entry, parent); @@ -190,6 +195,7 @@ abstract class AbstractInputCheckedMapDecorator this.parent = parent; } + @Override public V setValue(V value) { value = parent.checkSetValue(value); return entry.setValue(value); diff --git a/src/java/org/apache/commons/collections/map/AbstractLinkedMap.java b/src/java/org/apache/commons/collections/map/AbstractLinkedMap.java index d5a070895..c27906bfc 100644 --- a/src/java/org/apache/commons/collections/map/AbstractLinkedMap.java +++ b/src/java/org/apache/commons/collections/map/AbstractLinkedMap.java @@ -125,6 +125,7 @@ public abstract class AbstractLinkedMap extends AbstractHashedMap im * {@link #createEntry(HashEntry, int, Object, Object)} to create * the map entry object. */ + @Override protected void init() { header = createEntry(null, -1, null, null); header.before = header.after = header; @@ -137,6 +138,7 @@ public abstract class AbstractLinkedMap extends AbstractHashedMap im * @param value the value to search for * @return true if the map contains the value */ + @Override public boolean containsValue(Object value) { // override uses faster iterator if (value == null) { @@ -159,6 +161,7 @@ public abstract class AbstractLinkedMap extends AbstractHashedMap im * Clears the map, resetting the size to zero and nullifying references * to avoid garbage collection issues. */ + @Override public void clear() { // override to reset the linked list super.clear(); @@ -201,6 +204,7 @@ public abstract class AbstractLinkedMap extends AbstractHashedMap im return (entry == null || entry.after == header ? null : entry.after.getKey()); } + @Override protected LinkEntry getEntry(Object key) { return (LinkEntry) super.getEntry(key); } @@ -257,6 +261,7 @@ public abstract class AbstractLinkedMap extends AbstractHashedMap im * @param link the entry to add * @param hashIndex the index into the data array to store at */ + @Override protected void addEntry(HashEntry entry, int hashIndex) { LinkEntry link = (LinkEntry) entry; link.after = header; @@ -277,6 +282,7 @@ public abstract class AbstractLinkedMap extends AbstractHashedMap im * @param value the value to store * @return the newly created entry */ + @Override protected LinkEntry createEntry(HashEntry next, int hashCode, K key, V value) { return new LinkEntry(next, hashCode, convertKey(key), value); } @@ -291,6 +297,7 @@ public abstract class AbstractLinkedMap extends AbstractHashedMap im * @param hashIndex the index into the data structure * @param previous the previous entry in the chain */ + @Override protected void removeEntry(HashEntry entry, int hashIndex, HashEntry previous) { LinkEntry link = (LinkEntry) entry; link.before.after = link.after; @@ -331,6 +338,7 @@ public abstract class AbstractLinkedMap extends AbstractHashedMap im /** * {@inheritDoc} */ + @Override public OrderedMapIterator mapIterator() { if (size == 0) { return EmptyOrderedMapIterator.getInstance(); @@ -388,6 +396,7 @@ public abstract class AbstractLinkedMap extends AbstractHashedMap im * * @return the entrySet iterator */ + @Override protected Iterator> createEntrySetIterator() { if (size() == 0) { return EmptyOrderedIterator.>getInstance(); @@ -421,6 +430,7 @@ public abstract class AbstractLinkedMap extends AbstractHashedMap im * * @return the keySet iterator */ + @Override protected Iterator createKeySetIterator() { if (size() == 0) { return EmptyOrderedIterator.getInstance(); @@ -455,6 +465,7 @@ public abstract class AbstractLinkedMap extends AbstractHashedMap im * * @return the values iterator */ + @Override protected Iterator createValuesIterator() { if (size() == 0) { return EmptyOrderedIterator.getInstance(); @@ -585,6 +596,7 @@ public abstract class AbstractLinkedMap extends AbstractHashedMap im next = parent.header.after; } + @Override public String toString() { if (last != null) { return "Iterator[" + last.getKey() + "=" + last.getValue() + "]"; diff --git a/src/java/org/apache/commons/collections/map/AbstractMapDecorator.java b/src/java/org/apache/commons/collections/map/AbstractMapDecorator.java index 9dc35cb22..411a2238f 100644 --- a/src/java/org/apache/commons/collections/map/AbstractMapDecorator.java +++ b/src/java/org/apache/commons/collections/map/AbstractMapDecorator.java @@ -125,6 +125,7 @@ public abstract class AbstractMapDecorator extends AbstractIterableMap extends AbstractIterableMap extends AbstractMapDecor * * @return the decorated map */ + @Override protected OrderedMap decorated() { return (OrderedMap) super.decorated(); } @@ -83,6 +84,7 @@ public abstract class AbstractOrderedMapDecorator extends AbstractMapDecor return decorated().previousKey(key); } + @Override public OrderedMapIterator mapIterator() { return decorated().mapIterator(); } diff --git a/src/java/org/apache/commons/collections/map/AbstractReferenceMap.java b/src/java/org/apache/commons/collections/map/AbstractReferenceMap.java index 4a9c71279..71aa9c09d 100644 --- a/src/java/org/apache/commons/collections/map/AbstractReferenceMap.java +++ b/src/java/org/apache/commons/collections/map/AbstractReferenceMap.java @@ -172,6 +172,7 @@ public abstract class AbstractReferenceMap extends AbstractHashedMap /** * Initialise this subclass during construction, cloning or deserialization. */ + @Override protected void init() { queue = new ReferenceQueue(); } @@ -182,6 +183,7 @@ public abstract class AbstractReferenceMap extends AbstractHashedMap * * @return the size */ + @Override public int size() { purgeBeforeRead(); return super.size(); @@ -192,6 +194,7 @@ public abstract class AbstractReferenceMap extends AbstractHashedMap * * @return true if the map is currently size zero */ + @Override public boolean isEmpty() { purgeBeforeRead(); return super.isEmpty(); @@ -203,6 +206,7 @@ public abstract class AbstractReferenceMap extends AbstractHashedMap * @param key the key to search for * @return true if the map contains the key */ + @Override public boolean containsKey(Object key) { purgeBeforeRead(); Entry entry = getEntry(key); @@ -218,6 +222,7 @@ public abstract class AbstractReferenceMap extends AbstractHashedMap * @param value the value to search for * @return true if the map contains the value */ + @Override public boolean containsValue(Object value) { purgeBeforeRead(); if (value == null) { @@ -232,6 +237,7 @@ public abstract class AbstractReferenceMap extends AbstractHashedMap * @param key the key * @return the mapped value, null if no match */ + @Override public V get(Object key) { purgeBeforeRead(); Entry entry = getEntry(key); @@ -251,6 +257,7 @@ public abstract class AbstractReferenceMap extends AbstractHashedMap * @return the value previously mapped to this key, null if none * @throws NullPointerException if either the key or value is null */ + @Override public V put(K key, V value) { if (key == null) { throw new NullPointerException("null keys not allowed"); @@ -269,6 +276,7 @@ public abstract class AbstractReferenceMap extends AbstractHashedMap * @param key the mapping to remove * @return the value mapped to the removed key, null if key not in map */ + @Override public V remove(Object key) { if (key == null) { return null; @@ -280,6 +288,7 @@ public abstract class AbstractReferenceMap extends AbstractHashedMap /** * Clears this map. */ + @Override public void clear() { super.clear(); while (queue.poll() != null) {} // drain the queue @@ -292,6 +301,7 @@ public abstract class AbstractReferenceMap extends AbstractHashedMap * * @return a map iterator */ + @Override public MapIterator mapIterator() { return new ReferenceMapIterator(this); } @@ -303,6 +313,7 @@ public abstract class AbstractReferenceMap extends AbstractHashedMap * * @return a set view of this map's entries */ + @Override public Set> entrySet() { if (entrySet == null) { entrySet = new ReferenceEntrySet(this); @@ -315,6 +326,7 @@ public abstract class AbstractReferenceMap extends AbstractHashedMap * * @return a set view of this map's keys */ + @Override public Set keySet() { if (keySet == null) { keySet = new ReferenceKeySet(this); @@ -327,6 +339,7 @@ public abstract class AbstractReferenceMap extends AbstractHashedMap * * @return a set view of this map's values */ + @Override public Collection values() { if (values == null) { values = new ReferenceValues(this); @@ -405,6 +418,7 @@ public abstract class AbstractReferenceMap extends AbstractHashedMap * @param key the key * @return the entry, null if no match */ + @Override protected HashEntry getEntry(Object key) { if (key == null) { return null; @@ -435,6 +449,7 @@ public abstract class AbstractReferenceMap extends AbstractHashedMap * @param key2 the second key extracted from the entry via entry.key * @return true if equal */ + @Override @SuppressWarnings("unchecked") protected boolean isEqualKey(Object key1, Object key2) { key2 = (keyType == ReferenceStrength.HARD ? key2 : ((Reference) key2).get()); @@ -450,6 +465,7 @@ public abstract class AbstractReferenceMap extends AbstractHashedMap * @param value the value to store * @return the newly created entry */ + @Override protected ReferenceEntry createEntry(HashEntry next, int hashCode, K key, V value) { return new ReferenceEntry(this, next, hashCode, key, value); } @@ -459,6 +475,7 @@ public abstract class AbstractReferenceMap extends AbstractHashedMap * * @return the entrySet iterator */ + @Override protected Iterator> createEntrySetIterator() { return new ReferenceEntrySetIterator(this); } @@ -468,6 +485,7 @@ public abstract class AbstractReferenceMap extends AbstractHashedMap * * @return the keySet iterator */ + @Override protected Iterator createKeySetIterator() { return new ReferenceKeySetIterator(this); } @@ -477,6 +495,7 @@ public abstract class AbstractReferenceMap extends AbstractHashedMap * * @return the values iterator */ + @Override protected Iterator createValuesIterator() { return new ReferenceValuesIterator(this); } @@ -491,10 +510,12 @@ public abstract class AbstractReferenceMap extends AbstractHashedMap super(parent); } + @Override public Object[] toArray() { return toArray(new Object[0]); } + @Override public T[] toArray(T[] arr) { // special implementation to handle disappearing entries ArrayList> list = new ArrayList>(); @@ -515,10 +536,12 @@ public abstract class AbstractReferenceMap extends AbstractHashedMap super(parent); } + @Override public Object[] toArray() { return toArray(new Object[0]); } + @Override public T[] toArray(T[] arr) { // special implementation to handle disappearing keys List list = new ArrayList(parent.size()); @@ -539,10 +562,12 @@ public abstract class AbstractReferenceMap extends AbstractHashedMap super(parent); } + @Override public Object[] toArray() { return toArray(new Object[0]); } + @Override public T[] toArray(T[] arr) { // special implementation to handle disappearing values List list = new ArrayList(parent.size()); @@ -588,6 +613,7 @@ public abstract class AbstractReferenceMap extends AbstractHashedMap * * @return the key, which may be null if it was garbage collected */ + @Override @SuppressWarnings("unchecked") public K getKey() { return (K) ((parent.keyType == ReferenceStrength.HARD) ? key : ((Reference) key).get()); @@ -599,6 +625,7 @@ public abstract class AbstractReferenceMap extends AbstractHashedMap * * @return the value, which may be null if it was garbage collected */ + @Override @SuppressWarnings("unchecked") public V getValue() { return (V) ((parent.valueType == ReferenceStrength.HARD) ? value : ((Reference) value).get()); @@ -610,6 +637,7 @@ public abstract class AbstractReferenceMap extends AbstractHashedMap * @param obj the object to store * @return the previous value */ + @Override @SuppressWarnings("unchecked") public V setValue(V obj) { V old = getValue(); @@ -629,6 +657,7 @@ public abstract class AbstractReferenceMap extends AbstractHashedMap * @param obj the other map entry to compare to * @return true if equal, false if not */ + @Override @SuppressWarnings("unchecked") public boolean equals(Object obj) { if (obj == this) { @@ -657,6 +686,7 @@ public abstract class AbstractReferenceMap extends AbstractHashedMap * * @return the hashcode of the entry */ + @Override public int hashCode() { return parent.hashEntry(getKey(), getValue()); } @@ -912,6 +942,7 @@ public abstract class AbstractReferenceMap extends AbstractHashedMap this.hash = hash; } + @Override public int hashCode() { return hash; } @@ -929,6 +960,7 @@ public abstract class AbstractReferenceMap extends AbstractHashedMap this.hash = hash; } + @Override public int hashCode() { return hash; } @@ -953,6 +985,7 @@ public abstract class AbstractReferenceMap extends AbstractHashedMap * * @param out the output stream */ + @Override protected void doWriteObject(ObjectOutputStream out) throws IOException { out.writeInt(keyType.value); out.writeInt(valueType.value); @@ -984,6 +1017,7 @@ public abstract class AbstractReferenceMap extends AbstractHashedMap * * @param in the input stream */ + @Override @SuppressWarnings("unchecked") protected void doReadObject(ObjectInputStream in) throws IOException, ClassNotFoundException { this.keyType = ReferenceStrength.resolve(in.readInt()); diff --git a/src/java/org/apache/commons/collections/map/AbstractSortedMapDecorator.java b/src/java/org/apache/commons/collections/map/AbstractSortedMapDecorator.java index 4d6262636..4bd7fdf6c 100644 --- a/src/java/org/apache/commons/collections/map/AbstractSortedMapDecorator.java +++ b/src/java/org/apache/commons/collections/map/AbstractSortedMapDecorator.java @@ -72,6 +72,7 @@ public abstract class AbstractSortedMapDecorator extends AbstractMapDecora * * @return the decorated map */ + @Override protected SortedMap decorated() { return (SortedMap) super.decorated(); } diff --git a/src/java/org/apache/commons/collections/map/CaseInsensitiveMap.java b/src/java/org/apache/commons/collections/map/CaseInsensitiveMap.java index 7505a8939..e21415bc8 100644 --- a/src/java/org/apache/commons/collections/map/CaseInsensitiveMap.java +++ b/src/java/org/apache/commons/collections/map/CaseInsensitiveMap.java @@ -116,6 +116,7 @@ public class CaseInsensitiveMap extends AbstractHashedMap implements * @param key the key convert * @return the converted key */ + @Override protected Object convertKey(Object key) { if (key != null) { char[] chars = key.toString().toCharArray(); @@ -133,6 +134,7 @@ public class CaseInsensitiveMap extends AbstractHashedMap implements * * @return a shallow clone */ + @Override public CaseInsensitiveMap clone() { return (CaseInsensitiveMap) super.clone(); } diff --git a/src/java/org/apache/commons/collections/map/CompositeMap.java b/src/java/org/apache/commons/collections/map/CompositeMap.java index 7071aaaad..e5b5c4219 100644 --- a/src/java/org/apache/commons/collections/map/CompositeMap.java +++ b/src/java/org/apache/commons/collections/map/CompositeMap.java @@ -463,6 +463,7 @@ public class CompositeMap extends AbstractIterableMap implements Ser * @param obj the object to compare to * @return true if the maps are equal */ + @Override @SuppressWarnings("unchecked") public boolean equals(Object obj) { if (obj instanceof Map) { @@ -475,6 +476,7 @@ public class CompositeMap extends AbstractIterableMap implements Ser /** * Gets a hash code for the Map as per the Map specification. */ + @Override public int hashCode() { int code = 0; for (Map.Entry entry : entrySet()) { diff --git a/src/java/org/apache/commons/collections/map/DefaultedMap.java b/src/java/org/apache/commons/collections/map/DefaultedMap.java index cac72f219..c4a3b8766 100644 --- a/src/java/org/apache/commons/collections/map/DefaultedMap.java +++ b/src/java/org/apache/commons/collections/map/DefaultedMap.java @@ -183,6 +183,7 @@ public class DefaultedMap extends AbstractMapDecorator implements Se } //----------------------------------------------------------------------- + @Override @SuppressWarnings("unchecked") public V get(Object key) { // create value for key if key is not currently in the map diff --git a/src/java/org/apache/commons/collections/map/FixedSizeMap.java b/src/java/org/apache/commons/collections/map/FixedSizeMap.java index 55ff9a346..dedbe6528 100644 --- a/src/java/org/apache/commons/collections/map/FixedSizeMap.java +++ b/src/java/org/apache/commons/collections/map/FixedSizeMap.java @@ -112,6 +112,7 @@ public class FixedSizeMap } //----------------------------------------------------------------------- + @Override public V put(K key, V value) { if (map.containsKey(key) == false) { throw new IllegalArgumentException("Cannot put new key/value pair - Map is fixed size"); @@ -119,6 +120,7 @@ public class FixedSizeMap return map.put(key, value); } + @Override public void putAll(Map mapToCopy) { for (K key : mapToCopy.keySet()) { if (!containsKey(key)) { @@ -128,25 +130,30 @@ public class FixedSizeMap map.putAll(mapToCopy); } + @Override public void clear() { throw new UnsupportedOperationException("Map is fixed size"); } + @Override public V remove(Object key) { throw new UnsupportedOperationException("Map is fixed size"); } + @Override public Set> entrySet() { Set> set = map.entrySet(); // unmodifiable set will still allow modification via Map.Entry objects return UnmodifiableSet.decorate(set); } + @Override public Set keySet() { Set set = map.keySet(); return UnmodifiableSet.decorate(set); } + @Override public Collection values() { Collection coll = map.values(); return UnmodifiableCollection.decorate(coll); diff --git a/src/java/org/apache/commons/collections/map/FixedSizeSortedMap.java b/src/java/org/apache/commons/collections/map/FixedSizeSortedMap.java index 17abe58d5..978c429dc 100644 --- a/src/java/org/apache/commons/collections/map/FixedSizeSortedMap.java +++ b/src/java/org/apache/commons/collections/map/FixedSizeSortedMap.java @@ -113,6 +113,7 @@ public class FixedSizeSortedMap } //----------------------------------------------------------------------- + @Override public V put(K key, V value) { if (map.containsKey(key) == false) { throw new IllegalArgumentException("Cannot put new key/value pair - Map is fixed size"); @@ -120,6 +121,7 @@ public class FixedSizeSortedMap return map.put(key, value); } + @Override public void putAll(Map mapToCopy) { if (CollectionUtils.isSubCollection(mapToCopy.keySet(), keySet())) { throw new IllegalArgumentException("Cannot put new key/value pair - Map is fixed size"); @@ -127,35 +129,43 @@ public class FixedSizeSortedMap map.putAll(mapToCopy); } + @Override public void clear() { throw new UnsupportedOperationException("Map is fixed size"); } + @Override public V remove(Object key) { throw new UnsupportedOperationException("Map is fixed size"); } + @Override public Set> entrySet() { return UnmodifiableSet.decorate(map.entrySet()); } + @Override public Set keySet() { return UnmodifiableSet.decorate(map.keySet()); } + @Override public Collection values() { return UnmodifiableCollection.decorate(map.values()); } //----------------------------------------------------------------------- + @Override public SortedMap subMap(K fromKey, K toKey) { return new FixedSizeSortedMap(getSortedMap().subMap(fromKey, toKey)); } + @Override public SortedMap headMap(K toKey) { return new FixedSizeSortedMap(getSortedMap().headMap(toKey)); } + @Override public SortedMap tailMap(K fromKey) { return new FixedSizeSortedMap(getSortedMap().tailMap(fromKey)); } diff --git a/src/java/org/apache/commons/collections/map/Flat3Map.java b/src/java/org/apache/commons/collections/map/Flat3Map.java index 4cd567739..55a28b2e0 100644 --- a/src/java/org/apache/commons/collections/map/Flat3Map.java +++ b/src/java/org/apache/commons/collections/map/Flat3Map.java @@ -667,6 +667,7 @@ public class Flat3Map implements IterableMap, Serializable, Cloneabl canRemove = false; } + @Override public String toString() { if (canRemove) { return "Iterator[" + getKey() + "=" + getValue() + "]"; @@ -702,14 +703,17 @@ public class Flat3Map implements IterableMap, Serializable, Cloneabl this.parent = parent; } + @Override public int size() { return parent.size(); } + @Override public void clear() { parent.clear(); } + @Override public boolean remove(Object obj) { if (obj instanceof Map.Entry == false) { return false; @@ -721,6 +725,7 @@ public class Flat3Map implements IterableMap, Serializable, Cloneabl return result; } + @Override public Iterator> iterator() { if (parent.delegateMap != null) { return parent.delegateMap.entrySet().iterator(); @@ -829,6 +834,7 @@ public class Flat3Map implements IterableMap, Serializable, Cloneabl return nextEntry(); } + @Override public boolean equals(Object obj) { if (canRemove == false) { return false; @@ -843,6 +849,7 @@ public class Flat3Map implements IterableMap, Serializable, Cloneabl (value == null ? other.getValue() == null : value.equals(other.getValue())); } + @Override public int hashCode() { if (canRemove == false) { return 0; @@ -853,6 +860,7 @@ public class Flat3Map implements IterableMap, Serializable, Cloneabl (value == null ? 0 : value.hashCode()); } + @Override public String toString() { if (canRemove) { return getKey() + "=" + getValue(); @@ -886,24 +894,29 @@ public class Flat3Map implements IterableMap, Serializable, Cloneabl this.parent = parent; } + @Override public int size() { return parent.size(); } + @Override public void clear() { parent.clear(); } + @Override public boolean contains(Object key) { return parent.containsKey(key); } + @Override public boolean remove(Object key) { boolean result = parent.containsKey(key); parent.remove(key); return result; } + @Override public Iterator iterator() { if (parent.delegateMap != null) { return parent.delegateMap.keySet().iterator(); @@ -956,18 +969,22 @@ public class Flat3Map implements IterableMap, Serializable, Cloneabl this.parent = parent; } + @Override public int size() { return parent.size(); } + @Override public void clear() { parent.clear(); } + @Override public boolean contains(Object value) { return parent.containsValue(value); } + @Override public Iterator iterator() { if (parent.delegateMap != null) { return parent.delegateMap.values().iterator(); @@ -1030,6 +1047,7 @@ public class Flat3Map implements IterableMap, Serializable, Cloneabl * @return a shallow clone * @since Commons Collections 3.1 */ + @Override @SuppressWarnings("unchecked") public Flat3Map clone() { try { @@ -1049,6 +1067,7 @@ public class Flat3Map implements IterableMap, Serializable, Cloneabl * @param obj the object to compare to * @return true if equal */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -1100,6 +1119,7 @@ public class Flat3Map implements IterableMap, Serializable, Cloneabl * * @return the hash code defined in the Map interface */ + @Override public int hashCode() { if (delegateMap != null) { return delegateMap.hashCode(); @@ -1121,6 +1141,7 @@ public class Flat3Map implements IterableMap, Serializable, Cloneabl * * @return a string version of the map */ + @Override public String toString() { if (delegateMap != null) { return delegateMap.toString(); diff --git a/src/java/org/apache/commons/collections/map/HashedMap.java b/src/java/org/apache/commons/collections/map/HashedMap.java index c880ea715..a966fd730 100644 --- a/src/java/org/apache/commons/collections/map/HashedMap.java +++ b/src/java/org/apache/commons/collections/map/HashedMap.java @@ -93,6 +93,7 @@ public class HashedMap * * @return a shallow clone */ + @Override public HashedMap clone() { return (HashedMap) super.clone(); } diff --git a/src/java/org/apache/commons/collections/map/IdentityMap.java b/src/java/org/apache/commons/collections/map/IdentityMap.java index abf563e87..62793cdcf 100644 --- a/src/java/org/apache/commons/collections/map/IdentityMap.java +++ b/src/java/org/apache/commons/collections/map/IdentityMap.java @@ -95,6 +95,7 @@ public class IdentityMap * @param key the key to get a hash code for * @return the hash code */ + @Override protected int hash(Object key) { return System.identityHashCode(key); } @@ -107,6 +108,7 @@ public class IdentityMap * @param key2 the second key to compare * @return true if equal by identity */ + @Override protected boolean isEqualKey(Object key1, Object key2) { return (key1 == key2); } @@ -119,6 +121,7 @@ public class IdentityMap * @param value2 the second value to compare * @return true if equal by identity */ + @Override protected boolean isEqualValue(Object value1, Object value2) { return (value1 == value2); } @@ -133,6 +136,7 @@ public class IdentityMap * @param value the value to store * @return the newly created entry */ + @Override protected IdentityEntry createEntry(HashEntry next, int hashCode, K key, V value) { return new IdentityEntry(next, hashCode, key, value); } @@ -147,6 +151,7 @@ public class IdentityMap super(next, hashCode, key, value); } + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -160,6 +165,7 @@ public class IdentityMap (getValue() == other.getValue()); } + @Override public int hashCode() { return System.identityHashCode(getKey()) ^ System.identityHashCode(getValue()); @@ -172,6 +178,7 @@ public class IdentityMap * * @return a shallow clone */ + @Override public IdentityMap clone() { return (IdentityMap) super.clone(); } diff --git a/src/java/org/apache/commons/collections/map/LRUMap.java b/src/java/org/apache/commons/collections/map/LRUMap.java index 185b7235d..581266537 100644 --- a/src/java/org/apache/commons/collections/map/LRUMap.java +++ b/src/java/org/apache/commons/collections/map/LRUMap.java @@ -170,6 +170,7 @@ public class LRUMap * @param key the key * @return the mapped value, null if no match */ + @Override public V get(Object key) { LinkEntry entry = getEntry(key); if (entry == null) { @@ -218,6 +219,7 @@ public class LRUMap * @param entry the entry to update * @param newValue the new value to store */ + @Override protected void updateEntry(HashEntry entry, V newValue) { moveToMRU((LinkEntry) entry); // handles modCount entry.setValue(newValue); @@ -238,6 +240,7 @@ public class LRUMap * @param key the key to add * @param value the value to add */ + @Override protected void addMapping(int hashIndex, int hashCode, K key, V value) { if (isFull()) { LinkEntry reuse = header.after; @@ -397,6 +400,7 @@ public class LRUMap * * @return a shallow clone */ + @Override public LRUMap clone() { return (LRUMap) super.clone(); } @@ -420,6 +424,7 @@ public class LRUMap /** * Writes the data necessary for put() to work in deserialization. */ + @Override protected void doWriteObject(ObjectOutputStream out) throws IOException { out.writeInt(maxSize); super.doWriteObject(out); @@ -428,6 +433,7 @@ public class LRUMap /** * Reads the data necessary for put() to work in the superclass. */ + @Override protected void doReadObject(ObjectInputStream in) throws IOException, ClassNotFoundException { maxSize = in.readInt(); super.doReadObject(in); diff --git a/src/java/org/apache/commons/collections/map/LinkedMap.java b/src/java/org/apache/commons/collections/map/LinkedMap.java index 529675b89..981c037b1 100644 --- a/src/java/org/apache/commons/collections/map/LinkedMap.java +++ b/src/java/org/apache/commons/collections/map/LinkedMap.java @@ -113,6 +113,7 @@ public class LinkedMap extends AbstractLinkedMap implements Serializ * * @return a shallow clone */ + @Override public LinkedMap clone() { return (LinkedMap) super.clone(); } @@ -215,70 +216,87 @@ public class LinkedMap extends AbstractLinkedMap implements Serializ this.parent = parent; } + @Override public int size() { return parent.size(); } + @Override public K get(int index) { return parent.get(index); } + @Override public boolean contains(Object obj) { return parent.containsKey(obj); } + @Override public int indexOf(Object obj) { return parent.indexOf(obj); } + @Override public int lastIndexOf(Object obj) { return parent.indexOf(obj); } + @Override public boolean containsAll(Collection coll) { return parent.keySet().containsAll(coll); } + @Override public K remove(int index) { throw new UnsupportedOperationException(); } + @Override public boolean remove(Object obj) { throw new UnsupportedOperationException(); } + @Override public boolean removeAll(Collection coll) { throw new UnsupportedOperationException(); } + @Override public boolean retainAll(Collection coll) { throw new UnsupportedOperationException(); } + @Override public void clear() { throw new UnsupportedOperationException(); } + @Override public Object[] toArray() { return parent.keySet().toArray(); } + @Override public T[] toArray(T[] array) { return parent.keySet().toArray(array); } + @Override public Iterator iterator() { return UnmodifiableIterator.decorate(parent.keySet().iterator()); } + @Override public ListIterator listIterator() { return UnmodifiableListIterator.decorate(super.listIterator()); } + @Override public ListIterator listIterator(int fromIndex) { return UnmodifiableListIterator.decorate(super.listIterator(fromIndex)); } + @Override public List subList(int fromIndexInclusive, int toIndexExclusive) { return UnmodifiableList.decorate(super.subList(fromIndexInclusive, toIndexExclusive)); } diff --git a/src/java/org/apache/commons/collections/map/ListOrderedMap.java b/src/java/org/apache/commons/collections/map/ListOrderedMap.java index 4b1fd12c8..437fdd740 100644 --- a/src/java/org/apache/commons/collections/map/ListOrderedMap.java +++ b/src/java/org/apache/commons/collections/map/ListOrderedMap.java @@ -140,6 +140,7 @@ public class ListOrderedMap // Implement OrderedMap //----------------------------------------------------------------------- + @Override public OrderedMapIterator mapIterator() { return new ListOrderedMapIterator(this); } @@ -201,6 +202,7 @@ public class ListOrderedMap } //----------------------------------------------------------------------- + @Override public V put(K key, V value) { if (decorated().containsKey(key)) { // re-adding doesn't change order @@ -213,6 +215,7 @@ public class ListOrderedMap } } + @Override public void putAll(Map map) { for (Map.Entry entry : map.entrySet()) { put(entry.getKey(), entry.getValue()); @@ -233,12 +236,14 @@ public class ListOrderedMap } } + @Override public V remove(Object key) { V result = decorated().remove(key); insertOrder.remove(key); return result; } + @Override public void clear() { decorated().clear(); insertOrder.clear(); @@ -253,6 +258,7 @@ public class ListOrderedMap * @see #keyList() * @return the fully modifiable collection view over the keys */ + @Override public Set keySet() { return new KeySetView(this); } @@ -282,6 +288,7 @@ public class ListOrderedMap * @see #valueList() * @return the fully modifiable collection view over the values */ + @Override public Collection values() { return new ValuesView(this); } @@ -307,6 +314,7 @@ public class ListOrderedMap * * @return the fully modifiable set view over the entries */ + @Override public Set> entrySet() { return new EntrySetView(this, this.insertOrder); } @@ -317,6 +325,7 @@ public class ListOrderedMap * * @return the Map as a String */ + @Override public String toString() { if (isEmpty()) { return "{}"; @@ -466,18 +475,22 @@ public class ListOrderedMap this.parent = (ListOrderedMap) parent; } + @Override public int size() { return this.parent.size(); } + @Override public boolean contains(Object value) { return this.parent.containsValue(value); } + @Override public void clear() { this.parent.clear(); } + @Override public Iterator iterator() { return new AbstractUntypedIteratorDecorator, V>(parent.entrySet().iterator()) { public V next() { @@ -486,14 +499,17 @@ public class ListOrderedMap }; } + @Override public V get(int index) { return this.parent.getValue(index); } + @Override public V set(int index, V value) { return this.parent.setValue(index, value); } + @Override public V remove(int index) { return this.parent.remove(index); } @@ -509,18 +525,22 @@ public class ListOrderedMap this.parent = (ListOrderedMap) parent; } + @Override public int size() { return this.parent.size(); } + @Override public boolean contains(Object value) { return this.parent.containsKey(value); } + @Override public void clear() { this.parent.clear(); } + @Override public Iterator iterator() { return new AbstractUntypedIteratorDecorator, K>(parent.entrySet().iterator()) { public K next() { @@ -549,21 +569,26 @@ public class ListOrderedMap return entrySet; } + @Override public int size() { return this.parent.size(); } + @Override public boolean isEmpty() { return this.parent.isEmpty(); } + @Override public boolean contains(Object obj) { return getEntrySet().contains(obj); } + @Override public boolean containsAll(Collection coll) { return getEntrySet().containsAll(coll); } + @Override @SuppressWarnings("unchecked") public boolean remove(Object obj) { if (obj instanceof Map.Entry == false) { @@ -577,10 +602,12 @@ public class ListOrderedMap return false; } + @Override public void clear() { this.parent.clear(); } + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -588,14 +615,17 @@ public class ListOrderedMap return getEntrySet().equals(obj); } + @Override public int hashCode() { return getEntrySet().hashCode(); } + @Override public String toString() { return getEntrySet().toString(); } + @Override public Iterator> iterator() { return new ListOrderedIterator(parent, insertOrder); } @@ -616,6 +646,7 @@ public class ListOrderedMap return new ListOrderedMapEntry(parent, last); } + @Override public void remove() { super.remove(); parent.decorated().remove(last); @@ -631,10 +662,12 @@ public class ListOrderedMap this.parent = parent; } + @Override public V getValue() { return parent.get(key); } + @Override public V setValue(V value) { return parent.decorated().put(key, value); } @@ -709,6 +742,7 @@ public class ListOrderedMap readable = false; } + @Override public String toString() { if (readable == true) { return "Iterator[" + getKey() + "=" + getValue() + "]"; diff --git a/src/java/org/apache/commons/collections/map/MultiKeyMap.java b/src/java/org/apache/commons/collections/map/MultiKeyMap.java index ce39401f2..2bf40cc50 100644 --- a/src/java/org/apache/commons/collections/map/MultiKeyMap.java +++ b/src/java/org/apache/commons/collections/map/MultiKeyMap.java @@ -807,6 +807,7 @@ public class MultiKeyMap extends AbstractMapDecorator clone() { return new MultiKeyMap(decorated().clone()); } @@ -821,6 +822,7 @@ public class MultiKeyMap extends AbstractMapDecorator key, V value) { checkKey(key); return super.put(key, value); @@ -843,6 +845,7 @@ public class MultiKeyMap extends AbstractMapDecorator, V> mapIterator() { return decorated().mapIterator(); } diff --git a/src/java/org/apache/commons/collections/map/MultiValueMap.java b/src/java/org/apache/commons/collections/map/MultiValueMap.java index cdbfebc9a..a8b5c9bfe 100644 --- a/src/java/org/apache/commons/collections/map/MultiValueMap.java +++ b/src/java/org/apache/commons/collections/map/MultiValueMap.java @@ -166,6 +166,7 @@ public class MultiValueMap extends AbstractMapDecorator impleme /** * Clear the map. */ + @Override public void clear() { // If you believe that you have GC issues here, try uncommenting this code // Set pairs = getMap().entrySet(); @@ -215,6 +216,7 @@ public class MultiValueMap extends AbstractMapDecorator impleme * @param value the value to search for * @return true if the map contains the value */ + @Override @SuppressWarnings("unchecked") public boolean containsValue(Object value) { Set> pairs = decorated().entrySet(); @@ -238,6 +240,7 @@ public class MultiValueMap extends AbstractMapDecorator impleme * @param value the value to add to the collection at the key * @return the value added if the map changed and null if the map did not change */ + @Override @SuppressWarnings("unchecked") public Object put(K key, Object value) { boolean result = false; @@ -267,6 +270,7 @@ public class MultiValueMap extends AbstractMapDecorator impleme * * @param map the map to copy (either a normal or multi map) */ + @Override @SuppressWarnings("unchecked") public void putAll(Map map) { if (map instanceof MultiMap) { @@ -287,6 +291,7 @@ public class MultiValueMap extends AbstractMapDecorator impleme * * @return a collection view of the values contained in this map */ + @Override @SuppressWarnings("unchecked") public Collection values() { Collection vs = valuesView; @@ -406,6 +411,7 @@ public class MultiValueMap extends AbstractMapDecorator impleme * Inner class that provides the values view. */ private class Values extends AbstractCollection { + @Override public Iterator iterator() { final IteratorChain chain = new IteratorChain(); for (Iterator it = keySet().iterator(); it.hasNext();) { @@ -414,10 +420,12 @@ public class MultiValueMap extends AbstractMapDecorator impleme return chain; } + @Override public int size() { return totalSize(); } + @Override public void clear() { MultiValueMap.this.clear(); } diff --git a/src/java/org/apache/commons/collections/map/PredicatedMap.java b/src/java/org/apache/commons/collections/map/PredicatedMap.java index c5f44c423..baf2b7fe1 100644 --- a/src/java/org/apache/commons/collections/map/PredicatedMap.java +++ b/src/java/org/apache/commons/collections/map/PredicatedMap.java @@ -151,6 +151,7 @@ public class PredicatedMap * @throws IllegalArgumentException if invalid * @since Commons Collections 3.1 */ + @Override protected V checkSetValue(V value) { if (valuePredicate.evaluate(value) == false) { throw new IllegalArgumentException("Cannot set value - Predicate rejected it"); @@ -164,16 +165,19 @@ public class PredicatedMap * @return true if a value predicate is in use * @since Commons Collections 3.1 */ + @Override protected boolean isSetValueChecking() { return (valuePredicate != null); } //----------------------------------------------------------------------- + @Override public V put(K key, V value) { validate(key, value); return map.put(key, value); } + @Override public void putAll(Map mapToCopy) { for (Map.Entry entry : mapToCopy.entrySet()) { validate(entry.getKey(), entry.getValue()); diff --git a/src/java/org/apache/commons/collections/map/ReferenceIdentityMap.java b/src/java/org/apache/commons/collections/map/ReferenceIdentityMap.java index 74447ea53..91b5a1c2c 100644 --- a/src/java/org/apache/commons/collections/map/ReferenceIdentityMap.java +++ b/src/java/org/apache/commons/collections/map/ReferenceIdentityMap.java @@ -156,6 +156,7 @@ public class ReferenceIdentityMap extends AbstractReferenceMap imple * @param key the key to get a hash code for * @return the hash code */ + @Override protected int hash(Object key) { return System.identityHashCode(key); } @@ -169,6 +170,7 @@ public class ReferenceIdentityMap extends AbstractReferenceMap imple * @param value the value to get a hash code for, may be null * @return the hash code, as per the MapEntry specification */ + @Override protected int hashEntry(Object key, Object value) { return System.identityHashCode(key) ^ System.identityHashCode(value); @@ -184,6 +186,7 @@ public class ReferenceIdentityMap extends AbstractReferenceMap imple * @param key2 the second key extracted from the entry via entry.key * @return true if equal by identity */ + @Override protected boolean isEqualKey(Object key1, Object key2) { key2 = keyType == ReferenceStrength.HARD ? key2 : ((Reference) key2).get(); return key1 == key2; @@ -198,6 +201,7 @@ public class ReferenceIdentityMap extends AbstractReferenceMap imple * @param value2 the second value extracted from the entry via getValue() * @return true if equal by identity */ + @Override protected boolean isEqualValue(Object value1, Object value2) { return value1 == value2; } diff --git a/src/java/org/apache/commons/collections/map/SingletonMap.java b/src/java/org/apache/commons/collections/map/SingletonMap.java index ce31472c0..c50040773 100644 --- a/src/java/org/apache/commons/collections/map/SingletonMap.java +++ b/src/java/org/apache/commons/collections/map/SingletonMap.java @@ -466,6 +466,7 @@ public class SingletonMap hasNext = true; } + @Override public String toString() { if (hasNext) { return "Iterator[]"; @@ -487,18 +488,23 @@ public class SingletonMap this.parent = parent; } + @Override public int size() { return 1; } + @Override public boolean isEmpty() { return false; } + @Override public boolean contains(Object object) { return parent.containsValue(object); } + @Override public void clear() { throw new UnsupportedOperationException(); } + @Override public Iterator iterator() { return new SingletonIterator(parent.getValue(), false); } @@ -510,6 +516,7 @@ public class SingletonMap * * @return a shallow clone */ + @Override @SuppressWarnings("unchecked") public SingletonMap clone() { try { @@ -525,6 +532,7 @@ public class SingletonMap * @param obj the object to compare to * @return true if equal */ + @Override @SuppressWarnings("unchecked") public boolean equals(Object obj) { if (obj == this) { @@ -546,6 +554,7 @@ public class SingletonMap * * @return the hash code defined in the Map interface */ + @Override public int hashCode() { return (getKey() == null ? 0 : getKey().hashCode()) ^ (getValue() == null ? 0 : getValue().hashCode()); @@ -556,6 +565,7 @@ public class SingletonMap * * @return a string version of the map */ + @Override public String toString() { return new StringBuilder(128) .append('{') diff --git a/src/java/org/apache/commons/collections/map/TransformedMap.java b/src/java/org/apache/commons/collections/map/TransformedMap.java index 0b4c9c7d0..1159d5c88 100644 --- a/src/java/org/apache/commons/collections/map/TransformedMap.java +++ b/src/java/org/apache/commons/collections/map/TransformedMap.java @@ -209,6 +209,7 @@ public class TransformedMap * @return the transformed value * @since Commons Collections 3.1 */ + @Override protected V checkSetValue(V value) { return valueTransformer.transform(value); } @@ -219,17 +220,20 @@ public class TransformedMap * @return true if a value transformer is in use * @since Commons Collections 3.1 */ + @Override protected boolean isSetValueChecking() { return (valueTransformer != null); } //----------------------------------------------------------------------- + @Override public V put(K key, V value) { key = transformKey(key); value = transformValue(value); return decorated().put(key, value); } + @Override public void putAll(Map mapToCopy) { mapToCopy = transformMap(mapToCopy); decorated().putAll(mapToCopy); diff --git a/src/java/org/apache/commons/collections/map/UnmodifiableEntrySet.java b/src/java/org/apache/commons/collections/map/UnmodifiableEntrySet.java index e17f6f96d..e99152250 100644 --- a/src/java/org/apache/commons/collections/map/UnmodifiableEntrySet.java +++ b/src/java/org/apache/commons/collections/map/UnmodifiableEntrySet.java @@ -68,35 +68,43 @@ public final class UnmodifiableEntrySet } //----------------------------------------------------------------------- + @Override public boolean add(Map.Entry object) { throw new UnsupportedOperationException(); } + @Override public boolean addAll(Collection> coll) { throw new UnsupportedOperationException(); } + @Override public void clear() { throw new UnsupportedOperationException(); } + @Override public boolean remove(Object object) { throw new UnsupportedOperationException(); } + @Override public boolean removeAll(Collection coll) { throw new UnsupportedOperationException(); } + @Override public boolean retainAll(Collection coll) { throw new UnsupportedOperationException(); } //----------------------------------------------------------------------- + @Override public Iterator> iterator() { return new UnmodifiableEntrySetIterator(collection.iterator()); } + @Override @SuppressWarnings("unchecked") public Object[] toArray() { Object[] array = collection.toArray(); @@ -106,6 +114,7 @@ public final class UnmodifiableEntrySet return array; } + @Override @SuppressWarnings("unchecked") public T[] toArray(T[] array) { Object[] result = array; @@ -142,10 +151,12 @@ public final class UnmodifiableEntrySet super(iterator); } + @Override public Map.Entry next() { return new UnmodifiableEntry(iterator.next()); } + @Override public void remove() { throw new UnsupportedOperationException(); } @@ -161,6 +172,7 @@ public final class UnmodifiableEntrySet super(entry); } + @Override public V setValue(V obj) { throw new UnsupportedOperationException(); } diff --git a/src/java/org/apache/commons/collections/map/UnmodifiableMap.java b/src/java/org/apache/commons/collections/map/UnmodifiableMap.java index 433aead27..12258cca0 100644 --- a/src/java/org/apache/commons/collections/map/UnmodifiableMap.java +++ b/src/java/org/apache/commons/collections/map/UnmodifiableMap.java @@ -103,22 +103,27 @@ public final class UnmodifiableMap } //----------------------------------------------------------------------- + @Override public void clear() { throw new UnsupportedOperationException(); } + @Override public V put(K key, V value) { throw new UnsupportedOperationException(); } + @Override public void putAll(Map mapToCopy) { throw new UnsupportedOperationException(); } + @Override public V remove(Object key) { throw new UnsupportedOperationException(); } + @Override public MapIterator mapIterator() { if (map instanceof IterableMap) { MapIterator it = ((IterableMap) map).mapIterator(); @@ -128,16 +133,19 @@ public final class UnmodifiableMap return UnmodifiableMapIterator.decorate(it); } + @Override public Set> entrySet() { Set> set = super.entrySet(); return UnmodifiableEntrySet.decorate(set); } + @Override public Set keySet() { Set set = super.keySet(); return UnmodifiableSet.decorate(set); } + @Override public Collection values() { Collection coll = super.values(); return UnmodifiableCollection.decorate(coll); diff --git a/src/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java b/src/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java index 80e943daf..bbec077cf 100644 --- a/src/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java +++ b/src/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java @@ -101,37 +101,45 @@ public final class UnmodifiableOrderedMap extends AbstractOrderedMapDecora } //----------------------------------------------------------------------- + @Override public OrderedMapIterator mapIterator() { OrderedMapIterator it = decorated().mapIterator(); return UnmodifiableOrderedMapIterator.decorate(it); } + @Override public void clear() { throw new UnsupportedOperationException(); } + @Override public V put(K key, V value) { throw new UnsupportedOperationException(); } + @Override public void putAll(Map mapToCopy) { throw new UnsupportedOperationException(); } + @Override public V remove(Object key) { throw new UnsupportedOperationException(); } + @Override public Set> entrySet() { Set> set = super.entrySet(); return UnmodifiableEntrySet.decorate(set); } + @Override public Set keySet() { Set set = super.keySet(); return UnmodifiableSet.decorate(set); } + @Override public Collection values() { Collection coll = super.values(); return UnmodifiableCollection.decorate(coll); diff --git a/src/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java b/src/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java index 60224c992..39e69e7d3 100644 --- a/src/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java +++ b/src/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java @@ -101,55 +101,68 @@ public final class UnmodifiableSortedMap } //----------------------------------------------------------------------- + @Override public void clear() { throw new UnsupportedOperationException(); } + @Override public V put(K key, V value) { throw new UnsupportedOperationException(); } + @Override public void putAll(Map mapToCopy) { throw new UnsupportedOperationException(); } + @Override public V remove(Object key) { throw new UnsupportedOperationException(); } + @Override public Set> entrySet() { return UnmodifiableEntrySet.decorate(super.entrySet()); } + @Override public Set keySet() { return UnmodifiableSet.decorate(super.keySet()); } + @Override public Collection values() { return UnmodifiableCollection.decorate(super.values()); } //----------------------------------------------------------------------- + @Override public K firstKey() { return decorated().firstKey(); } + @Override public K lastKey() { return decorated().lastKey(); } + @Override public Comparator comparator() { return decorated().comparator(); } + @Override public SortedMap subMap(K fromKey, K toKey) { return new UnmodifiableSortedMap(decorated().subMap(fromKey, toKey)); } + @Override public SortedMap headMap(K toKey) { return new UnmodifiableSortedMap(decorated().headMap(toKey)); } + @Override public SortedMap tailMap(K fromKey) { return new UnmodifiableSortedMap(decorated().tailMap(fromKey)); } diff --git a/src/java/org/apache/commons/collections/set/AbstractSetDecorator.java b/src/java/org/apache/commons/collections/set/AbstractSetDecorator.java index db25dffd0..bbd6eadd0 100644 --- a/src/java/org/apache/commons/collections/set/AbstractSetDecorator.java +++ b/src/java/org/apache/commons/collections/set/AbstractSetDecorator.java @@ -60,6 +60,7 @@ public abstract class AbstractSetDecorator extends AbstractCollectionDecorato * * @return the decorated set */ + @Override protected Set decorated() { return (Set) super.decorated(); } diff --git a/src/java/org/apache/commons/collections/set/AbstractSortedSetDecorator.java b/src/java/org/apache/commons/collections/set/AbstractSortedSetDecorator.java index deafe9b1c..3e0ccb6b4 100644 --- a/src/java/org/apache/commons/collections/set/AbstractSortedSetDecorator.java +++ b/src/java/org/apache/commons/collections/set/AbstractSortedSetDecorator.java @@ -61,6 +61,7 @@ public abstract class AbstractSortedSetDecorator * * @return the decorated set */ + @Override protected SortedSet decorated() { return (SortedSet) super.decorated(); } diff --git a/src/java/org/apache/commons/collections/set/CompositeSet.java b/src/java/org/apache/commons/collections/set/CompositeSet.java index 1e53d8d06..5e507dfec 100644 --- a/src/java/org/apache/commons/collections/set/CompositeSet.java +++ b/src/java/org/apache/commons/collections/set/CompositeSet.java @@ -70,6 +70,7 @@ public class CompositeSet extends CompositeCollection implements Set { * @see org.apache.commons.collections.collection.CompositeCollection.CollectionMutator * @see SetMutator */ + @Override public synchronized void addComposited(Collection c) { if (!(c instanceof Set)) { throw new IllegalArgumentException("Collections added must implement java.util.Set"); @@ -110,6 +111,7 @@ public class CompositeSet extends CompositeCollection implements Set { * * @throws IllegalArgumentException if c or d does not implement java.util.Set */ + @Override @SuppressWarnings("unchecked") public synchronized void addComposited(Collection c, Collection d) { if (!(c instanceof Set)) throw new IllegalArgumentException("Argument must implement java.util.Set"); @@ -122,6 +124,7 @@ public class CompositeSet extends CompositeCollection implements Set { * @param comps * @throws IllegalArgumentException if any of the collections in comps do not implement Set */ + @Override public synchronized void addComposited(Collection[] comps) { for (int i = comps.length - 1; i >= 0; --i) { this.addComposited(comps[i]); @@ -135,6 +138,7 @@ public class CompositeSet extends CompositeCollection implements Set { * composited sets will throw IllegalArgumentException *

*/ + @Override public void setMutator(CollectionMutator mutator) { super.setMutator(mutator); } @@ -148,6 +152,7 @@ public class CompositeSet extends CompositeCollection implements Set { * @param obj Object to be removed * @return true if the object is removed, false otherwise */ + @Override public boolean remove(Object obj) { for (Set set : getCollections()) { if (set.contains(obj)) return set.remove(obj); @@ -158,6 +163,7 @@ public class CompositeSet extends CompositeCollection implements Set { /** * @see Set#equals */ + @Override @SuppressWarnings("unchecked") public boolean equals(Object obj) { if (obj instanceof Set) { @@ -170,6 +176,7 @@ public class CompositeSet extends CompositeCollection implements Set { /** * @see Set#hashCode */ + @Override public int hashCode() { int code = 0; for (E e : this) { diff --git a/src/java/org/apache/commons/collections/set/ListOrderedSet.java b/src/java/org/apache/commons/collections/set/ListOrderedSet.java index 82ed03cc9..a885ad92d 100644 --- a/src/java/org/apache/commons/collections/set/ListOrderedSet.java +++ b/src/java/org/apache/commons/collections/set/ListOrderedSet.java @@ -168,15 +168,18 @@ public class ListOrderedSet extends AbstractSerializableSetDecorator imple } //----------------------------------------------------------------------- + @Override public void clear() { collection.clear(); setOrder.clear(); } + @Override public OrderedIterator iterator() { return new OrderedSetIterator(setOrder.listIterator(), collection); } + @Override public boolean add(E object) { if (collection.add(object)) { setOrder.add(object); @@ -185,6 +188,7 @@ public class ListOrderedSet extends AbstractSerializableSetDecorator imple return false; } + @Override public boolean addAll(Collection coll) { boolean result = false; for (E e : coll) { @@ -193,12 +197,14 @@ public class ListOrderedSet extends AbstractSerializableSetDecorator imple return result; } + @Override public boolean remove(Object object) { boolean result = collection.remove(object); setOrder.remove(object); return result; } + @Override public boolean removeAll(Collection coll) { boolean result = false; for (Iterator it = coll.iterator(); it.hasNext();) { @@ -207,6 +213,7 @@ public class ListOrderedSet extends AbstractSerializableSetDecorator imple return result; } + @Override public boolean retainAll(Collection coll) { boolean result = collection.retainAll(coll); if (result == false) { @@ -224,10 +231,12 @@ public class ListOrderedSet extends AbstractSerializableSetDecorator imple return result; } + @Override public Object[] toArray() { return setOrder.toArray(); } + @Override public T[] toArray(T a[]) { return setOrder.toArray(a); } @@ -273,6 +282,7 @@ public class ListOrderedSet extends AbstractSerializableSetDecorator imple * any custom toStrings will be ignored. */ // Fortunately List.toString and Set.toString look the same + @Override public String toString() { return setOrder.toString(); } @@ -294,11 +304,13 @@ public class ListOrderedSet extends AbstractSerializableSetDecorator imple this.set = set; } + @Override public E next() { last = iterator.next(); return last; } + @Override public void remove() { set.remove(last); iterator.remove(); diff --git a/src/java/org/apache/commons/collections/set/MapBackedSet.java b/src/java/org/apache/commons/collections/set/MapBackedSet.java index a208f7bad..c1b150ac2 100644 --- a/src/java/org/apache/commons/collections/set/MapBackedSet.java +++ b/src/java/org/apache/commons/collections/set/MapBackedSet.java @@ -147,10 +147,12 @@ public final class MapBackedSet implements Set, Serializable { return map.keySet().toArray(array); } + @Override public boolean equals(Object obj) { return map.keySet().equals(obj); } + @Override public int hashCode() { return map.keySet().hashCode(); } diff --git a/src/java/org/apache/commons/collections/set/PredicatedSet.java b/src/java/org/apache/commons/collections/set/PredicatedSet.java index 6cfcb53b9..a40802d47 100644 --- a/src/java/org/apache/commons/collections/set/PredicatedSet.java +++ b/src/java/org/apache/commons/collections/set/PredicatedSet.java @@ -82,6 +82,7 @@ public class PredicatedSet extends PredicatedCollection implements Set * * @return the decorated set */ + @Override protected Set decorated() { return (Set) super.decorated(); } diff --git a/src/java/org/apache/commons/collections/set/PredicatedSortedSet.java b/src/java/org/apache/commons/collections/set/PredicatedSortedSet.java index 6527b074c..0e3022733 100644 --- a/src/java/org/apache/commons/collections/set/PredicatedSortedSet.java +++ b/src/java/org/apache/commons/collections/set/PredicatedSortedSet.java @@ -82,6 +82,7 @@ public class PredicatedSortedSet extends PredicatedSet implements SortedSe * * @return the decorated sorted set */ + @Override protected SortedSet decorated() { return (SortedSet) super.decorated(); } diff --git a/src/java/org/apache/commons/collections/set/UnmodifiableSet.java b/src/java/org/apache/commons/collections/set/UnmodifiableSet.java index 40a03029a..e79ed02ef 100644 --- a/src/java/org/apache/commons/collections/set/UnmodifiableSet.java +++ b/src/java/org/apache/commons/collections/set/UnmodifiableSet.java @@ -67,30 +67,37 @@ public final class UnmodifiableSet } //----------------------------------------------------------------------- + @Override public Iterator iterator() { return UnmodifiableIterator.decorate(decorated().iterator()); } + @Override public boolean add(E object) { throw new UnsupportedOperationException(); } + @Override public boolean addAll(Collection coll) { throw new UnsupportedOperationException(); } + @Override public void clear() { throw new UnsupportedOperationException(); } + @Override public boolean remove(Object object) { throw new UnsupportedOperationException(); } + @Override public boolean removeAll(Collection coll) { throw new UnsupportedOperationException(); } + @Override public boolean retainAll(Collection coll) { throw new UnsupportedOperationException(); } diff --git a/src/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java b/src/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java index 35628abc9..24c8c27ad 100644 --- a/src/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java +++ b/src/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java @@ -96,45 +96,55 @@ public final class UnmodifiableSortedSet } //----------------------------------------------------------------------- + @Override public Iterator iterator() { return UnmodifiableIterator.decorate(decorated().iterator()); } + @Override public boolean add(E object) { throw new UnsupportedOperationException(); } + @Override public boolean addAll(Collection coll) { throw new UnsupportedOperationException(); } + @Override public void clear() { throw new UnsupportedOperationException(); } + @Override public boolean remove(Object object) { throw new UnsupportedOperationException(); } + @Override public boolean removeAll(Collection coll) { throw new UnsupportedOperationException(); } + @Override public boolean retainAll(Collection coll) { throw new UnsupportedOperationException(); } //----------------------------------------------------------------------- + @Override public SortedSet subSet(E fromElement, E toElement) { SortedSet sub = decorated().subSet(fromElement, toElement); return new UnmodifiableSortedSet(sub); } + @Override public SortedSet headSet(E toElement) { SortedSet sub = decorated().headSet(toElement); return new UnmodifiableSortedSet(sub); } + @Override public SortedSet tailSet(E fromElement) { SortedSet sub = decorated().tailSet(fromElement); return new UnmodifiableSortedSet(sub); diff --git a/src/java/org/apache/commons/collections/splitmap/AbstractIterableGetMapDecorator.java b/src/java/org/apache/commons/collections/splitmap/AbstractIterableGetMapDecorator.java index 14390ba73..fa5271fd4 100644 --- a/src/java/org/apache/commons/collections/splitmap/AbstractIterableGetMapDecorator.java +++ b/src/java/org/apache/commons/collections/splitmap/AbstractIterableGetMapDecorator.java @@ -130,6 +130,7 @@ public class AbstractIterableGetMapDecorator implements IterableGet /** * {@inheritDoc} */ + @Override public boolean equals(Object object) { if (object == this) { return true; @@ -140,6 +141,7 @@ public class AbstractIterableGetMapDecorator implements IterableGet /** * {@inheritDoc} */ + @Override public int hashCode() { return decorated().hashCode(); } @@ -147,6 +149,7 @@ public class AbstractIterableGetMapDecorator implements IterableGet /** * {@inheritDoc} */ + @Override public String toString() { return decorated().toString(); } diff --git a/src/test/org/apache/commons/collections/BulkTest.java b/src/test/org/apache/commons/collections/BulkTest.java index 35cb26757..931c8b1cb 100644 --- a/src/test/org/apache/commons/collections/BulkTest.java +++ b/src/test/org/apache/commons/collections/BulkTest.java @@ -174,6 +174,7 @@ public class BulkTest extends TestCase implements Cloneable { * * @return a clone of this BulkTest */ + @Override public Object clone() { try { return super.clone(); @@ -226,6 +227,7 @@ public class BulkTest extends TestCase implements Cloneable { * * @return the display name of this BulkTest */ + @Override public String toString() { return getName() + "(" + verboseName + ") "; } diff --git a/src/test/org/apache/commons/collections/LocalTestNode.java b/src/test/org/apache/commons/collections/LocalTestNode.java index ae6f709c8..d4f8ca9f8 100644 --- a/src/test/org/apache/commons/collections/LocalTestNode.java +++ b/src/test/org/apache/commons/collections/LocalTestNode.java @@ -96,6 +96,7 @@ class LocalTestNode, V extends Comparable> implements * * @return true if equal */ + @Override @SuppressWarnings("unchecked") public boolean equals(Object o) { @@ -116,6 +117,7 @@ class LocalTestNode, V extends Comparable> implements /** * @return hash code */ + @Override public int hashCode() { return getKey().hashCode() ^ getValue().hashCode(); } diff --git a/src/test/org/apache/commons/collections/TestArrayStack.java b/src/test/org/apache/commons/collections/TestArrayStack.java index fd922e630..202ab89c8 100644 --- a/src/test/org/apache/commons/collections/TestArrayStack.java +++ b/src/test/org/apache/commons/collections/TestArrayStack.java @@ -42,6 +42,7 @@ public class TestArrayStack extends TestArrayList { junit.textui.TestRunner.main(testCaseName); } + @Override public ArrayStack makeObject() { return new ArrayStack(); } @@ -97,6 +98,7 @@ public class TestArrayStack extends TestArrayList { } + @Override @SuppressWarnings("unchecked") public void testSearch() { ArrayStack stack = makeObject(); diff --git a/src/test/org/apache/commons/collections/TestClosureUtils.java b/src/test/org/apache/commons/collections/TestClosureUtils.java index 4df9bf505..dfb397360 100644 --- a/src/test/org/apache/commons/collections/TestClosureUtils.java +++ b/src/test/org/apache/commons/collections/TestClosureUtils.java @@ -69,12 +69,14 @@ public class TestClosureUtils extends junit.framework.TestCase { /** * Set up instance variables required by this test case. */ + @Override public void setUp() { } /** * Tear down instance variables required by this test case. */ + @Override public void tearDown() { } diff --git a/src/test/org/apache/commons/collections/TestFactoryUtils.java b/src/test/org/apache/commons/collections/TestFactoryUtils.java index ab24a3aaa..361382a2b 100644 --- a/src/test/org/apache/commons/collections/TestFactoryUtils.java +++ b/src/test/org/apache/commons/collections/TestFactoryUtils.java @@ -50,12 +50,14 @@ public class TestFactoryUtils extends junit.framework.TestCase { /** * Set up instance variables required by this test case. */ + @Override public void setUp() { } /** * Tear down instance variables required by this test case. */ + @Override public void tearDown() { } @@ -205,6 +207,7 @@ public class TestFactoryUtils extends junit.framework.TestCase { public Mock1(Mock1 mock) { iVal = mock.iVal; } + @Override public boolean equals(Object obj) { if (obj instanceof Mock1) { if (iVal == ((Mock1) obj).iVal) { @@ -221,6 +224,7 @@ public class TestFactoryUtils extends junit.framework.TestCase { public Mock2(Object val) { iVal = val; } + @Override public boolean equals(Object obj) { if (obj instanceof Mock2) { if (iVal == ((Mock2) obj).iVal) { diff --git a/src/test/org/apache/commons/collections/TestLinkedList.java b/src/test/org/apache/commons/collections/TestLinkedList.java index bd6a33434..05f103af2 100644 --- a/src/test/org/apache/commons/collections/TestLinkedList.java +++ b/src/test/org/apache/commons/collections/TestLinkedList.java @@ -44,6 +44,7 @@ public abstract class TestLinkedList extends AbstractTestList { super(testName); } + @Override public abstract LinkedList makeObject(); /** @@ -51,6 +52,7 @@ public abstract class TestLinkedList extends AbstractTestList { * * @return the collection field as a List */ + @Override public LinkedList getCollection() { return (LinkedList) super.getCollection(); } @@ -197,6 +199,7 @@ public abstract class TestLinkedList extends AbstractTestList { /** * Returns an empty {@link LinkedList}. */ + @Override public Collection makeConfirmedCollection() { return new LinkedList(); } @@ -204,6 +207,7 @@ public abstract class TestLinkedList extends AbstractTestList { /** * Returns a full {@link LinkedList}. */ + @Override public Collection makeConfirmedFullCollection() { List list = new LinkedList(); list.addAll(Arrays.asList(getFullElements())); diff --git a/src/test/org/apache/commons/collections/TestListUtils.java b/src/test/org/apache/commons/collections/TestListUtils.java index 27117a887..e4c370eb1 100644 --- a/src/test/org/apache/commons/collections/TestListUtils.java +++ b/src/test/org/apache/commons/collections/TestListUtils.java @@ -56,6 +56,7 @@ public class TestListUtils extends BulkTest { return BulkTest.makeSuite(TestListUtils.class); } + @Override public void setUp() { fullArray = new String[]{a, b, c, d, e}; fullList = new ArrayList(Arrays.asList(fullArray)); diff --git a/src/test/org/apache/commons/collections/TestMapUtils.java b/src/test/org/apache/commons/collections/TestMapUtils.java index 5cabc5ec8..39f64f2a8 100644 --- a/src/test/org/apache/commons/collections/TestMapUtils.java +++ b/src/test/org/apache/commons/collections/TestMapUtils.java @@ -278,6 +278,7 @@ public class TestMapUtils extends BulkTest { in.put("5", "E"); ResourceBundle b = new ListResourceBundle() { + @Override public Object[][] getContents() { final Object[][] contents = new Object[ in.size() ][2]; final Iterator i = in.keySet().iterator(); diff --git a/src/test/org/apache/commons/collections/TestTransformerUtils.java b/src/test/org/apache/commons/collections/TestTransformerUtils.java index a26db9d2e..5e5e72f11 100644 --- a/src/test/org/apache/commons/collections/TestTransformerUtils.java +++ b/src/test/org/apache/commons/collections/TestTransformerUtils.java @@ -77,12 +77,14 @@ public class TestTransformerUtils extends junit.framework.TestCase { /** * Set up instance variables required by this test case. */ + @Override public void setUp() { } /** * Tear down instance variables required by this test case. */ + @Override public void tearDown() { } diff --git a/src/test/org/apache/commons/collections/TestTreeMap.java b/src/test/org/apache/commons/collections/TestTreeMap.java index d517d5063..dac5184f0 100644 --- a/src/test/org/apache/commons/collections/TestTreeMap.java +++ b/src/test/org/apache/commons/collections/TestTreeMap.java @@ -38,6 +38,7 @@ public abstract class TestTreeMap extends AbstractTestMap { junit.textui.TestRunner.main(testCaseName); } + @Override public boolean isAllowNullKey() { return false; } diff --git a/src/test/org/apache/commons/collections/bag/AbstractTestBag.java b/src/test/org/apache/commons/collections/bag/AbstractTestBag.java index 0942fe57a..606bc2b31 100644 --- a/src/test/org/apache/commons/collections/bag/AbstractTestBag.java +++ b/src/test/org/apache/commons/collections/bag/AbstractTestBag.java @@ -63,6 +63,7 @@ public abstract class AbstractTestBag extends AbstractTestObject { * * @return the bag to be tested */ + @Override public abstract Bag makeObject(); //----------------------------------------------------------------------- @@ -491,6 +492,7 @@ public abstract class AbstractTestBag extends AbstractTestObject { * * TODO: store a new serialized object on the disk. */ + @Override protected boolean skipSerializedCanonicalTests() { return true; } diff --git a/src/test/org/apache/commons/collections/bag/TestHashBag.java b/src/test/org/apache/commons/collections/bag/TestHashBag.java index 64caa7844..c99540e61 100644 --- a/src/test/org/apache/commons/collections/bag/TestHashBag.java +++ b/src/test/org/apache/commons/collections/bag/TestHashBag.java @@ -44,10 +44,12 @@ public class TestHashBag extends AbstractTestBag { junit.textui.TestRunner.main(testCaseName); } + @Override public Bag makeObject() { return new HashBag(); } + @Override public String getCompatibilityVersion() { return "3"; } diff --git a/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java b/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java index c2e419e9d..442f9f1ef 100644 --- a/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java +++ b/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java @@ -65,6 +65,7 @@ public class TestPredicatedBag extends AbstractTestBag { return PredicatedBag.decorate(bag, predicate); } + @Override public Bag makeObject() { return decorateBag(new HashBag(), truePredicate); } @@ -128,6 +129,7 @@ public class TestPredicatedBag extends AbstractTestBag { } } + @Override public String getCompatibilityVersion() { return "3.1"; } diff --git a/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java b/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java index 4d187cccb..263f15005 100644 --- a/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java +++ b/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java @@ -67,6 +67,7 @@ public class TestPredicatedSortedBag extends AbstractTestSortedBag { return PredicatedSortedBag.decorate(bag, predicate); } + @Override public SortedBag makeObject() { return decorateBag(new TreeBag(), truePredicate); } @@ -105,6 +106,7 @@ public class TestPredicatedSortedBag extends AbstractTestSortedBag { assertTrue("natural order, so comparator should be null", c == null); } + @Override public String getCompatibilityVersion() { return "3.1"; } diff --git a/src/test/org/apache/commons/collections/bag/TestTransformedBag.java b/src/test/org/apache/commons/collections/bag/TestTransformedBag.java index 2a263f469..c7293ffa8 100644 --- a/src/test/org/apache/commons/collections/bag/TestTransformedBag.java +++ b/src/test/org/apache/commons/collections/bag/TestTransformedBag.java @@ -47,6 +47,7 @@ public class TestTransformedBag extends AbstractTestBag { junit.textui.TestRunner.main(testCaseName); } + @Override @SuppressWarnings("unchecked") public Bag makeObject() { return TransformedBag.decorate(new HashBag(), (Transformer) TestTransformedCollection.NOOP_TRANSFORMER); @@ -87,6 +88,7 @@ public class TestTransformedBag extends AbstractTestBag { assertEquals(true, bag.remove(new Integer((String) els[0]))); } + @Override public String getCompatibilityVersion() { return "3.1"; } diff --git a/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java b/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java index 81f284583..00357b9e0 100644 --- a/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java +++ b/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java @@ -48,6 +48,7 @@ public class TestTransformedSortedBag extends AbstractTestSortedBag { junit.textui.TestRunner.main(testCaseName); } + @Override @SuppressWarnings("unchecked") public SortedBag makeObject() { return TransformedSortedBag.decorate(new TreeBag(), (Transformer) TestTransformedCollection.NOOP_TRANSFORMER); @@ -83,6 +84,7 @@ public class TestTransformedSortedBag extends AbstractTestSortedBag { assertEquals(true, bag.remove(new Integer((String) els[0]))); } + @Override public String getCompatibilityVersion() { return "3.1"; } diff --git a/src/test/org/apache/commons/collections/bag/TestTreeBag.java b/src/test/org/apache/commons/collections/bag/TestTreeBag.java index 7a4eae37c..b1c38295e 100644 --- a/src/test/org/apache/commons/collections/bag/TestTreeBag.java +++ b/src/test/org/apache/commons/collections/bag/TestTreeBag.java @@ -45,6 +45,7 @@ public class TestTreeBag extends AbstractTestSortedBag { junit.textui.TestRunner.main(testCaseName); } + @Override public SortedBag makeObject() { return new TreeBag(); } @@ -79,6 +80,7 @@ public class TestTreeBag extends AbstractTestSortedBag { assertEquals("Should get last key", "D", ((SortedBag) bag).last()); } + @Override public String getCompatibilityVersion() { return "3"; } diff --git a/src/test/org/apache/commons/collections/bidimap/AbstractTestBidiMap.java b/src/test/org/apache/commons/collections/bidimap/AbstractTestBidiMap.java index 148473d27..e79e02375 100644 --- a/src/test/org/apache/commons/collections/bidimap/AbstractTestBidiMap.java +++ b/src/test/org/apache/commons/collections/bidimap/AbstractTestBidiMap.java @@ -60,11 +60,13 @@ public abstract class AbstractTestBidiMap extends AbstractTestIterableMap< /** * Override to return the empty BidiMap. */ + @Override public abstract BidiMap makeObject(); /** * Override to indicate to AbstractTestMap this is a BidiMap. */ + @Override public boolean isAllowDuplicateValues() { return false; } @@ -72,6 +74,7 @@ public abstract class AbstractTestBidiMap extends AbstractTestIterableMap< /** * Override as DualHashBidiMap didn't exist until version 3. */ + @Override public String getCompatibilityVersion() { return "3"; } @@ -117,6 +120,7 @@ public abstract class AbstractTestBidiMap extends AbstractTestIterableMap< *

* This implementation checks the inverse map as well. */ + @Override public void verify() { verifyInverse(); super.verify(); @@ -334,6 +338,7 @@ public abstract class AbstractTestBidiMap extends AbstractTestIterableMap< } //----------------------------------------------------------------------- + @Override public BulkTest bulkTestMapEntrySet() { return new TestBidiMapEntrySet(); } @@ -412,45 +417,56 @@ public abstract class AbstractTestBidiMap extends AbstractTestIterableMap< this.main = main; } + @Override public BidiMap makeObject() { return main.makeObject().inverseBidiMap(); } + @Override public BidiMap makeFullMap() { return main.makeFullMap().inverseBidiMap(); } + @Override public V[] getSampleKeys() { return main.getSampleValues(); } + @Override public K[] getSampleValues() { return main.getSampleKeys(); } + @Override public String getCompatibilityVersion() { return main.getCompatibilityVersion(); } + @Override public boolean isAllowNullKey() { return main.isAllowNullKey(); } + @Override public boolean isAllowNullValue() { return main.isAllowNullValue(); } + @Override public boolean isPutAddSupported() { return main.isPutAddSupported(); } + @Override public boolean isPutChangeSupported() { return main.isPutChangeSupported(); } + @Override public boolean isSetValueSupported() { return main.isSetValueSupported(); } + @Override public boolean isRemoveSupported() { return main.isRemoveSupported(); } @@ -467,38 +483,46 @@ public abstract class AbstractTestBidiMap extends AbstractTestIterableMap< super("TestBidiMapIterator"); } + @Override public V[] addSetValues() { return AbstractTestBidiMap.this.getNewSampleValues(); } + @Override public boolean supportsRemove() { return AbstractTestBidiMap.this.isRemoveSupported(); } + @Override public boolean supportsSetValue() { return AbstractTestBidiMap.this.isSetValueSupported(); } + @Override public MapIterator makeEmptyIterator() { resetEmpty(); return AbstractTestBidiMap.this.getMap().mapIterator(); } + @Override public MapIterator makeObject() { resetFull(); return AbstractTestBidiMap.this.getMap().mapIterator(); } + @Override public BidiMap getMap() { // assumes makeFullMapIterator() called first return AbstractTestBidiMap.this.getMap(); } + @Override public Map getConfirmedMap() { // assumes makeFullMapIterator() called first return AbstractTestBidiMap.this.getConfirmed(); } + @Override public void verify() { super.verify(); AbstractTestBidiMap.this.verify(); diff --git a/src/test/org/apache/commons/collections/bidimap/AbstractTestOrderedBidiMap.java b/src/test/org/apache/commons/collections/bidimap/AbstractTestOrderedBidiMap.java index dcf7e2900..6529a61a6 100644 --- a/src/test/org/apache/commons/collections/bidimap/AbstractTestOrderedBidiMap.java +++ b/src/test/org/apache/commons/collections/bidimap/AbstractTestOrderedBidiMap.java @@ -165,38 +165,46 @@ public abstract class AbstractTestOrderedBidiMap extends AbstractTestBidiM super("TestBidiOrderedMapIterator"); } + @Override public V[] addSetValues() { return AbstractTestOrderedBidiMap.this.getNewSampleValues(); } + @Override public boolean supportsRemove() { return AbstractTestOrderedBidiMap.this.isRemoveSupported(); } + @Override public boolean supportsSetValue() { return AbstractTestOrderedBidiMap.this.isSetValueSupported(); } + @Override public MapIterator makeEmptyIterator() { resetEmpty(); return AbstractTestOrderedBidiMap.this.getMap().mapIterator(); } + @Override public MapIterator makeObject() { resetFull(); return AbstractTestOrderedBidiMap.this.getMap().mapIterator(); } + @Override public Map getMap() { // assumes makeFullMapIterator() called first return AbstractTestOrderedBidiMap.this.map; } + @Override public Map getConfirmedMap() { // assumes makeFullMapIterator() called first return AbstractTestOrderedBidiMap.this.confirmed; } + @Override public void verify() { super.verify(); AbstractTestOrderedBidiMap.this.verify(); diff --git a/src/test/org/apache/commons/collections/bidimap/AbstractTestSortedBidiMap.java b/src/test/org/apache/commons/collections/bidimap/AbstractTestSortedBidiMap.java index 6dc37e968..f6536ad92 100644 --- a/src/test/org/apache/commons/collections/bidimap/AbstractTestSortedBidiMap.java +++ b/src/test/org/apache/commons/collections/bidimap/AbstractTestSortedBidiMap.java @@ -78,10 +78,12 @@ public abstract class AbstractTestSortedBidiMap, V exten // } //----------------------------------------------------------------------- + @Override public boolean isAllowNullKey() { return false; } + @Override public boolean isAllowNullValue() { return false; } @@ -100,6 +102,7 @@ public abstract class AbstractTestSortedBidiMap, V exten return (SortedBidiMap) super.makeFullMap(); } + @Override public SortedMap makeConfirmedMap() { return new TreeMap(); } diff --git a/src/test/org/apache/commons/collections/bidimap/TestAbstractOrderedBidiMapDecorator.java b/src/test/org/apache/commons/collections/bidimap/TestAbstractOrderedBidiMapDecorator.java index 3223033fb..32400270d 100644 --- a/src/test/org/apache/commons/collections/bidimap/TestAbstractOrderedBidiMapDecorator.java +++ b/src/test/org/apache/commons/collections/bidimap/TestAbstractOrderedBidiMapDecorator.java @@ -48,18 +48,22 @@ public class TestAbstractOrderedBidiMapDecorator return new TestOrderedBidiMap(); } + @Override public SortedMap makeConfirmedMap() { return new TreeMap(); } + @Override public boolean isAllowNullKey() { return false; } + @Override public boolean isAllowNullValue() { return false; } + @Override public boolean isSetValueSupported() { return true; } @@ -79,6 +83,7 @@ public class TestAbstractOrderedBidiMapDecorator super(map); } + @Override public OrderedBidiMap inverseBidiMap() { if (inverse == null) { inverse = new TestOrderedBidiMap(decorated().inverseBidiMap()); diff --git a/src/test/org/apache/commons/collections/bidimap/TestDualHashBidiMap.java b/src/test/org/apache/commons/collections/bidimap/TestDualHashBidiMap.java index 4ff34cb66..0149ab363 100644 --- a/src/test/org/apache/commons/collections/bidimap/TestDualHashBidiMap.java +++ b/src/test/org/apache/commons/collections/bidimap/TestDualHashBidiMap.java @@ -54,6 +54,7 @@ public class TestDualHashBidiMap extends AbstractTestBidiMap { /** * Override to prevent infinite recursion of tests. */ + @Override public String[] ignoredTests() { return new String[] { "TestDualHashBidiMap.bulkTestInverseMap.bulkTestInverseMap" }; } diff --git a/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap.java b/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap.java index 815b1141a..631f64480 100644 --- a/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap.java +++ b/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap.java @@ -54,6 +54,7 @@ public class TestDualTreeBidiMap, V extends Comparable, V extends Comparable< super(testName); } + @Override public DualTreeBidiMap makeObject() { return new DualTreeBidiMap( new ReverseComparator(ComparableComparator. getInstance()), new ReverseComparator(ComparableComparator. getInstance())); } + @Override public TreeMap makeConfirmedMap() { return new TreeMap(new ReverseComparator(ComparableComparator.getInstance())); } @@ -114,6 +116,7 @@ public class TestDualTreeBidiMap2, V extends Comparable< } } + @Override public String getCompatibilityVersion() { return "3.Test2"; } @@ -121,6 +124,7 @@ public class TestDualTreeBidiMap2, V extends Comparable< /** * Override to prevent infinite recursion of tests. */ + @Override public String[] ignoredTests() { return new String[] {"TestDualTreeBidiMap2.bulkTestInverseMap.bulkTestInverseMap"}; } diff --git a/src/test/org/apache/commons/collections/bidimap/TestTreeBidiMap.java b/src/test/org/apache/commons/collections/bidimap/TestTreeBidiMap.java index a741469c6..0a0400ca8 100644 --- a/src/test/org/apache/commons/collections/bidimap/TestTreeBidiMap.java +++ b/src/test/org/apache/commons/collections/bidimap/TestTreeBidiMap.java @@ -45,10 +45,12 @@ public class TestTreeBidiMap, V extends Comparable> e super(testName); } + @Override public BidiMap makeObject() { return new TreeBidiMap(); } + @Override public TreeMap makeConfirmedMap() { return new TreeMap(); } @@ -56,22 +58,27 @@ public class TestTreeBidiMap, V extends Comparable> e /** * Override to prevent infinite recursion of tests. */ + @Override public String[] ignoredTests() { return new String[] {"TestTreeBidiMap.bulkTestInverseMap.bulkTestInverseMap"}; } + @Override public boolean isAllowNullKey() { return false; } + @Override public boolean isAllowNullValue() { return false; } + @Override public boolean isSetValueSupported() { return false; } + @Override public String getCompatibilityVersion() { return "3.3"; } diff --git a/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableBidiMap.java b/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableBidiMap.java index 8af3f179d..e56c85c74 100644 --- a/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableBidiMap.java +++ b/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableBidiMap.java @@ -46,16 +46,19 @@ public class TestUnmodifiableBidiMap extends AbstractTestBidiMap { super(testName); } + @Override public BidiMap makeObject() { return UnmodifiableBidiMap.decorate(new DualHashBidiMap()); } + @Override public BidiMap makeFullMap() { BidiMap bidi = new DualHashBidiMap(); addSampleMappings(bidi); return UnmodifiableBidiMap.decorate(bidi); } + @Override public Map makeConfirmedMap() { return new HashMap(); } @@ -63,18 +66,22 @@ public class TestUnmodifiableBidiMap extends AbstractTestBidiMap { /** * Override to prevent infinite recursion of tests. */ + @Override public String[] ignoredTests() { return new String[] {"TestUnmodifiableBidiMap.bulkTestInverseMap.bulkTestInverseMap"}; } + @Override public boolean isPutAddSupported() { return false; } + @Override public boolean isPutChangeSupported() { return false; } + @Override public boolean isRemoveSupported() { return false; } diff --git a/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableOrderedBidiMap.java b/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableOrderedBidiMap.java index 6c732e70c..0ebf7da8a 100644 --- a/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableOrderedBidiMap.java +++ b/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableOrderedBidiMap.java @@ -47,16 +47,19 @@ public class TestUnmodifiableOrderedBidiMap, V extends C super(testName); } + @Override public OrderedBidiMap makeObject() { return UnmodifiableOrderedBidiMap.decorate(new TreeBidiMap()); } + @Override public BidiMap makeFullMap() { OrderedBidiMap bidi = new TreeBidiMap(); addSampleMappings(bidi); return UnmodifiableOrderedBidiMap.decorate(bidi); } + @Override public Map makeConfirmedMap() { return new TreeMap(); } @@ -64,26 +67,32 @@ public class TestUnmodifiableOrderedBidiMap, V extends C /** * Override to prevent infinite recursion of tests. */ + @Override public String[] ignoredTests() { return new String[] {"TestUnmodifiableOrderedBidiMap.bulkTestInverseMap.bulkTestInverseMap"}; } + @Override public boolean isAllowNullKey() { return false; } + @Override public boolean isAllowNullValue() { return false; } + @Override public boolean isPutAddSupported() { return false; } + @Override public boolean isPutChangeSupported() { return false; } + @Override public boolean isRemoveSupported() { return false; } diff --git a/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java b/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java index 7b4597c91..108753bd7 100644 --- a/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java +++ b/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java @@ -47,47 +47,57 @@ public class TestUnmodifiableSortedBidiMap, V extends Co } //----------------------------------------------------------------------- + @Override public SortedBidiMap makeObject() { return UnmodifiableSortedBidiMap.decorate(new DualTreeBidiMap()); } + @Override public SortedBidiMap makeFullMap() { SortedBidiMap bidi = new DualTreeBidiMap(); addSampleMappings(bidi); return UnmodifiableSortedBidiMap.decorate(bidi); } + @Override public SortedMap makeConfirmedMap() { return new TreeMap(); } + @Override public boolean isSubMapViewsSerializable() { // TreeMap sub map views have a bug in deserialization. return false; } + @Override public String[] ignoredTests() { // Override to prevent infinite recursion of tests. return new String[] {"TestUnmodifiableSortedBidiMap.bulkTestInverseMap.bulkTestInverseMap"}; } //----------------------------------------------------------------------- + @Override public boolean isAllowNullKey() { return false; } + @Override public boolean isAllowNullValue() { return false; } + @Override public boolean isPutAddSupported() { return false; } + @Override public boolean isPutChangeSupported() { return false; } + @Override public boolean isRemoveSupported() { return false; } diff --git a/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java b/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java index c5071a600..337bab03c 100644 --- a/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java +++ b/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java @@ -52,10 +52,12 @@ public class TestBlockingBuffer extends AbstractTestObject { junit.textui.TestRunner.main(testCaseName); } + @Override public Buffer makeObject() { return BlockingBuffer.decorate(new MyBuffer()); } + @Override public boolean isEqualsCheckable() { return false; } @@ -437,6 +439,7 @@ public class TestBlockingBuffer extends AbstractTestObject { this.obj = obj; } + @Override public void run() { try { // wait for other thread to block on get() or remove() @@ -467,6 +470,7 @@ public class TestBlockingBuffer extends AbstractTestObject { this.obj = obj; } + @Override public void run() { try { // wait for other thread to block on get() or remove() @@ -517,6 +521,7 @@ public class TestBlockingBuffer extends AbstractTestObject { this.action = action; } + @Override public void run() { try { if (action == "get") { @@ -544,6 +549,7 @@ public class TestBlockingBuffer extends AbstractTestObject { return get(0); } + @Override public E remove() { if (isEmpty()) { throw new BufferUnderflowException(); @@ -559,6 +565,7 @@ public class TestBlockingBuffer extends AbstractTestObject { } } + @Override public String getCompatibilityVersion() { return "3.1"; } diff --git a/src/test/org/apache/commons/collections/buffer/TestBoundedBuffer.java b/src/test/org/apache/commons/collections/buffer/TestBoundedBuffer.java index 849a54c1d..0becf7b51 100644 --- a/src/test/org/apache/commons/collections/buffer/TestBoundedBuffer.java +++ b/src/test/org/apache/commons/collections/buffer/TestBoundedBuffer.java @@ -43,14 +43,17 @@ public class TestBoundedBuffer extends AbstractTestObject { junit.textui.TestRunner.main(testCaseName); } + @Override public String getCompatibilityVersion() { return "3.2"; } + @Override public boolean isEqualsCheckable() { return false; } + @Override public Buffer makeObject() { return BoundedBuffer.decorate(new UnboundedFifoBuffer(), 1); } @@ -183,6 +186,7 @@ public class TestBoundedBuffer extends AbstractTestObject { this(buffer, delay, 1); } + @Override public void run() { try { Thread.sleep(delay); @@ -215,6 +219,7 @@ public class TestBoundedBuffer extends AbstractTestObject { this(buffer, delay, 1); } + @Override public void run() { try { Thread.sleep(delay); diff --git a/src/test/org/apache/commons/collections/buffer/TestBoundedFifoBuffer.java b/src/test/org/apache/commons/collections/buffer/TestBoundedFifoBuffer.java index 8ea711394..961b7c940 100644 --- a/src/test/org/apache/commons/collections/buffer/TestBoundedFifoBuffer.java +++ b/src/test/org/apache/commons/collections/buffer/TestBoundedFifoBuffer.java @@ -49,6 +49,7 @@ public class TestBoundedFifoBuffer extends AbstractTestCollection { * the buffer contains the same elements in the same sequence as the * list. */ + @Override public void verify() { super.verify(); Iterator iterator1 = getCollection().iterator(); @@ -66,6 +67,7 @@ public class TestBoundedFifoBuffer extends AbstractTestCollection { * Overridden because UnboundedFifoBuffer doesn't allow null elements. * @return false */ + @Override public boolean isNullSupported() { return false; } @@ -74,6 +76,7 @@ public class TestBoundedFifoBuffer extends AbstractTestCollection { * Overridden because UnboundedFifoBuffer isn't fail fast. * @return false */ + @Override public boolean isFailFastSupported() { return false; } @@ -84,6 +87,7 @@ public class TestBoundedFifoBuffer extends AbstractTestCollection { * * @return an empty ArrayList */ + @Override public List makeConfirmedCollection() { return new ArrayList(); } @@ -93,6 +97,7 @@ public class TestBoundedFifoBuffer extends AbstractTestCollection { * * @return a full ArrayList */ + @Override public List makeConfirmedFullCollection() { List c = makeConfirmedCollection(); c.addAll(java.util.Arrays.asList(getFullElements())); @@ -104,6 +109,7 @@ public class TestBoundedFifoBuffer extends AbstractTestCollection { * * @return an empty BoundedFifoBuffer */ + @Override public BoundedFifoBuffer makeObject() { return new BoundedFifoBuffer(100); } @@ -166,6 +172,7 @@ public class TestBoundedFifoBuffer extends AbstractTestCollection { fail(); } + @Override public String getCompatibilityVersion() { return "3.1"; } diff --git a/src/test/org/apache/commons/collections/buffer/TestBoundedFifoBuffer2.java b/src/test/org/apache/commons/collections/buffer/TestBoundedFifoBuffer2.java index 3e5d55b02..6747a585f 100644 --- a/src/test/org/apache/commons/collections/buffer/TestBoundedFifoBuffer2.java +++ b/src/test/org/apache/commons/collections/buffer/TestBoundedFifoBuffer2.java @@ -49,6 +49,7 @@ public class TestBoundedFifoBuffer2 extends TestBoundedFifoBuffer { * * @return a full BoundedFifoBuffer */ + @Override public Collection makeFullCollection() { return new BoundedFifoBuffer(Arrays.asList(getFullElements())); } @@ -59,6 +60,7 @@ public class TestBoundedFifoBuffer2 extends TestBoundedFifoBuffer { * * @return false */ + @Override public boolean isAddSupported() { return false; } @@ -67,6 +69,7 @@ public class TestBoundedFifoBuffer2 extends TestBoundedFifoBuffer { * Overridden because the add operations raise BufferOverflowException * instead of UnsupportedOperationException. */ + @Override public void testUnsupportedAdd() { } diff --git a/src/test/org/apache/commons/collections/buffer/TestCircularFifoBuffer.java b/src/test/org/apache/commons/collections/buffer/TestCircularFifoBuffer.java index cf1aebd0a..02fc32ef9 100644 --- a/src/test/org/apache/commons/collections/buffer/TestCircularFifoBuffer.java +++ b/src/test/org/apache/commons/collections/buffer/TestCircularFifoBuffer.java @@ -60,6 +60,7 @@ public class TestCircularFifoBuffer extends AbstractTestCollection { * the buffer contains the same elements in the same sequence as the * list. */ + @Override public void verify() { super.verify(); Iterator iterator1 = getCollection().iterator(); @@ -77,6 +78,7 @@ public class TestCircularFifoBuffer extends AbstractTestCollection { * Overridden because UnboundedFifoBuffer doesn't allow null elements. * @return false */ + @Override public boolean isNullSupported() { return false; } @@ -85,6 +87,7 @@ public class TestCircularFifoBuffer extends AbstractTestCollection { * Overridden because UnboundedFifoBuffer isn't fail fast. * @return false */ + @Override public boolean isFailFastSupported() { return false; } @@ -95,6 +98,7 @@ public class TestCircularFifoBuffer extends AbstractTestCollection { * * @return an empty ArrayList */ + @Override public Collection makeConfirmedCollection() { return new ArrayList(); } @@ -104,6 +108,7 @@ public class TestCircularFifoBuffer extends AbstractTestCollection { * * @return a full ArrayList */ + @Override public Collection makeConfirmedFullCollection() { Collection c = makeConfirmedCollection(); c.addAll(java.util.Arrays.asList(getFullElements())); @@ -115,6 +120,7 @@ public class TestCircularFifoBuffer extends AbstractTestCollection { * * @return an empty BoundedFifoBuffer */ + @Override public Collection makeObject() { return new CircularFifoBuffer(100); } @@ -415,6 +421,7 @@ public class TestCircularFifoBuffer extends AbstractTestCollection { assertEquals(true, b3.contains("c")); } + @Override public String getCompatibilityVersion() { return "3.1"; } diff --git a/src/test/org/apache/commons/collections/buffer/TestPredicatedBuffer.java b/src/test/org/apache/commons/collections/buffer/TestPredicatedBuffer.java index 322d89dc6..ab5d16b40 100644 --- a/src/test/org/apache/commons/collections/buffer/TestPredicatedBuffer.java +++ b/src/test/org/apache/commons/collections/buffer/TestPredicatedBuffer.java @@ -57,14 +57,17 @@ public class TestPredicatedBuffer extends TestPredicatedCollection { return PredicatedBuffer.decorate(buffer, predicate); } + @Override public Buffer makeObject() { return decorateCollection(new ArrayStack(), truePredicate); } + @Override public Collection makeConfirmedCollection() { return new ArrayStack(); } + @Override public Collection makeConfirmedFullCollection() { ArrayStack list = new ArrayStack(); list.addAll(java.util.Arrays.asList(getFullElements())); @@ -105,6 +108,7 @@ public class TestPredicatedBuffer extends TestPredicatedCollection { } } + @Override public String getCompatibilityVersion() { return "3.1"; } diff --git a/src/test/org/apache/commons/collections/buffer/TestPriorityBuffer.java b/src/test/org/apache/commons/collections/buffer/TestPriorityBuffer.java index c7d71acd8..53894315e 100644 --- a/src/test/org/apache/commons/collections/buffer/TestPriorityBuffer.java +++ b/src/test/org/apache/commons/collections/buffer/TestPriorityBuffer.java @@ -57,6 +57,7 @@ public class TestPriorityBuffer extends AbstractTestCollection { } //----------------------------------------------------------------------- + @Override @SuppressWarnings("unchecked") public void verify() { super.verify(); @@ -87,15 +88,18 @@ public class TestPriorityBuffer extends AbstractTestCollection { * Overridden because BinaryBuffer isn't fail fast. * @return false */ + @Override public boolean isFailFastSupported() { return false; } //----------------------------------------------------------------------- + @Override public Collection makeConfirmedCollection() { return new ArrayList(); } + @Override public Collection makeConfirmedFullCollection() { ArrayList list = new ArrayList(); list.addAll(Arrays.asList(getFullElements())); @@ -105,16 +109,19 @@ public class TestPriorityBuffer extends AbstractTestCollection { /** * Return a new, empty {@link Object} to used for testing. */ + @Override public Buffer makeObject() { return new PriorityBuffer(); } //----------------------------------------------------------------------- + @Override @SuppressWarnings("unchecked") public E[] getFullElements() { return (E[]) getFullNonNullStringElements(); } + @Override @SuppressWarnings("unchecked") public E[] getOtherElements() { return (E[]) getOtherNonNullStringElements(); @@ -399,6 +406,7 @@ public class TestPriorityBuffer extends AbstractTestCollection { return h1; } + @Override public String getCompatibilityVersion() { return "3.2"; } diff --git a/src/test/org/apache/commons/collections/buffer/TestSynchronizedBuffer.java b/src/test/org/apache/commons/collections/buffer/TestSynchronizedBuffer.java index 305a78846..afc99b9eb 100644 --- a/src/test/org/apache/commons/collections/buffer/TestSynchronizedBuffer.java +++ b/src/test/org/apache/commons/collections/buffer/TestSynchronizedBuffer.java @@ -52,30 +52,36 @@ public class TestSynchronizedBuffer extends AbstractTestCollection { } //----------------------------------------------------------------------- + @Override public Buffer makeObject() { return SynchronizedBuffer.decorate(new UnboundedFifoBuffer()); } + @Override public Collection makeFullCollection() { Buffer buffer = new UnboundedFifoBuffer(); buffer.addAll(Arrays.asList(getFullElements())); return SynchronizedBuffer.decorate(buffer); } + @Override public Collection makeConfirmedCollection() { return new ArrayStack(); } + @Override public Collection makeConfirmedFullCollection() { ArrayStack list = new ArrayStack(); list.addAll(Arrays.asList(getFullElements())); return list; } + @Override public boolean isNullSupported() { return false; } + @Override public String getCompatibilityVersion() { return "3.1"; } diff --git a/src/test/org/apache/commons/collections/buffer/TestUnboundedFifoBuffer.java b/src/test/org/apache/commons/collections/buffer/TestUnboundedFifoBuffer.java index f227014b4..48a843a5c 100644 --- a/src/test/org/apache/commons/collections/buffer/TestUnboundedFifoBuffer.java +++ b/src/test/org/apache/commons/collections/buffer/TestUnboundedFifoBuffer.java @@ -48,6 +48,7 @@ public class TestUnboundedFifoBuffer extends AbstractTestCollection { * Verifies that the ArrayList has the same elements in the same * sequence as the UnboundedFifoBuffer. */ + @Override public void verify() { super.verify(); Iterator iterator1 = getCollection().iterator(); @@ -65,6 +66,7 @@ public class TestUnboundedFifoBuffer extends AbstractTestCollection { * Overridden because UnboundedFifoBuffer doesn't allow null elements. * @return false */ + @Override public boolean isNullSupported() { return false; } @@ -73,6 +75,7 @@ public class TestUnboundedFifoBuffer extends AbstractTestCollection { * Overridden because UnboundedFifoBuffer isn't fail fast. * @return false */ + @Override public boolean isFailFastSupported() { return false; } @@ -83,6 +86,7 @@ public class TestUnboundedFifoBuffer extends AbstractTestCollection { * * @return an empty ArrayList */ + @Override public Collection makeConfirmedCollection() { return new ArrayList(); } @@ -92,6 +96,7 @@ public class TestUnboundedFifoBuffer extends AbstractTestCollection { * * @return a full ArrayList */ + @Override public Collection makeConfirmedFullCollection() { Collection c = makeConfirmedCollection(); c.addAll(java.util.Arrays.asList(getFullElements())); @@ -103,6 +108,7 @@ public class TestUnboundedFifoBuffer extends AbstractTestCollection { * * @return an empty UnboundedFifoBuffer */ + @Override public Collection makeObject() { return new UnboundedFifoBuffer(5); } @@ -437,6 +443,7 @@ public class TestUnboundedFifoBuffer extends AbstractTestCollection { } //----------------------------------------------------------------------- + @Override public String getCompatibilityVersion() { return "3.1"; } diff --git a/src/test/org/apache/commons/collections/buffer/TestUnmodifiableBuffer.java b/src/test/org/apache/commons/collections/buffer/TestUnmodifiableBuffer.java index 538dc8a72..6a76ff2b7 100644 --- a/src/test/org/apache/commons/collections/buffer/TestUnmodifiableBuffer.java +++ b/src/test/org/apache/commons/collections/buffer/TestUnmodifiableBuffer.java @@ -52,34 +52,41 @@ public class TestUnmodifiableBuffer extends AbstractTestCollection { } //----------------------------------------------------------------------- + @Override public Collection makeObject() { return UnmodifiableBuffer.decorate(new UnboundedFifoBuffer()); } + @Override public Collection makeFullCollection() { Buffer buffer = new UnboundedFifoBuffer(); buffer.addAll(Arrays.asList(getFullElements())); return UnmodifiableBuffer.decorate(buffer); } + @Override public Collection makeConfirmedCollection() { return new ArrayStack(); } + @Override public Collection makeConfirmedFullCollection() { ArrayStack list = new ArrayStack(); list.addAll(Arrays.asList(getFullElements())); return list; } + @Override public boolean isAddSupported() { return false; } + @Override public boolean isRemoveSupported() { return false; } + @Override public boolean isNullSupported() { return false; } @@ -92,6 +99,7 @@ public class TestUnmodifiableBuffer extends AbstractTestCollection { } catch (UnsupportedOperationException ex) {} } + @Override public String getCompatibilityVersion() { return "3.1"; } diff --git a/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java b/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java index 806de1312..18095d27a 100644 --- a/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java +++ b/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java @@ -232,6 +232,7 @@ public abstract class AbstractTestCollection extends AbstractTestObject { * Returns true to indicate that the collection supports equals() comparisons. * This implementation returns false; */ + @Override public boolean isEqualsCheckable() { return false; } @@ -352,6 +353,7 @@ public abstract class AbstractTestCollection extends AbstractTestObject { /** * Return a new, empty {@link Collection} to be used for testing. */ + @Override public abstract Collection makeObject(); /** @@ -1248,6 +1250,7 @@ public abstract class AbstractTestCollection extends AbstractTestObject { } } + @Override public void testSerializeDeserializeThenCompare() throws Exception { Object obj = makeObject(); if (obj instanceof Serializable && isTestSerialization()) { diff --git a/src/test/org/apache/commons/collections/collection/TestCompositeCollection.java b/src/test/org/apache/commons/collections/collection/TestCompositeCollection.java index 8ab12fb13..24026660d 100644 --- a/src/test/org/apache/commons/collections/collection/TestCompositeCollection.java +++ b/src/test/org/apache/commons/collections/collection/TestCompositeCollection.java @@ -55,10 +55,12 @@ public class TestCompositeCollection extends AbstractTestCollection { /** * Run stock collection tests without Mutator, so turn off add, remove */ + @Override public boolean isAddSupported() { return false; } + @Override public boolean isRemoveSupported() { return false; } @@ -66,14 +68,17 @@ public class TestCompositeCollection extends AbstractTestCollection { /** * Empty collection is empty composite */ + @Override public Collection makeObject() { return new CompositeCollection(); } + @Override public Collection makeConfirmedCollection() { return new HashSet(); } + @Override @SuppressWarnings("unchecked") public E[] getFullElements() { return (E[]) new Object[] { "1", "2", "3", "4" }; @@ -82,6 +87,7 @@ public class TestCompositeCollection extends AbstractTestCollection { /** * Full collection consists of 4 collections, each with one element */ + @Override public Collection makeFullCollection() { CompositeCollection compositeCollection = new CompositeCollection(); E[] elements = getFullElements(); @@ -96,6 +102,7 @@ public class TestCompositeCollection extends AbstractTestCollection { /** * Full collection should look like a collection with 4 elements */ + @Override public Collection makeConfirmedFullCollection() { Collection collection = new HashSet(); collection.addAll(Arrays.asList(getFullElements())); @@ -106,6 +113,7 @@ public class TestCompositeCollection extends AbstractTestCollection { * Override testUnsupportedRemove, since the default impl expects removeAll, * retainAll and iterator().remove to throw */ + @Override public void testUnsupportedRemove() { resetFull(); try { @@ -375,6 +383,7 @@ public class TestCompositeCollection extends AbstractTestCollection { assertEquals(2, c.size()); } + @Override public String getCompatibilityVersion() { return "3.3"; } diff --git a/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java b/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java index dedbaf1ff..be8ac09d1 100644 --- a/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java +++ b/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java @@ -59,25 +59,30 @@ public class TestPredicatedCollection extends AbstractTestCollection { return PredicatedCollection.decorate(collection, predicate); } + @Override public Collection makeObject() { return decorateCollection(new ArrayList(), truePredicate); } + @Override public Collection makeConfirmedCollection() { return new ArrayList(); } + @Override @SuppressWarnings("unchecked") public E[] getFullElements() { return (E[]) new Object[] { "1", "3", "5", "7", "2", "4", "6" }; } + @Override public Collection makeFullCollection() { List list = new ArrayList(); list.addAll(Arrays.asList(getFullElements())); return decorateCollection(list, truePredicate); } + @Override public Collection makeConfirmedFullCollection() { List list = new ArrayList(); list.addAll(Arrays.asList(getFullElements())); @@ -130,6 +135,7 @@ public class TestPredicatedCollection extends AbstractTestCollection { assertTrue("Collection shouldn't contain illegal element", !c.contains("four")); } + @Override public String getCompatibilityVersion() { return "3.1"; } diff --git a/src/test/org/apache/commons/collections/collection/TestSynchronizedCollection.java b/src/test/org/apache/commons/collections/collection/TestSynchronizedCollection.java index 3782e12a2..6315e300f 100644 --- a/src/test/org/apache/commons/collections/collection/TestSynchronizedCollection.java +++ b/src/test/org/apache/commons/collections/collection/TestSynchronizedCollection.java @@ -49,20 +49,24 @@ public class TestSynchronizedCollection extends AbstractTestCollection { } //----------------------------------------------------------------------- + @Override public Collection makeObject() { return SynchronizedCollection.decorate(new ArrayList()); } + @Override public Collection makeConfirmedCollection() { return new ArrayList(); } + @Override public Collection makeConfirmedFullCollection() { ArrayList list = new ArrayList(); list.addAll(Arrays.asList(getFullElements())); return list; } + @Override public String getCompatibilityVersion() { return "3.1"; } diff --git a/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java b/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java index f09570328..7363fd7b2 100644 --- a/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java +++ b/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java @@ -61,20 +61,24 @@ public class TestTransformedCollection extends AbstractTestCollection { } //----------------------------------------------------------------------- + @Override public Collection makeConfirmedCollection() { return new ArrayList(); } + @Override public Collection makeConfirmedFullCollection() { List list = new ArrayList(); list.addAll(Arrays.asList(getFullElements())); return list; } + @Override public Collection makeObject() { return TransformedCollection.decorate(new ArrayList(), NOOP_TRANSFORMER); } + @Override public Collection makeFullCollection() { List list = new ArrayList(); list.addAll(Arrays.asList(getFullElements())); @@ -82,10 +86,12 @@ public class TestTransformedCollection extends AbstractTestCollection { } //----------------------------------------------------------------------- + @Override public Object[] getFullElements() { return new Object[] {"1", "3", "5", "7", "2", "4", "6"}; } + @Override public Object[] getOtherElements() { return new Object[] {"9", "88", "678", "87", "98", "78", "99"}; } @@ -122,6 +128,7 @@ public class TestTransformedCollection extends AbstractTestCollection { assertEquals(true, collection.remove(new Integer((String) els[0]))); } + @Override public String getCompatibilityVersion() { return "3.1"; } diff --git a/src/test/org/apache/commons/collections/collection/TestUnmodifiableCollection.java b/src/test/org/apache/commons/collections/collection/TestUnmodifiableCollection.java index e7e19f69f..8c0af1eef 100644 --- a/src/test/org/apache/commons/collections/collection/TestUnmodifiableCollection.java +++ b/src/test/org/apache/commons/collections/collection/TestUnmodifiableCollection.java @@ -50,34 +50,41 @@ public class TestUnmodifiableCollection extends AbstractTestCollection { } //----------------------------------------------------------------------- + @Override public Collection makeObject() { return UnmodifiableCollection.decorate(new ArrayList()); } + @Override public Collection makeFullCollection() { List list = new ArrayList(); list.addAll(Arrays.asList(getFullElements())); return UnmodifiableCollection.decorate(list); } + @Override public Collection makeConfirmedCollection() { return new ArrayList(); } + @Override public Collection makeConfirmedFullCollection() { ArrayList list = new ArrayList(); list.addAll(Arrays.asList(getFullElements())); return list; } + @Override public boolean isAddSupported() { return false; } + @Override public boolean isRemoveSupported() { return false; } + @Override public String getCompatibilityVersion() { return "3.1"; } diff --git a/src/test/org/apache/commons/collections/comparators/AbstractTestComparator.java b/src/test/org/apache/commons/collections/comparators/AbstractTestComparator.java index c03568fa0..8ca572447 100644 --- a/src/test/org/apache/commons/collections/comparators/AbstractTestComparator.java +++ b/src/test/org/apache/commons/collections/comparators/AbstractTestComparator.java @@ -60,11 +60,13 @@ public abstract class AbstractTestComparator extends AbstractTestObject { * * @return a full iterator */ + @Override public abstract Comparator makeObject(); /** * Overrides superclass to block tests. */ + @Override public boolean supportsEmptyCollections() { return false; } @@ -72,6 +74,7 @@ public abstract class AbstractTestComparator extends AbstractTestObject { /** * Overrides superclass to block tests. */ + @Override public boolean supportsFullCollections() { return false; } @@ -80,6 +83,7 @@ public abstract class AbstractTestComparator extends AbstractTestObject { * Overrides superclass to set the compatability to version 2 * as there were no Comparators in version 1.x. */ + @Override public String getCompatibilityVersion() { return "2"; } diff --git a/src/test/org/apache/commons/collections/comparators/TestBooleanComparator.java b/src/test/org/apache/commons/collections/comparators/TestBooleanComparator.java index 28eac9282..dc9c2cb9e 100644 --- a/src/test/org/apache/commons/collections/comparators/TestBooleanComparator.java +++ b/src/test/org/apache/commons/collections/comparators/TestBooleanComparator.java @@ -46,10 +46,12 @@ public class TestBooleanComparator extends AbstractTestComparator { // collections testing framework // ------------------------------------------------------------------------ + @Override public Comparator makeObject() { return new BooleanComparator(); } + @Override public List getComparableObjectsOrdered() { List list = new ArrayList(); list.add(new Boolean(false)); @@ -61,6 +63,7 @@ public class TestBooleanComparator extends AbstractTestComparator { return list; } + @Override public String getCompatibilityVersion() { return "3"; } diff --git a/src/test/org/apache/commons/collections/comparators/TestComparableComparator.java b/src/test/org/apache/commons/collections/comparators/TestComparableComparator.java index 6b199c574..375ff5d83 100644 --- a/src/test/org/apache/commons/collections/comparators/TestComparableComparator.java +++ b/src/test/org/apache/commons/collections/comparators/TestComparableComparator.java @@ -40,10 +40,12 @@ public class TestComparableComparator extends AbstractTestComparator { return new TestSuite(TestComparableComparator.class); } + @Override public Comparator makeObject() { return new ComparableComparator(); } + @Override public List getComparableObjectsOrdered() { List list = new LinkedList(); list.add(1); diff --git a/src/test/org/apache/commons/collections/comparators/TestComparatorChain.java b/src/test/org/apache/commons/collections/comparators/TestComparatorChain.java index 89cb9e395..e7ef5301d 100644 --- a/src/test/org/apache/commons/collections/comparators/TestComparatorChain.java +++ b/src/test/org/apache/commons/collections/comparators/TestComparatorChain.java @@ -41,6 +41,7 @@ public class TestComparatorChain extends AbstractTestComparator makeObject() { ComparatorChain chain = new ComparatorChain(new ColumnComparator(0)); chain.addComparator(new ColumnComparator(1), true); // reverse the second column @@ -114,6 +115,7 @@ public class TestComparatorChain extends AbstractTestComparator getComparableObjectsOrdered() { List list = new LinkedList(); // this is the correct order assuming a @@ -143,6 +145,7 @@ public class TestComparatorChain extends AbstractTestComparator super(testName); } + @Override public Comparator makeObject() { return new NullComparator(); } + @Override public List getComparableObjectsOrdered() { List list = new LinkedList(); list.add(new Integer(1)); @@ -67,6 +69,7 @@ public abstract class TestNullComparator extends AbstractTestComparator return list; } + @Override public String getCanonicalComparatorName(Object object) { return super.getCanonicalComparatorName(object) + "1"; } @@ -81,10 +84,12 @@ public abstract class TestNullComparator extends AbstractTestComparator super(testName); } + @Override public Comparator makeObject() { return new NullComparator(false); } + @Override public List getComparableObjectsOrdered() { List list = new LinkedList(); list.add(null); @@ -96,6 +101,7 @@ public abstract class TestNullComparator extends AbstractTestComparator return list; } + @Override public String getCanonicalComparatorName(Object object) { return super.getCanonicalComparatorName(object) + "2"; } diff --git a/src/test/org/apache/commons/collections/comparators/TestReverseComparator.java b/src/test/org/apache/commons/collections/comparators/TestReverseComparator.java index 848619246..7c049d909 100644 --- a/src/test/org/apache/commons/collections/comparators/TestReverseComparator.java +++ b/src/test/org/apache/commons/collections/comparators/TestReverseComparator.java @@ -55,10 +55,12 @@ public class TestReverseComparator extends AbstractTestComparator { * * @return Comparator that returns "natural" order */ + @Override public Comparator makeObject() { return new ReverseComparator(Collections.reverseOrder()); } + @Override public List getComparableObjectsOrdered() { List list = new LinkedList(); list.add(new Integer(1)); @@ -74,6 +76,7 @@ public class TestReverseComparator extends AbstractTestComparator { * doesn't adhere to the "soft" Comparator contract, and we've * already "cannonized" the comparator returned by makeComparator. */ + @Override @SuppressWarnings("unchecked") public void testSerializeDeserializeThenCompare() throws Exception { Comparator comp = new ReverseComparator(new ComparableComparator()); diff --git a/src/test/org/apache/commons/collections/functors/TestAnyAllOnePredicate.java b/src/test/org/apache/commons/collections/functors/TestAnyAllOnePredicate.java index 00ba0cf7b..5e2f8bf54 100644 --- a/src/test/org/apache/commons/collections/functors/TestAnyAllOnePredicate.java +++ b/src/test/org/apache/commons/collections/functors/TestAnyAllOnePredicate.java @@ -46,6 +46,7 @@ public abstract class TestAnyAllOnePredicate extends TestCompositePredicategetInstance with a one element array returns the first element in the array. */ + @Override @SuppressWarnings("unchecked") @Test public final void singleElementArrayToGetInstance() { @@ -58,6 +59,7 @@ public abstract class TestAnyAllOnePredicate extends TestCompositePredicategetInstance returns the single element in the * collection. */ + @Override @Test public final void singletonCollectionToGetInstance() { final Predicate predicate = createMockPredicate(null); diff --git a/src/test/org/apache/commons/collections/iterators/AbstractTestIterator.java b/src/test/org/apache/commons/collections/iterators/AbstractTestIterator.java index 53be5a7d3..a954d3dee 100644 --- a/src/test/org/apache/commons/collections/iterators/AbstractTestIterator.java +++ b/src/test/org/apache/commons/collections/iterators/AbstractTestIterator.java @@ -59,6 +59,7 @@ public abstract class AbstractTestIterator extends AbstractTestObject { * * @return a full iterator */ + @Override public abstract Iterator makeObject(); /** diff --git a/src/test/org/apache/commons/collections/iterators/AbstractTestListIterator.java b/src/test/org/apache/commons/collections/iterators/AbstractTestListIterator.java index 8ca9e3da4..682d9253a 100644 --- a/src/test/org/apache/commons/collections/iterators/AbstractTestListIterator.java +++ b/src/test/org/apache/commons/collections/iterators/AbstractTestListIterator.java @@ -51,6 +51,7 @@ public abstract class AbstractTestListIterator extends AbstractTestIterator makeEmptyIterator(); /** @@ -58,6 +59,7 @@ public abstract class AbstractTestListIterator extends AbstractTestIterator makeObject(); /** diff --git a/src/test/org/apache/commons/collections/iterators/AbstractTestMapIterator.java b/src/test/org/apache/commons/collections/iterators/AbstractTestMapIterator.java index 445cf7bd1..264a00f66 100644 --- a/src/test/org/apache/commons/collections/iterators/AbstractTestMapIterator.java +++ b/src/test/org/apache/commons/collections/iterators/AbstractTestMapIterator.java @@ -53,6 +53,7 @@ public abstract class AbstractTestMapIterator extends AbstractTestIterator * * @return an empty iterator */ + @Override public abstract MapIterator makeEmptyIterator(); /** @@ -60,6 +61,7 @@ public abstract class AbstractTestMapIterator extends AbstractTestIterator * * @return a full iterator */ + @Override public abstract MapIterator makeObject(); /** @@ -234,6 +236,7 @@ public abstract class AbstractTestMapIterator extends AbstractTestIterator } //----------------------------------------------------------------------- + @Override public void testRemove() { // override MapIterator it = makeObject(); Map map = getMap(); diff --git a/src/test/org/apache/commons/collections/iterators/AbstractTestOrderedMapIterator.java b/src/test/org/apache/commons/collections/iterators/AbstractTestOrderedMapIterator.java index a099be52d..38127f604 100644 --- a/src/test/org/apache/commons/collections/iterators/AbstractTestOrderedMapIterator.java +++ b/src/test/org/apache/commons/collections/iterators/AbstractTestOrderedMapIterator.java @@ -51,14 +51,17 @@ public abstract class AbstractTestOrderedMapIterator extends AbstractTestM } //----------------------------------------------------------------------- + @Override public abstract OrderedMapIterator makeEmptyIterator(); + @Override public abstract OrderedMapIterator makeObject(); //----------------------------------------------------------------------- /** * Test that the empty list iterator contract is correct. */ + @Override public void testEmptyMapIterator() { if (supportsEmptyIterator() == false) { return; @@ -78,6 +81,7 @@ public abstract class AbstractTestOrderedMapIterator extends AbstractTestM /** * Test that the full list iterator contract is correct. */ + @Override public void testFullMapIterator() { if (supportsFullIterator() == false) { return; diff --git a/src/test/org/apache/commons/collections/iterators/TestArrayIterator.java b/src/test/org/apache/commons/collections/iterators/TestArrayIterator.java index 6a585d177..68c033e87 100644 --- a/src/test/org/apache/commons/collections/iterators/TestArrayIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestArrayIterator.java @@ -46,14 +46,17 @@ public class TestArrayIterator extends AbstractTestIterator { super(testName); } + @Override public ArrayIterator makeEmptyIterator() { return new ArrayIterator(new Object[0]); } + @Override public ArrayIterator makeObject() { return new ArrayIterator(testArray); } + @Override public boolean supportsRemove() { return false; } diff --git a/src/test/org/apache/commons/collections/iterators/TestArrayIterator2.java b/src/test/org/apache/commons/collections/iterators/TestArrayIterator2.java index 975c37b50..83f6bc572 100644 --- a/src/test/org/apache/commons/collections/iterators/TestArrayIterator2.java +++ b/src/test/org/apache/commons/collections/iterators/TestArrayIterator2.java @@ -42,10 +42,12 @@ public class TestArrayIterator2 extends AbstractTestIterator { super(testName); } + @Override public ArrayIterator makeEmptyIterator() { return new ArrayIterator(new int[0]); } + @Override public ArrayIterator makeObject() { return new ArrayIterator(testArray); } @@ -62,6 +64,7 @@ public class TestArrayIterator2 extends AbstractTestIterator { return new ArrayIterator(array, start, end); } + @Override public boolean supportsRemove() { return false; } diff --git a/src/test/org/apache/commons/collections/iterators/TestArrayListIterator.java b/src/test/org/apache/commons/collections/iterators/TestArrayListIterator.java index 621ae5a71..b5739d068 100644 --- a/src/test/org/apache/commons/collections/iterators/TestArrayListIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestArrayListIterator.java @@ -39,10 +39,12 @@ public class TestArrayListIterator extends TestArrayIterator { return new TestSuite(TestArrayListIterator.class); } + @Override public ArrayListIterator makeEmptyIterator() { return new ArrayListIterator(new Object[0]); } + @Override public ArrayListIterator makeObject() { return new ArrayListIterator(testArray); } @@ -51,6 +53,7 @@ public class TestArrayListIterator extends TestArrayIterator { return new ArrayListIterator(array); } + @Override public boolean supportsRemove() { return false; } diff --git a/src/test/org/apache/commons/collections/iterators/TestArrayListIterator2.java b/src/test/org/apache/commons/collections/iterators/TestArrayListIterator2.java index 83d9b96cf..12e0e8612 100644 --- a/src/test/org/apache/commons/collections/iterators/TestArrayListIterator2.java +++ b/src/test/org/apache/commons/collections/iterators/TestArrayListIterator2.java @@ -35,10 +35,12 @@ public class TestArrayListIterator2 extends TestArrayIterator2 { return new TestSuite(TestArrayListIterator2.class); } + @Override public ArrayListIterator makeEmptyIterator() { return new ArrayListIterator(new int[0]); } + @Override public ArrayListIterator makeObject() { return new ArrayListIterator(testArray); } diff --git a/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java b/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java index 11be9cfc2..c32706380 100644 --- a/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java @@ -49,6 +49,7 @@ public class TestCollatingIterator extends AbstractTestIterator { private ArrayList odds = null; private ArrayList fib = null; + @Override public void setUp() throws Exception { super.setUp(); comparator = new ComparableComparator(); @@ -74,10 +75,12 @@ public class TestCollatingIterator extends AbstractTestIterator { //---------------------------------------------------- TestIterator Methods + @Override public CollatingIterator makeEmptyIterator() { return new CollatingIterator(comparator); } + @Override public CollatingIterator makeObject() { CollatingIterator iter = new CollatingIterator(comparator); iter.addIterator(evens.iterator()); diff --git a/src/test/org/apache/commons/collections/iterators/TestFilterIterator.java b/src/test/org/apache/commons/collections/iterators/TestFilterIterator.java index 44ae79888..75bd8492a 100644 --- a/src/test/org/apache/commons/collections/iterators/TestFilterIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestFilterIterator.java @@ -54,6 +54,7 @@ public class TestFilterIterator extends AbstractTestIterator { /** * Set up instance variables required by this test case. */ + @Override public void setUp() { array = new String[] { "a", "b", "c" }; initIterator(); @@ -62,6 +63,7 @@ public class TestFilterIterator extends AbstractTestIterator { /** * Tear down instance variables required by this test case. */ + @Override public void tearDown() throws Exception { iterator = null; } @@ -79,6 +81,7 @@ public class TestFilterIterator extends AbstractTestIterator { * * @return "empty" FilterIterator */ + @Override public FilterIterator makeEmptyIterator() { return makeBlockAllFilter(new ArrayIterator(array)); } @@ -89,6 +92,7 @@ public class TestFilterIterator extends AbstractTestIterator { * * @return a filtered iterator */ + @Override @SuppressWarnings("unchecked") public FilterIterator makeObject() { list = new ArrayList(Arrays.asList((E[]) array)); diff --git a/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java b/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java index bfba437fa..3e7097b26 100644 --- a/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java @@ -62,6 +62,7 @@ public class TestFilterListIterator extends TestCase { private Predicate fourPred = null; private Random random = new Random(); + @Override public void setUp() { list = new ArrayList(); odds = new ArrayList(); @@ -116,6 +117,7 @@ public class TestFilterListIterator extends TestCase { } + @Override public void tearDown() throws Exception { list = null; odds = null; diff --git a/src/test/org/apache/commons/collections/iterators/TestIteratorChain.java b/src/test/org/apache/commons/collections/iterators/TestIteratorChain.java index 9999c0880..198573410 100644 --- a/src/test/org/apache/commons/collections/iterators/TestIteratorChain.java +++ b/src/test/org/apache/commons/collections/iterators/TestIteratorChain.java @@ -54,6 +54,7 @@ public class TestIteratorChain extends AbstractTestIterator { super(testName); } + @Override public void setUp() { list1 = new ArrayList(); list1.add("One"); @@ -66,11 +67,13 @@ public class TestIteratorChain extends AbstractTestIterator { list3.add("Six"); } + @Override public IteratorChain makeEmptyIterator() { ArrayList list = new ArrayList(); return new IteratorChain(list.iterator()); } + @Override public IteratorChain makeObject() { IteratorChain chain = new IteratorChain(); @@ -127,6 +130,7 @@ public class TestIteratorChain extends AbstractTestIterator { assertEquals(1, list2.size()); } + @Override public void testRemove() { Iterator iter = makeObject(); diff --git a/src/test/org/apache/commons/collections/iterators/TestListIteratorWrapper.java b/src/test/org/apache/commons/collections/iterators/TestListIteratorWrapper.java index 1050801e1..037e807bf 100644 --- a/src/test/org/apache/commons/collections/iterators/TestListIteratorWrapper.java +++ b/src/test/org/apache/commons/collections/iterators/TestListIteratorWrapper.java @@ -49,6 +49,7 @@ public class TestListIteratorWrapper extends AbstractTestIterator { super(testName); } + @Override @SuppressWarnings("unchecked") public void setUp() { list1 = new ArrayList(); @@ -60,11 +61,13 @@ public class TestListIteratorWrapper extends AbstractTestIterator { list1.add((E) "Six"); } + @Override public ResettableListIterator makeEmptyIterator() { ArrayList list = new ArrayList(); return new ListIteratorWrapper(list.iterator()); } + @Override public ResettableListIterator makeObject() { return new ListIteratorWrapper(list1.iterator()); } @@ -112,6 +115,7 @@ public class TestListIteratorWrapper extends AbstractTestIterator { } + @Override public void testRemove() { ListIterator iter = makeObject(); diff --git a/src/test/org/apache/commons/collections/iterators/TestListIteratorWrapper2.java b/src/test/org/apache/commons/collections/iterators/TestListIteratorWrapper2.java index aad138d3e..abe2d7bcb 100644 --- a/src/test/org/apache/commons/collections/iterators/TestListIteratorWrapper2.java +++ b/src/test/org/apache/commons/collections/iterators/TestListIteratorWrapper2.java @@ -48,6 +48,7 @@ public class TestListIteratorWrapper2 extends AbstractTestIterator { super(testName); } + @Override @SuppressWarnings("unchecked") public void setUp() { list1 = new ArrayList(); @@ -59,11 +60,13 @@ public class TestListIteratorWrapper2 extends AbstractTestIterator { list1.add((E) "Six"); } + @Override public ResettableListIterator makeEmptyIterator() { ArrayList list = new ArrayList(); return new ListIteratorWrapper(list.listIterator()); } + @Override public ResettableListIterator makeObject() { return new ListIteratorWrapper(list1.listIterator()); } @@ -111,6 +114,7 @@ public class TestListIteratorWrapper2 extends AbstractTestIterator { } + @Override public void testRemove() { ListIterator iter = makeObject(); diff --git a/src/test/org/apache/commons/collections/iterators/TestObjectArrayIterator.java b/src/test/org/apache/commons/collections/iterators/TestObjectArrayIterator.java index 797cea854..b040f618b 100644 --- a/src/test/org/apache/commons/collections/iterators/TestObjectArrayIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestObjectArrayIterator.java @@ -44,11 +44,13 @@ public class TestObjectArrayIterator extends AbstractTestIterator { super(testName); } + @Override @SuppressWarnings("unchecked") public ObjectArrayIterator makeEmptyIterator() { return new ObjectArrayIterator((E[]) new Object[0]); } + @Override @SuppressWarnings("unchecked") public ObjectArrayIterator makeObject() { return new ObjectArrayIterator((E[]) testArray); @@ -70,6 +72,7 @@ public class TestObjectArrayIterator extends AbstractTestIterator { return new ObjectArrayIterator(array, start, end); } + @Override public boolean supportsRemove() { return false; } diff --git a/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator.java b/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator.java index ccd29ff12..fdeb8c0aa 100644 --- a/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator.java @@ -40,11 +40,13 @@ public class TestObjectArrayListIterator extends TestObjectArrayIterator { return new TestSuite(TestObjectArrayListIterator.class); } + @Override @SuppressWarnings("unchecked") public ObjectArrayListIterator makeEmptyIterator() { return new ObjectArrayListIterator((E[]) new Object[0]); } + @Override @SuppressWarnings("unchecked") public ObjectArrayListIterator makeObject() { return new ObjectArrayListIterator((E[]) testArray); diff --git a/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator2.java b/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator2.java index 9ef2d3105..4b8196714 100644 --- a/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator2.java +++ b/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator2.java @@ -38,11 +38,13 @@ public class TestObjectArrayListIterator2 extends AbstractTestListIterator return new TestSuite(TestObjectArrayListIterator2.class); } + @Override @SuppressWarnings("unchecked") public ObjectArrayListIterator makeEmptyIterator() { return new ObjectArrayListIterator((E[]) new Object[0]); } + @Override @SuppressWarnings("unchecked") public ObjectArrayListIterator makeObject() { return new ObjectArrayListIterator((E[]) testArray); @@ -52,10 +54,12 @@ public class TestObjectArrayListIterator2 extends AbstractTestListIterator return new ObjectArrayListIterator(array); } + @Override public boolean supportsAdd() { return false; } + @Override public boolean supportsRemove() { return false; } diff --git a/src/test/org/apache/commons/collections/iterators/TestObjectGraphIterator.java b/src/test/org/apache/commons/collections/iterators/TestObjectGraphIterator.java index 1aaab9b60..b00233630 100644 --- a/src/test/org/apache/commons/collections/iterators/TestObjectGraphIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestObjectGraphIterator.java @@ -56,6 +56,7 @@ public class TestObjectGraphIterator extends AbstractTestIterator { return new TestSuite(TestObjectGraphIterator.class); } + @Override public void setUp() { list1 = new ArrayList(); list1.add("One"); @@ -73,11 +74,13 @@ public class TestObjectGraphIterator extends AbstractTestIterator { } //----------------------------------------------------------------------- + @Override public ObjectGraphIterator makeEmptyIterator() { ArrayList list = new ArrayList(); return new ObjectGraphIterator(list.iterator()); } + @Override public ObjectGraphIterator makeObject() { return new ObjectGraphIterator(iteratorList.iterator()); } diff --git a/src/test/org/apache/commons/collections/iterators/TestReverseListIterator.java b/src/test/org/apache/commons/collections/iterators/TestReverseListIterator.java index 86203c533..5b567e86a 100644 --- a/src/test/org/apache/commons/collections/iterators/TestReverseListIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestReverseListIterator.java @@ -50,10 +50,12 @@ public class TestReverseListIterator extends AbstractTestListIterator { super(testName); } + @Override public ListIterator makeEmptyIterator() { return new ReverseListIterator(new ArrayList()); } + @Override @SuppressWarnings("unchecked") public ReverseListIterator makeObject() { List list = new ArrayList(Arrays.asList((E[]) testArray)); @@ -62,6 +64,7 @@ public class TestReverseListIterator extends AbstractTestListIterator { // overrides //----------------------------------------------------------------------- + @Override public void testEmptyListIteratorIsIndeedEmpty() { ListIterator it = makeEmptyIterator(); @@ -85,6 +88,7 @@ public class TestReverseListIterator extends AbstractTestListIterator { } } + @Override public void testWalkForwardAndBack() { ArrayList list = new ArrayList(); ListIterator it = makeObject(); diff --git a/src/test/org/apache/commons/collections/iterators/TestSingletonIterator.java b/src/test/org/apache/commons/collections/iterators/TestSingletonIterator.java index 7c22098ae..a09aa977a 100644 --- a/src/test/org/apache/commons/collections/iterators/TestSingletonIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestSingletonIterator.java @@ -48,6 +48,7 @@ public class TestSingletonIterator extends AbstractTestIterator { * Returns a SingletonIterator from which * the element has already been removed. */ + @Override public SingletonIterator makeEmptyIterator() { SingletonIterator iter = makeObject(); iter.next(); @@ -56,15 +57,18 @@ public class TestSingletonIterator extends AbstractTestIterator { return iter; } + @Override @SuppressWarnings("unchecked") public SingletonIterator makeObject() { return new SingletonIterator((E) testValue); } + @Override public boolean supportsRemove() { return true; } + @Override public boolean supportsEmptyIterator() { return true; } diff --git a/src/test/org/apache/commons/collections/iterators/TestSingletonIterator2.java b/src/test/org/apache/commons/collections/iterators/TestSingletonIterator2.java index f5cbf6ea7..c67b700da 100644 --- a/src/test/org/apache/commons/collections/iterators/TestSingletonIterator2.java +++ b/src/test/org/apache/commons/collections/iterators/TestSingletonIterator2.java @@ -45,6 +45,7 @@ public class TestSingletonIterator2 extends AbstractTestIterator { } //----------------------------------------------------------------------- + @Override @SuppressWarnings("unchecked") public SingletonIterator makeEmptyIterator() { SingletonIterator iter = new SingletonIterator((E) testValue); @@ -54,15 +55,18 @@ public class TestSingletonIterator2 extends AbstractTestIterator { return iter; } + @Override @SuppressWarnings("unchecked") public SingletonIterator makeObject() { return new SingletonIterator((E) testValue, false); } + @Override public boolean supportsRemove() { return false; } + @Override public boolean supportsEmptyIterator() { return false; } diff --git a/src/test/org/apache/commons/collections/iterators/TestSingletonListIterator.java b/src/test/org/apache/commons/collections/iterators/TestSingletonListIterator.java index 455b8bacc..01d4fe1c0 100644 --- a/src/test/org/apache/commons/collections/iterators/TestSingletonListIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestSingletonListIterator.java @@ -47,6 +47,7 @@ public class TestSingletonListIterator extends AbstractTestListIterator { * Returns a SingletonListIterator from which * the element has already been removed. */ + @Override public SingletonListIterator makeEmptyIterator() { SingletonListIterator iter = makeObject(); iter.next(); @@ -55,19 +56,23 @@ public class TestSingletonListIterator extends AbstractTestListIterator { return iter; } + @Override @SuppressWarnings("unchecked") public SingletonListIterator makeObject() { return new SingletonListIterator((E) testValue); } + @Override public boolean supportsAdd() { return false; } + @Override public boolean supportsRemove() { return true; } + @Override public boolean supportsEmptyIterator() { return true; } diff --git a/src/test/org/apache/commons/collections/iterators/TestUniqueFilterIterator.java b/src/test/org/apache/commons/collections/iterators/TestUniqueFilterIterator.java index efe6d3056..910558ce3 100644 --- a/src/test/org/apache/commons/collections/iterators/TestUniqueFilterIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestUniqueFilterIterator.java @@ -50,6 +50,7 @@ public class TestUniqueFilterIterator extends AbstractTestIterator { super(testName); } + @Override @SuppressWarnings("unchecked") public void setUp() { list1 = new ArrayList(); @@ -65,11 +66,13 @@ public class TestUniqueFilterIterator extends AbstractTestIterator { list1.add((E) "Five"); } + @Override public UniqueFilterIterator makeEmptyIterator() { ArrayList list = new ArrayList(); return new UniqueFilterIterator(list.iterator()); } + @Override public UniqueFilterIterator makeObject() { Iterator i = list1.iterator(); return new UniqueFilterIterator(i); diff --git a/src/test/org/apache/commons/collections/iterators/TestUnmodifiableIterator.java b/src/test/org/apache/commons/collections/iterators/TestUnmodifiableIterator.java index 05eac1645..c5fc373c6 100644 --- a/src/test/org/apache/commons/collections/iterators/TestUnmodifiableIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestUnmodifiableIterator.java @@ -57,14 +57,17 @@ public class TestUnmodifiableIterator extends AbstractTestIterator { testList = new ArrayList(Arrays.asList((E[]) testArray)); } + @Override public Iterator makeEmptyIterator() { return UnmodifiableIterator.decorate(Collections.emptyList().iterator()); } + @Override public Iterator makeObject() { return UnmodifiableIterator.decorate(testList.iterator()); } + @Override public boolean supportsRemove() { return false; } diff --git a/src/test/org/apache/commons/collections/iterators/TestUnmodifiableListIterator.java b/src/test/org/apache/commons/collections/iterators/TestUnmodifiableListIterator.java index e7275e209..ef424e408 100644 --- a/src/test/org/apache/commons/collections/iterators/TestUnmodifiableListIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestUnmodifiableListIterator.java @@ -57,22 +57,27 @@ public class TestUnmodifiableListIterator extends AbstractTestListIterator testList = new ArrayList(Arrays.asList((E[]) testArray)); } + @Override public ListIterator makeEmptyIterator() { return UnmodifiableListIterator.decorate(Collections.emptyList().listIterator()); } + @Override public ListIterator makeObject() { return UnmodifiableListIterator.decorate(testList.listIterator()); } + @Override public boolean supportsRemove() { return false; } + @Override public boolean supportsAdd() { return false; } + @Override public boolean supportsSet() { return false; } diff --git a/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java b/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java index 050095515..9296e0892 100644 --- a/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java @@ -44,14 +44,17 @@ public class TestUnmodifiableMapIterator extends AbstractTestMapIterator makeEmptyIterator() { return UnmodifiableMapIterator.decorate(new DualHashBidiMap().mapIterator()); } + @Override public MapIterator makeObject() { return UnmodifiableMapIterator.decorate(getMap().mapIterator()); } + @Override @SuppressWarnings("unchecked") public IterableMap getMap() { IterableMap testMap = new DualHashBidiMap(); @@ -61,6 +64,7 @@ public class TestUnmodifiableMapIterator extends AbstractTestMapIterator getConfirmedMap() { Map testMap = new HashMap(); @@ -70,10 +74,12 @@ public class TestUnmodifiableMapIterator extends AbstractTestMapIterator extends AbstractTestOrdere super(testName); } + @Override public OrderedMapIterator makeEmptyIterator() { return UnmodifiableOrderedMapIterator.decorate( ListOrderedMap.decorate(new HashMap()).mapIterator()); } + @Override public OrderedMapIterator makeObject() { return UnmodifiableOrderedMapIterator.decorate(getMap().mapIterator()); } + @Override @SuppressWarnings("unchecked") public OrderedMap getMap() { OrderedMap testMap = ListOrderedMap.decorate(new HashMap()); @@ -63,6 +66,7 @@ public class TestUnmodifiableOrderedMapIterator extends AbstractTestOrdere return testMap; } + @Override @SuppressWarnings("unchecked") public Map getConfirmedMap() { Map testMap = new TreeMap(); @@ -72,10 +76,12 @@ public class TestUnmodifiableOrderedMapIterator extends AbstractTestOrdere return testMap; } + @Override public boolean supportsRemove() { return false; } + @Override public boolean supportsSetValue() { return false; } diff --git a/src/test/org/apache/commons/collections/keyvalue/TestDefaultMapEntry.java b/src/test/org/apache/commons/collections/keyvalue/TestDefaultMapEntry.java index fa3e4b6f2..d434436c3 100644 --- a/src/test/org/apache/commons/collections/keyvalue/TestDefaultMapEntry.java +++ b/src/test/org/apache/commons/collections/keyvalue/TestDefaultMapEntry.java @@ -51,6 +51,7 @@ public class TestDefaultMapEntry extends AbstractTestMapEntry { * Subclasses should override this method to return a Map.Entry * of the type being tested. */ + @Override public Map.Entry makeMapEntry() { return new DefaultMapEntry(null, null); } @@ -60,6 +61,7 @@ public class TestDefaultMapEntry extends AbstractTestMapEntry { * Subclasses should override this method to return a Map.Entry * of the type being tested. */ + @Override public Map.Entry makeMapEntry(K key, V value) { return new DefaultMapEntry(key, value); } @@ -69,6 +71,7 @@ public class TestDefaultMapEntry extends AbstractTestMapEntry { * Subclasses should override this method. * */ + @Override @SuppressWarnings("unchecked") public void testConstructors() { // 1. test key-value constructor @@ -91,6 +94,7 @@ public class TestDefaultMapEntry extends AbstractTestMapEntry { assertSame(value, entry2.getValue()); } + @Override @SuppressWarnings("unchecked") public void testSelfReferenceHandling() { Map.Entry entry = makeMapEntry(); diff --git a/src/test/org/apache/commons/collections/keyvalue/TestMultiKey.java b/src/test/org/apache/commons/collections/keyvalue/TestMultiKey.java index 0741b82ba..b43b2bf82 100644 --- a/src/test/org/apache/commons/collections/keyvalue/TestMultiKey.java +++ b/src/test/org/apache/commons/collections/keyvalue/TestMultiKey.java @@ -59,10 +59,12 @@ public class TestMultiKey extends TestCase { junit.textui.TestRunner.main(testCaseName); } + @Override public void setUp() throws Exception { super.setUp(); } + @Override protected void tearDown() throws Exception { super.tearDown(); } @@ -225,12 +227,14 @@ public class TestMultiKey extends TestCase { this.name = name; } + @Override public boolean equals(Object obj) { return obj instanceof SystemHashCodeSimulatingKey && name.equals(((SystemHashCodeSimulatingKey)obj).name); } + @Override public int hashCode() { return hashCode; diff --git a/src/test/org/apache/commons/collections/keyvalue/TestTiedMapEntry.java b/src/test/org/apache/commons/collections/keyvalue/TestTiedMapEntry.java index d3b812acc..764a8bf4f 100644 --- a/src/test/org/apache/commons/collections/keyvalue/TestTiedMapEntry.java +++ b/src/test/org/apache/commons/collections/keyvalue/TestTiedMapEntry.java @@ -48,6 +48,7 @@ public class TestTiedMapEntry extends AbstractTestMapEntry { /** * Gets the instance to test */ + @Override public Map.Entry makeMapEntry(K key, V value) { Map map = new HashMap(); map.put(key, value); @@ -58,6 +59,7 @@ public class TestTiedMapEntry extends AbstractTestMapEntry { /** * Tests the constructors. */ + @Override public void testConstructors() { // ignore } diff --git a/src/test/org/apache/commons/collections/keyvalue/TestUnmodifiableMapEntry.java b/src/test/org/apache/commons/collections/keyvalue/TestUnmodifiableMapEntry.java index 9c3398f0d..fef0e087b 100644 --- a/src/test/org/apache/commons/collections/keyvalue/TestUnmodifiableMapEntry.java +++ b/src/test/org/apache/commons/collections/keyvalue/TestUnmodifiableMapEntry.java @@ -52,6 +52,7 @@ public class TestUnmodifiableMapEntry extends AbstractTestMapEntry { * Subclasses should override this method to return a Map.Entry * of the type being tested. */ + @Override public Map.Entry makeMapEntry() { return new UnmodifiableMapEntry(null, null); } @@ -61,6 +62,7 @@ public class TestUnmodifiableMapEntry extends AbstractTestMapEntry { * Subclasses should override this method to return a Map.Entry * of the type being tested. */ + @Override public Map.Entry makeMapEntry(K key, V value) { return new UnmodifiableMapEntry(key, value); } @@ -70,6 +72,7 @@ public class TestUnmodifiableMapEntry extends AbstractTestMapEntry { * Subclasses should override this method. * */ + @Override @SuppressWarnings("unchecked") public void testConstructors() { // 1. test key-value constructor @@ -91,6 +94,7 @@ public class TestUnmodifiableMapEntry extends AbstractTestMapEntry { assertTrue(entry instanceof Unmodifiable); } + @Override @SuppressWarnings("unchecked") public void testAccessorsAndMutators() { Map.Entry entry = makeMapEntry((K) key, (V) value); @@ -104,6 +108,7 @@ public class TestUnmodifiableMapEntry extends AbstractTestMapEntry { assertSame(null, entry.getValue()); } + @Override public void testSelfReferenceHandling() { // block } diff --git a/src/test/org/apache/commons/collections/list/AbstractTestList.java b/src/test/org/apache/commons/collections/list/AbstractTestList.java index 3a0d960f8..301f5ec2c 100644 --- a/src/test/org/apache/commons/collections/list/AbstractTestList.java +++ b/src/test/org/apache/commons/collections/list/AbstractTestList.java @@ -81,6 +81,7 @@ public abstract class AbstractTestList extends AbstractTestCollection { * Verifies that the test list implementation matches the confirmed list * implementation. */ + @Override @SuppressWarnings("unchecked") public void verify() { super.verify(); @@ -114,6 +115,7 @@ public abstract class AbstractTestList extends AbstractTestCollection { /** * List equals method is defined. */ + @Override public boolean isEqualsCheckable() { return true; } @@ -121,6 +123,7 @@ public abstract class AbstractTestList extends AbstractTestCollection { /** * Returns an empty {@link ArrayList}. */ + @Override public Collection makeConfirmedCollection() { ArrayList list = new ArrayList(); return list; @@ -129,6 +132,7 @@ public abstract class AbstractTestList extends AbstractTestCollection { /** * Returns a full {@link ArrayList}. */ + @Override public Collection makeConfirmedFullCollection() { ArrayList list = new ArrayList(); list.addAll(Arrays.asList(getFullElements())); @@ -140,11 +144,13 @@ public abstract class AbstractTestList extends AbstractTestCollection { * * @return an empty list to be used for testing */ + @Override public abstract List makeObject(); /** * {@inheritDoc} */ + @Override public List makeFullCollection() { // only works if list supports optional "addAll(Collection)" List list = makeObject(); @@ -168,6 +174,7 @@ public abstract class AbstractTestList extends AbstractTestCollection { * * @return the confirmed field as a List */ + @Override public List getConfirmed() { return (List) super.getConfirmed(); } @@ -339,10 +346,12 @@ public abstract class AbstractTestList extends AbstractTestCollection { final List listForC = Arrays.asList(getFullElements()); Collection c = new AbstractCollection() { + @Override public int size() { return listForC.size(); } + @Override public Iterator iterator() { return listForC.iterator(); } @@ -1036,6 +1045,7 @@ public abstract class AbstractTestList extends AbstractTestCollection { * * TODO: store new serialized objects in CVS. */ + @Override protected boolean skipSerializedCanonicalTests() { return true; } @@ -1116,43 +1126,52 @@ public abstract class AbstractTestList extends AbstractTestCollection { this.outer = outer; } + @Override @SuppressWarnings("unchecked") public E[] getFullElements() { List l = Arrays.asList(outer.getFullElements()); return (E[]) l.subList(3, l.size() - 3).toArray(); } + @Override public E[] getOtherElements() { return outer.getOtherElements(); } + @Override public boolean isAddSupported() { return outer.isAddSupported(); } + @Override public boolean isSetSupported() { return outer.isSetSupported(); } + @Override public boolean isRemoveSupported() { return outer.isRemoveSupported(); } + @Override public List makeObject() { return outer.makeFullCollection().subList(4, 4); } + @Override public List makeFullCollection() { int size = getFullElements().length; return outer.makeFullCollection().subList(3, size - 3); } + @Override public void resetEmpty() { outer.resetFull(); this.setCollection(outer.getCollection().subList(4, 4)); this.setConfirmed(outer.getConfirmed().subList(4, 4)); } + @Override public void resetFull() { outer.resetFull(); int size = outer.getConfirmed().size(); @@ -1160,11 +1179,13 @@ public abstract class AbstractTestList extends AbstractTestCollection { this.setConfirmed(outer.getConfirmed().subList(3, size - 3)); } + @Override public void verify() { super.verify(); outer.verify(); } + @Override public boolean isTestSerialization() { return false; } @@ -1299,27 +1320,33 @@ public abstract class AbstractTestList extends AbstractTestCollection { super("TestListIterator"); } + @Override public E addSetValue() { return AbstractTestList.this.getOtherElements()[0]; } + @Override public boolean supportsRemove() { return AbstractTestList.this.isRemoveSupported(); } + @Override public boolean supportsAdd() { return AbstractTestList.this.isAddSupported(); } + @Override public boolean supportsSet() { return AbstractTestList.this.isSetSupported(); } + @Override public ListIterator makeEmptyIterator() { resetEmpty(); return AbstractTestList.this.getCollection().listIterator(); } + @Override public ListIterator makeObject() { resetFull(); return AbstractTestList.this.getCollection().listIterator(); diff --git a/src/test/org/apache/commons/collections/list/TestCursorableLinkedList.java b/src/test/org/apache/commons/collections/list/TestCursorableLinkedList.java index 487d85996..f50dc167e 100644 --- a/src/test/org/apache/commons/collections/list/TestCursorableLinkedList.java +++ b/src/test/org/apache/commons/collections/list/TestCursorableLinkedList.java @@ -52,10 +52,12 @@ public class TestCursorableLinkedList extends TestAbstractLinkedList { private CursorableLinkedList list; + @Override public void setUp() { list = new CursorableLinkedList(); } + @Override public CursorableLinkedList makeObject() { return new CursorableLinkedList(); } @@ -1089,6 +1091,7 @@ public class TestCursorableLinkedList extends TestAbstractLinkedList { assertEquals(0, it.nextIndex()); } + @Override @SuppressWarnings("unchecked") public void testListIteratorSet() { list.add((E) "1"); @@ -1155,6 +1158,7 @@ public class TestCursorableLinkedList extends TestAbstractLinkedList { assertEquals("[]",list.toString()); } + @Override @SuppressWarnings("unchecked") public void testListIteratorAdd() { ListIterator it = list.listIterator(); @@ -1502,6 +1506,7 @@ public class TestCursorableLinkedList extends TestAbstractLinkedList { * * @return an array of sublist serialization test names */ + @Override public String[] ignoredTests() { ArrayList list = new ArrayList(); String prefix = "TestCursorableLinkedList"; @@ -1523,6 +1528,7 @@ public class TestCursorableLinkedList extends TestAbstractLinkedList { return (String[]) list.toArray(new String[0]); } + @Override public String getCompatibilityVersion() { return "4.0"; } diff --git a/src/test/org/apache/commons/collections/list/TestFixedSizeList.java b/src/test/org/apache/commons/collections/list/TestFixedSizeList.java index c0f955548..d97fe852e 100644 --- a/src/test/org/apache/commons/collections/list/TestFixedSizeList.java +++ b/src/test/org/apache/commons/collections/list/TestFixedSizeList.java @@ -47,24 +47,29 @@ public class TestFixedSizeList extends AbstractTestList { junit.textui.TestRunner.main(testCaseName); } + @Override public List makeObject() { return FixedSizeList.decorate(new ArrayList()); } + @Override public List makeFullCollection() { List list = new ArrayList(); list.addAll(Arrays.asList(getFullElements())); return FixedSizeList.decorate(list); } + @Override public boolean isAddSupported() { return false; } + @Override public boolean isRemoveSupported() { return false; } + @Override public String getCompatibilityVersion() { return "3.1"; } diff --git a/src/test/org/apache/commons/collections/list/TestGrowthList.java b/src/test/org/apache/commons/collections/list/TestGrowthList.java index 6346beba7..fb14e8ddd 100644 --- a/src/test/org/apache/commons/collections/list/TestGrowthList.java +++ b/src/test/org/apache/commons/collections/list/TestGrowthList.java @@ -47,10 +47,12 @@ public class TestGrowthList extends AbstractTestList { junit.textui.TestRunner.main(testCaseName); } + @Override public List makeObject() { return new GrowthList(); } + @Override public List makeFullCollection() { List list = new ArrayList(); list.addAll(Arrays.asList(getFullElements())); @@ -106,6 +108,7 @@ public class TestGrowthList extends AbstractTestList { /** * Override. */ + @Override public void testListAddByIndexBoundsChecking() { List list; E element = getOtherElements()[0]; @@ -121,6 +124,7 @@ public class TestGrowthList extends AbstractTestList { /** * Override. */ + @Override public void testListAddByIndexBoundsChecking2() { List list; E element = getOtherElements()[0]; @@ -136,6 +140,7 @@ public class TestGrowthList extends AbstractTestList { /** * Override. */ + @Override public void testListSetByIndexBoundsChecking() { List list = makeObject(); E element = getOtherElements()[0]; @@ -150,6 +155,7 @@ public class TestGrowthList extends AbstractTestList { /** * Override. */ + @Override public void testListSetByIndexBoundsChecking2() { List list = makeFullCollection(); E element = getOtherElements()[0]; @@ -162,6 +168,7 @@ public class TestGrowthList extends AbstractTestList { } //----------------------------------------------------------------------- + @Override public String getCompatibilityVersion() { return "3.2"; } diff --git a/src/test/org/apache/commons/collections/list/TestNodeCachingLinkedList.java b/src/test/org/apache/commons/collections/list/TestNodeCachingLinkedList.java index a46489672..32abfc05b 100644 --- a/src/test/org/apache/commons/collections/list/TestNodeCachingLinkedList.java +++ b/src/test/org/apache/commons/collections/list/TestNodeCachingLinkedList.java @@ -48,10 +48,12 @@ public class TestNodeCachingLinkedList extends TestAbstractLinkedList { } //----------------------------------------------------------------------- + @Override public NodeCachingLinkedList makeObject() { return new NodeCachingLinkedList(); } + @Override public String getCompatibilityVersion() { return "3"; } diff --git a/src/test/org/apache/commons/collections/list/TestPredicatedList.java b/src/test/org/apache/commons/collections/list/TestPredicatedList.java index d668a3e85..91226c4ee 100644 --- a/src/test/org/apache/commons/collections/list/TestPredicatedList.java +++ b/src/test/org/apache/commons/collections/list/TestPredicatedList.java @@ -57,10 +57,12 @@ public class TestPredicatedList extends AbstractTestList { return PredicatedList.decorate(list, predicate); } + @Override public List makeObject() { return decorateList(new ArrayList(), truePredicate); } + @Override @SuppressWarnings("unchecked") public E[] getFullElements() { return (E[]) new Object[] { "1", "3", "5", "7", "2", "4", "6" }; @@ -147,6 +149,7 @@ public class TestPredicatedList extends AbstractTestList { list.contains("three")); } + @Override public String getCompatibilityVersion() { return "3.1"; } diff --git a/src/test/org/apache/commons/collections/list/TestSetUniqueList.java b/src/test/org/apache/commons/collections/list/TestSetUniqueList.java index 0851a3f3f..5ce9eebe7 100644 --- a/src/test/org/apache/commons/collections/list/TestSetUniqueList.java +++ b/src/test/org/apache/commons/collections/list/TestSetUniqueList.java @@ -53,10 +53,12 @@ public class TestSetUniqueList extends AbstractTestList { } //----------------------------------------------------------------------- + @Override public List makeObject() { return new SetUniqueList(new ArrayList(), new HashSet()); } + @Override public void testListIteratorSet() { // override to block resetFull(); @@ -68,6 +70,7 @@ public class TestSetUniqueList extends AbstractTestList { } catch (UnsupportedOperationException ex) {} } + @Override @SuppressWarnings("unchecked") public E[] getFullNonNullElements() { // override to avoid duplicate "One" @@ -92,6 +95,7 @@ public class TestSetUniqueList extends AbstractTestList { }; } + @Override public void testListIteratorAdd() { // override to cope with Set behaviour resetEmpty(); @@ -120,6 +124,7 @@ public class TestSetUniqueList extends AbstractTestList { } } + @Override public void testCollectionAddAll() { // override for set behaviour resetEmpty(); @@ -174,6 +179,7 @@ public class TestSetUniqueList extends AbstractTestList { assertEquals("Third new element should be at index 0", thirdNewElement, list.get(0)); } + @Override @SuppressWarnings("unchecked") public void testListSetByIndex() { // override for set behaviour @@ -188,6 +194,7 @@ public class TestSetUniqueList extends AbstractTestList { } boolean extraVerify = true; + @Override public void testCollectionIteratorRemove() { try { extraVerify = false; @@ -197,6 +204,7 @@ public class TestSetUniqueList extends AbstractTestList { } } + @Override @SuppressWarnings("unchecked") public void verify() { super.verify(); @@ -447,6 +455,7 @@ public class TestSetUniqueList extends AbstractTestList { } //----------------------------------------------------------------------- + @Override public String getCompatibilityVersion() { return "3.1"; } diff --git a/src/test/org/apache/commons/collections/list/TestSynchronizedList.java b/src/test/org/apache/commons/collections/list/TestSynchronizedList.java index bf95432b6..2f378985c 100644 --- a/src/test/org/apache/commons/collections/list/TestSynchronizedList.java +++ b/src/test/org/apache/commons/collections/list/TestSynchronizedList.java @@ -46,14 +46,17 @@ public class TestSynchronizedList extends AbstractTestList { junit.textui.TestRunner.main(testCaseName); } + @Override public List makeConfirmedCollection() { return new ArrayList(); } + @Override public List makeObject() { return SynchronizedList.decorate(new ArrayList()); } + @Override public String getCompatibilityVersion() { return "3.1"; } diff --git a/src/test/org/apache/commons/collections/list/TestTransformedList.java b/src/test/org/apache/commons/collections/list/TestTransformedList.java index a2971b3db..138896ef1 100644 --- a/src/test/org/apache/commons/collections/list/TestTransformedList.java +++ b/src/test/org/apache/commons/collections/list/TestTransformedList.java @@ -51,21 +51,25 @@ public class TestTransformedList extends AbstractTestList { junit.textui.TestRunner.main(testCaseName); } + @Override public List makeConfirmedCollection() { return new ArrayList(); } + @Override public List makeConfirmedFullCollection() { List list = new ArrayList(); list.addAll(Arrays.asList(getFullElements())); return list; } + @Override @SuppressWarnings("unchecked") public List makeObject() { return TransformedList.decorate(new ArrayList(), (Transformer) TestTransformedCollection.NOOP_TRANSFORMER); } + @Override @SuppressWarnings("unchecked") public List makeFullCollection() { List list = new ArrayList(); @@ -138,6 +142,7 @@ public class TestTransformedList extends AbstractTestList { assertEquals(true, list.remove(new Integer((String) els[0]))); } + @Override public String getCompatibilityVersion() { return "3.1"; } diff --git a/src/test/org/apache/commons/collections/list/TestTreeList.java b/src/test/org/apache/commons/collections/list/TestTreeList.java index 9d950acd8..386a21d79 100644 --- a/src/test/org/apache/commons/collections/list/TestTreeList.java +++ b/src/test/org/apache/commons/collections/list/TestTreeList.java @@ -105,6 +105,7 @@ public class TestTreeList extends AbstractTestList { } //----------------------------------------------------------------------- + @Override public TreeList makeObject() { return new TreeList(); } diff --git a/src/test/org/apache/commons/collections/list/TestUnmodifiableList.java b/src/test/org/apache/commons/collections/list/TestUnmodifiableList.java index 3ef9a4620..12fd503fe 100644 --- a/src/test/org/apache/commons/collections/list/TestUnmodifiableList.java +++ b/src/test/org/apache/commons/collections/list/TestUnmodifiableList.java @@ -49,24 +49,29 @@ public class TestUnmodifiableList extends AbstractTestList { } //----------------------------------------------------------------------- + @Override public UnmodifiableList makeObject() { return new UnmodifiableList(new ArrayList()); } + @Override public UnmodifiableList makeFullCollection() { ArrayList list = new ArrayList(); list.addAll(Arrays.asList(getFullElements())); return new UnmodifiableList(list); } + @Override public boolean isSetSupported() { return false; } + @Override public boolean isAddSupported() { return false; } + @Override public boolean isRemoveSupported() { return false; } @@ -170,6 +175,7 @@ public class TestUnmodifiableList extends AbstractTestList { } } + @Override public String getCompatibilityVersion() { return "3.1"; } diff --git a/src/test/org/apache/commons/collections/map/AbstractTestOrderedMap.java b/src/test/org/apache/commons/collections/map/AbstractTestOrderedMap.java index 8e69a6524..ac93a831d 100644 --- a/src/test/org/apache/commons/collections/map/AbstractTestOrderedMap.java +++ b/src/test/org/apache/commons/collections/map/AbstractTestOrderedMap.java @@ -69,6 +69,7 @@ public abstract class AbstractTestOrderedMap extends AbstractTestIterableM * * @return a map that is known to be valid */ + @Override public Map makeConfirmedMap() { return new TreeMap(new NullComparator()); } @@ -77,6 +78,7 @@ public abstract class AbstractTestOrderedMap extends AbstractTestIterableM * The only confirmed collection we have that is ordered is the sorted one. * Thus, sort the keys. */ + @Override @SuppressWarnings("unchecked") public K[] getSampleKeys() { List list = new ArrayList(Arrays.asList(super.getSampleKeys())); @@ -197,38 +199,46 @@ public abstract class AbstractTestOrderedMap extends AbstractTestIterableM super("InnerTestOrderedMapIterator"); } + @Override public boolean supportsRemove() { return AbstractTestOrderedMap.this.isRemoveSupported(); } + @Override public boolean isGetStructuralModify() { return AbstractTestOrderedMap.this.isGetStructuralModify(); } + @Override public boolean supportsSetValue() { return AbstractTestOrderedMap.this.isSetValueSupported(); } + @Override public OrderedMapIterator makeEmptyIterator() { resetEmpty(); return AbstractTestOrderedMap.this.getMap().mapIterator(); } + @Override public OrderedMapIterator makeObject() { resetFull(); return AbstractTestOrderedMap.this.getMap().mapIterator(); } + @Override public OrderedMap getMap() { // assumes makeFullMapIterator() called first return AbstractTestOrderedMap.this.getMap(); } + @Override public Map getConfirmedMap() { // assumes makeFullMapIterator() called first return AbstractTestOrderedMap.this.getConfirmed(); } + @Override public void verify() { super.verify(); AbstractTestOrderedMap.this.verify(); diff --git a/src/test/org/apache/commons/collections/map/TestIdentityMap.java b/src/test/org/apache/commons/collections/map/TestIdentityMap.java index ba303729f..6213d63ef 100644 --- a/src/test/org/apache/commons/collections/map/TestIdentityMap.java +++ b/src/test/org/apache/commons/collections/map/TestIdentityMap.java @@ -55,10 +55,12 @@ public class TestIdentityMap extends AbstractTestObject { // return BulkTest.makeSuite(TestIdentityMap.class); // causes race condition! } + @Override public IdentityMap makeObject() { return new IdentityMap(); } + @Override public String getCompatibilityVersion() { return "3"; } diff --git a/src/test/org/apache/commons/collections/map/TestLRUMap.java b/src/test/org/apache/commons/collections/map/TestLRUMap.java index 6df45ec8c..83d971a0a 100644 --- a/src/test/org/apache/commons/collections/map/TestLRUMap.java +++ b/src/test/org/apache/commons/collections/map/TestLRUMap.java @@ -51,6 +51,7 @@ public class TestLRUMap extends AbstractTestOrderedMap { return BulkTest.makeSuite(TestLRUMap.class); } + @Override public LRUMap makeObject() { return new LRUMap(); } @@ -63,10 +64,12 @@ public class TestLRUMap extends AbstractTestOrderedMap { return (LRUMap) super.makeFullMap(); } + @Override public boolean isGetStructuralModify() { return true; } + @Override public String getCompatibilityVersion() { return "3"; } @@ -262,6 +265,7 @@ public class TestLRUMap extends AbstractTestOrderedMap { super(size); } + @Override protected boolean removeLRU(LinkEntry entry) { this.entry = entry; this.key = entry.getKey(); @@ -308,6 +312,7 @@ public class TestLRUMap extends AbstractTestOrderedMap { super(size, scanUntilRemove); } + @Override protected boolean removeLRU(LinkEntry entry) { return false; } @@ -335,6 +340,7 @@ public class TestLRUMap extends AbstractTestOrderedMap { super(size, true); } + @Override protected boolean removeLRU(LinkEntry entry) { if ("a".equals(entry.getValue())) { return false; @@ -350,11 +356,13 @@ public class TestLRUMap extends AbstractTestOrderedMap { SingleHashCode(String code) { this.code = code; } + @Override public int hashCode() { // always return the same hashcode // that way, it will end up in the same bucket return 12; } + @Override public String toString() { return "SingleHashCode:" + code; } @@ -480,6 +488,7 @@ public class TestLRUMap extends AbstractTestOrderedMap { final Map exceptions = new HashMap(); final ThreadGroup tg = new ThreadGroup(getName()) { + @Override public void uncaughtException(Thread t, Throwable e) { exceptions.put(e, t.getName()); super.uncaughtException(t, e); @@ -492,6 +501,7 @@ public class TestLRUMap extends AbstractTestOrderedMap { for (int i = 0; i < threads.length; ++i) { threads[i] = new Thread(tg, "JUnit Thread " + i) { + @Override public void run() { int i = 0; try { @@ -561,6 +571,7 @@ public class TestLRUMap extends AbstractTestOrderedMap { final Map exceptions = new HashMap(); final ThreadGroup tg = new ThreadGroup(getName()) { + @Override public void uncaughtException(Thread t, Throwable e) { exceptions.put(e, t.getName()); super.uncaughtException(t, e); @@ -573,6 +584,7 @@ public class TestLRUMap extends AbstractTestOrderedMap { for (int i = 0; i < threads.length; ++i) { threads[i] = new Thread(tg, "JUnit Thread " + i) { + @Override public void run() { int i = 0; try { @@ -643,6 +655,7 @@ public class TestLRUMap extends AbstractTestOrderedMap { final Map exceptions = new HashMap(); final ThreadGroup tg = new ThreadGroup(getName()) { + @Override public void uncaughtException(Thread t, Throwable e) { exceptions.put(e, t.getName()); super.uncaughtException(t, e); @@ -655,6 +668,7 @@ public class TestLRUMap extends AbstractTestOrderedMap { for (int i = 0; i < threads.length; ++i) { threads[i] = new Thread(tg, "JUnit Thread " + i) { + @Override public void run() { int i = 0; try { @@ -724,6 +738,7 @@ public class TestLRUMap extends AbstractTestOrderedMap { final Map exceptions = new HashMap(); final ThreadGroup tg = new ThreadGroup(getName()) { + @Override public void uncaughtException(Thread t, Throwable e) { exceptions.put(e, t.getName()); super.uncaughtException(t, e); @@ -736,6 +751,7 @@ public class TestLRUMap extends AbstractTestOrderedMap { for (int i = 0; i < threads.length; ++i) { threads[i] = new Thread(tg, "JUnit Thread " + i) { + @Override public void run() { int i = 0; try { diff --git a/src/test/org/apache/commons/collections/map/TestLinkedMap.java b/src/test/org/apache/commons/collections/map/TestLinkedMap.java index a29861218..01882c7fc 100644 --- a/src/test/org/apache/commons/collections/map/TestLinkedMap.java +++ b/src/test/org/apache/commons/collections/map/TestLinkedMap.java @@ -51,6 +51,7 @@ public class TestLinkedMap extends AbstractTestOrderedMap { return BulkTest.makeSuite(TestLinkedMap.class); } + @Override public LinkedMap makeObject() { return new LinkedMap(); } @@ -63,6 +64,7 @@ public class TestLinkedMap extends AbstractTestOrderedMap { return (LinkedMap) super.makeFullMap(); } + @Override public String getCompatibilityVersion() { return "3"; } @@ -240,29 +242,37 @@ public class TestLinkedMap extends AbstractTestOrderedMap { super("TestListView"); } + @Override public List makeObject() { return TestLinkedMap.this.makeObject().asList(); } + @Override public List makeFullCollection() { return TestLinkedMap.this.makeFullMap().asList(); } + @Override public K[] getFullElements() { return TestLinkedMap.this.getSampleKeys(); } + @Override public boolean isAddSupported() { return false; } + @Override public boolean isRemoveSupported() { return false; } + @Override public boolean isSetSupported() { return false; } + @Override public boolean isNullSupported() { return TestLinkedMap.this.isAllowNullKey(); } + @Override public boolean isTestSerialization() { return false; } diff --git a/src/test/org/apache/commons/collections/map/TestListOrderedMap.java b/src/test/org/apache/commons/collections/map/TestListOrderedMap.java index 6272dd502..027284564 100644 --- a/src/test/org/apache/commons/collections/map/TestListOrderedMap.java +++ b/src/test/org/apache/commons/collections/map/TestListOrderedMap.java @@ -52,6 +52,7 @@ public class TestListOrderedMap extends AbstractTestOrderedMap { junit.textui.TestRunner.main(testCaseName); } + @Override public ListOrderedMap makeObject() { return (ListOrderedMap) ListOrderedMap.decorate(new HashMap()); } @@ -382,28 +383,36 @@ public class TestListOrderedMap extends AbstractTestOrderedMap { super("TestKeyListView"); } + @Override public List makeObject() { return TestListOrderedMap.this.makeObject().keyList(); } + @Override public List makeFullCollection() { return TestListOrderedMap.this.makeFullMap().keyList(); } + @Override public K[] getFullElements() { return TestListOrderedMap.this.getSampleKeys(); } + @Override public boolean isAddSupported() { return false; } + @Override public boolean isRemoveSupported() { return false; } + @Override public boolean isSetSupported() { return false; } + @Override public boolean isNullSupported() { return TestListOrderedMap.this.isAllowNullKey(); } + @Override public boolean isTestSerialization() { return false; } @@ -415,34 +424,43 @@ public class TestListOrderedMap extends AbstractTestOrderedMap { super("TestValueListView"); } + @Override public List makeObject() { return TestListOrderedMap.this.makeObject().valueList(); } + @Override public List makeFullCollection() { return TestListOrderedMap.this.makeFullMap().valueList(); } + @Override public V[] getFullElements() { return TestListOrderedMap.this.getSampleValues(); } + @Override public boolean isAddSupported() { return false; } + @Override public boolean isRemoveSupported() { return true; } + @Override public boolean isSetSupported() { return true; } + @Override public boolean isNullSupported() { return TestListOrderedMap.this.isAllowNullKey(); } + @Override public boolean isTestSerialization() { return false; } } //----------------------------------------------------------------------- + @Override public String getCompatibilityVersion() { return "3.1"; } diff --git a/src/test/org/apache/commons/collections/map/TestListOrderedMap2.java b/src/test/org/apache/commons/collections/map/TestListOrderedMap2.java index 8af2efe7b..584404b59 100644 --- a/src/test/org/apache/commons/collections/map/TestListOrderedMap2.java +++ b/src/test/org/apache/commons/collections/map/TestListOrderedMap2.java @@ -49,6 +49,7 @@ public class TestListOrderedMap2 extends AbstractTestOrderedMap { junit.textui.TestRunner.main(testCaseName); } + @Override public ListOrderedMap makeObject() { return new ListOrderedMap(); } @@ -171,34 +172,43 @@ public class TestListOrderedMap2 extends AbstractTestOrderedMap { super("TestListView"); } + @Override public List makeObject() { return TestListOrderedMap2.this.makeObject().asList(); } + @Override public List makeFullCollection() { return TestListOrderedMap2.this.makeFullMap().asList(); } + @Override public K[] getFullElements() { return TestListOrderedMap2.this.getSampleKeys(); } + @Override public boolean isAddSupported() { return false; } + @Override public boolean isRemoveSupported() { return false; } + @Override public boolean isSetSupported() { return false; } + @Override public boolean isNullSupported() { return TestListOrderedMap2.this.isAllowNullKey(); } + @Override public boolean isTestSerialization() { return false; } } + @Override public String getCompatibilityVersion() { return "3.1"; } diff --git a/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java b/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java index b86db2cc3..7acd5db93 100644 --- a/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java +++ b/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java @@ -55,10 +55,12 @@ public class TestMultiKeyMap extends AbstractTestIterableMap makeObject() { return new MultiKeyMap(); } + @Override public MultiKey[] getSampleKeys() { return getMultiKeyKeys(); } @@ -81,6 +83,7 @@ public class TestMultiKeyMap extends AbstractTestIterableMap extends AbstractTestIterableMap extends AbstractTestIterableMap[] getOtherKeys() { return (MultiKey[]) new MultiKey[] { @@ -111,6 +116,7 @@ public class TestMultiKeyMap extends AbstractTestIterableMap extends AbstractTestIterableMap extends AbstractTestObject { // extend the AbstractTestMap //----------------------------------------------------------------------- + @Override public String getCompatibilityVersion() { return "3.3"; } + @Override public Object makeObject() { Map m = makeEmptyMap(); m.put("a", "1"); diff --git a/src/test/org/apache/commons/collections/map/TestPredicatedMap.java b/src/test/org/apache/commons/collections/map/TestPredicatedMap.java index afbdca827..322fe68d8 100644 --- a/src/test/org/apache/commons/collections/map/TestPredicatedMap.java +++ b/src/test/org/apache/commons/collections/map/TestPredicatedMap.java @@ -65,6 +65,7 @@ public class TestPredicatedMap extends AbstractTestIterableMap { return PredicatedMap.decorate(map, keyPredicate, valuePredicate); } + @Override public IterableMap makeObject() { return decorateMap(new HashMap(), truePredicate, truePredicate); } @@ -136,6 +137,7 @@ public class TestPredicatedMap extends AbstractTestIterableMap { } + @Override public String getCompatibilityVersion() { return "3.1"; } diff --git a/src/test/org/apache/commons/collections/map/TestPredicatedSortedMap.java b/src/test/org/apache/commons/collections/map/TestPredicatedSortedMap.java index 17e85b1a9..33adca3aa 100644 --- a/src/test/org/apache/commons/collections/map/TestPredicatedSortedMap.java +++ b/src/test/org/apache/commons/collections/map/TestPredicatedSortedMap.java @@ -67,6 +67,7 @@ public class TestPredicatedSortedMap extends AbstractTestSortedMap { return PredicatedSortedMap.decorate(map, keyPredicate, valuePredicate); } + @Override public SortedMap makeObject() { return decorateMap(new TreeMap(), truePredicate, truePredicate); } @@ -75,11 +76,13 @@ public class TestPredicatedSortedMap extends AbstractTestSortedMap { return decorateMap(new TreeMap(), testPredicate, testPredicate); } + @Override public boolean isSubMapViewsSerializable() { // TreeMap sub map views have a bug in deserialization. return false; } + @Override public boolean isAllowNullKey() { return false; } @@ -181,6 +184,7 @@ public class TestPredicatedSortedMap extends AbstractTestSortedMap { c == null); } + @Override public String getCompatibilityVersion() { return "3.1"; } diff --git a/src/test/org/apache/commons/collections/map/TestReferenceIdentityMap.java b/src/test/org/apache/commons/collections/map/TestReferenceIdentityMap.java index 421950adc..9b042f904 100644 --- a/src/test/org/apache/commons/collections/map/TestReferenceIdentityMap.java +++ b/src/test/org/apache/commons/collections/map/TestReferenceIdentityMap.java @@ -55,10 +55,12 @@ public class TestReferenceIdentityMap extends AbstractTestIterableMap makeObject() { return new ReferenceIdentityMap(ReferenceStrength.WEAK, ReferenceStrength.WEAK); } + @Override public Map makeConfirmedMap() { // Testing against another [collections] class generally isn't a good idea, // but the closest alternative is IdentityHashMap, which propagates reference-equality down to keySet and values. @@ -66,14 +68,17 @@ public class TestReferenceIdentityMap extends AbstractTestIterableMap(); } + @Override public boolean isAllowNullKey() { return false; } + @Override public boolean isAllowNullValue() { return false; } + @Override public String getCompatibilityVersion() { return "3.1"; } diff --git a/src/test/org/apache/commons/collections/map/TestReferenceMap.java b/src/test/org/apache/commons/collections/map/TestReferenceMap.java index d4c05d295..e47080370 100644 --- a/src/test/org/apache/commons/collections/map/TestReferenceMap.java +++ b/src/test/org/apache/commons/collections/map/TestReferenceMap.java @@ -47,18 +47,22 @@ public class TestReferenceMap extends AbstractTestIterableMap { junit.textui.TestRunner.main(testCaseName); } + @Override public ReferenceMap makeObject() { return new ReferenceMap(ReferenceStrength.WEAK, ReferenceStrength.WEAK); } + @Override public boolean isAllowNullKey() { return false; } + @Override public boolean isAllowNullValue() { return false; } + @Override public String getCompatibilityVersion() { return "3.1"; } diff --git a/src/test/org/apache/commons/collections/map/TestSingletonMap.java b/src/test/org/apache/commons/collections/map/TestSingletonMap.java index 575f1bca7..7d209a567 100644 --- a/src/test/org/apache/commons/collections/map/TestSingletonMap.java +++ b/src/test/org/apache/commons/collections/map/TestSingletonMap.java @@ -52,12 +52,14 @@ public class TestSingletonMap extends AbstractTestOrderedMap { } //----------------------------------------------------------------------- + @Override public OrderedMap makeObject() { // need an empty singleton map, but thats not possible // use a ridiculous fake instead to make the tests pass return UnmodifiableOrderedMap.decorate(ListOrderedMap.decorate(new HashMap())); } + @Override public String[] ignoredTests() { // the ridiculous map above still doesn't pass these tests // but its not relevant, so we ignore them @@ -67,29 +69,35 @@ public class TestSingletonMap extends AbstractTestOrderedMap { }; } + @Override @SuppressWarnings("unchecked") public SingletonMap makeFullMap() { return new SingletonMap((K) ONE, (V) TWO); } + @Override public boolean isPutAddSupported() { return false; } + @Override public boolean isRemoveSupported() { return false; } + @Override @SuppressWarnings("unchecked") public K[] getSampleKeys() { return (K[]) new Object[] { ONE }; } + @Override @SuppressWarnings("unchecked") public V[] getSampleValues() { return (V[]) new Object[] { TWO }; } + @Override @SuppressWarnings("unchecked") public V[] getNewSampleValues() { return (V[]) new Object[] { TEN }; @@ -169,6 +177,7 @@ public class TestSingletonMap extends AbstractTestOrderedMap { // } // } + @Override public String getCompatibilityVersion() { return "3.1"; } diff --git a/src/test/org/apache/commons/collections/map/TestStaticBucketMap.java b/src/test/org/apache/commons/collections/map/TestStaticBucketMap.java index 31014a021..0900cbf31 100644 --- a/src/test/org/apache/commons/collections/map/TestStaticBucketMap.java +++ b/src/test/org/apache/commons/collections/map/TestStaticBucketMap.java @@ -43,6 +43,7 @@ public class TestStaticBucketMap extends AbstractTestIterableMap { junit.textui.TestRunner.main(testCaseName); } + @Override public StaticBucketMap makeObject() { return new StaticBucketMap(30); } @@ -55,6 +56,7 @@ public class TestStaticBucketMap extends AbstractTestIterableMap { return false; } + @Override public String[] ignoredTests() { String pre = "TestStaticBucketMap.bulkTestMap"; String post = ".testCollectionIteratorFailFast"; diff --git a/src/test/org/apache/commons/collections/map/TestTransformedMap.java b/src/test/org/apache/commons/collections/map/TestTransformedMap.java index ec30c3314..86c7d1dbb 100644 --- a/src/test/org/apache/commons/collections/map/TestTransformedMap.java +++ b/src/test/org/apache/commons/collections/map/TestTransformedMap.java @@ -53,6 +53,7 @@ public class TestTransformedMap extends AbstractTestIterableMap { } //----------------------------------------------------------------------- + @Override public IterableMap makeObject() { return TransformedMap.decorate(new HashMap(), TransformerUtils. nopTransformer(), TransformerUtils. nopTransformer()); @@ -148,6 +149,7 @@ public class TestTransformedMap extends AbstractTestIterableMap { } //----------------------------------------------------------------------- + @Override public String getCompatibilityVersion() { return "3.1"; } diff --git a/src/test/org/apache/commons/collections/map/TestUnmodifiableMap.java b/src/test/org/apache/commons/collections/map/TestUnmodifiableMap.java index 9eb2b8c64..acf421fc7 100644 --- a/src/test/org/apache/commons/collections/map/TestUnmodifiableMap.java +++ b/src/test/org/apache/commons/collections/map/TestUnmodifiableMap.java @@ -51,22 +51,27 @@ public class TestUnmodifiableMap extends AbstractTestIterableMap { //------------------------------------------------------------------- + @Override public IterableMap makeObject() { return (IterableMap) UnmodifiableMap.decorate(new HashMap()); } + @Override public boolean isPutChangeSupported() { return false; } + @Override public boolean isPutAddSupported() { return false; } + @Override public boolean isRemoveSupported() { return false; } + @Override public IterableMap makeFullMap() { Map m = new HashMap(); addSampleMappings(m); @@ -89,6 +94,7 @@ public class TestUnmodifiableMap extends AbstractTestIterableMap { } catch (IllegalArgumentException ex) {} } + @Override public String getCompatibilityVersion() { return "3.1"; } diff --git a/src/test/org/apache/commons/collections/map/TestUnmodifiableOrderedMap.java b/src/test/org/apache/commons/collections/map/TestUnmodifiableOrderedMap.java index 74f4a9e31..e632cbef4 100644 --- a/src/test/org/apache/commons/collections/map/TestUnmodifiableOrderedMap.java +++ b/src/test/org/apache/commons/collections/map/TestUnmodifiableOrderedMap.java @@ -50,22 +50,27 @@ public class TestUnmodifiableOrderedMap extends AbstractTestOrderedMap makeObject() { return UnmodifiableOrderedMap.decorate(ListOrderedMap.decorate(new HashMap())); } + @Override public boolean isPutChangeSupported() { return false; } + @Override public boolean isPutAddSupported() { return false; } + @Override public boolean isRemoveSupported() { return false; } + @Override public OrderedMap makeFullMap() { OrderedMap m = ListOrderedMap.decorate(new HashMap()); addSampleMappings(m); @@ -88,6 +93,7 @@ public class TestUnmodifiableOrderedMap extends AbstractTestOrderedMap extends AbstractTestSortedMap //------------------------------------------------------------------- + @Override public SortedMap makeObject() { return UnmodifiableSortedMap.decorate(new TreeMap()); } + @Override public boolean isPutChangeSupported() { return false; } + @Override public boolean isPutAddSupported() { return false; } + @Override public boolean isRemoveSupported() { return false; } + @Override public SortedMap makeFullMap() { SortedMap m = new TreeMap(); addSampleMappings(m); @@ -88,6 +93,7 @@ public class TestUnmodifiableSortedMap extends AbstractTestSortedMap } catch (IllegalArgumentException ex) {} } + @Override public String getCompatibilityVersion() { return "3.1"; }