Skip to content

Commit 086e34b

Browse files
dfa1dfa1
authored
IO-746: dropping unnecessary casts and conversions (#267)
Signed-off-by: Davide Angelocola <davide.angelocola@gmail.com>
1 parent 70f3ce0 commit 086e34b

8 files changed

Lines changed: 24 additions & 24 deletions

File tree

‎src/main/java/org/apache/commons/io/IOUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ public static void close(final URLConnection conn) {
463463
* @see Throwable#addSuppressed(java.lang.Throwable)
464464
*/
465465
public static void closeQuietly(final Closeable closeable) {
466-
closeQuietly(closeable, (Consumer<IOException>) null);
466+
closeQuietly(closeable, null);
467467
}
468468

469469
/**

‎src/test/java/org/apache/commons/io/FilenameUtilsTestCase.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1151,32 +1151,32 @@ public void testIsExtensionCollection() {
11511151
assertFalse(FilenameUtils.isExtension(null, (Collection<String>) null));
11521152
assertFalse(FilenameUtils.isExtension("file.txt", (Collection<String>) null));
11531153
assertTrue(FilenameUtils.isExtension("file", (Collection<String>) null));
1154-
assertFalse(FilenameUtils.isExtension("file.txt", new ArrayList<String>()));
1154+
assertFalse(FilenameUtils.isExtension("file.txt", new ArrayList<>()));
11551155
assertTrue(FilenameUtils.isExtension("file.txt", new ArrayList<>(Arrays.asList("txt"))));
11561156
assertFalse(FilenameUtils.isExtension("file.txt", new ArrayList<>(Arrays.asList("rtf"))));
11571157
assertTrue(FilenameUtils.isExtension("file", new ArrayList<>(Arrays.asList("rtf", ""))));
11581158
assertTrue(FilenameUtils.isExtension("file.txt", new ArrayList<>(Arrays.asList("rtf", "txt"))));
11591159

11601160
assertFalse(FilenameUtils.isExtension("a/b/file.txt", (Collection<String>) null));
1161-
assertFalse(FilenameUtils.isExtension("a/b/file.txt", new ArrayList<String>()));
1161+
assertFalse(FilenameUtils.isExtension("a/b/file.txt", new ArrayList<>()));
11621162
assertTrue(FilenameUtils.isExtension("a/b/file.txt", new ArrayList<>(Arrays.asList("txt"))));
11631163
assertFalse(FilenameUtils.isExtension("a/b/file.txt", new ArrayList<>(Arrays.asList("rtf"))));
11641164
assertTrue(FilenameUtils.isExtension("a/b/file.txt", new ArrayList<>(Arrays.asList("rtf", "txt"))));
11651165

11661166
assertFalse(FilenameUtils.isExtension("a.b/file.txt", (Collection<String>) null));
1167-
assertFalse(FilenameUtils.isExtension("a.b/file.txt", new ArrayList<String>()));
1167+
assertFalse(FilenameUtils.isExtension("a.b/file.txt", new ArrayList<>()));
11681168
assertTrue(FilenameUtils.isExtension("a.b/file.txt", new ArrayList<>(Arrays.asList("txt"))));
11691169
assertFalse(FilenameUtils.isExtension("a.b/file.txt", new ArrayList<>(Arrays.asList("rtf"))));
11701170
assertTrue(FilenameUtils.isExtension("a.b/file.txt", new ArrayList<>(Arrays.asList("rtf", "txt"))));
11711171

11721172
assertFalse(FilenameUtils.isExtension("a\\b\\file.txt", (Collection<String>) null));
1173-
assertFalse(FilenameUtils.isExtension("a\\b\\file.txt", new ArrayList<String>()));
1173+
assertFalse(FilenameUtils.isExtension("a\\b\\file.txt", new ArrayList<>()));
11741174
assertTrue(FilenameUtils.isExtension("a\\b\\file.txt", new ArrayList<>(Arrays.asList("txt"))));
11751175
assertFalse(FilenameUtils.isExtension("a\\b\\file.txt", new ArrayList<>(Arrays.asList("rtf"))));
11761176
assertTrue(FilenameUtils.isExtension("a\\b\\file.txt", new ArrayList<>(Arrays.asList("rtf", "txt"))));
11771177

11781178
assertFalse(FilenameUtils.isExtension("a.b\\file.txt", (Collection<String>) null));
1179-
assertFalse(FilenameUtils.isExtension("a.b\\file.txt", new ArrayList<String>()));
1179+
assertFalse(FilenameUtils.isExtension("a.b\\file.txt", new ArrayList<>()));
11801180
assertTrue(FilenameUtils.isExtension("a.b\\file.txt", new ArrayList<>(Arrays.asList("txt"))));
11811181
assertFalse(FilenameUtils.isExtension("a.b\\file.txt", new ArrayList<>(Arrays.asList("rtf"))));
11821182
assertTrue(FilenameUtils.isExtension("a.b\\file.txt", new ArrayList<>(Arrays.asList("rtf", "txt"))));

‎src/test/java/org/apache/commons/io/IOUtilsCopyTestCase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ public void testCopy_readerToAppendable_nullIn() {
275275
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
276276
final OutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true);
277277
final Appendable writer = new OutputStreamWriter(out, StandardCharsets.US_ASCII);
278-
assertThrows(NullPointerException.class, () -> IOUtils.copy((Reader) null, writer));
278+
assertThrows(NullPointerException.class, () -> IOUtils.copy(null, writer));
279279
}
280280

281281
@SuppressWarnings("resource") // 'in' is deliberately not closed

‎src/test/java/org/apache/commons/io/IOUtilsTestCase.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ public void testCloseQuietly_AllCloseableIOException() {
392392
@Test
393393
public void testCloseQuietly_CloseableIOException() {
394394
assertDoesNotThrow(() -> {
395-
IOUtils.closeQuietly((Closeable) () -> {
395+
IOUtils.closeQuietly(() -> {
396396
throw new IOException();
397397
});
398398
});
@@ -598,7 +598,7 @@ public void testContentEquals_Reader_Reader() throws Exception {
598598
@Test
599599
public void testContentEqualsIgnoreEOL() throws Exception {
600600
{
601-
assertTrue(IOUtils.contentEqualsIgnoreEOL((Reader) null, null));
601+
assertTrue(IOUtils.contentEqualsIgnoreEOL(null, null));
602602
}
603603
{
604604
final Reader input1 = new CharArrayReader("".toCharArray());

‎src/test/java/org/apache/commons/io/filefilter/FileFilterTestCase.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ public void testAnd2() {
312312
assertFiltering(new AndFileFilter(filters), new File("test"), false);
313313
assertFiltering(new AndFileFilter(), new File("test"), false);
314314

315-
assertThrows(NullPointerException.class, () -> new AndFileFilter(falseFilter, (IOFileFilter) null));
315+
assertThrows(NullPointerException.class, () -> new AndFileFilter(falseFilter, null));
316316
assertThrows(NullPointerException.class, () -> new AndFileFilter(null, falseFilter));
317317
assertThrows(NullPointerException.class, () -> new AndFileFilter((List<IOFileFilter>) null));
318318
}
@@ -790,15 +790,15 @@ public void testFilterList_fromArray() throws Exception {
790790
@Test
791791
public void testFilterListNullParameters() {
792792
try {
793-
FileFilterUtils.filterList(null, Collections.<File>emptyList());
793+
FileFilterUtils.filterList(null, Collections.emptyList());
794794
fail();
795795
} catch (final IllegalArgumentException iae) {
796796
// Test passes, exception thrown for null filter
797797
}
798798

799799
final IOFileFilter filter = FileFilterUtils.trueFileFilter();
800800
try {
801-
FileFilterUtils.filterList(filter, Collections.singletonList((File) null));
801+
FileFilterUtils.filterList(filter, Collections.singletonList(null));
802802
} catch (final IllegalArgumentException iae) {
803803
// Test passes, exception thrown for list containing null
804804
}
@@ -870,15 +870,15 @@ public void testFilterSet_fromArray() throws Exception {
870870
@Test
871871
public void testFilterSetNullParameters() {
872872
try {
873-
FileFilterUtils.filterSet(null, Collections.<File>emptySet());
873+
FileFilterUtils.filterSet(null, Collections.emptySet());
874874
fail();
875875
} catch (final IllegalArgumentException iae) {
876876
// Test passes, exception thrown for null filter
877877
}
878878

879879
final IOFileFilter filter = FileFilterUtils.trueFileFilter();
880880
try {
881-
FileFilterUtils.filterSet(filter, new HashSet<>(Collections.singletonList((File) null)));
881+
FileFilterUtils.filterSet(filter, new HashSet<>(Collections.singletonList(null)));
882882
} catch (final IllegalArgumentException iae) {
883883
// Test passes, exception thrown for set containing null
884884
}
@@ -1355,7 +1355,7 @@ public void testOr() {
13551355
assertFalse(orFilter.accept(testFile.getParentFile(), testFile.getName()));
13561356
assertEquals(FileVisitResult.TERMINATE, orFilter.accept(testPath, null));
13571357

1358-
assertThrows(NullPointerException.class, () -> new OrFileFilter(falseFilter, (IOFileFilter) null));
1358+
assertThrows(NullPointerException.class, () -> new OrFileFilter(falseFilter, null));
13591359
}
13601360

13611361
@Test

‎src/test/java/org/apache/commons/io/input/CharacterSetFilterReaderTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class CharacterSetFilterReaderTest {
3636
@Test
3737
public void testInputSize0FilterSize0() throws IOException {
3838
final StringReader input = new StringReader("");
39-
try (CharacterSetFilterReader reader = new CharacterSetFilterReader(input, new HashSet<Integer>(0))) {
39+
try (CharacterSetFilterReader reader = new CharacterSetFilterReader(input, new HashSet<>(0))) {
4040
assertEquals(-1, reader.read());
4141
}
4242
}

‎src/test/java/org/apache/commons/io/input/TailerTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ public void testIO335() throws Exception { // test CR behavior
435435
private static class TestTailerListener extends TailerListenerAdapter {
436436

437437
// Must be synchronized because it is written by one thread and read by another
438-
private final List<String> lines = Collections.synchronizedList(new ArrayList<String>());
438+
private final List<String> lines = Collections.synchronizedList(new ArrayList<>());
439439

440440
volatile Exception exception;
441441

‎src/test/java/org/apache/commons/io/input/TeeInputStreamTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ public void setUp() throws Exception {
5454

5555
@Test
5656
public void testReadNothing() throws Exception {
57-
assertEquals("", new String(output.toString(ASCII)));
57+
assertEquals("", output.toString(ASCII));
5858
}
5959

6060
@Test
6161
public void testReadOneByte() throws Exception {
6262
assertEquals('a', tee.read());
63-
assertEquals("a", new String(output.toString(ASCII)));
63+
assertEquals("a", output.toString(ASCII));
6464
}
6565

6666
@Test
@@ -69,7 +69,7 @@ public void testReadEverything() throws Exception {
6969
assertEquals('b', tee.read());
7070
assertEquals('c', tee.read());
7171
assertEquals(-1, tee.read());
72-
assertEquals("abc", new String(output.toString(ASCII)));
72+
assertEquals("abc", output.toString(ASCII));
7373
}
7474

7575
@Test
@@ -80,7 +80,7 @@ public void testReadToArray() throws Exception {
8080
assertEquals('b', buffer[1]);
8181
assertEquals('c', buffer[2]);
8282
assertEquals(-1, tee.read(buffer));
83-
assertEquals("abc", new String(output.toString(ASCII)));
83+
assertEquals("abc", output.toString(ASCII));
8484
}
8585

8686
@Test
@@ -91,7 +91,7 @@ public void testReadToArrayWithOffset() throws Exception {
9191
assertEquals('b', buffer[5]);
9292
assertEquals('c', buffer[6]);
9393
assertEquals(-1, tee.read(buffer, 4, 4));
94-
assertEquals("abc", new String(output.toString(ASCII)));
94+
assertEquals("abc", output.toString(ASCII));
9595
}
9696

9797
@Test
@@ -100,7 +100,7 @@ public void testSkip() throws Exception {
100100
assertEquals(1, tee.skip(1));
101101
assertEquals('c', tee.read());
102102
assertEquals(-1, tee.read());
103-
assertEquals("ac", new String(output.toString(ASCII)));
103+
assertEquals("ac", output.toString(ASCII));
104104
}
105105

106106
@Test
@@ -112,7 +112,7 @@ public void testMarkReset() throws Exception {
112112
assertEquals('b', tee.read());
113113
assertEquals('c', tee.read());
114114
assertEquals(-1, tee.read());
115-
assertEquals("abbc", new String(output.toString(ASCII)));
115+
assertEquals("abbc", output.toString(ASCII));
116116
}
117117

118118
/**

0 commit comments

Comments
 (0)