This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-collections.git
The following commit(s) were added to refs/heads/master by this push:
new 706178d02 Remove extra whitespace
706178d02 is described below
commit 706178d022a6d87e01ec61a93f5dcd5198441f23
Author: Gary Gregory <[email protected]>
AuthorDate: Thu Oct 3 15:50:26 2024 -0400
Remove extra whitespace
---
.../org/apache/commons/collections4/ListUtils.java | 2 +-
.../org/apache/commons/collections4/MapUtils.java | 6 ++--
.../bloomfilter/ArrayCountingBloomFilter.java | 4 +--
.../bloomfilter/BloomFilterExtractor.java | 4 +--
.../commons/collections4/bloomfilter/Shape.java | 2 +-
.../commons/collections4/map/MultiValueMap.java | 4 ++-
.../apache/commons/collections4/ListUtilsTest.java | 4 +--
.../commons/collections4/TransformerUtilsTest.java | 10 +++----
.../AbstractCountingBloomFilterTest.java | 2 +-
.../bloomfilter/CountingPredicateTest.java | 4 +--
.../comparators/FixedOrderComparatorTest.java | 8 +++---
.../iterators/CollatingIteratorTest.java | 2 +-
.../commons/collections4/map/Flat3MapTest.java | 27 +++++++++---------
.../multimap/AbstractMultiValuedMapTest.java | 8 +++---
.../multiset/UnmodifiableMultiSetTest.java | 4 +--
.../commons/collections4/set/CompositeSetTest.java | 2 +-
.../splitmap/TransformedSplitMapTest.java | 32 ++++++++++------------
17 files changed, 62 insertions(+), 63 deletions(-)
diff --git a/src/main/java/org/apache/commons/collections4/ListUtils.java
b/src/main/java/org/apache/commons/collections4/ListUtils.java
index 04744234a..6a0243011 100644
--- a/src/main/java/org/apache/commons/collections4/ListUtils.java
+++ b/src/main/java/org/apache/commons/collections4/ListUtils.java
@@ -433,7 +433,7 @@ public class ListUtils {
* @since 4.0
*/
public static <E> List<E> longestCommonSubsequence(final List<E> a, final
List<E> b) {
- return longestCommonSubsequence( a, b, DefaultEquator.defaultEquator()
);
+ return longestCommonSubsequence(a, b, DefaultEquator.defaultEquator());
}
/**
diff --git a/src/main/java/org/apache/commons/collections4/MapUtils.java
b/src/main/java/org/apache/commons/collections4/MapUtils.java
index ccd4102ca..e05ec36ee 100644
--- a/src/main/java/org/apache/commons/collections4/MapUtils.java
+++ b/src/main/java/org/apache/commons/collections4/MapUtils.java
@@ -70,9 +70,9 @@ import
org.apache.commons.collections4.map.UnmodifiableSortedMap;
* <li>{@link #predicatedSortedMap(SortedMap,Predicate,Predicate)}
* <li>{@link #transformedMap(Map, Transformer, Transformer)}
* <li>{@link #transformedSortedMap(SortedMap, Transformer, Transformer)}
- * <li>{@link #multiValueMap( Map )}
- * <li>{@link #multiValueMap( Map, Class )}
- * <li>{@link #multiValueMap( Map, Factory )}
+ * <li>{@link #multiValueMap(Map)}
+ * <li>{@link #multiValueMap(Map, Class)}
+ * <li>{@link #multiValueMap(Map, Factory)}
* </ul>
*
* @since 1.0
diff --git
a/src/main/java/org/apache/commons/collections4/bloomfilter/ArrayCountingBloomFilter.java
b/src/main/java/org/apache/commons/collections4/bloomfilter/ArrayCountingBloomFilter.java
index dc029d231..0baa3d247 100644
---
a/src/main/java/org/apache/commons/collections4/bloomfilter/ArrayCountingBloomFilter.java
+++
b/src/main/java/org/apache/commons/collections4/bloomfilter/ArrayCountingBloomFilter.java
@@ -172,8 +172,8 @@ public final class ArrayCountingBloomFilter implements
CountingBloomFilter {
@Override
public int getMaxInsert(final CellExtractor cellExtractor) {
- final int[] max = {Integer.MAX_VALUE};
- cellExtractor.processCells( (x, y) -> {
+ final int[] max = { Integer.MAX_VALUE };
+ cellExtractor.processCells((x, y) -> {
final int count = cells[x] / y;
if (count < max[0]) {
max[0] = count;
diff --git
a/src/main/java/org/apache/commons/collections4/bloomfilter/BloomFilterExtractor.java
b/src/main/java/org/apache/commons/collections4/bloomfilter/BloomFilterExtractor.java
index 33d84d8f4..aa11c8584 100644
---
a/src/main/java/org/apache/commons/collections4/bloomfilter/BloomFilterExtractor.java
+++
b/src/main/java/org/apache/commons/collections4/bloomfilter/BloomFilterExtractor.java
@@ -100,10 +100,10 @@ public interface BloomFilterExtractor {
* @return the merged bloom filter.
*/
default BloomFilter flatten() {
- final BloomFilter[] bf = {null};
+ final BloomFilter[] bf = { null };
processBloomFilters(x -> {
if (bf[0] == null) {
- bf[0] = new SimpleBloomFilter( x.getShape());
+ bf[0] = new SimpleBloomFilter(x.getShape());
}
return bf[0].merge(x);
});
diff --git
a/src/main/java/org/apache/commons/collections4/bloomfilter/Shape.java
b/src/main/java/org/apache/commons/collections4/bloomfilter/Shape.java
index 1411dee37..a0faaddf1 100644
--- a/src/main/java/org/apache/commons/collections4/bloomfilter/Shape.java
+++ b/src/main/java/org/apache/commons/collections4/bloomfilter/Shape.java
@@ -133,7 +133,7 @@ public final class Shape {
private static void checkCalculatedProbability(final double probability) {
// We do not need to check for p <= 0.0 since we only allow positive
values for
// parameters and the closest we can come to exp(-kn/m) == 1 is
- // exp(-1/Integer.MAX_INT) approx 0.9999999995343387 so Math.pow( x, y
) will
+ // exp(-1/Integer.MAX_INT) approx 0.9999999995343387 so Math.pow(x, y)
will
// always be 0<x<1 and y>0
if (probability >= 1.0) {
throw new IllegalArgumentException("Calculated probability is
greater than or equal to 1: " + probability);
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 a2dfa7a3e..566ebea21 100644
--- a/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java
@@ -365,7 +365,7 @@ public class MultiValueMap<K, V> extends
AbstractMapDecorator<K, Object> impleme
return new LazyIteratorChain<Entry<K, V>>() {
@Override
protected Iterator<? extends Entry<K, V>> nextIterator(final int
count) {
- if ( ! keyIterator.hasNext() ) {
+ if (!keyIterator.hasNext()) {
return null;
}
final K key = keyIterator.next();
@@ -374,10 +374,12 @@ public class MultiValueMap<K, V> extends
AbstractMapDecorator<K, Object> impleme
public K getKey() {
return key;
}
+
@Override
public V getValue() {
return input;
}
+
@Override
public V setValue(final V value) {
throw new UnsupportedOperationException();
diff --git a/src/test/java/org/apache/commons/collections4/ListUtilsTest.java
b/src/test/java/org/apache/commons/collections4/ListUtilsTest.java
index 70c0b3426..20d59cebb 100644
--- a/src/test/java/org/apache/commons/collections4/ListUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/ListUtilsTest.java
@@ -82,8 +82,8 @@ public class ListUtilsTest {
public void testEquals() {
final Collection<String> data = Arrays.asList("a", "b", "c");
- final List<String> list1 = new ArrayList<>( data );
- final List<String> list2 = new ArrayList<>( data );
+ final List<String> list1 = new ArrayList<>(data);
+ final List<String> list2 = new ArrayList<>(data);
assertEquals(list1, list2);
assertTrue(ListUtils.isEqualList(list1, list2));
diff --git
a/src/test/java/org/apache/commons/collections4/TransformerUtilsTest.java
b/src/test/java/org/apache/commons/collections4/TransformerUtilsTest.java
index 69a20c1e7..c758b2611 100644
--- a/src/test/java/org/apache/commons/collections4/TransformerUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/TransformerUtilsTest.java
@@ -271,12 +271,10 @@ public class TransformerUtilsTest {
@Test
public void testStringValueTransformer() {
- assertNotNull( "StringValueTransformer should NEVER return a null
value.",
- TransformerUtils.stringValueTransformer().transform(null));
- assertEquals( "null",
- TransformerUtils.stringValueTransformer().transform(null),
"StringValueTransformer should return \"null\" when given a null argument.");
- assertEquals( "6",
- TransformerUtils.stringValueTransformer().transform(6),
"StringValueTransformer should return toString value");
+ assertNotNull("StringValueTransformer should NEVER return a null
value.", TransformerUtils.stringValueTransformer().transform(null));
+ assertEquals("null",
TransformerUtils.stringValueTransformer().transform(null),
+ "StringValueTransformer should return \"null\" when given a
null argument.");
+ assertEquals("6",
TransformerUtils.stringValueTransformer().transform(6), "StringValueTransformer
should return toString value");
}
@Test
diff --git
a/src/test/java/org/apache/commons/collections4/bloomfilter/AbstractCountingBloomFilterTest.java
b/src/test/java/org/apache/commons/collections4/bloomfilter/AbstractCountingBloomFilterTest.java
index 2b3dc7ad8..93a39c4d6 100644
---
a/src/test/java/org/apache/commons/collections4/bloomfilter/AbstractCountingBloomFilterTest.java
+++
b/src/test/java/org/apache/commons/collections4/bloomfilter/AbstractCountingBloomFilterTest.java
@@ -161,7 +161,7 @@ public abstract class AbstractCountingBloomFilterTest<T
extends CountingBloomFil
public final void testCountingBloomFilterSpecificContains() {
final BloomFilter bf = new SimpleBloomFilter(getTestShape());
bf.merge(TestingHashers.FROM1);
- final CountingBloomFilter bf2 =
TestingHashers.populateFromHashersFrom1AndFrom11(
createEmptyFilter(getTestShape()));
+ final CountingBloomFilter bf2 =
TestingHashers.populateFromHashersFrom1AndFrom11(createEmptyFilter(getTestShape()));
assertTrue(bf.contains(bf), "BF Should contain itself");
assertTrue(bf2.contains(bf2), "BF2 Should contain itself");
diff --git
a/src/test/java/org/apache/commons/collections4/bloomfilter/CountingPredicateTest.java
b/src/test/java/org/apache/commons/collections4/bloomfilter/CountingPredicateTest.java
index 18a9aed4e..bfbd96f81 100644
---
a/src/test/java/org/apache/commons/collections4/bloomfilter/CountingPredicateTest.java
+++
b/src/test/java/org/apache/commons/collections4/bloomfilter/CountingPredicateTest.java
@@ -86,8 +86,8 @@ public class CountingPredicateTest {
public void testPredicateSameLength() {
final List<Pair<Integer, Integer>> expected = new ArrayList<>();
final List<Pair<Integer, Integer>> result = new ArrayList<>();
- expected.add( Pair.of(1, 3));
- expected.add( Pair.of(2, 3));
+ expected.add(Pair.of(1, 3));
+ expected.add(Pair.of(2, 3));
final CountingPredicate<Integer> cp = new CountingPredicate<>(ary,
makeFunc((x, y) -> true, result));
assertTrue(cp.test(3));
assertTrue(cp.test(3));
diff --git
a/src/test/java/org/apache/commons/collections4/comparators/FixedOrderComparatorTest.java
b/src/test/java/org/apache/commons/collections4/comparators/FixedOrderComparatorTest.java
index fe519047c..c29f7dfd7 100644
---
a/src/test/java/org/apache/commons/collections4/comparators/FixedOrderComparatorTest.java
+++
b/src/test/java/org/apache/commons/collections4/comparators/FixedOrderComparatorTest.java
@@ -290,8 +290,8 @@ public class FixedOrderComparatorTest extends
AbstractComparatorTest<String> {
assertComparatorYieldsOrder(keys.toArray(ArrayUtils.EMPTY_STRING_ARRAY),
comparator);
assertEquals(-1, comparator.compare("Minneapolis", "New York"));
- assertEquals( 1, comparator.compare("New York", "Minneapolis"));
- assertEquals( 0, comparator.compare("Minneapolis", "St Paul"));
+ assertEquals(1, comparator.compare("New York", "Minneapolis"));
+ assertEquals(0, comparator.compare("Minneapolis", "St Paul"));
comparator = new FixedOrderComparator<>(topCities);
comparator.setUnknownObjectBehavior(FixedOrderComparator.UnknownObjectBehavior.AFTER);
@@ -299,8 +299,8 @@ public class FixedOrderComparatorTest extends
AbstractComparatorTest<String> {
keys.add("Minneapolis");
assertComparatorYieldsOrder(keys.toArray(ArrayUtils.EMPTY_STRING_ARRAY),
comparator);
- assertEquals( 1, comparator.compare("Minneapolis", "New York"));
+ assertEquals(1, comparator.compare("Minneapolis", "New York"));
assertEquals(-1, comparator.compare("New York", "Minneapolis"));
- assertEquals( 0, comparator.compare("Minneapolis", "St Paul"));
+ assertEquals(0, comparator.compare("Minneapolis", "St Paul"));
}
}
diff --git
a/src/test/java/org/apache/commons/collections4/iterators/CollatingIteratorTest.java
b/src/test/java/org/apache/commons/collections4/iterators/CollatingIteratorTest.java
index 9acdcea33..2f3f515b9 100644
---
a/src/test/java/org/apache/commons/collections4/iterators/CollatingIteratorTest.java
+++
b/src/test/java/org/apache/commons/collections4/iterators/CollatingIteratorTest.java
@@ -233,7 +233,7 @@ public class CollatingIteratorTest extends
AbstractIteratorTest<Integer> {
int i = 0;
final CollatingIterator<Integer> collatingIterator2 = new
CollatingIterator<>(null, l1.iterator(), l2.iterator());
collatingIterator2.setComparator(new ComparableComparator<>());
- for ( ; collatingIterator2.hasNext(); i++ ) {
+ for (; collatingIterator2.hasNext(); i++) {
final Integer n = collatingIterator2.next();
assertEquals((int) n, i + 1, "wrong order");
}
diff --git
a/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
b/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
index 7cef22572..1171e7ff6 100644
--- a/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
@@ -97,6 +97,7 @@ public class Flat3MapTest<K, V> extends
AbstractIterableMapTest<K, V> {
Flat3MapTest.this.verify();
}
}
+
private static final Integer ONE = Integer.valueOf(1);
private static final Integer TWO = Integer.valueOf(2);
private static final Integer THREE = Integer.valueOf(3);
@@ -212,17 +213,17 @@ public class Flat3MapTest<K, V> extends
AbstractIterableMapTest<K, V> {
@Test
public void testCollections261() {
final Flat3Map<Integer, Integer> m = new Flat3Map<>();
- m.put( Integer.valueOf(1), Integer.valueOf(1) );
- m.put( Integer.valueOf(0), Integer.valueOf(0) );
- assertEquals( Integer.valueOf(1), m.remove( Integer.valueOf(1) ) );
- assertEquals( Integer.valueOf(0), m.remove( Integer.valueOf(0) ) );
+ m.put(Integer.valueOf(1), Integer.valueOf(1));
+ m.put(Integer.valueOf(0), Integer.valueOf(0));
+ assertEquals(Integer.valueOf(1), m.remove(Integer.valueOf(1)));
+ assertEquals(Integer.valueOf(0), m.remove(Integer.valueOf(0)));
- m.put( Integer.valueOf(2), Integer.valueOf(2) );
- m.put( Integer.valueOf(1), Integer.valueOf(1) );
- m.put( Integer.valueOf(0), Integer.valueOf(0) );
- assertEquals( Integer.valueOf(2), m.remove( Integer.valueOf(2) ) );
- assertEquals( Integer.valueOf(1), m.remove( Integer.valueOf(1) ) );
- assertEquals( Integer.valueOf(0), m.remove( Integer.valueOf(0) ) );
+ m.put(Integer.valueOf(2), Integer.valueOf(2));
+ m.put(Integer.valueOf(1), Integer.valueOf(1));
+ m.put(Integer.valueOf(0), Integer.valueOf(0));
+ assertEquals(Integer.valueOf(2), m.remove(Integer.valueOf(2)));
+ assertEquals(Integer.valueOf(1), m.remove(Integer.valueOf(1)));
+ assertEquals(Integer.valueOf(0), m.remove(Integer.valueOf(0)));
}
@Test
@@ -859,16 +860,16 @@ public class Flat3MapTest<K, V> extends
AbstractIterableMapTest<K, V> {
final Flat3Map<Integer, Integer> m = new Flat3Map<>();
final String string0 = m.toString();
assertNotNull(string0);
- m.put( Integer.valueOf(1), Integer.valueOf(1) );
+ m.put(Integer.valueOf(1), Integer.valueOf(1));
final String string1 = m.toString();
assertNotNull(string1);
assertNotSame(string0, string1);
- m.put( Integer.valueOf(0), Integer.valueOf(0) );
+ m.put(Integer.valueOf(0), Integer.valueOf(0));
final String string2 = m.toString();
assertNotNull(string2);
assertNotSame(string0, string2);
assertNotSame(string1, string2);
- m.put( Integer.valueOf(2), Integer.valueOf(2) );
+ m.put(Integer.valueOf(2), Integer.valueOf(2));
final String string3 = m.toString();
assertNotNull(string3);
assertNotSame(string0, string3);
diff --git
a/src/test/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapTest.java
b/src/test/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapTest.java
index a5997e73d..9df8a6b26 100644
---
a/src/test/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapTest.java
+++
b/src/test/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapTest.java
@@ -867,13 +867,13 @@ public abstract class AbstractMultiValuedMapTest<K, V>
extends AbstractObjectTes
// public void testIterator_Key() {
// final MultiValuedMap<K, V> map = makeFullMap();
// Iterator<V> it = map.iterator("k0");
-// assertTrue( it.hasNext());
+// assertTrue(it.hasNext());
// Set<V> values = new HashSet<V>();
// while (it.hasNext()) {
// values.add(it.next());
// }
-// assertTrue( values.contains("v0_1"));
-// assertTrue( values.contains("v1_1"));
+// assertTrue(values.contains("v0_1"));
+// assertTrue(values.contains("v1_1"));
// assertFalse(map.iterator("A").hasNext());
// assertFalse(map.iterator("A").hasNext());
// if (!isAddSupported()) {
@@ -881,7 +881,7 @@ public abstract class AbstractMultiValuedMapTest<K, V>
extends AbstractObjectTes
// }
// map.put((K) "A", (V) "AA");
// it = map.iterator("A");
-// assertTrue( it.hasNext());
+// assertTrue(it.hasNext());
// it.next();
// assertFalse(it.hasNext());
// }
diff --git
a/src/test/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSetTest.java
b/src/test/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSetTest.java
index 9fd57a5da..b416bb56f 100644
---
a/src/test/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSetTest.java
+++
b/src/test/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSetTest.java
@@ -96,8 +96,8 @@ public class UnmodifiableMultiSetTest<E> extends
AbstractMultiSetTest<E> {
@Test
public void testEntrySet() {
final MultiSet<E> multiset = makeFullCollection();
- final MultiSet<E> unmodifiableMultiSet =
UnmodifiableMultiSet.unmodifiableMultiSet(multiset);
- assertSame( unmodifiableMultiSet.entrySet().size(),
multiset.entrySet().size());
+ final MultiSet<E> unmodifiableMultiSet =
UnmodifiableMultiSet.unmodifiableMultiSet(multiset);
+ assertSame(unmodifiableMultiSet.entrySet().size(),
multiset.entrySet().size());
}
@Test
diff --git
a/src/test/java/org/apache/commons/collections4/set/CompositeSetTest.java
b/src/test/java/org/apache/commons/collections4/set/CompositeSetTest.java
index 51e71fe70..1d91d5cb4 100644
--- a/src/test/java/org/apache/commons/collections4/set/CompositeSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/CompositeSetTest.java
@@ -69,7 +69,7 @@ public class CompositeSetTest<E> extends AbstractSetTest<E> {
public CompositeSet<E> makeObject() {
final HashSet<E> contained = new HashSet<>();
final CompositeSet<E> set = new CompositeSet<>(contained);
- set.setMutator( new EmptySetMutator<>(contained) );
+ set.setMutator(new EmptySetMutator<>(contained));
return set;
}
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 673396ee2..e36ae44a6 100644
---
a/src/test/java/org/apache/commons/collections4/splitmap/TransformedSplitMapTest.java
+++
b/src/test/java/org/apache/commons/collections4/splitmap/TransformedSplitMapTest.java
@@ -68,14 +68,12 @@ public class TransformedSplitMapTest extends BulkTest {
@Test
public void testFullMap() throws IOException, ClassNotFoundException {
- final TransformedSplitMap<String, String, String, String> map =
TransformedSplitMap.transformingMap(
- new HashMap<>(),
- NOPTransformer.<String>nopTransformer(),
- NOPTransformer.<String>nopTransformer() );
- map.put( "a", "b" );
- map.put( "c", "d" );
- map.put( "e", "f" );
- map.put( "g", "h" );
+ final TransformedSplitMap<String, String, String, String> map =
TransformedSplitMap.transformingMap(new HashMap<>(),
+ NOPTransformer.<String>nopTransformer(),
NOPTransformer.<String>nopTransformer());
+ map.put("a", "b");
+ map.put("c", "d");
+ map.put("e", "f");
+ map.put("g", "h");
final ObjectInputStream in = new ObjectInputStream(new
FileInputStream(TEST_DATA_PATH +
"TransformedSplitMap.fullCollection.version4.obj"));
final Object readObject = in.readObject();
@@ -150,19 +148,19 @@ public class TransformedSplitMapTest extends BulkTest {
// TransformedSplitMap<String, String, String, String> map =
TransformedSplitMap.transformingMap(
// new HashMap<String, String>(),
// NOPTransformer.<String>nopTransformer(),
-// NOPTransformer.<String>nopTransformer() );
+// NOPTransformer.<String>nopTransformer());
//
// ObjectOutputStream out = new ObjectOutputStream(
-// new FileOutputStream(
"src/test/resources/data/test/TransformedSplitMap.emptyCollection.version4.obj"
) );
-// out.writeObject( map );
+// new
FileOutputStream("src/test/resources/data/test/TransformedSplitMap.emptyCollection.version4.obj"));
+// out.writeObject(map);
//
-// map.put( "a", "b" );
-// map.put( "c", "d" );
-// map.put( "e", "f" );
-// map.put( "g", "h" );
+// map.put("a", "b");
+// map.put("c", "d");
+// map.put("e", "f");
+// map.put("g", "h");
//
// out = new ObjectOutputStream(
-// new FileOutputStream(
"src/test/resources/data/test/TransformedSplitMap.fullCollection.version4.obj"
) );
-// out.writeObject( map );
+// new
FileOutputStream("src/test/resources/data/test/TransformedSplitMap.fullCollection.version4.obj"));
+// out.writeObject(map);
// }
}
