Apache
/
commons-collections
mirror of https://github.com/apache/commons-collections.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use isEmpty().

This commit is contained in:
Gary Gregory 2021-01-16 20:37:44 -05:00
parent 6b0d7c4898
commit 2b23b7add8
24 changed files with 54 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java
View File

@ -599,7 +599,7 @@ public abstract class AbstractMapBag<E> implements Bag<E> {
*/
@Override
public String toString() {
if (size() == 0) {
if (isEmpty()) {
return "[]";
}
final StringBuilder buf = new StringBuilder();

2
src/main/java/org/apache/commons/collections4/bloomfilter/HasherBloomFilter.java
View File

@ -96,7 +96,7 @@ public class HasherBloomFilter extends AbstractBloomFilter {
@Override
public long[] getBits() {
if (hasher.size() == 0) {
if (hasher.isEmpty()) {
return EMPTY;
}

9
src/main/java/org/apache/commons/collections4/bloomfilter/hasher/StaticHasher.java
View File

@ -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

2
src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java
View File

@ -251,7 +251,7 @@ public class ComparatorChain<E> implements Comparator<E>, 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");
}
}

2
src/main/java/org/apache/commons/collections4/functors/ChainedClosure.java
View File

@ -66,7 +66,7 @@ public class ChainedClosure<E> implements Closure<E>, Serializable {
@SuppressWarnings("unchecked")
public static <E> Closure<E> chainedClosure(final Collection<? extends Closure<? super E>> closures) {
Objects.requireNonNull(closures, "closures");
if (closures.size() == 0) {
if (closures.isEmpty()) {
return NOPClosure.<E>nopClosure();
}
// convert to array like this to guarantee iterator() ordering

2
src/main/java/org/apache/commons/collections4/functors/ChainedTransformer.java
View File

@ -72,7 +72,7 @@ public class ChainedTransformer<T> implements Transformer<T, T>, Serializable {
public static <T> Transformer<T, T> chainedTransformer(
final Collection<? extends Transformer<? super T, ? extends T>> transformers) {
Objects.requireNonNull(transformers, "transformers");
if (transformers.size() == 0) {
if (transformers.isEmpty()) {
return NOPTransformer.<T>nopTransformer();
}
// convert to array like this to guarantee iterator() ordering

2
src/main/java/org/apache/commons/collections4/functors/SwitchTransformer.java
View File

@ -94,7 +94,7 @@ public class SwitchTransformer<I, O> implements Transformer<I, O>, Serializable
final Map<? extends Predicate<? super I>, ? extends Transformer<? super I, ? extends O>> map) {
Objects.requireNonNull(map, "map");
if (map.size() == 0) {
if (map.isEmpty()) {
return ConstantTransformer.<I, O>nullTransformer();
}
// convert to array like this to guarantee iterator() ordering

2
src/main/java/org/apache/commons/collections4/iterators/LoopingIterator.java
View File

@ -81,7 +81,7 @@ public class LoopingIterator<E> implements ResettableIterator<E> {
*/
@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) {

2
src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java
View File

@ -402,7 +402,7 @@ public abstract class AbstractLinkedList<E> implements List<E> {
@Override
public String toString() {
if (size() == 0) {
if (isEmpty()) {
return "[]";
}
final StringBuilder buf = new StringBuilder(16 * size());

2
src/main/java/org/apache/commons/collections4/list/SetUniqueList.java
View File

@ -276,7 +276,7 @@ public class SetUniqueList<E> extends AbstractSerializableListDecorator<E> {
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

8
src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java
View File

@ -826,7 +826,7 @@ public class AbstractHashedMap<K, V> extends AbstractMap<K, V> implements Iterab
* @return the entrySet iterator
*/
protected Iterator<Map.Entry<K, V>> createEntrySetIterator() {
if (size() == 0) {
if (isEmpty()) {
return EmptyIterator.<Map.Entry<K, V>>emptyIterator();
}
return new EntrySetIterator<>(this);
@ -926,7 +926,7 @@ public class AbstractHashedMap<K, V> extends AbstractMap<K, V> implements Iterab
* @return the keySet iterator
*/
protected Iterator<K> createKeySetIterator() {
if (size() == 0) {
if (isEmpty()) {
return EmptyIterator.<K>emptyIterator();
}
return new KeySetIterator<>(this);
@ -1014,7 +1014,7 @@ public class AbstractHashedMap<K, V> extends AbstractMap<K, V> implements Iterab
* @return the values iterator
*/
protected Iterator<V> createValuesIterator() {
if (size() == 0) {
if (isEmpty()) {
return EmptyIterator.<V>emptyIterator();
}
return new ValuesIterator<>(this);
@ -1387,7 +1387,7 @@ public class AbstractHashedMap<K, V> extends AbstractMap<K, V> implements Iterab
*/
@Override
public String toString() {
if (size() == 0) {
if (isEmpty()) {
return "{}";
}
final StringBuilder buf = new StringBuilder(32 * size());

6
src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java
View File

@ -410,7 +410,7 @@ public abstract class AbstractLinkedMap<K, V> extends AbstractHashedMap<K, V> im
*/
@Override
protected Iterator<Map.Entry<K, V>> createEntrySetIterator() {
if (size() == 0) {
if (isEmpty()) {
return EmptyOrderedIterator.<Map.Entry<K, V>>emptyOrderedIterator();
}
return new EntrySetIterator<>(this);
@ -446,7 +446,7 @@ public abstract class AbstractLinkedMap<K, V> extends AbstractHashedMap<K, V> im
*/
@Override
protected Iterator<K> createKeySetIterator() {
if (size() == 0) {
if (isEmpty()) {
return EmptyOrderedIterator.<K>emptyOrderedIterator();
}
return new KeySetIterator<>(this);
@ -483,7 +483,7 @@ public abstract class AbstractLinkedMap<K, V> extends AbstractHashedMap<K, V> im
*/
@Override
protected Iterator<V> createValuesIterator() {
if (size() == 0) {
if (isEmpty()) {
return EmptyOrderedIterator.<V>emptyOrderedIterator();
}
return new ValuesIterator<>(this);

6
src/main/java/org/apache/commons/collections4/map/Flat3Map.java
View File

@ -793,7 +793,7 @@ public class Flat3Map<K, V> implements IterableMap<K, V>, Serializable, Cloneabl
if (parent.delegateMap != null) {
return parent.delegateMap.entrySet().iterator();
}
if (parent.size() == 0) {
if (parent.isEmpty()) {
return EmptyIterator.<Map.Entry<K, V>>emptyIterator();
}
return new EntrySetIterator<>(parent);
@ -1016,7 +1016,7 @@ public class Flat3Map<K, V> implements IterableMap<K, V>, Serializable, Cloneabl
if (parent.delegateMap != null) {
return parent.delegateMap.keySet().iterator();
}
if (parent.size() == 0) {
if (parent.isEmpty()) {
return EmptyIterator.<K>emptyIterator();
}
return new KeySetIterator<>(parent);
@ -1084,7 +1084,7 @@ public class Flat3Map<K, V> implements IterableMap<K, V>, Serializable, Cloneabl
if (parent.delegateMap != null) {
return parent.delegateMap.values().iterator();
}
if (parent.size() == 0) {
if (parent.isEmpty()) {
return EmptyIterator.<V>emptyIterator();
}
return new ValuesIterator<>(parent);

4
src/main/java/org/apache/commons/collections4/map/ListOrderedMap.java
View File

@ -171,7 +171,7 @@ public class ListOrderedMap<K, V>
*/
@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<K, V>
*/
@Override
public K lastKey() {
if (size() == 0) {
if (isEmpty()) {
throw new NoSuchElementException("Map is empty");
}
return insertOrder.get(size() - 1);

2
src/main/java/org/apache/commons/collections4/map/MultiValueMap.java
View File

@ -383,7 +383,7 @@ public class MultiValueMap<K, V> extends AbstractMapDecorator<K, Object> impleme
* @return true if this map changed
*/
public boolean putAll(final K key, final Collection<V> values) {
if (values == null || values.size() == 0) {
if (values == null || values.isEmpty()) {
return false;
}
boolean result = false;

2
src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java
View File

@ -192,7 +192,7 @@ public final class StaticBucketMap<K, V> extends AbstractIterableMap<K, V> {
*/
@Override
public boolean isEmpty() {
return (size() == 0);
return size() == 0;
}
/**

2
src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java
View File

@ -354,7 +354,7 @@ public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K,
@Override
public MapIterator<K, V> mapIterator() {
if (size() == 0) {
if (isEmpty()) {
return EmptyMapIterator.emptyMapIterator();
}
return new MultiValuedMapIterator();

2
src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java
View File

@ -772,7 +772,7 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> {
@Override
public K firstKey() {
if (size() == 0) {
if (isEmpty()) {
throw new NoSuchElementException();
}
return firstEntry().getKey();

2
src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java
View File

@ -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<Integer>) null, (Transformer<Integer, Number>) null);
assertTrue(collection.size() == 0);
assertTrue(collection.isEmpty());
final int size = collectionA.size();
collectionB = CollectionUtils.collect((Collection<Integer>) null, transformer, collectionB);

4
src/test/java/org/apache/commons/collections4/iterators/IteratorChainTest.java
View File

@ -134,9 +134,9 @@ public class IteratorChainTest extends AbstractIteratorTest<String> {
}
}
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() {

4
src/test/java/org/apache/commons/collections4/iterators/LazyIteratorChainTest.java
View File

@ -148,9 +148,9 @@ public class LazyIteratorChainTest extends AbstractIteratorTest<String> {
}
}
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() {

24
src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java
View File

@ -1036,8 +1036,8 @@ public abstract class AbstractMapTest<K, V> 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<K, V> 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<K, V> 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<K, V> 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<K, V> 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<K, V> 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());
}
//-----------------------------------------------------------------------

2
src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java
View File

@ -696,7 +696,7 @@ public abstract class AbstractMultiSetTest<T> extends AbstractCollectionTest<T>
final MultiSet<T> 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);
}
}

4
src/test/java/org/apache/commons/collections4/splitmap/TransformedSplitMapTest.java
View File

@ -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() );
}