Apache/commons-collections
1
0
Fork 0
mirror of https://github.com/apache/commons-collections.git synced 2025-02-17 15:35:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant type arguments.

Browse Source
This commit is contained in:
Gary Gregory 2019-03-09 08:47:39 -05:00
parent 5c33153740
commit 3b9f72be23
7 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -892,7 +892,7 @@ public class CollectionUtils {
public static <O> Collection<O> select(final Iterable<? extends O> inputCollection,
final Predicate<? super O> predicate) {
final Collection<O> answer = inputCollection instanceof Collection<?> ?
new ArrayList<O>(((Collection<?>) inputCollection).size()) : new ArrayList<O>();
new ArrayList<>(((Collection<?>) inputCollection).size()) : new ArrayList<>();
return select(inputCollection, predicate, answer);
}
@ -982,7 +982,7 @@ public class CollectionUtils {
public static <O> Collection<O> selectRejected(final Iterable<? extends O> inputCollection,
final Predicate<? super O> predicate) {
final Collection<O> answer = inputCollection instanceof Collection<?> ?
new ArrayList<O>(((Collection<?>) inputCollection).size()) : new ArrayList<O>();
new ArrayList<>(((Collection<?>) inputCollection).size()) : new ArrayList<>();
return selectRejected(inputCollection, predicate, answer);
}
@ -1030,7 +1030,7 @@ public class CollectionUtils {
public static <I, O> Collection<O> collect(final Iterable<I> inputCollection,
final Transformer<? super I, ? extends O> transformer) {
final Collection<O> answer = inputCollection instanceof Collection<?> ?
new ArrayList<O>(((Collection<?>) inputCollection).size()) : new ArrayList<O>();
new ArrayList<>(((Collection<?>) inputCollection).size()) : new ArrayList<>();
return collect(inputCollection, transformer, answer);
}

2
src/main/java/org/apache/commons/collections4/properties/SortedProperties.java
View File

@ -46,6 +46,6 @@ public class SortedProperties extends Properties {
keys.add(key.toString());
}
Collections.sort(keys);
return new IteratorEnumeration<Object>(keys.iterator());
return new IteratorEnumeration<>(keys.iterator());
}
}

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

@ -148,9 +148,9 @@ public class CollectionUtilsTest extends MockTestCase {
iterableA = collectionA;
iterableB = collectionB;
iterableC = collectionC;
collectionA2 = new ArrayList<Number>(collectionA);
collectionB2 = new LinkedList<Number>(collectionB);
collectionC2 = new LinkedList<Number>(collectionC);
collectionA2 = new ArrayList<>(collectionA);
collectionB2 = new LinkedList<>(collectionB);
collectionC2 = new LinkedList<>(collectionC);
iterableA2 = collectionA2;
iterableB2 = collectionB2;

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

@ -47,7 +47,7 @@ public class IteratorIterableTest extends BulkTest {
@SuppressWarnings("unused")
public void testIterator() {
final Iterator<Integer> iter = createIterator();
final Iterable<Number> iterable = new IteratorIterable<Number>(iter);
final Iterable<Number> iterable = new IteratorIterable<>(iter);
// first use
verifyIteration(iterable);
@ -61,7 +61,7 @@ public class IteratorIterableTest extends BulkTest {
public void testMultipleUserIterator() {
final Iterator<Integer> iter = createIterator();
final Iterable<Number> iterable = new IteratorIterable<Number>(iter, true);
final Iterable<Number> iterable = new IteratorIterable<>(iter, true);
// first use
verifyIteration(iterable);

18
src/test/java/org/apache/commons/collections4/iterators/ObjectGraphIteratorTest.java
View File

@ -67,7 +67,7 @@ public class ObjectGraphIteratorTest extends AbstractIteratorTest<Object> {
@Override
public ObjectGraphIterator<Object> makeObject() {
return new ObjectGraphIterator<Object>(iteratorList.iterator());
return new ObjectGraphIterator<>(iteratorList.iterator());
}
//-----------------------------------------------------------------------
@ -108,7 +108,7 @@ public class ObjectGraphIteratorTest extends AbstractIteratorTest<Object> {
//-----------------------------------------------------------------------
public void testIteratorConstructorIteration_Empty() {
final List<Iterator<Object>> iteratorList = new ArrayList<>();
final Iterator<Object> it = new ObjectGraphIterator<Object>(iteratorList.iterator());
final Iterator<Object> it = new ObjectGraphIterator<>(iteratorList.iterator());
assertEquals(false, it.hasNext());
try {
@ -128,7 +128,7 @@ public class ObjectGraphIteratorTest extends AbstractIteratorTest<Object> {
iteratorList.add(list1.iterator());
iteratorList.add(list2.iterator());
iteratorList.add(list3.iterator());
final Iterator<Object> it = new ObjectGraphIterator<Object>(iteratorList.iterator());
final Iterator<Object> it = new ObjectGraphIterator<>(iteratorList.iterator());
for (int i = 0; i < 6; i++) {
assertEquals(true, it.hasNext());
@ -147,7 +147,7 @@ public class ObjectGraphIteratorTest extends AbstractIteratorTest<Object> {
iteratorList.add(list1.iterator());
iteratorList.add(list2.iterator());
iteratorList.add(list3.iterator());
final Iterator<Object> it = new ObjectGraphIterator<Object>(iteratorList.iterator());
final Iterator<Object> it = new ObjectGraphIterator<>(iteratorList.iterator());
for (int i = 0; i < 6; i++) {
assertEquals(testArray[i], it.next());
@ -168,7 +168,7 @@ public class ObjectGraphIteratorTest extends AbstractIteratorTest<Object> {
iteratorList.add(IteratorUtils.<String>emptyIterator());
iteratorList.add(list3.iterator());
iteratorList.add(IteratorUtils.<String>emptyIterator());
final Iterator<Object> it = new ObjectGraphIterator<Object>(iteratorList.iterator());
final Iterator<Object> it = new ObjectGraphIterator<>(iteratorList.iterator());
for (int i = 0; i < 6; i++) {
assertEquals(true, it.hasNext());
@ -187,7 +187,7 @@ public class ObjectGraphIteratorTest extends AbstractIteratorTest<Object> {
iteratorList.add(list1.iterator());
iteratorList.add(list2.iterator());
iteratorList.add(list3.iterator());
final Iterator<Object> it = new ObjectGraphIterator<Object>(iteratorList.iterator());
final Iterator<Object> it = new ObjectGraphIterator<>(iteratorList.iterator());
for (int i = 0; i < 6; i++) {
assertEquals(testArray[i], it.next());
@ -205,7 +205,7 @@ public class ObjectGraphIteratorTest extends AbstractIteratorTest<Object> {
iteratorList.add(list1.iterator());
iteratorList.add(list2.iterator());
iteratorList.add(list3.iterator());
final Iterator<Object> it = new ObjectGraphIterator<Object>(iteratorList.iterator(), null);
final Iterator<Object> it = new ObjectGraphIterator<>(iteratorList.iterator(), null);
for (int i = 0; i < 6; i++) {
assertEquals(true, it.hasNext());
@ -223,7 +223,7 @@ public class ObjectGraphIteratorTest extends AbstractIteratorTest<Object> {
iteratorList.add(IteratorUtils.<String>emptyIterator());
iteratorList.add(list3.iterator());
iteratorList.add(IteratorUtils.<String>emptyIterator());
final Iterator<Object> it = new ObjectGraphIterator<Object>(iteratorList.iterator(), null);
final Iterator<Object> it = new ObjectGraphIterator<>(iteratorList.iterator(), null);
for (int i = 0; i < 6; i++) {
assertEquals(true, it.hasNext());
@ -251,7 +251,7 @@ public class ObjectGraphIteratorTest extends AbstractIteratorTest<Object> {
public void testIteration_RootNoTransformer() {
final Forest forest = new Forest();
final Iterator<Object> it = new ObjectGraphIterator<Object>(forest, null);
final Iterator<Object> it = new ObjectGraphIterator<>(forest, null);
assertEquals(true, it.hasNext());
assertSame(forest, it.next());

4
src/test/java/org/apache/commons/collections4/keyvalue/MultiKeyTest.java
View File

@ -176,7 +176,7 @@ public class MultiKeyTest {
public void testHashCode() {
final MultiKey<Integer> mk1 = new MultiKey<>(ONE, TWO);
final MultiKey<Integer> mk2 = new MultiKey<>(ONE, TWO);
final MultiKey<Object> mk3 = new MultiKey<Object>(ONE, "TWO");
final MultiKey<Object> mk3 = new MultiKey<>(ONE, "TWO");
assertTrue(mk1.hashCode() == mk1.hashCode());
assertTrue(mk1.hashCode() == mk2.hashCode());
@ -190,7 +190,7 @@ public class MultiKeyTest {
public void testEquals() {
final MultiKey<Integer> mk1 = new MultiKey<>(ONE, TWO);
final MultiKey<Integer> mk2 = new MultiKey<>(ONE, TWO);
final MultiKey<Object> mk3 = new MultiKey<Object>(ONE, "TWO");
final MultiKey<Object> mk3 = new MultiKey<>(ONE, "TWO");
assertEquals(mk1, mk1);
assertEquals(mk1, mk2);

4
src/test/java/org/apache/commons/collections4/map/MultiValueMapTest.java
View File

@ -124,8 +124,8 @@ public class MultiValueMapTest<K, V> extends AbstractObjectTest {
public void testKeyedIterator() {
final MultiValueMap<K, V> map = createTestMap();
final ArrayList<Object> actual = new ArrayList<Object>(IteratorUtils.toList(map.iterator("one")));
final ArrayList<Object> expected = new ArrayList<Object>(Arrays.asList("uno", "un"));
final ArrayList<Object> actual = new ArrayList<>(IteratorUtils.toList(map.iterator("one")));
final ArrayList<Object> expected = new ArrayList<>(Arrays.asList("uno", "un"));
assertEquals(expected, actual);
}