http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/map/CompositeMap.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/map/CompositeMap.java b/src/main/java/org/apache/commons/collections4/map/CompositeMap.java index 7c16b2a..d5c4861 100644 --- a/src/main/java/org/apache/commons/collections4/map/CompositeMap.java +++ b/src/main/java/org/apache/commons/collections4/map/CompositeMap.java @@ -173,6 +173,7 @@ public class CompositeMap<K, V> extends AbstractIterableMap<K, V> implements Ser * * @throws UnsupportedOperationException if any of the composited Maps do not support clear() */ + @Override public void clear() { for (int i = this.composite.length - 1; i >= 0; --i) { this.composite[i].clear(); @@ -195,6 +196,7 @@ public class CompositeMap<K, V> extends AbstractIterableMap<K, V> implements Ser * @throws NullPointerException if the key is {@code null} and this map * does not not permit {@code null} keys (optional). */ + @Override public boolean containsKey(final Object key) { for (int i = this.composite.length - 1; i >= 0; --i) { if (this.composite[i].containsKey(key)) { @@ -220,6 +222,7 @@ public class CompositeMap<K, V> extends AbstractIterableMap<K, V> implements Ser * @throws NullPointerException if the value is {@code null} and this map * does not not permit {@code null} values (optional). */ + @Override public boolean containsValue(final Object value) { for (int i = this.composite.length - 1; i >= 0; --i) { if (this.composite[i].containsValue(value)) { @@ -246,6 +249,7 @@ public class CompositeMap<K, V> extends AbstractIterableMap<K, V> implements Ser * @see CompositeSet * @return a set view of the mappings contained in this map. */ + @Override public Set<Map.Entry<K, V>> entrySet() { final CompositeSet<Map.Entry<K, V>> entries = new CompositeSet<Map.Entry<K,V>>(); for (int i = composite.length - 1; i >= 0; --i) { @@ -278,6 +282,7 @@ public class CompositeMap<K, V> extends AbstractIterableMap<K, V> implements Ser * * @see #containsKey(Object) */ + @Override public V get(final Object key) { for (int i = this.composite.length - 1; i >= 0; --i) { if (this.composite[i].containsKey(key)) { @@ -292,6 +297,7 @@ public class CompositeMap<K, V> extends AbstractIterableMap<K, V> implements Ser * * @return {@code true} if this map contains no key-value mappings. */ + @Override public boolean isEmpty() { for (int i = this.composite.length - 1; i >= 0; --i) { if (!this.composite[i].isEmpty()) { @@ -316,6 +322,7 @@ public class CompositeMap<K, V> extends AbstractIterableMap<K, V> implements Ser * * @return a set view of the keys contained in this map. */ + @Override public Set<K> keySet() { final CompositeSet<K> keys = new CompositeSet<K>(); for (int i = this.composite.length - 1; i >= 0; --i) { @@ -349,6 +356,7 @@ public class CompositeMap<K, V> extends AbstractIterableMap<K, V> implements Ser * keys or values, and the specified key or value is * {@code null}. */ + @Override public V put(final K key, final V value) { if (this.mutator == null) { throw new UnsupportedOperationException("No mutator specified"); @@ -378,6 +386,7 @@ public class CompositeMap<K, V> extends AbstractIterableMap<K, V> implements Ser * this map does not permit {@code null} keys or values, and the * specified map contains {@code null} keys or values. */ + @Override public void putAll(final Map<? extends K, ? extends V> map) { if (this.mutator == null) { throw new UnsupportedOperationException("No mutator specified"); @@ -410,6 +419,7 @@ public class CompositeMap<K, V> extends AbstractIterableMap<K, V> implements Ser * @throws UnsupportedOperationException if the {@code remove} method is * not supported by the composited map containing the key */ + @Override public V remove(final Object key) { for (int i = this.composite.length - 1; i >= 0; --i) { if (this.composite[i].containsKey(key)) { @@ -426,6 +436,7 @@ public class CompositeMap<K, V> extends AbstractIterableMap<K, V> implements Ser * * @return the number of key-value mappings in this map. */ + @Override public int size() { int size = 0; for (int i = this.composite.length - 1; i >= 0; --i) { @@ -447,6 +458,7 @@ public class CompositeMap<K, V> extends AbstractIterableMap<K, V> implements Ser * * @return a collection view of the values contained in this map. */ + @Override public Collection<V> values() { final CompositeCollection<V> values = new CompositeCollection<V>(); for (int i = composite.length - 1; i >= 0; --i) {
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java b/src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java index 668d555..5b0e10f 100644 --- a/src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java +++ b/src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java @@ -52,6 +52,7 @@ public class EntrySetToMapIteratorAdapter<K, V> implements MapIterator<K, V>, Re /** * {@inheritDoc} */ + @Override public K getKey() { return current().getKey(); } @@ -59,6 +60,7 @@ public class EntrySetToMapIteratorAdapter<K, V> implements MapIterator<K, V>, Re /** * {@inheritDoc} */ + @Override public V getValue() { return current().getValue(); } @@ -66,6 +68,7 @@ public class EntrySetToMapIteratorAdapter<K, V> implements MapIterator<K, V>, Re /** * {@inheritDoc} */ + @Override public V setValue(final V value) { return current().setValue(value); } @@ -73,6 +76,7 @@ public class EntrySetToMapIteratorAdapter<K, V> implements MapIterator<K, V>, Re /** * {@inheritDoc} */ + @Override public boolean hasNext() { return iterator.hasNext(); } @@ -80,6 +84,7 @@ public class EntrySetToMapIteratorAdapter<K, V> implements MapIterator<K, V>, Re /** * {@inheritDoc} */ + @Override public K next() { entry = iterator.next(); return getKey(); @@ -88,6 +93,7 @@ public class EntrySetToMapIteratorAdapter<K, V> implements MapIterator<K, V>, Re /** * {@inheritDoc} */ + @Override public synchronized void reset() { iterator = entrySet.iterator(); } @@ -95,6 +101,7 @@ public class EntrySetToMapIteratorAdapter<K, V> implements MapIterator<K, V>, Re /** * {@inheritDoc} */ + @Override public void remove() { iterator.remove(); entry = null; http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/map/FixedSizeMap.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/map/FixedSizeMap.java b/src/main/java/org/apache/commons/collections4/map/FixedSizeMap.java index 29e35c2..706f5dc 100644 --- a/src/main/java/org/apache/commons/collections4/map/FixedSizeMap.java +++ b/src/main/java/org/apache/commons/collections4/map/FixedSizeMap.java @@ -159,10 +159,12 @@ public class FixedSizeMap<K, V> return UnmodifiableCollection.unmodifiableCollection(coll); } + @Override public boolean isFull() { return true; } + @Override public int maxSize() { return size(); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/map/FixedSizeSortedMap.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/map/FixedSizeSortedMap.java b/src/main/java/org/apache/commons/collections4/map/FixedSizeSortedMap.java index 4a9deaa..fc7f31a 100644 --- a/src/main/java/org/apache/commons/collections4/map/FixedSizeSortedMap.java +++ b/src/main/java/org/apache/commons/collections4/map/FixedSizeSortedMap.java @@ -171,10 +171,12 @@ public class FixedSizeSortedMap<K, V> return new FixedSizeSortedMap<K, V>(getSortedMap().tailMap(fromKey)); } + @Override public boolean isFull() { return true; } + @Override public int maxSize() { return size(); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/map/Flat3Map.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/map/Flat3Map.java b/src/main/java/org/apache/commons/collections4/map/Flat3Map.java index 6b07d05..caaf73a 100644 --- a/src/main/java/org/apache/commons/collections4/map/Flat3Map.java +++ b/src/main/java/org/apache/commons/collections4/map/Flat3Map.java @@ -123,6 +123,7 @@ public class Flat3Map<K, V> implements IterableMap<K, V>, Serializable, Cloneabl * @param key the key * @return the mapped value, null if no match */ + @Override public V get(final Object key) { if (delegateMap != null) { return delegateMap.get(key); @@ -171,6 +172,7 @@ public class Flat3Map<K, V> implements IterableMap<K, V>, Serializable, Cloneabl * * @return the size */ + @Override public int size() { if (delegateMap != null) { return delegateMap.size(); @@ -183,6 +185,7 @@ public class Flat3Map<K, V> implements IterableMap<K, V>, Serializable, Cloneabl * * @return true if the map is currently size zero */ + @Override public boolean isEmpty() { return size() == 0; } @@ -194,6 +197,7 @@ public class Flat3Map<K, V> implements IterableMap<K, V>, Serializable, Cloneabl * @param key the key to search for * @return true if the map contains the key */ + @Override public boolean containsKey(final Object key) { if (delegateMap != null) { return delegateMap.containsKey(key); @@ -241,6 +245,7 @@ public class Flat3Map<K, V> implements IterableMap<K, V>, Serializable, Cloneabl * @param value the value to search for * @return true if the map contains the key */ + @Override public boolean containsValue(final Object value) { if (delegateMap != null) { return delegateMap.containsValue(value); @@ -287,6 +292,7 @@ public class Flat3Map<K, V> implements IterableMap<K, V>, Serializable, Cloneabl * @param value the value to add * @return the value previously mapped to this key, null if none */ + @Override public V put(final K key, final V value) { if (delegateMap != null) { return delegateMap.put(key, value); @@ -371,6 +377,7 @@ public class Flat3Map<K, V> implements IterableMap<K, V>, Serializable, Cloneabl * @param map the map to add * @throws NullPointerException if the map is null */ + @Override public void putAll(final Map<? extends K, ? extends V> map) { final int size = map.size(); if (size == 0) { @@ -434,6 +441,7 @@ public class Flat3Map<K, V> implements IterableMap<K, V>, Serializable, Cloneabl * @param key the mapping to remove * @return the value mapped to the removed key, null if key not in map */ + @Override public V remove(final Object key) { if (delegateMap != null) { return delegateMap.remove(key); @@ -582,6 +590,7 @@ public class Flat3Map<K, V> implements IterableMap<K, V>, Serializable, Cloneabl * Clears the map, resetting the size to zero and nullifying references * to avoid garbage collection issues. */ + @Override public void clear() { if (delegateMap != null) { delegateMap.clear(); // should aid gc @@ -606,6 +615,7 @@ public class Flat3Map<K, V> implements IterableMap<K, V>, Serializable, Cloneabl * * @return the map iterator */ + @Override public MapIterator<K, V> mapIterator() { if (delegateMap != null) { return delegateMap.mapIterator(); @@ -629,10 +639,12 @@ public class Flat3Map<K, V> implements IterableMap<K, V>, Serializable, Cloneabl this.parent = parent; } + @Override public boolean hasNext() { return nextIndex < parent.size; } + @Override public K next() { if (hasNext() == false) { throw new NoSuchElementException(AbstractHashedMap.NO_NEXT_ENTRY); @@ -642,6 +654,7 @@ public class Flat3Map<K, V> implements IterableMap<K, V>, Serializable, Cloneabl return getKey(); } + @Override public void remove() { if (canRemove == false) { throw new IllegalStateException(AbstractHashedMap.REMOVE_INVALID); @@ -651,6 +664,7 @@ public class Flat3Map<K, V> implements IterableMap<K, V>, Serializable, Cloneabl canRemove = false; } + @Override public K getKey() { if (canRemove == false) { throw new IllegalStateException(AbstractHashedMap.GETKEY_INVALID); @@ -666,6 +680,7 @@ public class Flat3Map<K, V> implements IterableMap<K, V>, Serializable, Cloneabl throw new IllegalStateException("Invalid map index: " + nextIndex); } + @Override public V getValue() { if (canRemove == false) { throw new IllegalStateException(AbstractHashedMap.GETVALUE_INVALID); @@ -681,6 +696,7 @@ public class Flat3Map<K, V> implements IterableMap<K, V>, Serializable, Cloneabl throw new IllegalStateException("Invalid map index: " + nextIndex); } + @Override public V setValue(final V value) { if (canRemove == false) { throw new IllegalStateException(AbstractHashedMap.SETVALUE_INVALID); @@ -702,6 +718,7 @@ public class Flat3Map<K, V> implements IterableMap<K, V>, Serializable, Cloneabl return old; } + @Override public void reset() { nextIndex = 0; canRemove = false; @@ -726,6 +743,7 @@ public class Flat3Map<K, V> implements IterableMap<K, V>, Serializable, Cloneabl * * @return the entrySet view */ + @Override public Set<Map.Entry<K, V>> entrySet() { if (delegateMap != null) { return delegateMap.entrySet(); @@ -802,6 +820,7 @@ public class Flat3Map<K, V> implements IterableMap<K, V>, Serializable, Cloneabl this.removed = flag; } + @Override public K getKey() { if (removed) { throw new IllegalStateException(AbstractHashedMap.GETKEY_INVALID); @@ -817,6 +836,7 @@ public class Flat3Map<K, V> implements IterableMap<K, V>, Serializable, Cloneabl throw new IllegalStateException("Invalid map index: " + index); } + @Override public V getValue() { if (removed) { throw new IllegalStateException(AbstractHashedMap.GETVALUE_INVALID); @@ -832,6 +852,7 @@ public class Flat3Map<K, V> implements IterableMap<K, V>, Serializable, Cloneabl throw new IllegalStateException("Invalid map index: " + index); } + @Override public V setValue(final V value) { if (removed) { throw new IllegalStateException(AbstractHashedMap.SETVALUE_INVALID); @@ -933,6 +954,7 @@ public class Flat3Map<K, V> implements IterableMap<K, V>, Serializable, Cloneabl super(parent); } + @Override public Map.Entry<K, V> next() { return nextEntry(); } @@ -945,6 +967,7 @@ public class Flat3Map<K, V> implements IterableMap<K, V>, Serializable, Cloneabl * * @return the keySet view */ + @Override public Set<K> keySet() { if (delegateMap != null) { return delegateMap.keySet(); @@ -1007,6 +1030,7 @@ public class Flat3Map<K, V> implements IterableMap<K, V>, Serializable, Cloneabl super((Flat3Map<K, Object>) parent); } + @Override public K next() { return nextEntry().getKey(); } @@ -1019,6 +1043,7 @@ public class Flat3Map<K, V> implements IterableMap<K, V>, Serializable, Cloneabl * * @return the values view */ + @Override public Collection<V> values() { if (delegateMap != null) { return delegateMap.values(); @@ -1074,6 +1099,7 @@ public class Flat3Map<K, V> implements IterableMap<K, V>, Serializable, Cloneabl super((Flat3Map<Object, V>) parent); } + @Override public V next() { return nextEntry().getValue(); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/map/LRUMap.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/map/LRUMap.java b/src/main/java/org/apache/commons/collections4/map/LRUMap.java index e6b26bc..b7c2dc8 100644 --- a/src/main/java/org/apache/commons/collections4/map/LRUMap.java +++ b/src/main/java/org/apache/commons/collections4/map/LRUMap.java @@ -443,6 +443,7 @@ public class LRUMap<K, V> * * @return <code>true</code> if the map is full */ + @Override public boolean isFull() { return size >= maxSize; } @@ -452,6 +453,7 @@ public class LRUMap<K, V> * * @return the maximum number of elements the map can hold */ + @Override public int maxSize() { return maxSize; } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/map/LazySortedMap.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/map/LazySortedMap.java b/src/main/java/org/apache/commons/collections4/map/LazySortedMap.java index 459f586..dd536ec 100644 --- a/src/main/java/org/apache/commons/collections4/map/LazySortedMap.java +++ b/src/main/java/org/apache/commons/collections4/map/LazySortedMap.java @@ -127,28 +127,34 @@ public class LazySortedMap<K,V> extends LazyMap<K,V> implements SortedMap<K,V> { } //----------------------------------------------------------------------- + @Override public K firstKey() { return getSortedMap().firstKey(); } + @Override public K lastKey() { return getSortedMap().lastKey(); } + @Override public Comparator<? super K> comparator() { return getSortedMap().comparator(); } + @Override public SortedMap<K,V> subMap(final K fromKey, final K toKey) { final SortedMap<K,V> map = getSortedMap().subMap(fromKey, toKey); return new LazySortedMap<K,V>(map, factory); } + @Override public SortedMap<K,V> headMap(final K toKey) { final SortedMap<K,V> map = getSortedMap().headMap(toKey); return new LazySortedMap<K,V>(map, factory); } + @Override public SortedMap<K,V> tailMap(final K fromKey) { final SortedMap<K,V> map = getSortedMap().tailMap(fromKey); return new LazySortedMap<K,V>(map, factory); http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/map/ListOrderedMap.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/map/ListOrderedMap.java b/src/main/java/org/apache/commons/collections4/map/ListOrderedMap.java index 55c85f2..867c171 100644 --- a/src/main/java/org/apache/commons/collections4/map/ListOrderedMap.java +++ b/src/main/java/org/apache/commons/collections4/map/ListOrderedMap.java @@ -163,6 +163,7 @@ public class ListOrderedMap<K, V> * @return the first key currently in this map * @throws NoSuchElementException if this map is empty */ + @Override public K firstKey() { if (size() == 0) { throw new NoSuchElementException("Map is empty"); @@ -176,6 +177,7 @@ public class ListOrderedMap<K, V> * @return the last key currently in this map * @throws NoSuchElementException if this map is empty */ + @Override public K lastKey() { if (size() == 0) { throw new NoSuchElementException("Map is empty"); @@ -190,6 +192,7 @@ public class ListOrderedMap<K, V> * @param key the key to find previous for * @return the next key, null if no match or at start */ + @Override public K nextKey(final Object key) { final int index = insertOrder.indexOf(key); if (index >= 0 && index < size() - 1) { @@ -205,6 +208,7 @@ public class ListOrderedMap<K, V> * @param key the key to find previous for * @return the previous key, null if no match or at start */ + @Override public K previousKey(final Object key) { final int index = insertOrder.indexOf(key); if (index > 0) { @@ -525,6 +529,7 @@ public class ListOrderedMap<K, V> @Override public Iterator<V> iterator() { return new AbstractUntypedIteratorDecorator<Map.Entry<Object, V>, V>(parent.entrySet().iterator()) { + @Override public V next() { return getIterator().next().getValue(); } @@ -575,6 +580,7 @@ public class ListOrderedMap<K, V> @Override public Iterator<K> iterator() { return new AbstractUntypedIteratorDecorator<Map.Entry<K, Object>, K>(parent.entrySet().iterator()) { + @Override public K next() { return getIterator().next().getKey(); } @@ -673,6 +679,7 @@ public class ListOrderedMap<K, V> this.parent = parent; } + @Override public Map.Entry<K, V> next() { last = getIterator().next(); return new ListOrderedMapEntry<K, V>(parent, last); @@ -718,26 +725,31 @@ public class ListOrderedMap<K, V> this.iterator = parent.insertOrder.listIterator(); } + @Override public boolean hasNext() { return iterator.hasNext(); } + @Override public K next() { last = iterator.next(); readable = true; return last; } + @Override public boolean hasPrevious() { return iterator.hasPrevious(); } + @Override public K previous() { last = iterator.previous(); readable = true; return last; } + @Override public void remove() { if (readable == false) { throw new IllegalStateException(AbstractHashedMap.REMOVE_INVALID); @@ -747,6 +759,7 @@ public class ListOrderedMap<K, V> readable = false; } + @Override public K getKey() { if (readable == false) { throw new IllegalStateException(AbstractHashedMap.GETKEY_INVALID); @@ -754,6 +767,7 @@ public class ListOrderedMap<K, V> return last; } + @Override public V getValue() { if (readable == false) { throw new IllegalStateException(AbstractHashedMap.GETVALUE_INVALID); @@ -761,6 +775,7 @@ public class ListOrderedMap<K, V> return parent.get(last); } + @Override public V setValue(final V value) { if (readable == false) { throw new IllegalStateException(AbstractHashedMap.SETVALUE_INVALID); @@ -768,6 +783,7 @@ public class ListOrderedMap<K, V> return parent.map.put(last, value); } + @Override public void reset() { iterator = parent.insertOrder.listIterator(); last = null; http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java b/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java index f156409..16ae3b8 100644 --- a/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java +++ b/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java @@ -134,6 +134,7 @@ public class PassiveExpiringMap<K, V> * {@link System#currentTimeMillis()} is returned. Otherwise, -1 * is returned indicating the entry never expires. */ + @Override public long expirationTime(final K key, final V value) { if (timeToLiveMillis >= 0L) { // avoid numerical overflow http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/map/PredicatedSortedMap.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/map/PredicatedSortedMap.java b/src/main/java/org/apache/commons/collections4/map/PredicatedSortedMap.java index aa10931..11f1e4b 100644 --- a/src/main/java/org/apache/commons/collections4/map/PredicatedSortedMap.java +++ b/src/main/java/org/apache/commons/collections4/map/PredicatedSortedMap.java @@ -98,28 +98,34 @@ public class PredicatedSortedMap<K, V> extends PredicatedMap<K, V> implements So } //----------------------------------------------------------------------- + @Override public K firstKey() { return getSortedMap().firstKey(); } + @Override public K lastKey() { return getSortedMap().lastKey(); } + @Override public Comparator<? super K> comparator() { return getSortedMap().comparator(); } + @Override public SortedMap<K, V> subMap(final K fromKey, final K toKey) { final SortedMap<K, V> map = getSortedMap().subMap(fromKey, toKey); return new PredicatedSortedMap<K, V>(map, keyPredicate, valuePredicate); } + @Override public SortedMap<K, V> headMap(final K toKey) { final SortedMap<K, V> map = getSortedMap().headMap(toKey); return new PredicatedSortedMap<K, V>(map, keyPredicate, valuePredicate); } + @Override public SortedMap<K, V> tailMap(final K fromKey) { final SortedMap<K, V> map = getSortedMap().tailMap(fromKey); return new PredicatedSortedMap<K, V>(map, keyPredicate, valuePredicate); http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/map/SingletonMap.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/map/SingletonMap.java b/src/main/java/org/apache/commons/collections4/map/SingletonMap.java index a3362fe..342d4eb 100644 --- a/src/main/java/org/apache/commons/collections4/map/SingletonMap.java +++ b/src/main/java/org/apache/commons/collections4/map/SingletonMap.java @@ -133,6 +133,7 @@ public class SingletonMap<K, V> * * @return the key */ + @Override public K getKey() { return key; } @@ -142,6 +143,7 @@ public class SingletonMap<K, V> * * @return the value */ + @Override public V getValue() { return value; } @@ -165,6 +167,7 @@ public class SingletonMap<K, V> * * @return true always */ + @Override public boolean isFull() { return true; } @@ -174,6 +177,7 @@ public class SingletonMap<K, V> * * @return 1 always */ + @Override public int maxSize() { return 1; } @@ -186,6 +190,7 @@ public class SingletonMap<K, V> * @param key the key * @return the mapped value, null if no match */ + @Override public V get(final Object key) { if (isEqualKey(key)) { return value; @@ -198,6 +203,7 @@ public class SingletonMap<K, V> * * @return the size of 1 */ + @Override public int size() { return 1; } @@ -207,6 +213,7 @@ public class SingletonMap<K, V> * * @return false always */ + @Override public boolean isEmpty() { return false; } @@ -218,6 +225,7 @@ public class SingletonMap<K, V> * @param key the key to search for * @return true if the map contains the key */ + @Override public boolean containsKey(final Object key) { return isEqualKey(key); } @@ -228,6 +236,7 @@ public class SingletonMap<K, V> * @param value the value to search for * @return true if the map contains the key */ + @Override public boolean containsValue(final Object value) { return isEqualValue(value); } @@ -244,6 +253,7 @@ public class SingletonMap<K, V> * @return the value previously mapped to this key, null if none * @throws IllegalArgumentException if the key does not match */ + @Override public V put(final K key, final V value) { if (isEqualKey(key)) { return setValue(value); @@ -262,6 +272,7 @@ public class SingletonMap<K, V> * @throws NullPointerException if the map is null * @throws IllegalArgumentException if the key does not match */ + @Override public void putAll(final Map<? extends K, ? extends V> map) { switch (map.size()) { case 0: @@ -284,6 +295,7 @@ public class SingletonMap<K, V> * @return the value mapped to the removed key, null if key not in map * @throws UnsupportedOperationException always */ + @Override public V remove(final Object key) { throw new UnsupportedOperationException(); } @@ -291,6 +303,7 @@ public class SingletonMap<K, V> /** * Unsupported operation. */ + @Override public void clear() { throw new UnsupportedOperationException(); } @@ -303,6 +316,7 @@ public class SingletonMap<K, V> * * @return the entrySet view */ + @Override public Set<Map.Entry<K, V>> entrySet() { final Map.Entry<K, V> entry = new TiedMapEntry<K, V>(this, getKey()); return Collections.singleton(entry); @@ -315,6 +329,7 @@ public class SingletonMap<K, V> * * @return the keySet view */ + @Override public Set<K> keySet() { return Collections.singleton(key); } @@ -326,6 +341,7 @@ public class SingletonMap<K, V> * * @return the values view */ + @Override public Collection<V> values() { return new SingletonValues<V>(this); } @@ -333,6 +349,7 @@ public class SingletonMap<K, V> /** * {@inheritDoc} */ + @Override public OrderedMapIterator<K, V> mapIterator() { return new SingletonMapIterator<K, V>(this); } @@ -342,6 +359,7 @@ public class SingletonMap<K, V> * * @return the key */ + @Override public K firstKey() { return getKey(); } @@ -351,6 +369,7 @@ public class SingletonMap<K, V> * * @return the key */ + @Override public K lastKey() { return getKey(); } @@ -361,6 +380,7 @@ public class SingletonMap<K, V> * @param key the next key * @return null always */ + @Override public K nextKey(final K key) { return null; } @@ -371,6 +391,7 @@ public class SingletonMap<K, V> * @param key the next key * @return null always */ + @Override public K previousKey(final K key) { return null; } @@ -410,10 +431,12 @@ public class SingletonMap<K, V> this.parent = parent; } + @Override public boolean hasNext() { return hasNext; } + @Override public K next() { if (hasNext == false) { throw new NoSuchElementException(AbstractHashedMap.NO_NEXT_ENTRY); @@ -423,10 +446,12 @@ public class SingletonMap<K, V> return parent.getKey(); } + @Override public boolean hasPrevious() { return hasNext == false; } + @Override public K previous() { if (hasNext == true) { throw new NoSuchElementException(AbstractHashedMap.NO_PREVIOUS_ENTRY); @@ -435,10 +460,12 @@ public class SingletonMap<K, V> return parent.getKey(); } + @Override public void remove() { throw new UnsupportedOperationException(); } + @Override public K getKey() { if (canGetSet == false) { throw new IllegalStateException(AbstractHashedMap.GETKEY_INVALID); @@ -446,6 +473,7 @@ public class SingletonMap<K, V> return parent.getKey(); } + @Override public V getValue() { if (canGetSet == false) { throw new IllegalStateException(AbstractHashedMap.GETVALUE_INVALID); @@ -453,6 +481,7 @@ public class SingletonMap<K, V> return parent.getValue(); } + @Override public V setValue(final V value) { if (canGetSet == false) { throw new IllegalStateException(AbstractHashedMap.SETVALUE_INVALID); @@ -460,6 +489,7 @@ public class SingletonMap<K, V> return parent.setValue(value); } + @Override public void reset() { hasNext = true; } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java b/src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java index 7921e71..10bb1d7 100644 --- a/src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java +++ b/src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java @@ -171,6 +171,7 @@ public final class StaticBucketMap<K, V> extends AbstractIterableMap<K, V> { * * @return the current size */ + @Override public int size() { int cnt = 0; @@ -187,6 +188,7 @@ public final class StaticBucketMap<K, V> extends AbstractIterableMap<K, V> { * * @return true if empty */ + @Override public boolean isEmpty() { return (size() == 0); } @@ -197,6 +199,7 @@ public final class StaticBucketMap<K, V> extends AbstractIterableMap<K, V> { * @param key the key to retrieve * @return the associated value */ + @Override public V get(final Object key) { final int hash = getHash(key); @@ -220,6 +223,7 @@ public final class StaticBucketMap<K, V> extends AbstractIterableMap<K, V> { * @param key the key to check * @return true if found */ + @Override public boolean containsKey(final Object key) { final int hash = getHash(key); @@ -243,6 +247,7 @@ public final class StaticBucketMap<K, V> extends AbstractIterableMap<K, V> { * @param value the value to check * @return true if found */ + @Override public boolean containsValue(final Object value) { for (int i = 0; i < buckets.length; i++) { synchronized (locks[i]) { @@ -268,6 +273,7 @@ public final class StaticBucketMap<K, V> extends AbstractIterableMap<K, V> { * @param value the value to use * @return the previous mapping for the key */ + @Override public V put(final K key, final V value) { final int hash = getHash(key); @@ -313,6 +319,7 @@ public final class StaticBucketMap<K, V> extends AbstractIterableMap<K, V> { * @param key the key to remove * @return the previous value at this key */ + @Override public V remove(final Object key) { final int hash = getHash(key); @@ -347,6 +354,7 @@ public final class StaticBucketMap<K, V> extends AbstractIterableMap<K, V> { * * @return the key set */ + @Override public Set<K> keySet() { return new KeySet(); } @@ -356,6 +364,7 @@ public final class StaticBucketMap<K, V> extends AbstractIterableMap<K, V> { * * @return the values */ + @Override public Collection<V> values() { return new Values(); } @@ -365,6 +374,7 @@ public final class StaticBucketMap<K, V> extends AbstractIterableMap<K, V> { * * @return the entry set */ + @Override public Set<Map.Entry<K, V>> entrySet() { return new EntrySet(); } @@ -376,6 +386,7 @@ public final class StaticBucketMap<K, V> extends AbstractIterableMap<K, V> { * * @param map the map of entries to add */ + @Override public void putAll(final Map<? extends K, ? extends V> map) { for (final Map.Entry<? extends K, ? extends V> entry : map.entrySet()) { put(entry.getKey(), entry.getValue()); @@ -385,6 +396,7 @@ public final class StaticBucketMap<K, V> extends AbstractIterableMap<K, V> { /** * Clears the map of all entries. */ + @Override public void clear() { for (int i = 0; i < buckets.length; i++) { final Lock lock = locks[i]; @@ -444,10 +456,12 @@ public final class StaticBucketMap<K, V> extends AbstractIterableMap<K, V> { protected V value; protected Node<K, V> next; + @Override public K getKey() { return key; } + @Override public V getValue() { return value; } @@ -473,6 +487,7 @@ public final class StaticBucketMap<K, V> extends AbstractIterableMap<K, V> { (value == null ? e2.getValue() == null : value.equals(e2.getValue()))); } + @Override public V setValue(final V obj) { final V retVal = value; value = obj; @@ -532,6 +547,7 @@ public final class StaticBucketMap<K, V> extends AbstractIterableMap<K, V> { private class EntryIterator extends BaseIterator implements Iterator<Map.Entry<K, V>> { + @Override public Map.Entry<K, V> next() { return nextEntry(); } @@ -540,6 +556,7 @@ public final class StaticBucketMap<K, V> extends AbstractIterableMap<K, V> { private class ValueIterator extends BaseIterator implements Iterator<V> { + @Override public V next() { return nextEntry().getValue(); } @@ -548,6 +565,7 @@ public final class StaticBucketMap<K, V> extends AbstractIterableMap<K, V> { private class KeyIterator extends BaseIterator implements Iterator<K> { + @Override public K next() { return nextEntry().getKey(); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/map/TransformedSortedMap.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/map/TransformedSortedMap.java b/src/main/java/org/apache/commons/collections4/map/TransformedSortedMap.java index 6044d33..5675611 100644 --- a/src/main/java/org/apache/commons/collections4/map/TransformedSortedMap.java +++ b/src/main/java/org/apache/commons/collections4/map/TransformedSortedMap.java @@ -129,28 +129,34 @@ public class TransformedSortedMap<K, V> } //----------------------------------------------------------------------- + @Override public K firstKey() { return getSortedMap().firstKey(); } + @Override public K lastKey() { return getSortedMap().lastKey(); } + @Override public Comparator<? super K> comparator() { return getSortedMap().comparator(); } + @Override public SortedMap<K, V> subMap(final K fromKey, final K toKey) { final SortedMap<K, V> map = getSortedMap().subMap(fromKey, toKey); return new TransformedSortedMap<K, V>(map, keyTransformer, valueTransformer); } + @Override public SortedMap<K, V> headMap(final K toKey) { final SortedMap<K, V> map = getSortedMap().headMap(toKey); return new TransformedSortedMap<K, V>(map, keyTransformer, valueTransformer); } + @Override public SortedMap<K, V> tailMap(final K fromKey) { final SortedMap<K, V> map = getSortedMap().tailMap(fromKey); return new TransformedSortedMap<K, V>(map, keyTransformer, valueTransformer); http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/queue/AbstractQueueDecorator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/queue/AbstractQueueDecorator.java b/src/main/java/org/apache/commons/collections4/queue/AbstractQueueDecorator.java index a98dbbd..3801757 100644 --- a/src/main/java/org/apache/commons/collections4/queue/AbstractQueueDecorator.java +++ b/src/main/java/org/apache/commons/collections4/queue/AbstractQueueDecorator.java @@ -70,22 +70,27 @@ public abstract class AbstractQueueDecorator<E> extends AbstractCollectionDecora //----------------------------------------------------------------------- + @Override public boolean offer(final E obj) { return decorated().offer(obj); } + @Override public E poll() { return decorated().poll(); } + @Override public E peek() { return decorated().peek(); } + @Override public E element() { return decorated().element(); } + @Override public E remove() { return decorated().remove(); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/queue/CircularFifoQueue.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/queue/CircularFifoQueue.java b/src/main/java/org/apache/commons/collections4/queue/CircularFifoQueue.java index 0ce1b75..3b098b3 100644 --- a/src/main/java/org/apache/commons/collections4/queue/CircularFifoQueue.java +++ b/src/main/java/org/apache/commons/collections4/queue/CircularFifoQueue.java @@ -185,6 +185,7 @@ public class CircularFifoQueue<E> extends AbstractCollection<E> * * @return always returns {@code false} */ + @Override public boolean isFull() { return false; } @@ -205,6 +206,7 @@ public class CircularFifoQueue<E> extends AbstractCollection<E> * * @return the maximum number of elements the collection can hold */ + @Override public int maxSize() { return maxElements; } @@ -280,10 +282,12 @@ public class CircularFifoQueue<E> extends AbstractCollection<E> * @return true, always * @throws NullPointerException if the given element is null */ + @Override public boolean offer(E element) { return add(element); } + @Override public E poll() { if (isEmpty()) { return null; @@ -291,6 +295,7 @@ public class CircularFifoQueue<E> extends AbstractCollection<E> return remove(); } + @Override public E element() { if (isEmpty()) { throw new NoSuchElementException("queue is empty"); @@ -298,6 +303,7 @@ public class CircularFifoQueue<E> extends AbstractCollection<E> return peek(); } + @Override public E peek() { if (isEmpty()) { return null; @@ -305,6 +311,7 @@ public class CircularFifoQueue<E> extends AbstractCollection<E> return elements[start]; } + @Override public E remove() { if (isEmpty()) { throw new NoSuchElementException("queue is empty"); @@ -364,10 +371,12 @@ public class CircularFifoQueue<E> extends AbstractCollection<E> private int lastReturnedIndex = -1; private boolean isFirst = full; + @Override public boolean hasNext() { return isFirst || index != end; } + @Override public E next() { if (!hasNext()) { throw new NoSuchElementException(); @@ -378,6 +387,7 @@ public class CircularFifoQueue<E> extends AbstractCollection<E> return elements[lastReturnedIndex]; } + @Override public void remove() { if (lastReturnedIndex == -1) { throw new IllegalStateException(); http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/queue/PredicatedQueue.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/queue/PredicatedQueue.java b/src/main/java/org/apache/commons/collections4/queue/PredicatedQueue.java index 3f35e87..334edd3 100644 --- a/src/main/java/org/apache/commons/collections4/queue/PredicatedQueue.java +++ b/src/main/java/org/apache/commons/collections4/queue/PredicatedQueue.java @@ -94,23 +94,28 @@ public class PredicatedQueue<E> extends PredicatedCollection<E> implements Queue * @return the result of adding to the underlying queue * @throws IllegalArgumentException if the add is invalid */ + @Override public boolean offer(final E object) { validate(object); return decorated().offer(object); } + @Override public E poll() { return decorated().poll(); } + @Override public E peek() { return decorated().peek(); } + @Override public E element() { return decorated().element(); } + @Override public E remove() { return decorated().remove(); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/queue/TransformedQueue.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/queue/TransformedQueue.java b/src/main/java/org/apache/commons/collections4/queue/TransformedQueue.java index c314c05..0f321d7 100644 --- a/src/main/java/org/apache/commons/collections4/queue/TransformedQueue.java +++ b/src/main/java/org/apache/commons/collections4/queue/TransformedQueue.java @@ -111,22 +111,27 @@ public class TransformedQueue<E> extends TransformedCollection<E> implements Que //----------------------------------------------------------------------- + @Override public boolean offer(final E obj) { return getQueue().offer(transform(obj)); } + @Override public E poll() { return getQueue().poll(); } + @Override public E peek() { return getQueue().peek(); } + @Override public E element() { return getQueue().element(); } + @Override public E remove() { return getQueue().remove(); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/sequence/ReplacementsFinder.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/sequence/ReplacementsFinder.java b/src/main/java/org/apache/commons/collections4/sequence/ReplacementsFinder.java index c815c1c..35e562e 100644 --- a/src/main/java/org/apache/commons/collections4/sequence/ReplacementsFinder.java +++ b/src/main/java/org/apache/commons/collections4/sequence/ReplacementsFinder.java @@ -74,6 +74,7 @@ public class ReplacementsFinder<T> implements CommandVisitor<T> { * * @param object object to insert */ + @Override public void visitInsertCommand(final T object) { pendingInsertions.add(object); } @@ -86,6 +87,7 @@ public class ReplacementsFinder<T> implements CommandVisitor<T> { * * @param object synchronization object detected */ + @Override public void visitKeepCommand(final T object) { if (pendingDeletions.isEmpty() && pendingInsertions.isEmpty()) { ++skipped; @@ -102,6 +104,7 @@ public class ReplacementsFinder<T> implements CommandVisitor<T> { * * @param object object to delete */ + @Override public void visitDeleteCommand(final T object) { pendingDeletions.add(object); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/set/AbstractSortedSetDecorator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/set/AbstractSortedSetDecorator.java b/src/main/java/org/apache/commons/collections4/set/AbstractSortedSetDecorator.java index 44818ae..f3123ab 100644 --- a/src/main/java/org/apache/commons/collections4/set/AbstractSortedSetDecorator.java +++ b/src/main/java/org/apache/commons/collections4/set/AbstractSortedSetDecorator.java @@ -65,26 +65,32 @@ public abstract class AbstractSortedSetDecorator<E> } //----------------------------------------------------------------------- + @Override public SortedSet<E> subSet(final E fromElement, final E toElement) { return decorated().subSet(fromElement, toElement); } + @Override public SortedSet<E> headSet(final E toElement) { return decorated().headSet(toElement); } + @Override public SortedSet<E> tailSet(final E fromElement) { return decorated().tailSet(fromElement); } + @Override public E first() { return decorated().first(); } + @Override public E last() { return decorated().last(); } + @Override public Comparator<? super E> comparator() { return decorated().comparator(); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/set/CompositeSet.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/set/CompositeSet.java b/src/main/java/org/apache/commons/collections4/set/CompositeSet.java index 8260273..22eccc1 100644 --- a/src/main/java/org/apache/commons/collections4/set/CompositeSet.java +++ b/src/main/java/org/apache/commons/collections4/set/CompositeSet.java @@ -92,6 +92,7 @@ public class CompositeSet<E> implements Set<E>, Serializable { * * @return total number of elements in all contained containers */ + @Override public int size() { int size = 0; for (final Set<E> item : all) { @@ -107,6 +108,7 @@ public class CompositeSet<E> implements Set<E>, Serializable { * * @return true if all of the contained sets are empty */ + @Override public boolean isEmpty() { for (final Set<E> item : all) { if (item.isEmpty() == false) { @@ -124,6 +126,7 @@ public class CompositeSet<E> implements Set<E>, Serializable { * @param obj the object to search for * @return true if obj is contained in any of the contained sets */ + @Override public boolean contains(final Object obj) { for (final Set<E> item : all) { if (item.contains(obj)) { @@ -143,6 +146,7 @@ public class CompositeSet<E> implements Set<E>, Serializable { * the order they were added, but this behavior should not be relied upon. * @see IteratorChain */ + @Override public Iterator<E> iterator() { if (all.isEmpty()) { return EmptyIterator.<E>emptyIterator(); @@ -159,6 +163,7 @@ public class CompositeSet<E> implements Set<E>, Serializable { * * @return an object array of all the elements in the collection */ + @Override public Object[] toArray() { final Object[] result = new Object[size()]; int i = 0; @@ -176,6 +181,7 @@ public class CompositeSet<E> implements Set<E>, Serializable { * @param array the array to use, populating if possible * @return an array of all the elements in the collection */ + @Override @SuppressWarnings("unchecked") public <T> T[] toArray(final T[] array) { final int size = size(); @@ -209,6 +215,7 @@ public class CompositeSet<E> implements Set<E>, Serializable { * @throws NullPointerException if the object cannot be added because its null * @throws IllegalArgumentException if the object cannot be added */ + @Override public boolean add(final E obj) { if (mutator == null) { throw new UnsupportedOperationException( @@ -224,6 +231,7 @@ public class CompositeSet<E> implements Set<E>, Serializable { * @param obj object to be removed * @return true if the object is removed, false otherwise */ + @Override public boolean remove(final Object obj) { for (final Set<E> set : getSets()) { if (set.contains(obj)) { @@ -242,6 +250,7 @@ public class CompositeSet<E> implements Set<E>, Serializable { * @param coll the collection to check for * @return true if all elements contained */ + @Override public boolean containsAll(final Collection<?> coll) { for (final Object item : coll) { if (contains(item) == false) { @@ -262,6 +271,7 @@ public class CompositeSet<E> implements Set<E>, Serializable { * @throws NullPointerException if the object cannot be added because its null * @throws IllegalArgumentException if the object cannot be added */ + @Override public boolean addAll(final Collection<? extends E> coll) { if (mutator == null) { throw new UnsupportedOperationException( @@ -279,6 +289,7 @@ public class CompositeSet<E> implements Set<E>, Serializable { * @return true if the composite was modified * @throws UnsupportedOperationException if removeAll is unsupported */ + @Override public boolean removeAll(final Collection<?> coll) { if (coll.size() == 0) { return false; @@ -300,6 +311,7 @@ public class CompositeSet<E> implements Set<E>, Serializable { * @return true if the composite was modified * @throws UnsupportedOperationException if retainAll is unsupported */ + @Override public boolean retainAll(final Collection<?> coll) { boolean changed = false; for (final Collection<E> item : all) { @@ -315,6 +327,7 @@ public class CompositeSet<E> implements Set<E>, Serializable { * * @throws UnsupportedOperationException if clear is unsupported */ + @Override public void clear() { for (final Collection<E> coll : all) { coll.clear(); http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java b/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java index 14fe6c0..41f6315 100644 --- a/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java +++ b/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java @@ -396,10 +396,12 @@ public class ListOrderedSet<E> last = null; } + @Override public boolean hasPrevious() { return ((ListIterator<E>) getIterator()).hasPrevious(); } + @Override public E previous() { last = ((ListIterator<E>) getIterator()).previous(); return last; http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/set/MapBackedSet.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/set/MapBackedSet.java b/src/main/java/org/apache/commons/collections4/set/MapBackedSet.java index f1a4f13..0b6182c 100644 --- a/src/main/java/org/apache/commons/collections4/set/MapBackedSet.java +++ b/src/main/java/org/apache/commons/collections4/set/MapBackedSet.java @@ -93,32 +93,39 @@ public final class MapBackedSet<E, V> implements Set<E>, Serializable { } //----------------------------------------------------------------------- + @Override public int size() { return map.size(); } + @Override public boolean isEmpty() { return map.isEmpty(); } + @Override public Iterator<E> iterator() { return map.keySet().iterator(); } + @Override public boolean contains(final Object obj) { return map.containsKey(obj); } + @Override public boolean containsAll(final Collection<?> coll) { return map.keySet().containsAll(coll); } + @Override public boolean add(final E obj) { final int size = map.size(); map.put(obj, dummyValue); return map.size() != size; } + @Override public boolean addAll(final Collection<? extends E> coll) { final int size = map.size(); for (final E e : coll) { @@ -127,28 +134,34 @@ public final class MapBackedSet<E, V> implements Set<E>, Serializable { return map.size() != size; } + @Override public boolean remove(final Object obj) { final int size = map.size(); map.remove(obj); return map.size() != size; } + @Override public boolean removeAll(final Collection<?> coll) { return map.keySet().removeAll(coll); } + @Override public boolean retainAll(final Collection<?> coll) { return map.keySet().retainAll(coll); } + @Override public void clear() { map.clear(); } + @Override public Object[] toArray() { return map.keySet().toArray(); } + @Override public <T> T[] toArray(final T[] array) { return map.keySet().toArray(array); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/set/PredicatedSortedSet.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/set/PredicatedSortedSet.java b/src/main/java/org/apache/commons/collections4/set/PredicatedSortedSet.java index 0610a64..631a451 100644 --- a/src/main/java/org/apache/commons/collections4/set/PredicatedSortedSet.java +++ b/src/main/java/org/apache/commons/collections4/set/PredicatedSortedSet.java @@ -92,28 +92,34 @@ public class PredicatedSortedSet<E> extends PredicatedSet<E> implements SortedSe } //----------------------------------------------------------------------- + @Override public Comparator<? super E> comparator() { return decorated().comparator(); } + @Override public E first() { return decorated().first(); } + @Override public E last() { return decorated().last(); } + @Override public SortedSet<E> subSet(final E fromElement, final E toElement) { final SortedSet<E> sub = decorated().subSet(fromElement, toElement); return new PredicatedSortedSet<E>(sub, predicate); } + @Override public SortedSet<E> headSet(final E toElement) { final SortedSet<E> head = decorated().headSet(toElement); return new PredicatedSortedSet<E>(head, predicate); } + @Override public SortedSet<E> tailSet(final E fromElement) { final SortedSet<E> tail = decorated().tailSet(fromElement); return new PredicatedSortedSet<E>(tail, predicate); http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/set/TransformedSortedSet.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/set/TransformedSortedSet.java b/src/main/java/org/apache/commons/collections4/set/TransformedSortedSet.java index 29ae3fd..05d8fdd 100644 --- a/src/main/java/org/apache/commons/collections4/set/TransformedSortedSet.java +++ b/src/main/java/org/apache/commons/collections4/set/TransformedSortedSet.java @@ -113,29 +113,35 @@ public class TransformedSortedSet<E> extends TransformedSet<E> implements Sorted } //----------------------------------------------------------------------- + @Override public E first() { return getSortedSet().first(); } + @Override public E last() { return getSortedSet().last(); } + @Override public Comparator<? super E> comparator() { return getSortedSet().comparator(); } //----------------------------------------------------------------------- + @Override public SortedSet<E> subSet(final E fromElement, final E toElement) { final SortedSet<E> set = getSortedSet().subSet(fromElement, toElement); return new TransformedSortedSet<E>(set, transformer); } + @Override public SortedSet<E> headSet(final E toElement) { final SortedSet<E> set = getSortedSet().headSet(toElement); return new TransformedSortedSet<E>(set, transformer); } + @Override public SortedSet<E> tailSet(final E fromElement) { final SortedSet<E> set = getSortedSet().tailSet(fromElement); return new TransformedSortedSet<E>(set, transformer); http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java b/src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java index 0802637..22ebfc5 100644 --- a/src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java +++ b/src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java @@ -64,38 +64,47 @@ public class AbstractIterableGetMapDecorator<K, V> implements IterableGet<K, V> return map; } + @Override public boolean containsKey(final Object key) { return decorated().containsKey(key); } + @Override public boolean containsValue(final Object value) { return decorated().containsValue(value); } + @Override public Set<Map.Entry<K, V>> entrySet() { return decorated().entrySet(); } + @Override public V get(final Object key) { return decorated().get(key); } + @Override public V remove(final Object key) { return decorated().remove(key); } + @Override public boolean isEmpty() { return decorated().isEmpty(); } + @Override public Set<K> keySet() { return decorated().keySet(); } + @Override public int size() { return decorated().size(); } + @Override public Collection<V> values() { return decorated().values(); } @@ -104,6 +113,7 @@ public class AbstractIterableGetMapDecorator<K, V> implements IterableGet<K, V> * Get a MapIterator over this Get. * @return MapIterator<K, V> */ + @Override public MapIterator<K, V> mapIterator() { return new EntrySetToMapIteratorAdapter<K, V>(entrySet()); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/splitmap/TransformedSplitMap.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/splitmap/TransformedSplitMap.java b/src/main/java/org/apache/commons/collections4/splitmap/TransformedSplitMap.java index cb67c45..35e7491 100644 --- a/src/main/java/org/apache/commons/collections4/splitmap/TransformedSplitMap.java +++ b/src/main/java/org/apache/commons/collections4/splitmap/TransformedSplitMap.java @@ -199,14 +199,17 @@ public class TransformedSplitMap<J, K, U, V> extends AbstractIterableGetMapDecor } //----------------------------------------------------------------------- + @Override public V put(final J key, final U value) { return decorated().put(transformKey(key), transformValue(value)); } + @Override public void putAll(final Map<? extends J, ? extends U> mapToCopy) { decorated().putAll(transformMap(mapToCopy)); } + @Override public void clear() { decorated().clear(); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/trie/AbstractBitwiseTrie.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/trie/AbstractBitwiseTrie.java b/src/main/java/org/apache/commons/collections4/trie/AbstractBitwiseTrie.java index 79a3be6..7224120 100644 --- a/src/main/java/org/apache/commons/collections4/trie/AbstractBitwiseTrie.java +++ b/src/main/java/org/apache/commons/collections4/trie/AbstractBitwiseTrie.java @@ -169,14 +169,17 @@ public abstract class AbstractBitwiseTrie<K, V> extends AbstractMap<K, V> return setValue(value); } + @Override public K getKey() { return key; } + @Override public V getValue() { return value; } + @Override public V setValue(final V value) { final V previous = this.value; this.value = value; http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java b/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java index 613eade..be779ea 100644 --- a/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java +++ b/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java @@ -771,10 +771,12 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> { //----------------------------------------------------------------------- + @Override public Comparator<? super K> comparator() { return getKeyAnalyzer(); } + @Override public K firstKey() { if (size() == 0) { throw new NoSuchElementException(); @@ -782,6 +784,7 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> { return firstEntry().getKey(); } + @Override public K lastKey() { final TrieEntry<K, V> entry = lastEntry(); if (entry != null) { @@ -790,6 +793,7 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> { throw new NoSuchElementException(); } + @Override public K nextKey(final K key) { if (key == null) { throw new NullPointerException(); @@ -802,6 +806,7 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> { return null; } + @Override public K previousKey(final K key) { if (key == null) { throw new NullPointerException(); @@ -814,10 +819,12 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> { return null; } + @Override public OrderedMapIterator<K, V> mapIterator() { return new TrieMapIterator(); } + @Override public SortedMap<K, V> prefixMap(final K key) { return getPrefixMapByBits(key, 0, lengthInBits(key)); } @@ -858,14 +865,17 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> { return new PrefixRangeMap(key, offsetInBits, lengthInBits); } + @Override public SortedMap<K, V> headMap(final K toKey) { return new RangeEntryMap(null, toKey); } + @Override public SortedMap<K, V> subMap(final K fromKey, final K toKey) { return new RangeEntryMap(fromKey, toKey); } + @Override public SortedMap<K, V> tailMap(final K fromKey) { return new RangeEntryMap(fromKey, null); } @@ -1422,6 +1432,7 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> { * An {@link Iterator} that returns {@link Entry} Objects. */ private class EntryIterator extends TrieIterator<Map.Entry<K,V>> { + @Override public Map.Entry<K,V> next() { return nextEntry(); } @@ -1464,6 +1475,7 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> { * An {@link Iterator} that returns Key Objects. */ private class KeyIterator extends TrieIterator<K> { + @Override public K next() { return nextEntry().getKey(); } @@ -1511,6 +1523,7 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> { * An {@link Iterator} that returns Value Objects. */ private class ValueIterator extends TrieIterator<V> { + @Override public V next() { return nextEntry().getValue(); } @@ -1567,10 +1580,12 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> { return AbstractPatriciaTrie.this.nextEntry(prior); } + @Override public boolean hasNext() { return next != null; } + @Override public void remove() { if (current == null) { throw new IllegalStateException(); @@ -1595,10 +1610,12 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> { protected TrieEntry<K, V> previous; // the previous node to return + @Override public K next() { return nextEntry().getKey(); } + @Override public K getKey() { if (current == null) { throw new IllegalStateException(); @@ -1606,6 +1623,7 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> { return current.getKey(); } + @Override public V getValue() { if (current == null) { throw new IllegalStateException(); @@ -1613,6 +1631,7 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> { return current.getValue(); } + @Override public V setValue(final V value) { if (current == null) { throw new IllegalStateException(); @@ -1620,10 +1639,12 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> { return current.setValue(value); } + @Override public boolean hasPrevious() { return previous != null; } + @Override public K previous() { return previousEntry().getKey(); } @@ -1687,6 +1708,7 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> { */ protected abstract boolean isToInclusive(); + @Override public Comparator<? super K> comparator() { return AbstractPatriciaTrie.this.comparator(); } @@ -1734,6 +1756,7 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> { return entrySet; } + @Override public SortedMap<K, V> subMap(final K fromKey, final K toKey) { if (!inRange2(fromKey)) { throw new IllegalArgumentException("FromKey is out of range: " + fromKey); @@ -1746,6 +1769,7 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> { return createRangeMap(fromKey, isFromInclusive(), toKey, isToInclusive()); } + @Override public SortedMap<K, V> headMap(final K toKey) { if (!inRange2(toKey)) { throw new IllegalArgumentException("ToKey is out of range: " + toKey); @@ -1753,6 +1777,7 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> { return createRangeMap(getFromKey(), isFromInclusive(), toKey, isToInclusive()); } + @Override public SortedMap<K, V> tailMap(final K fromKey) { if (!inRange2(fromKey)) { throw new IllegalArgumentException("FromKey is out of range: " + fromKey); @@ -1860,7 +1885,8 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> { this.toInclusive = toInclusive; } - public K firstKey() { + @Override + public K firstKey() { Map.Entry<K,V> e = null; if (fromKey == null) { e = firstEntry(); @@ -1879,7 +1905,8 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> { return first; } - public K lastKey() { + @Override + public K lastKey() { Map.Entry<K,V> e; if (toKey == null) { e = lastEntry(); @@ -2049,6 +2076,7 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> { return next != null && !compare(next.key, excludedKey); } + @Override public Map.Entry<K,V> next() { if (next == null || compare(next.key, excludedKey)) { throw new NoSuchElementException(); @@ -2130,6 +2158,7 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> { return size; } + @Override public K firstKey() { fixup(); @@ -2148,6 +2177,7 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> { return first; } + @Override public K lastKey() { fixup(); @@ -2284,10 +2314,12 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> { this.entry = entry; } + @Override public boolean hasNext() { return hit == 0; } + @Override public Map.Entry<K, V> next() { if (hit != 0) { throw new NoSuchElementException(); @@ -2297,6 +2329,7 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> { return entry; } + @Override public void remove() { if (hit != 1) { throw new IllegalStateException(); @@ -2333,6 +2366,7 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> { this.lengthInBits = lengthInBits; } + @Override public Map.Entry<K,V> next() { final Map.Entry<K, V> entry = nextEntry(); if (lastOne) { http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/trie/KeyAnalyzer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/trie/KeyAnalyzer.java b/src/main/java/org/apache/commons/collections4/trie/KeyAnalyzer.java index bd4176a..699eddf 100644 --- a/src/main/java/org/apache/commons/collections4/trie/KeyAnalyzer.java +++ b/src/main/java/org/apache/commons/collections4/trie/KeyAnalyzer.java @@ -134,6 +134,7 @@ public abstract class KeyAnalyzer<K> implements Comparator<K>, Serializable { */ public abstract boolean isPrefix(K prefix, int offsetInBits, int lengthInBits, K key); + @Override @SuppressWarnings("unchecked") public int compare(final K o1, final K o2) { if (o1 == null) { http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/main/java/org/apache/commons/collections4/trie/UnmodifiableTrie.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/trie/UnmodifiableTrie.java b/src/main/java/org/apache/commons/collections4/trie/UnmodifiableTrie.java index 3776fec..596abf6 100644 --- a/src/main/java/org/apache/commons/collections4/trie/UnmodifiableTrie.java +++ b/src/main/java/org/apache/commons/collections4/trie/UnmodifiableTrie.java @@ -78,92 +78,114 @@ public class UnmodifiableTrie<K, V> implements Trie<K, V>, Serializable, Unmodif //----------------------------------------------------------------------- + @Override public Set<Entry<K, V>> entrySet() { return Collections.unmodifiableSet(delegate.entrySet()); } + @Override public Set<K> keySet() { return Collections.unmodifiableSet(delegate.keySet()); } + @Override public Collection<V> values() { return Collections.unmodifiableCollection(delegate.values()); } + @Override public void clear() { throw new UnsupportedOperationException(); } + @Override public boolean containsKey(final Object key) { return delegate.containsKey(key); } + @Override public boolean containsValue(final Object value) { return delegate.containsValue(value); } + @Override public V get(final Object key) { return delegate.get(key); } + @Override public boolean isEmpty() { return delegate.isEmpty(); } + @Override public V put(final K key, final V value) { throw new UnsupportedOperationException(); } + @Override public void putAll(final Map<? extends K, ? extends V> m) { throw new UnsupportedOperationException(); } + @Override public V remove(final Object key) { throw new UnsupportedOperationException(); } + @Override public int size() { return delegate.size(); } + @Override public K firstKey() { return delegate.firstKey(); } + @Override public SortedMap<K, V> headMap(final K toKey) { return Collections.unmodifiableSortedMap(delegate.headMap(toKey)); } + @Override public K lastKey() { return delegate.lastKey(); } + @Override public SortedMap<K, V> subMap(final K fromKey, final K toKey) { return Collections.unmodifiableSortedMap(delegate.subMap(fromKey, toKey)); } + @Override public SortedMap<K, V> tailMap(final K fromKey) { return Collections.unmodifiableSortedMap(delegate.tailMap(fromKey)); } + @Override public SortedMap<K, V> prefixMap(final K key) { return Collections.unmodifiableSortedMap(delegate.prefixMap(key)); } + @Override public Comparator<? super K> comparator() { return delegate.comparator(); } //----------------------------------------------------------------------- + @Override public OrderedMapIterator<K, V> mapIterator() { final OrderedMapIterator<K, V> it = delegate.mapIterator(); return UnmodifiableOrderedMapIterator.unmodifiableOrderedMapIterator(it); } + @Override public K nextKey(K key) { return delegate.nextKey(key); } + @Override public K previousKey(K key) { return delegate.previousKey(key); } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/test/java/org/apache/commons/collections4/ClosureUtilsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/collections4/ClosureUtilsTest.java b/src/test/java/org/apache/commons/collections4/ClosureUtilsTest.java index d9c2def..7307e7c 100644 --- a/src/test/java/org/apache/commons/collections4/ClosureUtilsTest.java +++ b/src/test/java/org/apache/commons/collections4/ClosureUtilsTest.java @@ -44,6 +44,7 @@ public class ClosureUtilsTest { static class MockClosure<T> implements Closure<T> { int count = 0; + @Override public void execute(final T object) { count++; } @@ -56,6 +57,7 @@ public class ClosureUtilsTest { static class MockTransformer<T> implements Transformer<T, T> { int count = 0; + @Override public T transform(final T object) { count++; return object; http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/test/java/org/apache/commons/collections4/ListUtilsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/collections4/ListUtilsTest.java b/src/test/java/org/apache/commons/collections4/ListUtilsTest.java index 7c43997..12c7cf5 100644 --- a/src/test/java/org/apache/commons/collections4/ListUtilsTest.java +++ b/src/test/java/org/apache/commons/collections4/ListUtilsTest.java @@ -124,6 +124,7 @@ public class ListUtilsTest { @Test public void testPredicatedList() { final Predicate<Object> predicate = new Predicate<Object>() { + @Override public boolean evaluate(final Object o) { return o instanceof String; } @@ -150,6 +151,7 @@ public class ListUtilsTest { private int index; + @Override public Integer create() { index++; return Integer.valueOf(index); @@ -427,6 +429,7 @@ public class ListUtilsTest { } private static Predicate<Number> EQUALS_TWO = new Predicate<Number>() { + @Override public boolean evaluate(final Number input) { return input.intValue() == 2; } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/test/java/org/apache/commons/collections4/MapPerformance.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/collections4/MapPerformance.java b/src/test/java/org/apache/commons/collections4/MapPerformance.java index c2201bf..4b79cc3 100644 --- a/src/test/java/org/apache/commons/collections4/MapPerformance.java +++ b/src/test/java/org/apache/commons/collections4/MapPerformance.java @@ -132,37 +132,49 @@ public class MapPerformance { // ---------------------------------------------------------------------- private static class DummyMap<K, V> implements Map<K, V> { + @Override public void clear() { } + @Override public boolean containsKey(final Object key) { return false; } + @Override public boolean containsValue(final Object value) { return false; } + @Override public Set<Map.Entry<K, V>> entrySet() { return null; } + @Override public V get(final Object key) { return null; } + @Override public boolean isEmpty() { return false; } + @Override public Set<K> keySet() { return null; } + @Override public V put(final K key, final V value) { return null; } + @Override public void putAll(final Map<? extends K, ? extends V> t) { } + @Override public V remove(final Object key) { return null; } + @Override public int size() { return 0; } + @Override public Collection<V> values() { return null; } http://git-wip-us.apache.org/repos/asf/commons-collections/blob/5250fdfd/src/test/java/org/apache/commons/collections4/MapUtilsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/collections4/MapUtilsTest.java b/src/test/java/org/apache/commons/collections4/MapUtilsTest.java index 20b1888..f955a4d 100644 --- a/src/test/java/org/apache/commons/collections4/MapUtilsTest.java +++ b/src/test/java/org/apache/commons/collections4/MapUtilsTest.java @@ -51,6 +51,7 @@ public class MapUtilsTest { public Predicate<Object> getPredicate() { return new Predicate<Object>() { + @Override public boolean evaluate(final Object o) { return o instanceof String; } @@ -107,6 +108,7 @@ public class MapUtilsTest { @Test public void testLazyMapTransformer() { final Map<Object, Object> map = MapUtils.lazyMap(new HashMap<Object, Object>(), new Transformer<Object, Object>() { + @Override public Object transform(final Object mapKey) { if (mapKey instanceof String) { return Integer.valueOf((String) mapKey); @@ -820,6 +822,7 @@ public class MapUtilsTest { this.name = name; } + @Override public int compareTo(X o) { return key - o.key | name.compareTo(o.name); } @@ -839,6 +842,7 @@ public class MapUtilsTest { // Now test key transform population final MultiValueMap<Integer, X> map = MultiValueMap.multiValueMap(new TreeMap<Integer, Collection<X>>()); MapUtils.populateMap(map, list, new Transformer<X, Integer>() { + @Override public Integer transform(X input) { return input.key; }
