You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2020/01/26 22:26:53 UTC
[commons-collections] branch master updated: Remove unnecessary
type casts.
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 9675e6c Remove unnecessary type casts.
9675e6c is described below
commit 9675e6c794ad15bd5aa85026633e241e2898fa3e
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Jan 26 17:26:49 2020 -0500
Remove unnecessary type casts.
---
.../commons/collections4/bloomfilter/hasher/DynamicHasher.java | 2 +-
.../java/org/apache/commons/collections4/IteratorUtilsTest.java | 2 +-
.../commons/collections4/collection/AbstractCollectionTest.java | 2 +-
src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java | 6 +++---
.../commons/collections4/multimap/AbstractMultiValuedMapTest.java | 4 ++--
.../collections4/multimap/UnmodifiableMultiValuedMapTest.java | 4 ++--
.../apache/commons/collections4/multiset/AbstractMultiSetTest.java | 4 ++--
.../commons/collections4/multiset/UnmodifiableMultiSetTest.java | 2 +-
8 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/DynamicHasher.java b/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/DynamicHasher.java
index 59e813c..7c08978 100644
--- a/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/DynamicHasher.java
+++ b/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/DynamicHasher.java
@@ -115,7 +115,7 @@ public class DynamicHasher implements Hasher {
buffer++;
}
return (int) Math.floorMod(function.apply(buffers.get(buffer), funcCount++),
- (long) shape.getNumberOfBits());
+ shape.getNumberOfBits());
}
throw new NoSuchElementException();
}
diff --git a/src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java b/src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java
index 87d9437..a1d1a1b 100644
--- a/src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java
@@ -1410,7 +1410,7 @@ public class IteratorUtilsTest {
@Test(expected = NullPointerException.class)
public void testUnmodifiableMapIterator() {
Set<?> set = new LinkedHashSet<>();
- final MapIterator ie = (MapIterator) new EntrySetToMapIteratorAdapter(set);
+ final MapIterator ie = new EntrySetToMapIteratorAdapter(set);
assertTrue("create instance fail", IteratorUtils.unmodifiableMapIterator(ie) instanceof MapIterator);
IteratorUtils.unmodifiableMapIterator(null);
diff --git a/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java
index 37649ad..73c62cd 100644
--- a/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java
+++ b/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java
@@ -982,7 +982,7 @@ public abstract class AbstractCollectionTest<E> extends AbstractObjectTest {
final int size = getCollection().size();
final int targetCount = Collections.frequency(elements, target);
- final Predicate<E> filter = e -> target.equals((E) e);
+ final Predicate<E> filter = e -> target.equals(e);
assertTrue("Full collection removeIf should work", getCollection().removeIf(filter));
getConfirmed().removeIf(filter);
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 d4e3b29..8b748ca 100644
--- a/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
@@ -354,9 +354,9 @@ public class Flat3MapTest<K, V> extends AbstractIterableMapTest<K, V> {
Map.Entry<K, V> mapEntry3 = it.next();
it.remove();
assertEquals(2, map.size());
- assertEquals("one", map.get((K) "A"));
- assertEquals("two", map.get((K) "B"));
- assertEquals(null, map.get((K) "C"));
+ assertEquals("one", map.get("A"));
+ assertEquals("two", map.get("B"));
+ assertEquals(null, map.get("C"));
}
//-----------------------------------------------------------------------
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 6b16196..25fe327 100644
--- a/src/test/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapTest.java
@@ -688,8 +688,8 @@ public abstract class AbstractMultiValuedMapTest<K, V> extends AbstractObjectTes
}
assertEquals("{A=[X, Y, Z], B=[U, V, W]}", map.toString());
- map.remove((K) "A");
- map.remove((K) "B");
+ map.remove("A");
+ map.remove("B");
assertEquals("{}", map.toString());
}
diff --git a/src/test/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMapTest.java b/src/test/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMapTest.java
index ca4527e..3465a41 100644
--- a/src/test/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMapTest.java
@@ -104,7 +104,7 @@ public class UnmodifiableMultiValuedMapTest<K, V> extends AbstractMultiValuedMap
public void testRemoveException() {
final MultiValuedMap<K, V> map = makeFullMap();
try {
- map.remove((K) "one");
+ map.remove("one");
fail();
} catch (final UnsupportedOperationException e) {
// expected, not support remove() method
@@ -116,7 +116,7 @@ public class UnmodifiableMultiValuedMapTest<K, V> extends AbstractMultiValuedMap
public void testRemoveMappingException() {
final MultiValuedMap<K, V> map = makeFullMap();
try {
- map.removeMapping((K) "one", (V) "uno");
+ map.removeMapping("one", "uno");
fail();
} catch (final UnsupportedOperationException e) {
// expected, not support removeMapping() method
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 1ab2dbc..5a756b4 100644
--- a/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java
@@ -472,9 +472,9 @@ public abstract class AbstractMultiSetTest<T> extends AbstractCollectionTest<T>
multiset.add((T) "A");
final MultiSet.Entry<T> entry = multiset.entrySet().iterator().next();
assertEquals(2, entry.getCount());
- multiset.remove((T) "A");
+ multiset.remove("A");
assertEquals(1, entry.getCount());
- multiset.remove((T) "A");
+ multiset.remove("A");
assertEquals(0, entry.getCount());
}
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 c626ff9..c35bbe8 100644
--- a/src/test/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSetTest.java
@@ -105,7 +105,7 @@ public class UnmodifiableMultiSetTest<E> extends AbstractMultiSetTest<E> {
final MultiSet<E> multiset = makeFullCollection();
final MultiSet<E> unmodifiableMultiSet = UnmodifiableMultiSet.unmodifiableMultiSet(multiset);
try {
- unmodifiableMultiSet.remove( (E)"One",1);
+ unmodifiableMultiSet.remove( "One",1);
fail();
} catch (final UnsupportedOperationException ex) {}
}