diff --git a/src/main/java/org/apache/commons/collections4/IteratorUtils.java b/src/main/java/org/apache/commons/collections4/IteratorUtils.java index 29296a9a2..bf389be03 100644 --- a/src/main/java/org/apache/commons/collections4/IteratorUtils.java +++ b/src/main/java/org/apache/commons/collections4/IteratorUtils.java @@ -1190,7 +1190,7 @@ public class IteratorUtils { */ public static E forEachButLast(final Iterator iterator, final Closure closure) { Objects.requireNonNull(closure, "closure"); - + if (iterator != null) { while (iterator.hasNext()) { final E element = iterator.next(); diff --git a/src/main/java/org/apache/commons/collections4/SetUtils.java b/src/main/java/org/apache/commons/collections4/SetUtils.java index 658af05b5..97e46e58e 100644 --- a/src/main/java/org/apache/commons/collections4/SetUtils.java +++ b/src/main/java/org/apache/commons/collections4/SetUtils.java @@ -159,7 +159,7 @@ public class SetUtils { public static SetView disjunction(final Set setA, final Set setB) { Objects.requireNonNull(setA, "setA"); Objects.requireNonNull(setB, "setB"); - + final SetView aMinusB = difference(setA, setB); final SetView bMinusA = difference(setB, setA); diff --git a/src/test/java/org/apache/commons/collections4/collection/TransformedCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/TransformedCollectionTest.java index 172d6f817..cd8155083 100644 --- a/src/test/java/org/apache/commons/collections4/collection/TransformedCollectionTest.java +++ b/src/test/java/org/apache/commons/collections4/collection/TransformedCollectionTest.java @@ -39,7 +39,7 @@ public class TransformedCollectionTest extends AbstractCollectionTest { return Integer.valueOf((String) input); } } - + private static class ToLowerCase implements Transformer { @Override public Object transform(final Object input) { diff --git a/src/test/java/org/apache/commons/collections4/map/DefaultedMapTest.java b/src/test/java/org/apache/commons/collections4/map/DefaultedMapTest.java index 5c0da38d9..f047f2d7f 100644 --- a/src/test/java/org/apache/commons/collections4/map/DefaultedMapTest.java +++ b/src/test/java/org/apache/commons/collections4/map/DefaultedMapTest.java @@ -138,7 +138,7 @@ public class DefaultedMapTest extends AbstractIterableMapTest { } catch (NullPointerException e) { // Expected } - + try { DefaultedMap.defaultedMap((Map) null, nullFactory); fail("Expecting NullPointerException"); @@ -152,7 +152,7 @@ public class DefaultedMapTest extends AbstractIterableMapTest { } catch (NullPointerException e) { // Expected } - + try { DefaultedMap.defaultedMap((Map) null, nullTransformer); fail("Expecting NullPointerException"); diff --git a/src/test/java/org/apache/commons/collections4/map/LazySortedMapTest.java b/src/test/java/org/apache/commons/collections4/map/LazySortedMapTest.java index 4a67ec883..8b0d275d1 100644 --- a/src/test/java/org/apache/commons/collections4/map/LazySortedMapTest.java +++ b/src/test/java/org/apache/commons/collections4/map/LazySortedMapTest.java @@ -45,9 +45,9 @@ public class LazySortedMapTest extends AbstractSortedMapTest { return arg1.compareTo(arg0); } } - + private static final Factory oneFactory = FactoryUtils.constantFactory(1); - + protected final Comparator reverseStringComparator = new ReverseStringComparator(); public LazySortedMapTest(final String testName) { @@ -105,7 +105,7 @@ public class LazySortedMapTest extends AbstractSortedMapTest { assertTrue("natural order, so comparator should be null", c == null); } - + public void testReverseSortOrder() { final SortedMap map = lazySortedMap(new ConcurrentSkipListMap(reverseStringComparator), oneFactory); map.put("A", 5); diff --git a/src/test/java/org/apache/commons/collections4/map/PredicatedSortedMapTest.java b/src/test/java/org/apache/commons/collections4/map/PredicatedSortedMapTest.java index dd059abe3..730b27a8b 100644 --- a/src/test/java/org/apache/commons/collections4/map/PredicatedSortedMapTest.java +++ b/src/test/java/org/apache/commons/collections4/map/PredicatedSortedMapTest.java @@ -41,11 +41,11 @@ public class PredicatedSortedMapTest extends AbstractSortedMapTest { return ((String) arg1).compareTo((String)arg0); } } - + protected static final Predicate truePredicate = TruePredicate.truePredicate(); protected static final Predicate testPredicate = o -> o instanceof String; - + protected final Comparator reverseStringComparator = new ReverseStringComparator(); public PredicatedSortedMapTest(final String testName) { @@ -66,7 +66,7 @@ public class PredicatedSortedMapTest extends AbstractSortedMapTest { public SortedMap makeTestMap() { return decorateMap(new TreeMap(), testPredicate, testPredicate); } - + public SortedMap makeTestMapWithComparator() { return decorateMap(new ConcurrentSkipListMap(reverseStringComparator), testPredicate, testPredicate); } @@ -178,7 +178,7 @@ public class PredicatedSortedMapTest extends AbstractSortedMapTest { assertTrue("natural order, so comparator should be null", c == null); } - + @SuppressWarnings("unchecked") public void testReverseSortOrder() { final SortedMap map = makeTestMapWithComparator(); diff --git a/src/test/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMapTest.java b/src/test/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMapTest.java index 0cbfbb48b..be9ce42c1 100644 --- a/src/test/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMapTest.java +++ b/src/test/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMapTest.java @@ -215,7 +215,7 @@ public class ArrayListValuedHashMapTest extends AbstractMultiValuedMapTest assertEquals(3, listMap.get((K) "A").indexOf("Q")); assertEquals(4, listMap.get((K) "A").lastIndexOf("Q")); assertEquals(-1, listMap.get((K) "A").lastIndexOf("A")); - + List list2 = new ArrayList<>(); listMap.get((K) "B").addAll(0, list2); assertEquals("{A=[W, X, F, Q, Q, L]}", listMap.toString()); diff --git a/src/test/java/org/apache/commons/collections4/queue/CircularFifoQueueTest.java b/src/test/java/org/apache/commons/collections4/queue/CircularFifoQueueTest.java index 79cefea44..a8751c91c 100644 --- a/src/test/java/org/apache/commons/collections4/queue/CircularFifoQueueTest.java +++ b/src/test/java/org/apache/commons/collections4/queue/CircularFifoQueueTest.java @@ -466,7 +466,7 @@ public class CircularFifoQueueTest extends AbstractQueueTest { } fail(); } - + @Override public String getCompatibilityVersion() { return "4"; diff --git a/src/test/java/org/apache/commons/collections4/queue/UnmodifiableQueueTest.java b/src/test/java/org/apache/commons/collections4/queue/UnmodifiableQueueTest.java index fe300d324..d769c2970 100644 --- a/src/test/java/org/apache/commons/collections4/queue/UnmodifiableQueueTest.java +++ b/src/test/java/org/apache/commons/collections4/queue/UnmodifiableQueueTest.java @@ -105,7 +105,7 @@ public class UnmodifiableQueueTest extends AbstractQueueTest { fail(); } catch (final NullPointerException ex) {} } - + public void testOffer() { Queue queue = makeFullCollection(); E e = null;