diff --git a/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java b/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java index 33cf4548e..114968ae5 100644 --- a/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java +++ b/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java @@ -599,7 +599,7 @@ public abstract class AbstractMapBag implements Bag { */ @Override public String toString() { - if (size() == 0) { + if (isEmpty()) { return "[]"; } final StringBuilder buf = new StringBuilder(); diff --git a/src/main/java/org/apache/commons/collections4/bloomfilter/HasherBloomFilter.java b/src/main/java/org/apache/commons/collections4/bloomfilter/HasherBloomFilter.java index 0b5405bce..71272e65c 100644 --- a/src/main/java/org/apache/commons/collections4/bloomfilter/HasherBloomFilter.java +++ b/src/main/java/org/apache/commons/collections4/bloomfilter/HasherBloomFilter.java @@ -96,7 +96,7 @@ public class HasherBloomFilter extends AbstractBloomFilter { @Override public long[] getBits() { - if (hasher.size() == 0) { + if (hasher.isEmpty()) { return EMPTY; } diff --git a/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/StaticHasher.java b/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/StaticHasher.java index eec96d176..1c028fa72 100644 --- a/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/StaticHasher.java +++ b/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/StaticHasher.java @@ -105,6 +105,15 @@ public final class StaticHasher implements Hasher { return shape; } + /** + * Tests emptiness (size == 0). + * + * @return Whether or not this is empty. + */ + public boolean isEmpty() { + return size() == 0; + } + /** * Gets an iterator of integers that are the bits to enable in the Bloom * filter based on the shape. The iterator will not return the same value multiple diff --git a/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java b/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java index 2153dfdd7..88ebfd9f2 100644 --- a/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java +++ b/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java @@ -251,7 +251,7 @@ public class ComparatorChain implements Comparator, Serializable { * @throws UnsupportedOperationException if the {@link ComparatorChain} is empty */ private void checkChainIntegrity() { - if (comparatorChain.size() == 0) { + if (comparatorChain.isEmpty()) { throw new UnsupportedOperationException("ComparatorChains must contain at least one Comparator"); } } diff --git a/src/main/java/org/apache/commons/collections4/functors/ChainedClosure.java b/src/main/java/org/apache/commons/collections4/functors/ChainedClosure.java index 84730baf9..074baf5d2 100644 --- a/src/main/java/org/apache/commons/collections4/functors/ChainedClosure.java +++ b/src/main/java/org/apache/commons/collections4/functors/ChainedClosure.java @@ -66,7 +66,7 @@ public class ChainedClosure implements Closure, Serializable { @SuppressWarnings("unchecked") public static Closure chainedClosure(final Collection> closures) { Objects.requireNonNull(closures, "closures"); - if (closures.size() == 0) { + if (closures.isEmpty()) { return NOPClosure.nopClosure(); } // convert to array like this to guarantee iterator() ordering diff --git a/src/main/java/org/apache/commons/collections4/functors/ChainedTransformer.java b/src/main/java/org/apache/commons/collections4/functors/ChainedTransformer.java index 3c3e4ba4a..3cc39de68 100644 --- a/src/main/java/org/apache/commons/collections4/functors/ChainedTransformer.java +++ b/src/main/java/org/apache/commons/collections4/functors/ChainedTransformer.java @@ -72,7 +72,7 @@ public class ChainedTransformer implements Transformer, Serializable { public static Transformer chainedTransformer( final Collection> transformers) { Objects.requireNonNull(transformers, "transformers"); - if (transformers.size() == 0) { + if (transformers.isEmpty()) { return NOPTransformer.nopTransformer(); } // convert to array like this to guarantee iterator() ordering diff --git a/src/main/java/org/apache/commons/collections4/functors/SwitchTransformer.java b/src/main/java/org/apache/commons/collections4/functors/SwitchTransformer.java index 2175cce3d..4f5030d94 100644 --- a/src/main/java/org/apache/commons/collections4/functors/SwitchTransformer.java +++ b/src/main/java/org/apache/commons/collections4/functors/SwitchTransformer.java @@ -94,7 +94,7 @@ public class SwitchTransformer implements Transformer, Serializable final Map, ? extends Transformer> map) { Objects.requireNonNull(map, "map"); - if (map.size() == 0) { + if (map.isEmpty()) { return ConstantTransformer.nullTransformer(); } // convert to array like this to guarantee iterator() ordering diff --git a/src/main/java/org/apache/commons/collections4/iterators/LoopingIterator.java b/src/main/java/org/apache/commons/collections4/iterators/LoopingIterator.java index 4c2614b58..df0625e5f 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/LoopingIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/LoopingIterator.java @@ -81,7 +81,7 @@ public class LoopingIterator implements ResettableIterator { */ @Override public E next() { - if (collection.size() == 0) { + if (collection.isEmpty()) { throw new NoSuchElementException("There are no elements for this iterator to loop on"); } if (iterator.hasNext() == false) { diff --git a/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java b/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java index 8954c7083..067c86c32 100644 --- a/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java +++ b/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java @@ -402,7 +402,7 @@ public abstract class AbstractLinkedList implements List { @Override public String toString() { - if (size() == 0) { + if (isEmpty()) { return "[]"; } final StringBuilder buf = new StringBuilder(16 * size()); diff --git a/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java b/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java index 1a5dadadc..84a014d3e 100644 --- a/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java +++ b/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java @@ -276,7 +276,7 @@ public class SetUniqueList extends AbstractSerializableListDecorator { if (result == false) { return false; } - if (set.size() == 0) { + if (set.isEmpty()) { super.clear(); } else { // use the set as parameter for the call to retainAll to improve performance diff --git a/src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java b/src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java index 5e0e8189e..146968c53 100644 --- a/src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java +++ b/src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java @@ -826,7 +826,7 @@ public class AbstractHashedMap extends AbstractMap implements Iterab * @return the entrySet iterator */ protected Iterator> createEntrySetIterator() { - if (size() == 0) { + if (isEmpty()) { return EmptyIterator.>emptyIterator(); } return new EntrySetIterator<>(this); @@ -926,7 +926,7 @@ public class AbstractHashedMap extends AbstractMap implements Iterab * @return the keySet iterator */ protected Iterator createKeySetIterator() { - if (size() == 0) { + if (isEmpty()) { return EmptyIterator.emptyIterator(); } return new KeySetIterator<>(this); @@ -1014,7 +1014,7 @@ public class AbstractHashedMap extends AbstractMap implements Iterab * @return the values iterator */ protected Iterator createValuesIterator() { - if (size() == 0) { + if (isEmpty()) { return EmptyIterator.emptyIterator(); } return new ValuesIterator<>(this); @@ -1387,7 +1387,7 @@ public class AbstractHashedMap extends AbstractMap implements Iterab */ @Override public String toString() { - if (size() == 0) { + if (isEmpty()) { return "{}"; } final StringBuilder buf = new StringBuilder(32 * size()); diff --git a/src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java b/src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java index 8d9ad7c1d..efc5262c7 100644 --- a/src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java +++ b/src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java @@ -410,7 +410,7 @@ public abstract class AbstractLinkedMap extends AbstractHashedMap im */ @Override protected Iterator> createEntrySetIterator() { - if (size() == 0) { + if (isEmpty()) { return EmptyOrderedIterator.>emptyOrderedIterator(); } return new EntrySetIterator<>(this); @@ -446,7 +446,7 @@ public abstract class AbstractLinkedMap extends AbstractHashedMap im */ @Override protected Iterator createKeySetIterator() { - if (size() == 0) { + if (isEmpty()) { return EmptyOrderedIterator.emptyOrderedIterator(); } return new KeySetIterator<>(this); @@ -483,7 +483,7 @@ public abstract class AbstractLinkedMap extends AbstractHashedMap im */ @Override protected Iterator createValuesIterator() { - if (size() == 0) { + if (isEmpty()) { return EmptyOrderedIterator.emptyOrderedIterator(); } return new ValuesIterator<>(this); 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 473d98bca..fcaa424a3 100644 --- a/src/main/java/org/apache/commons/collections4/map/Flat3Map.java +++ b/src/main/java/org/apache/commons/collections4/map/Flat3Map.java @@ -793,7 +793,7 @@ public class Flat3Map implements IterableMap, Serializable, Cloneabl if (parent.delegateMap != null) { return parent.delegateMap.entrySet().iterator(); } - if (parent.size() == 0) { + if (parent.isEmpty()) { return EmptyIterator.>emptyIterator(); } return new EntrySetIterator<>(parent); @@ -1016,7 +1016,7 @@ public class Flat3Map implements IterableMap, Serializable, Cloneabl if (parent.delegateMap != null) { return parent.delegateMap.keySet().iterator(); } - if (parent.size() == 0) { + if (parent.isEmpty()) { return EmptyIterator.emptyIterator(); } return new KeySetIterator<>(parent); @@ -1084,7 +1084,7 @@ public class Flat3Map implements IterableMap, Serializable, Cloneabl if (parent.delegateMap != null) { return parent.delegateMap.values().iterator(); } - if (parent.size() == 0) { + if (parent.isEmpty()) { return EmptyIterator.emptyIterator(); } return new ValuesIterator<>(parent); 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 13234c533..9417b8d5c 100644 --- a/src/main/java/org/apache/commons/collections4/map/ListOrderedMap.java +++ b/src/main/java/org/apache/commons/collections4/map/ListOrderedMap.java @@ -171,7 +171,7 @@ public class ListOrderedMap */ @Override public K firstKey() { - if (size() == 0) { + if (isEmpty()) { throw new NoSuchElementException("Map is empty"); } return insertOrder.get(0); @@ -185,7 +185,7 @@ public class ListOrderedMap */ @Override public K lastKey() { - if (size() == 0) { + if (isEmpty()) { throw new NoSuchElementException("Map is empty"); } return insertOrder.get(size() - 1); diff --git a/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java b/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java index 2a221868f..42b242cde 100644 --- a/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java +++ b/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java @@ -383,7 +383,7 @@ public class MultiValueMap extends AbstractMapDecorator impleme * @return true if this map changed */ public boolean putAll(final K key, final Collection values) { - if (values == null || values.size() == 0) { + if (values == null || values.isEmpty()) { return false; } boolean result = false; 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 8a2c51cf0..53e29b355 100644 --- a/src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java +++ b/src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java @@ -192,7 +192,7 @@ public final class StaticBucketMap extends AbstractIterableMap { */ @Override public boolean isEmpty() { - return (size() == 0); + return size() == 0; } /** diff --git a/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java b/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java index 9bdaa1909..1ea509a17 100644 --- a/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java +++ b/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java @@ -354,7 +354,7 @@ public abstract class AbstractMultiValuedMap implements MultiValuedMap mapIterator() { - if (size() == 0) { + if (isEmpty()) { return EmptyMapIterator.emptyMapIterator(); } return new MultiValuedMapIterator(); 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 c66541d37..f0512438e 100644 --- a/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java +++ b/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java @@ -772,7 +772,7 @@ abstract class AbstractPatriciaTrie extends AbstractBitwiseTrie { @Override public K firstKey() { - if (size() == 0) { + if (isEmpty()) { throw new NoSuchElementException(); } return firstEntry().getKey(); diff --git a/src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java b/src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java index 114ce9517..521554947 100644 --- a/src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java +++ b/src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java @@ -332,7 +332,7 @@ public class CollectionUtilsTest extends MockTestCase { assertTrue(collection.size() == collectionA.size()); assertTrue(collection.contains(2L) && !collection.contains(1)); collection = CollectionUtils.collect((Iterator) null, (Transformer) null); - assertTrue(collection.size() == 0); + assertTrue(collection.isEmpty()); final int size = collectionA.size(); collectionB = CollectionUtils.collect((Collection) null, transformer, collectionB); diff --git a/src/test/java/org/apache/commons/collections4/iterators/IteratorChainTest.java b/src/test/java/org/apache/commons/collections4/iterators/IteratorChainTest.java index e3d8e325d..9c45e33d0 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/IteratorChainTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/IteratorChainTest.java @@ -134,9 +134,9 @@ public class IteratorChainTest extends AbstractIteratorTest { } } - assertTrue("List is empty", list1.size() == 0); + assertTrue("List is empty", list1.isEmpty()); assertTrue("List is empty", list2.size() == 1); - assertTrue("List is empty", list3.size() == 0); + assertTrue("List is empty", list3.isEmpty()); } public void testFirstIteratorIsEmptyBug() { diff --git a/src/test/java/org/apache/commons/collections4/iterators/LazyIteratorChainTest.java b/src/test/java/org/apache/commons/collections4/iterators/LazyIteratorChainTest.java index 3827c4169..33b9398a6 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/LazyIteratorChainTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/LazyIteratorChainTest.java @@ -148,9 +148,9 @@ public class LazyIteratorChainTest extends AbstractIteratorTest { } } - assertTrue("List is empty", list1.size() == 0); + assertTrue("List is empty", list1.isEmpty()); assertTrue("List is empty", list2.size() == 1); - assertTrue("List is empty", list3.size() == 0); + assertTrue("List is empty", list3.isEmpty()); } public void testFirstIteratorIsEmptyBug() { diff --git a/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java b/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java index 95280dc05..d24936c4f 100644 --- a/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java +++ b/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java @@ -1036,8 +1036,8 @@ public abstract class AbstractMapTest extends AbstractObjectTest { assertTrue(getMap().size() > 0); assertTrue(values.size() > 0); values.clear(); - assertTrue(getMap().size() == 0); - assertTrue(values.size() == 0); + assertTrue(getMap().isEmpty()); + assertTrue(values.isEmpty()); // clear map, reflected in values resetFull(); @@ -1045,8 +1045,8 @@ public abstract class AbstractMapTest extends AbstractObjectTest { assertTrue(getMap().size() > 0); assertTrue(values.size() > 0); getMap().clear(); - assertTrue(getMap().size() == 0); - assertTrue(values.size() == 0); + assertTrue(getMap().isEmpty()); + assertTrue(values.isEmpty()); } /** @@ -1064,8 +1064,8 @@ public abstract class AbstractMapTest extends AbstractObjectTest { assertTrue(getMap().size() > 0); assertTrue(keySet.size() > 0); keySet.clear(); - assertTrue(getMap().size() == 0); - assertTrue(keySet.size() == 0); + assertTrue(getMap().isEmpty()); + assertTrue(keySet.isEmpty()); // clear map, reflected in values resetFull(); @@ -1073,8 +1073,8 @@ public abstract class AbstractMapTest extends AbstractObjectTest { assertTrue(getMap().size() > 0); assertTrue(keySet.size() > 0); getMap().clear(); - assertTrue(getMap().size() == 0); - assertTrue(keySet.size() == 0); + assertTrue(getMap().isEmpty()); + assertTrue(keySet.isEmpty()); } /** @@ -1092,8 +1092,8 @@ public abstract class AbstractMapTest extends AbstractObjectTest { assertTrue(getMap().size() > 0); assertTrue(entrySet.size() > 0); entrySet.clear(); - assertTrue(getMap().size() == 0); - assertTrue(entrySet.size() == 0); + assertTrue(getMap().isEmpty()); + assertTrue(entrySet.isEmpty()); // clear map, reflected in values resetFull(); @@ -1101,8 +1101,8 @@ public abstract class AbstractMapTest extends AbstractObjectTest { assertTrue(getMap().size() > 0); assertTrue(entrySet.size() > 0); getMap().clear(); - assertTrue(getMap().size() == 0); - assertTrue(entrySet.size() == 0); + assertTrue(getMap().isEmpty()); + assertTrue(entrySet.isEmpty()); } //----------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java b/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java index 3e4a49012..ac0dcb12f 100644 --- a/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java +++ b/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java @@ -696,7 +696,7 @@ public abstract class AbstractMultiSetTest extends AbstractCollectionTest final MultiSet multiset = makeObject(); if (multiset instanceof Serializable && !skipSerializedCanonicalTests() && isTestSerialization()) { final MultiSet multiset2 = (MultiSet) readExternalFormFromDisk(getCanonicalEmptyCollectionName(multiset)); - assertTrue("MultiSet is empty", multiset2.size() == 0); + assertTrue("MultiSet is empty", multiset2.isEmpty()); assertEquals(multiset, multiset2); } } diff --git a/src/test/java/org/apache/commons/collections4/splitmap/TransformedSplitMapTest.java b/src/test/java/org/apache/commons/collections4/splitmap/TransformedSplitMapTest.java index 45416a3a3..8059a9fe6 100644 --- a/src/test/java/org/apache/commons/collections4/splitmap/TransformedSplitMapTest.java +++ b/src/test/java/org/apache/commons/collections4/splitmap/TransformedSplitMapTest.java @@ -118,7 +118,7 @@ public class TransformedSplitMapTest extends BulkTest { in.close(); final TransformedSplitMap readMap = (TransformedSplitMap) readObject; - assertTrue( "Map should be empty", readMap.size() == 0 ); + assertTrue( "Map should be empty", readMap.isEmpty() ); assertEquals( map.entrySet(), readMap.entrySet() ); } @@ -138,7 +138,7 @@ public class TransformedSplitMapTest extends BulkTest { in.close(); final TransformedSplitMap readMap = (TransformedSplitMap) readObject; - assertFalse( "Map should not be empty", readMap.size() == 0 ); + assertFalse( "Map should not be empty", readMap.isEmpty() ); assertEquals( map.entrySet(), readMap.entrySet() ); }