Skip to content

Commit b4385de

Browse files
javadevjavadev
committed
Remove redundant type casting.
1 parent 8a5ab5f commit b4385de

File tree

5 files changed

+31
-31
lines changed

5 files changed

+31
-31
lines changed

‎src/main/java/com/github/underscore/$.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1768,7 +1768,7 @@ public Chain<T> rest(int n) {
17681768

17691769
@SuppressWarnings("unchecked")
17701770
public Chain flatten() {
1771-
return new Chain((List<T>) $.flatten(list));
1771+
return new Chain($.flatten(list));
17721772
}
17731773

17741774
public <F> Chain<F> map(final Function1<? super T, F> func) {
@@ -1893,7 +1893,7 @@ public <E> Chain<Optional<T>> findWhere(final List<Tuple<String, E>> properties)
18931893
}
18941894

18951895
public Chain<T> uniq() {
1896-
return new Chain<T>((List<T>) $.uniq(list));
1896+
return new Chain<T>($.uniq(list));
18971897
}
18981898

18991899
@SuppressWarnings("unchecked")
@@ -1938,15 +1938,15 @@ public Chain<T> concat(final List<T> ... lists) {
19381938
}
19391939

19401940
public Chain<T> slice(final int start) {
1941-
return new Chain<T>((List<T>) $.slice(list, start));
1941+
return new Chain<T>($.slice(list, start));
19421942
}
19431943

19441944
public Chain<T> slice(final int start, final int end) {
1945-
return new Chain<T>((List<T>) $.slice(list, start, end));
1945+
return new Chain<T>($.slice(list, start, end));
19461946
}
19471947

19481948
public Chain<T> reverse() {
1949-
return new Chain<T>((List<T>) $.reverse(list));
1949+
return new Chain<T>($.reverse(list));
19501950
}
19511951

19521952
public Chain<String> join() {
@@ -1958,11 +1958,11 @@ public Chain<String> join(final String separator) {
19581958
}
19591959

19601960
public Chain<T> skip(final int numberToSkip) {
1961-
return new Chain<T>((List<T>) list.subList(numberToSkip, list.size()));
1961+
return new Chain<T>(list.subList(numberToSkip, list.size()));
19621962
}
19631963

19641964
public Chain<T> limit(final int size) {
1965-
return new Chain<T>((List<T>) list.subList(0, size));
1965+
return new Chain<T>(list.subList(0, size));
19661966
}
19671967

19681968
@SuppressWarnings("unchecked")
@@ -2074,13 +2074,13 @@ public static <T> List<T> concat(final Iterable<T> first, final Iterable<T> ...
20742074
for (Iterable<T> otherItem : other) {
20752075
length += size(otherItem);
20762076
}
2077-
final T[] result = (T[]) Arrays.copyOf(toArray(first), size(first) + length);
2077+
final T[] result = Arrays.copyOf(toArray(first), size(first) + length);
20782078
int index = 0;
20792079
for (Iterable<T> otherItem : other) {
20802080
System.arraycopy(toArray(otherItem), 0, result, size(first) + index, size(otherItem));
20812081
index += size(otherItem);
20822082
}
2083-
return (List<T>) Arrays.asList(result);
2083+
return Arrays.asList(result);
20842084
}
20852085

20862086

‎src/test/java/com/github/underscore/ChainingTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ public Boolean apply(final String name) {
395395
@SuppressWarnings("unchecked")
396396
public void chain7() {
397397
String[] words = new String[] {"Gallinule", "Escambio", "Aciform", "Entortilation", "Extensibility"};
398-
int sum = (Integer) $.chain(words)
398+
int sum = $.chain(words)
399399
.filter(new Predicate<String>() {
400400
public Boolean apply(String w) {
401401
return w.startsWith("E");

‎src/test/java/com/github/underscore/CollectionsTest.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -324,14 +324,14 @@ public Boolean apply(Integer item) {
324324
}
325325
});
326326
assertEquals("Optional.of(2)", result.toString());
327-
final Optional<Integer> resultChain = (Optional<Integer>) $.chain(asList(1, 2, 3, 4, 5, 6)).find(
327+
final Optional<Integer> resultChain = $.chain(asList(1, 2, 3, 4, 5, 6)).find(
328328
new Predicate<Integer>() {
329329
public Boolean apply(Integer item) {
330330
return item % 2 == 0;
331331
}
332332
}).item();
333333
assertEquals("Optional.of(2)", resultChain.toString());
334-
final Optional<Integer> resultChain2 = (Optional<Integer>) $.chain(asList(1, 2, 3, 4, 5, 6)).find(
334+
final Optional<Integer> resultChain2 = $.chain(asList(1, 2, 3, 4, 5, 6)).find(
335335
new Predicate<Integer>() {
336336
public Boolean apply(Integer item) {
337337
return item > 6;
@@ -361,14 +361,14 @@ public Boolean apply(Integer item) {
361361
}
362362
});
363363
assertEquals("Optional.absent()", result2.toString());
364-
final Optional<Integer> resultChain = (Optional<Integer>) $.chain(asList(1, 2, 3, 4, 5, 6)).findLast(
364+
final Optional<Integer> resultChain = $.chain(asList(1, 2, 3, 4, 5, 6)).findLast(
365365
new Predicate<Integer>() {
366366
public Boolean apply(Integer item) {
367367
return item % 2 == 0;
368368
}
369369
}).item();
370370
assertEquals("Optional.of(6)", resultChain.toString());
371-
final Optional<Integer> resultChain2 = (Optional<Integer>) $.chain(asList(1, 2, 3, 4, 5, 6)).findLast(
371+
final Optional<Integer> resultChain2 = $.chain(asList(1, 2, 3, 4, 5, 6)).findLast(
372372
new Predicate<Integer>() {
373373
public Boolean apply(Integer item) {
374374
return item > 6;
@@ -473,7 +473,7 @@ public Boolean apply(Integer item) {
473473
return item % 2 == 0;
474474
}
475475
});
476-
final boolean result1chain = (Boolean) $.chain(asList(1, 2, 3, 4))
476+
final boolean result1chain = $.chain(asList(1, 2, 3, 4))
477477
.every(
478478
new Predicate<Integer>() {
479479
public Boolean apply(Integer item) {
@@ -493,7 +493,7 @@ public Boolean apply(Integer item) {
493493
return item < 5;
494494
}
495495
});
496-
final boolean result2chain = (Boolean) $.chain(asList(1, 2, 3, 4))
496+
final boolean result2chain = $.chain(asList(1, 2, 3, 4))
497497
.every(
498498
new Predicate<Integer>() {
499499
public Boolean apply(Integer item) {
@@ -606,7 +606,7 @@ public Boolean apply(Integer item) {
606606
return item % 2 == 0;
607607
}
608608
});
609-
final boolean result1chain = (Boolean) $.chain(asList(1, 2, 3, 4))
609+
final boolean result1chain = $.chain(asList(1, 2, 3, 4))
610610
.some(
611611
new Predicate<Integer>() {
612612
public Boolean apply(Integer item) {
@@ -626,7 +626,7 @@ public Boolean apply(Integer item) {
626626
return item == 5;
627627
}
628628
});
629-
final boolean result2chain = (Boolean) $.chain(asList(1, 2, 3, 4))
629+
final boolean result2chain = $.chain(asList(1, 2, 3, 4))
630630
.some(
631631
new Predicate<Integer>() {
632632
public Boolean apply(Integer item) {
@@ -661,7 +661,7 @@ public void contains() {
661661
assertTrue(result);
662662
final boolean resultObj = new $(asList(1, 2, 3)).contains(3);
663663
assertTrue(resultObj);
664-
final boolean resultChain = (Boolean) $.chain(asList(1, 2, 3)).contains(3).item();
664+
final boolean resultChain = $.chain(asList(1, 2, 3)).contains(3).item();
665665
assertTrue(resultChain);
666666
final boolean result2 = $.contains(asList(1, 2, 3), 3, 1);
667667
assertTrue(result2);
@@ -908,7 +908,7 @@ public String toString() {
908908
Tuple.<String, Object>create("author", "Shakespeare"),
909909
Tuple.<String, Object>create("year", Integer.valueOf(1611)))).get().toString());
910910
assertEquals("title: Cymbeline, author: Shakespeare, year: 1611",
911-
((Optional<Book>) $.chain(listOfPlays).findWhere(asList(
911+
($.chain(listOfPlays).findWhere(asList(
912912
Tuple.<String, Object>create("author", "Shakespeare"),
913913
Tuple.<String, Object>create("year", Integer.valueOf(1611)))).item()).get().toString());
914914
assertEquals("title: Cymbeline, author: Shakespeare, year: 1611",
@@ -942,7 +942,7 @@ public String toString() {
942942
$.findWhere(listOfPlays2, asList(
943943
Tuple.<String, Object>create("getAuthor", "Shakespeare"),
944944
Tuple.<String, Object>create("year", Integer.valueOf(1611)))).get().toString());
945-
assertEquals(Optional.absent(),
945+
assertEquals(Optional.<Book2>absent(),
946946
$.findWhere(listOfPlays2, asList(
947947
Tuple.<String, Object>create("getAuthor", "Shakespeare2"),
948948
Tuple.<String, Object>create("year", Integer.valueOf(1611)))));

‎src/test/java/com/github/underscore/FunctionsTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -278,12 +278,12 @@ public void apply(Integer item) {
278278
@Test
279279
@SuppressWarnings("unchecked")
280280
public void iteratee() {
281-
List<Map<String, Object>> sooges = asList(
282-
(Map<String, Object>) new LinkedHashMap<String, Object>() { { put("name", "curly"); put("age", 25); } },
283-
(Map<String, Object>) new LinkedHashMap<String, Object>() { { put("name", "moe"); put("age", 21); } },
284-
(Map<String, Object>) new LinkedHashMap<String, Object>() { { put("name", "larry"); put("age", 23); } }
281+
List<Map<String, Object>> stooges = Arrays.<Map<String, Object>>asList(
282+
new LinkedHashMap<String, Object>() { { put("name", "curly"); put("age", 25); } },
283+
new LinkedHashMap<String, Object>() { { put("name", "moe"); put("age", 21); } },
284+
new LinkedHashMap<String, Object>() { { put("name", "larry"); put("age", 23); } }
285285
);
286-
final List<Object> result = $.map(sooges, $.iteratee("age"));
286+
final List<Object> result = $.map(stooges, $.iteratee("age"));
287287
assertEquals("[25, 21, 23]", result.toString());
288288
}
289289
}

‎src/test/java/com/github/underscore/ObjectsTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ public void cloneMap() {
171171
Map<String, String> result = (Map<String, String>) $.clone(new LinkedHashMap<String, String>() { {
172172
put("name", "moe"); } });
173173
assertEquals("{name=moe}", result.toString());
174-
Integer[] result2 = (Integer[]) $.clone(new Integer[] { 1, 2, 3, 4, 5 });
174+
Integer[] result2 = $.clone(new Integer[] { 1, 2, 3, 4, 5 });
175175
assertEquals("[1, 2, 3, 4, 5]", asList(result2).toString());
176176
}
177177

@@ -414,12 +414,12 @@ public void isMatch() {
414414
@Test
415415
@SuppressWarnings("unchecked")
416416
public void matcher() {
417-
List<Map<String, Object>> list = asList(
418-
(Map<String, Object>) new LinkedHashMap<String, Object>() { {
417+
List<Map<String, Object>> list = Arrays.<Map<String, Object>>asList(
418+
new LinkedHashMap<String, Object>() { {
419419
put("name", "moe"); put("selected", true); put("visible", true); } },
420-
(Map<String, Object>) new LinkedHashMap<String, Object>() { {
420+
new LinkedHashMap<String, Object>() { {
421421
put("name", "larry"); put("selected", true); put("visible", false); } },
422-
(Map<String, Object>) new LinkedHashMap<String, Object>() { {
422+
new LinkedHashMap<String, Object>() { {
423423
put("name", "curly"); } }
424424
);
425425
Predicate<Map<String, Object>> ready = $.matcher(new LinkedHashMap<String, Object>() { {

0 commit comments

Comments
 (0)