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-io.git
The following commit(s) were added to refs/heads/master by this push: new 44005b2 - Simplify array declarations. - Javadoc. - Use try-with-resources. 44005b2 is described below commit 44005b29ee76647599b1df52d259cfdfdb708e2a Author: Gary Gregory <gardgreg...@gmail.com> AuthorDate: Sat May 22 09:32:28 2021 -0400 - Simplify array declarations. - Javadoc. - Use try-with-resources. --- .../org/apache/commons/io/FileSystemUtils.java | 2 +- src/main/java/org/apache/commons/io/FileUtils.java | 2 +- .../java/org/apache/commons/io/FilenameUtils.java | 2 +- src/main/java/org/apache/commons/io/IOUtils.java | 2 +- .../io/comparator/CompositeFileComparator.java | 2 +- .../commons/io/file/CountingPathVisitor.java | 2 +- .../java/org/apache/commons/io/file/PathUtils.java | 14 ++-- .../apache/commons/io/filefilter/IOFileFilter.java | 2 +- .../apache/commons/io/input/XmlStreamReader.java | 4 +- .../commons/io/monitor/FileAlterationMonitor.java | 2 +- .../org/apache/commons/io/monitor/FileEntry.java | 2 +- .../apache/commons/io/DirectoryWalkerTestCase.java | 6 +- .../commons/io/DirectoryWalkerTestCaseJava4.java | 6 +- .../org/apache/commons/io/EndianUtilsTest.java | 18 ++--- .../org/apache/commons/io/FileSystemTestCase.java | 2 +- .../org/apache/commons/io/FileUtilsTestCase.java | 24 +++--- .../org/apache/commons/io/IOUtilsTestCase.java | 6 +- .../apache/commons/io/IOUtilsWriteTestCase.java | 20 ++--- .../io/filefilter/AndFileFilterTestCase.java | 39 +++++----- .../commons/io/filefilter/FileFilterTestCase.java | 6 +- .../io/filefilter/OrFileFilterTestCase.java | 39 +++++----- .../io/filefilter/RegexFileFilterTestCase.java | 2 +- .../commons/io/input/BOMInputStreamTest.java | 52 ++++++------- .../io/input/CharSequenceInputStreamTest.java | 2 +- .../commons/io/input/CircularInputStreamTest.java | 4 +- .../io/input/ClassLoaderObjectInputStreamTest.java | 4 +- .../io/input/InfiniteCircularInputStreamTest.java | 4 +- .../commons/io/input/ReaderInputStreamTest.java | 86 +++++++++++----------- .../buffer/CircularBufferInputStreamTest.java | 2 +- .../io/output/FileWriterWithEncodingTest.java | 2 +- .../apache/commons/io/output/NullWriterTest.java | 2 +- .../io/output/ProxyCollectionWriterTest.java | 8 +- .../commons/io/output/StringBuilderWriterTest.java | 2 +- .../apache/commons/io/output/TeeWriterTest.java | 8 +- 34 files changed, 193 insertions(+), 187 deletions(-) diff --git a/src/main/java/org/apache/commons/io/FileSystemUtils.java b/src/main/java/org/apache/commons/io/FileSystemUtils.java index b58cef9..9036e32 100644 --- a/src/main/java/org/apache/commons/io/FileSystemUtils.java +++ b/src/main/java/org/apache/commons/io/FileSystemUtils.java @@ -310,7 +310,7 @@ public class FileSystemUtils { } // build and run the 'dir' command - final String[] cmdAttribs = new String[] {"cmd.exe", "/C", "dir /a /-c " + normPath}; + final String[] cmdAttribs = {"cmd.exe", "/C", "dir /a /-c " + normPath}; // read in the output of the command to an ArrayList final List<String> lines = performCommand(cmdAttribs, Integer.MAX_VALUE, timeout); diff --git a/src/main/java/org/apache/commons/io/FileUtils.java b/src/main/java/org/apache/commons/io/FileUtils.java index e66dacf..db86169 100644 --- a/src/main/java/org/apache/commons/io/FileUtils.java +++ b/src/main/java/org/apache/commons/io/FileUtils.java @@ -186,7 +186,7 @@ public class FileUtils { /** * An empty array of type {@code File}. */ - public static final File[] EMPTY_FILE_ARRAY = new File[0]; + public static final File[] EMPTY_FILE_ARRAY = {}; /** * Copies the given array and adds StandardCopyOption.COPY_ATTRIBUTES. diff --git a/src/main/java/org/apache/commons/io/FilenameUtils.java b/src/main/java/org/apache/commons/io/FilenameUtils.java index 5505752..7c36799 100644 --- a/src/main/java/org/apache/commons/io/FilenameUtils.java +++ b/src/main/java/org/apache/commons/io/FilenameUtils.java @@ -87,7 +87,7 @@ import java.util.regex.Pattern; */ public class FilenameUtils { - private static final String[] EMPTY_STRING_ARRAY = new String[0]; + private static final String[] EMPTY_STRING_ARRAY = {}; private static final String EMPTY_STRING = ""; diff --git a/src/main/java/org/apache/commons/io/IOUtils.java b/src/main/java/org/apache/commons/io/IOUtils.java index 0cf8bc9..c74b74c 100644 --- a/src/main/java/org/apache/commons/io/IOUtils.java +++ b/src/main/java/org/apache/commons/io/IOUtils.java @@ -140,7 +140,7 @@ public class IOUtils { * * @since 2.9.0 */ - public static final byte[] EMPTY_BYTE_ARRAY = new byte[0]; + public static final byte[] EMPTY_BYTE_ARRAY = {}; /** * Represents the end-of-file (or stream). diff --git a/src/main/java/org/apache/commons/io/comparator/CompositeFileComparator.java b/src/main/java/org/apache/commons/io/comparator/CompositeFileComparator.java index fc48db0..17b4ff0 100644 --- a/src/main/java/org/apache/commons/io/comparator/CompositeFileComparator.java +++ b/src/main/java/org/apache/commons/io/comparator/CompositeFileComparator.java @@ -43,7 +43,7 @@ import java.util.List; */ public class CompositeFileComparator extends AbstractFileComparator implements Serializable { - private static final Comparator<?>[] EMPTY_COMPARATOR_ARRAY = new Comparator<?>[0]; + private static final Comparator<?>[] EMPTY_COMPARATOR_ARRAY = {}; private static final long serialVersionUID = -2224170307287243428L; private static final Comparator<?>[] NO_COMPARATORS = {}; private final Comparator<File>[] delegates; diff --git a/src/main/java/org/apache/commons/io/file/CountingPathVisitor.java b/src/main/java/org/apache/commons/io/file/CountingPathVisitor.java index bfe2841..f9ae727 100644 --- a/src/main/java/org/apache/commons/io/file/CountingPathVisitor.java +++ b/src/main/java/org/apache/commons/io/file/CountingPathVisitor.java @@ -34,7 +34,7 @@ import org.apache.commons.io.filefilter.TrueFileFilter; */ public class CountingPathVisitor extends SimplePathVisitor { - static final String[] EMPTY_STRING_ARRAY = new String[0]; + static final String[] EMPTY_STRING_ARRAY = {}; /** * Creates a new instance configured with a BigInteger {@link PathCounters}. diff --git a/src/main/java/org/apache/commons/io/file/PathUtils.java b/src/main/java/org/apache/commons/io/file/PathUtils.java index 08e4fe4..0ba3644 100644 --- a/src/main/java/org/apache/commons/io/file/PathUtils.java +++ b/src/main/java/org/apache/commons/io/file/PathUtils.java @@ -136,43 +136,43 @@ public final class PathUtils { * * @since 2.8.0 */ - public static final CopyOption[] EMPTY_COPY_OPTIONS = new CopyOption[0]; + public static final CopyOption[] EMPTY_COPY_OPTIONS = {}; /** * Empty {@link LinkOption} array. * * @since 2.8.0 */ - public static final DeleteOption[] EMPTY_DELETE_OPTION_ARRAY = new DeleteOption[0]; + public static final DeleteOption[] EMPTY_DELETE_OPTION_ARRAY = {}; /** * Empty {@link FileVisitOption} array. */ - public static final FileVisitOption[] EMPTY_FILE_VISIT_OPTION_ARRAY = new FileVisitOption[0]; + public static final FileVisitOption[] EMPTY_FILE_VISIT_OPTION_ARRAY = {}; /** * Empty {@link LinkOption} array. */ - public static final LinkOption[] EMPTY_LINK_OPTION_ARRAY = new LinkOption[0]; + public static final LinkOption[] EMPTY_LINK_OPTION_ARRAY = {}; /** * {@link LinkOption} array for {@link LinkOption#NOFOLLOW_LINKS}. * * @since 2.9.0 */ - public static final LinkOption[] NOFOLLOW_LINK_OPTION_ARRAY = new LinkOption[] {LinkOption.NOFOLLOW_LINKS}; + public static final LinkOption[] NOFOLLOW_LINK_OPTION_ARRAY = {LinkOption.NOFOLLOW_LINKS}; /** * Empty {@link OpenOption} array. */ - public static final OpenOption[] EMPTY_OPEN_OPTION_ARRAY = new OpenOption[0]; + public static final OpenOption[] EMPTY_OPEN_OPTION_ARRAY = {}; /** * Empty {@link Path} array. * * @since 2.9.0 */ - public static final Path[] EMPTY_PATH_ARRAY = new Path[0]; + public static final Path[] EMPTY_PATH_ARRAY = {}; /** * Accumulates file tree information in a {@link AccumulatorPathVisitor}. diff --git a/src/main/java/org/apache/commons/io/filefilter/IOFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/IOFileFilter.java index 6c29841..e45780e 100644 --- a/src/main/java/org/apache/commons/io/filefilter/IOFileFilter.java +++ b/src/main/java/org/apache/commons/io/filefilter/IOFileFilter.java @@ -35,7 +35,7 @@ public interface IOFileFilter extends FileFilter, FilenameFilter, PathFilter { /** * An empty String array. */ - String[] EMPTY_STRING_ARRAY = new String[0]; + String[] EMPTY_STRING_ARRAY = {}; /** * Checks to see if the File should be accepted by this filter. diff --git a/src/main/java/org/apache/commons/io/input/XmlStreamReader.java b/src/main/java/org/apache/commons/io/input/XmlStreamReader.java index 28a2af1..7dd1063 100644 --- a/src/main/java/org/apache/commons/io/input/XmlStreamReader.java +++ b/src/main/java/org/apache/commons/io/input/XmlStreamReader.java @@ -88,7 +88,7 @@ public class XmlStreamReader extends Reader { private static final String EBCDIC = "CP1047"; - private static final ByteOrderMark[] BOMS = new ByteOrderMark[] { + private static final ByteOrderMark[] BOMS = { ByteOrderMark.UTF_8, ByteOrderMark.UTF_16BE, ByteOrderMark.UTF_16LE, @@ -97,7 +97,7 @@ public class XmlStreamReader extends Reader { }; // UTF_16LE and UTF_32LE have the same two starting BOM bytes. - private static final ByteOrderMark[] XML_GUESS_BYTES = new ByteOrderMark[] { + private static final ByteOrderMark[] XML_GUESS_BYTES = { new ByteOrderMark(UTF_8, 0x3C, 0x3F, 0x78, 0x6D), new ByteOrderMark(UTF_16BE, 0x00, 0x3C, 0x00, 0x3F), new ByteOrderMark(UTF_16LE, 0x3C, 0x00, 0x3F, 0x00), diff --git a/src/main/java/org/apache/commons/io/monitor/FileAlterationMonitor.java b/src/main/java/org/apache/commons/io/monitor/FileAlterationMonitor.java index 9e129b8..713e663 100644 --- a/src/main/java/org/apache/commons/io/monitor/FileAlterationMonitor.java +++ b/src/main/java/org/apache/commons/io/monitor/FileAlterationMonitor.java @@ -32,7 +32,7 @@ import java.util.concurrent.ThreadFactory; */ public final class FileAlterationMonitor implements Runnable { - private static final FileAlterationObserver[] EMPTY_ARRAY = new FileAlterationObserver[0]; + private static final FileAlterationObserver[] EMPTY_ARRAY = {}; private final long interval; private final List<FileAlterationObserver> observers = new CopyOnWriteArrayList<>(); diff --git a/src/main/java/org/apache/commons/io/monitor/FileEntry.java b/src/main/java/org/apache/commons/io/monitor/FileEntry.java index 467b54b..5b9dece 100644 --- a/src/main/java/org/apache/commons/io/monitor/FileEntry.java +++ b/src/main/java/org/apache/commons/io/monitor/FileEntry.java @@ -48,7 +48,7 @@ public class FileEntry implements Serializable { private static final long serialVersionUID = -2505664948818681153L; - static final FileEntry[] EMPTY_FILE_ENTRY_ARRAY = new FileEntry[0]; + static final FileEntry[] EMPTY_FILE_ENTRY_ARRAY = {}; private final FileEntry parent; private FileEntry[] children; diff --git a/src/test/java/org/apache/commons/io/DirectoryWalkerTestCase.java b/src/test/java/org/apache/commons/io/DirectoryWalkerTestCase.java index 50b2181..5fc0ba0 100644 --- a/src/test/java/org/apache/commons/io/DirectoryWalkerTestCase.java +++ b/src/test/java/org/apache/commons/io/DirectoryWalkerTestCase.java @@ -49,15 +49,15 @@ public class DirectoryWalkerTestCase { private static final File commonsDir = new File(apacheDir, "commons"); private static final File ioDir = new File(commonsDir, "io"); private static final File outputDir = new File(ioDir, "output"); - private static final File[] dirs = new File[] {orgDir, apacheDir, commonsDir, ioDir, outputDir}; + private static final File[] dirs = {orgDir, apacheDir, commonsDir, ioDir, outputDir}; // Files private static final File filenameUtils = new File(ioDir, "FilenameUtils.java"); private static final File ioUtils = new File(ioDir, "IOUtils.java"); private static final File proxyWriter = new File(outputDir, "ProxyWriter.java"); private static final File nullStream = new File(outputDir, "NullOutputStream.java"); - private static final File[] ioFiles = new File[] {filenameUtils, ioUtils}; - private static final File[] outputFiles = new File[] {proxyWriter, nullStream}; + private static final File[] ioFiles = {filenameUtils, ioUtils}; + private static final File[] outputFiles = {proxyWriter, nullStream}; // Filters private static final IOFileFilter dirsFilter = createNameFilter(dirs); diff --git a/src/test/java/org/apache/commons/io/DirectoryWalkerTestCaseJava4.java b/src/test/java/org/apache/commons/io/DirectoryWalkerTestCaseJava4.java index d814f15..946d108 100644 --- a/src/test/java/org/apache/commons/io/DirectoryWalkerTestCaseJava4.java +++ b/src/test/java/org/apache/commons/io/DirectoryWalkerTestCaseJava4.java @@ -50,15 +50,15 @@ public class DirectoryWalkerTestCaseJava4 { private static final File commonsDir = new File(apacheDir, "commons"); private static final File ioDir = new File(commonsDir, "io"); private static final File outputDir = new File(ioDir, "output"); - private static final File[] dirs = new File[]{orgDir, apacheDir, commonsDir, ioDir, outputDir}; + private static final File[] dirs = {orgDir, apacheDir, commonsDir, ioDir, outputDir}; // Files private static final File filenameUtils = new File(ioDir, "FilenameUtils.java"); private static final File ioUtils = new File(ioDir, "IOUtils.java"); private static final File proxyWriter = new File(outputDir, "ProxyWriter.java"); private static final File nullStream = new File(outputDir, "NullOutputStream.java"); - private static final File[] ioFiles = new File[]{filenameUtils, ioUtils}; - private static final File[] outputFiles = new File[]{proxyWriter, nullStream}; + private static final File[] ioFiles = {filenameUtils, ioUtils}; + private static final File[] outputFiles = {proxyWriter, nullStream}; // Filters private static final IOFileFilter dirsFilter = createNameFilter(dirs); diff --git a/src/test/java/org/apache/commons/io/EndianUtilsTest.java b/src/test/java/org/apache/commons/io/EndianUtilsTest.java index 4391001..884a1ca 100644 --- a/src/test/java/org/apache/commons/io/EndianUtilsTest.java +++ b/src/test/java/org/apache/commons/io/EndianUtilsTest.java @@ -108,7 +108,7 @@ public class EndianUtilsTest { @Test public void testReadSwappedShort() throws IOException { - final byte[] bytes = new byte[] { 0x02, 0x01 }; + final byte[] bytes = { 0x02, 0x01 }; assertEquals( 0x0102, EndianUtils.readSwappedShort( bytes, 0 ) ); final ByteArrayInputStream input = new ByteArrayInputStream(bytes); @@ -131,7 +131,7 @@ public class EndianUtilsTest { @Test public void testReadSwappedUnsignedShort() throws IOException { - final byte[] bytes = new byte[] { 0x02, 0x01 }; + final byte[] bytes = { 0x02, 0x01 }; assertEquals( 0x00000102, EndianUtils.readSwappedUnsignedShort( bytes, 0 ) ); final ByteArrayInputStream input = new ByteArrayInputStream(bytes); @@ -140,7 +140,7 @@ public class EndianUtilsTest { @Test public void testReadSwappedInteger() throws IOException { - final byte[] bytes = new byte[] { 0x04, 0x03, 0x02, 0x01 }; + final byte[] bytes = { 0x04, 0x03, 0x02, 0x01 }; assertEquals( 0x01020304, EndianUtils.readSwappedInteger( bytes, 0 ) ); final ByteArrayInputStream input = new ByteArrayInputStream(bytes); @@ -167,7 +167,7 @@ public class EndianUtilsTest { @Test public void testReadSwappedUnsignedInteger() throws IOException { - final byte[] bytes = new byte[] { 0x04, 0x03, 0x02, 0x01 }; + final byte[] bytes = { 0x04, 0x03, 0x02, 0x01 }; assertEquals( 0x0000000001020304L, EndianUtils.readSwappedUnsignedInteger( bytes, 0 ) ); final ByteArrayInputStream input = new ByteArrayInputStream(bytes); @@ -176,7 +176,7 @@ public class EndianUtilsTest { @Test public void testReadSwappedLong() throws IOException { - final byte[] bytes = new byte[] { 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01 }; + final byte[] bytes = { 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01 }; assertEquals( 0x0102030405060708L, EndianUtils.readSwappedLong( bytes, 0 ) ); final ByteArrayInputStream input = new ByteArrayInputStream(bytes); @@ -211,7 +211,7 @@ public class EndianUtilsTest { @Test public void testReadSwappedFloat() throws IOException { - final byte[] bytes = new byte[] { 0x04, 0x03, 0x02, 0x01 }; + final byte[] bytes = { 0x04, 0x03, 0x02, 0x01 }; final float f1 = Float.intBitsToFloat( 0x01020304 ); final float f2 = EndianUtils.readSwappedFloat( bytes, 0 ); assertEquals( f1, f2, 0.0 ); @@ -241,7 +241,7 @@ public class EndianUtilsTest { @Test public void testReadSwappedDouble() throws IOException { - final byte[] bytes = new byte[] { 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01 }; + final byte[] bytes = { 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01 }; final double d1 = Double.longBitsToDouble( 0x0102030405060708L ); final double d2 = EndianUtils.readSwappedDouble( bytes, 0 ); assertEquals( d1, d2, 0.0 ); @@ -281,7 +281,7 @@ public class EndianUtilsTest { @Test public void testSymmetryOfLong() { - final double[] tests = new double[] {34.345, -345.5645, 545.12, 10.043, 7.123456789123}; + final double[] tests = {34.345, -345.5645, 545.12, 10.043, 7.123456789123}; for (final double test : tests) { // testing the real problem @@ -302,7 +302,7 @@ public class EndianUtilsTest { // tests #IO-117 @Test public void testUnsignedOverrun() throws Exception { - final byte[] target = new byte[] { 0, 0, 0, (byte)0x80 }; + final byte[] target = { 0, 0, 0, (byte)0x80 }; final long expected = 0x80000000L; long actual = EndianUtils.readSwappedUnsignedInteger(target, 0); diff --git a/src/test/java/org/apache/commons/io/FileSystemTestCase.java b/src/test/java/org/apache/commons/io/FileSystemTestCase.java index c58166a..91ab4b2 100644 --- a/src/test/java/org/apache/commons/io/FileSystemTestCase.java +++ b/src/test/java/org/apache/commons/io/FileSystemTestCase.java @@ -99,7 +99,7 @@ public class FileSystemTestCase { for (char i = 0; i < 32; i++) { assertEquals(replacement, fs.toLegalFileName(String.valueOf(i), replacement).charAt(0)); } - final char[] illegal = new char[] { '<', '>', ':', '"', '/', '\\', '|', '?', '*' }; + final char[] illegal = { '<', '>', ':', '"', '/', '\\', '|', '?', '*' }; for (char i = 0; i < illegal.length; i++) { assertEquals(replacement, fs.toLegalFileName(String.valueOf(i), replacement).charAt(0)); } diff --git a/src/test/java/org/apache/commons/io/FileUtilsTestCase.java b/src/test/java/org/apache/commons/io/FileUtilsTestCase.java index 339241c..93418c9 100644 --- a/src/test/java/org/apache/commons/io/FileUtilsTestCase.java +++ b/src/test/java/org/apache/commons/io/FileUtilsTestCase.java @@ -2501,7 +2501,7 @@ public class FileUtilsTestCase { public void testReadLines() throws Exception { final File file = TestUtils.newFile(temporaryFolder, "lines.txt"); try { - final String[] data = new String[]{"hello", "/u1234", "", "this is", "some text"}; + final String[] data = {"hello", "/u1234", "", "this is", "some text"}; TestUtils.createLineBasedFile(file, data); final List<String> lines = FileUtils.readLines(file, "UTF-8"); @@ -2704,7 +2704,7 @@ public class FileUtilsTestCase { @Test public void testToFiles1() throws Exception { - final URL[] urls = new URL[]{ + final URL[] urls = { new URL("file", null, "file1.txt"), new URL("file", null, "file2.txt"), }; @@ -2717,7 +2717,7 @@ public class FileUtilsTestCase { @Test public void testToFiles2() throws Exception { - final URL[] urls = new URL[]{ + final URL[] urls = { new URL("file", null, "file1.txt"), null, }; @@ -2738,7 +2738,7 @@ public class FileUtilsTestCase { @Test public void testToFiles3a() throws Exception { - final URL[] urls = new URL[0]; // empty array + final URL[] urls = {}; // empty array final File[] files = FileUtils.toFiles(urls); assertEquals(0, files.length); @@ -2746,7 +2746,7 @@ public class FileUtilsTestCase { @Test public void testToFiles4() throws Exception { - final URL[] urls = new URL[]{ + final URL[] urls = { new URL("file", null, "file1.txt"), new URL("http", "jakarta.apache.org", "file1.txt"), }; @@ -2793,7 +2793,7 @@ public class FileUtilsTestCase { @Test public void testToURLs1() throws Exception { - final File[] files = new File[]{ + final File[] files = { new File(temporaryFolder, "file1.txt"), new File(temporaryFolder, "file2.txt"), new File(temporaryFolder, "test file.txt"), @@ -2813,7 +2813,7 @@ public class FileUtilsTestCase { @Test public void testToURLs3a() throws Exception { - final File[] files = new File[0]; // empty array + final File[] files = {}; // empty array final URL[] urls = FileUtils.toURLs(files); assertEquals(0, urls.length); @@ -2847,7 +2847,7 @@ public class FileUtilsTestCase { @Test public void testWriteByteArrayToFile() throws Exception { final File file = new File(temporaryFolder, "write.obj"); - final byte[] data = new byte[]{11, 21, 31}; + final byte[] data = {11, 21, 31}; FileUtils.writeByteArrayToFile(file, data); TestUtils.assertEqualContent(data, file); } @@ -2880,7 +2880,7 @@ public class FileUtilsTestCase { @Test public void testWriteByteArrayToFile_WithOffsetAndLength() throws Exception { final File file = new File(temporaryFolder, "write.obj"); - final byte[] data = new byte[]{11, 21, 32, 41, 51}; + final byte[] data = {11, 21, 32, 41, 51}; final byte[] writtenData = new byte[3]; System.arraycopy(data, 1, writtenData, 0, 3); FileUtils.writeByteArrayToFile(file, data, 1, 3); @@ -2931,7 +2931,7 @@ public class FileUtilsTestCase { @Test public void testWriteLines_3arg_nullSeparator() throws Exception { - final Object[] data = new Object[]{ + final Object[] data = { "hello", new StringBuffer("world"), "", "this is", null, "some text"}; final List<Object> list = Arrays.asList(data); @@ -2978,7 +2978,7 @@ public class FileUtilsTestCase { @Test public void testWriteLines_4arg() throws Exception { - final Object[] data = new Object[]{ + final Object[] data = { "hello", new StringBuffer("world"), "", "this is", null, "some text"}; final List<Object> list = Arrays.asList(data); @@ -2992,7 +2992,7 @@ public class FileUtilsTestCase { @Test public void testWriteLines_4arg_nullSeparator() throws Exception { - final Object[] data = new Object[]{ + final Object[] data = { "hello", new StringBuffer("world"), "", "this is", null, "some text"}; final List<Object> list = Arrays.asList(data); diff --git a/src/test/java/org/apache/commons/io/IOUtilsTestCase.java b/src/test/java/org/apache/commons/io/IOUtilsTestCase.java index ad1050e..59f46a3 100644 --- a/src/test/java/org/apache/commons/io/IOUtilsTestCase.java +++ b/src/test/java/org/apache/commons/io/IOUtilsTestCase.java @@ -1044,7 +1044,7 @@ public class IOUtilsTestCase { final File file = TestUtils.newFile(temporaryFolder, "lines.txt"); InputStream in = null; try { - final String[] data = new String[] {"hello", "world", "", "this is", "some text"}; + final String[] data = {"hello", "world", "", "this is", "some text"}; TestUtils.createLineBasedFile(file, data); in = new FileInputStream(file); @@ -1062,7 +1062,7 @@ public class IOUtilsTestCase { final File file = TestUtils.newFile(temporaryFolder, "lines.txt"); InputStream in = null; try { - final String[] data = new String[] {"hello", "/u1234", "", "this is", "some text"}; + final String[] data = {"hello", "/u1234", "", "this is", "some text"}; TestUtils.createLineBasedFile(file, data); in = new FileInputStream(file); @@ -1080,7 +1080,7 @@ public class IOUtilsTestCase { final File file = TestUtils.newFile(temporaryFolder, "lines.txt"); Reader in = null; try { - final String[] data = new String[] {"hello", "/u1234", "", "this is", "some text"}; + final String[] data = {"hello", "/u1234", "", "this is", "some text"}; TestUtils.createLineBasedFile(file, data); in = new InputStreamReader(new FileInputStream(file)); diff --git a/src/test/java/org/apache/commons/io/IOUtilsWriteTestCase.java b/src/test/java/org/apache/commons/io/IOUtilsWriteTestCase.java index 44b6504..bbed524 100644 --- a/src/test/java/org/apache/commons/io/IOUtilsWriteTestCase.java +++ b/src/test/java/org/apache/commons/io/IOUtilsWriteTestCase.java @@ -566,7 +566,7 @@ public class IOUtilsWriteTestCase { @Test public void testWriteLines_OutputStream() throws Exception { - final Object[] data = new Object[]{ + final Object[] data = { "hello", new StringBuffer("world"), "", "this is", null, "some text"}; final List<Object> list = Arrays.asList(data); @@ -597,7 +597,7 @@ public class IOUtilsWriteTestCase { @Test public void testWriteLines_OutputStream_nullSeparator() throws Exception { - final Object[] data = new Object[]{"hello", "world"}; + final Object[] data = {"hello", "world"}; final List<Object> list = Arrays.asList(data); final ByteArrayOutputStream baout = new ByteArrayOutputStream(); @@ -614,7 +614,7 @@ public class IOUtilsWriteTestCase { @Test public void testWriteLines_OutputStream_nullStream() throws Exception { - final Object[] data = new Object[]{"hello", "world"}; + final Object[] data = {"hello", "world"}; final List<Object> list = Arrays.asList(data); try { IOUtils.writeLines(list, "*", (OutputStream) null); @@ -625,7 +625,7 @@ public class IOUtilsWriteTestCase { @Test public void testWriteLines_OutputStream_Encoding() throws Exception { - final Object[] data = new Object[]{ + final Object[] data = { "hello\u8364", new StringBuffer("world"), "", "this is", null, "some text"}; final List<Object> list = Arrays.asList(data); @@ -656,7 +656,7 @@ public class IOUtilsWriteTestCase { @Test public void testWriteLines_OutputStream_Encoding_nullSeparator() throws Exception { - final Object[] data = new Object[]{"hello", "world"}; + final Object[] data = {"hello", "world"}; final List<Object> list = Arrays.asList(data); final ByteArrayOutputStream baout = new ByteArrayOutputStream(); @@ -673,7 +673,7 @@ public class IOUtilsWriteTestCase { @Test public void testWriteLines_OutputStream_Encoding_nullStream() throws Exception { - final Object[] data = new Object[]{"hello", "world"}; + final Object[] data = {"hello", "world"}; final List<Object> list = Arrays.asList(data); try { IOUtils.writeLines(list, "*", null, "US-ASCII"); @@ -684,7 +684,7 @@ public class IOUtilsWriteTestCase { @Test public void testWriteLines_OutputStream_Encoding_nullEncoding() throws Exception { - final Object[] data = new Object[]{ + final Object[] data = { "hello", new StringBuffer("world"), "", "this is", null, "some text"}; final List<Object> list = Arrays.asList(data); @@ -703,7 +703,7 @@ public class IOUtilsWriteTestCase { @Test public void testWriteLines_Writer() throws Exception { - final Object[] data = new Object[]{ + final Object[] data = { "hello", new StringBuffer("world"), "", "this is", null, "some text"}; final List<Object> list = Arrays.asList(data); @@ -738,7 +738,7 @@ public class IOUtilsWriteTestCase { @Test public void testWriteLines_Writer_nullSeparator() throws Exception { - final Object[] data = new Object[]{"hello", "world"}; + final Object[] data = {"hello", "world"}; final List<Object> list = Arrays.asList(data); final ByteArrayOutputStream baout = new ByteArrayOutputStream(); @@ -757,7 +757,7 @@ public class IOUtilsWriteTestCase { @Test public void testWriteLines_Writer_nullStream() throws Exception { - final Object[] data = new Object[]{"hello", "world"}; + final Object[] data = {"hello", "world"}; final List<Object> list = Arrays.asList(data); try { IOUtils.writeLines(list, "*", (Writer) null); diff --git a/src/test/java/org/apache/commons/io/filefilter/AndFileFilterTestCase.java b/src/test/java/org/apache/commons/io/filefilter/AndFileFilterTestCase.java index 169964e..e573b85 100644 --- a/src/test/java/org/apache/commons/io/filefilter/AndFileFilterTestCase.java +++ b/src/test/java/org/apache/commons/io/filefilter/AndFileFilterTestCase.java @@ -21,6 +21,9 @@ import java.util.List; import org.junit.jupiter.api.BeforeEach; +/** + * Tests {@link AndFileFilter}. + */ public class AndFileFilterTestCase extends ConditionalFileFilterAbstractTestCase { private static final String DEFAULT_WORKING_PATH = "./AndFileFilterTestCase/"; @@ -113,9 +116,9 @@ public class AndFileFilterTestCase extends ConditionalFileFilterAbstractTestCase filters.add(trueFilters[2]); filters.add(trueFilters[3]); // test 1 true results - final boolean[] trueResults = new boolean[] {true, true, true}; + final boolean[] trueResults = {true, true, true}; // test 1 false results - final boolean[] falseResults = new boolean[] {false, false, false}; + final boolean[] falseResults = {false, false, false}; testFilters.add(1, filters); testTrueResults.add(1, trueResults); @@ -135,9 +138,9 @@ public class AndFileFilterTestCase extends ConditionalFileFilterAbstractTestCase filters.add(falseFilters[2]); filters.add(falseFilters[3]); // test 2 true results - final boolean[] trueResults = new boolean[] {false, false, false}; + final boolean[] trueResults = {false, false, false}; // test 2 false results - final boolean[] falseResults = new boolean[] {true, false, false}; + final boolean[] falseResults = {true, false, false}; testFilters.add(2, filters); testTrueResults.add(2, trueResults); @@ -157,9 +160,9 @@ public class AndFileFilterTestCase extends ConditionalFileFilterAbstractTestCase filters.add(falseFilters[2]); filters.add(falseFilters[3]); // test 3 true results - final boolean[] trueResults = new boolean[] {true, false, false}; + final boolean[] trueResults = {true, false, false}; // test 3 false results - final boolean[] falseResults = new boolean[] {true, false, false}; + final boolean[] falseResults = {true, false, false}; testFilters.add(3, filters); testTrueResults.add(3, trueResults); @@ -179,9 +182,9 @@ public class AndFileFilterTestCase extends ConditionalFileFilterAbstractTestCase filters.add(falseFilters[2]); filters.add(falseFilters[3]); // test 4 true results - final boolean[] trueResults = new boolean[] {true, true, false}; + final boolean[] trueResults = {true, true, false}; // test 4 false results - final boolean[] falseResults = new boolean[] {true, false, false}; + final boolean[] falseResults = {true, false, false}; testFilters.add(4, filters); testTrueResults.add(4, trueResults); @@ -201,9 +204,9 @@ public class AndFileFilterTestCase extends ConditionalFileFilterAbstractTestCase filters.add(trueFilters[2]); filters.add(trueFilters[3]); // test 5 true results - final boolean[] trueResults = new boolean[] {false, false, false}; + final boolean[] trueResults = {false, false, false}; // test 5 false results - final boolean[] falseResults = new boolean[] {true, false, false}; + final boolean[] falseResults = {true, false, false}; testFilters.add(5, filters); testTrueResults.add(5, trueResults); @@ -222,9 +225,9 @@ public class AndFileFilterTestCase extends ConditionalFileFilterAbstractTestCase filters.add(trueFilters[3]); filters.add(falseFilters[3]); // test 6 true results - final boolean[] trueResults = new boolean[] {true, false, false}; + final boolean[] trueResults = {true, false, false}; // test 6 false results - final boolean[] falseResults = new boolean[] {true, false, false}; + final boolean[] falseResults = {true, false, false}; testFilters.add(6, filters); testTrueResults.add(6, trueResults); @@ -243,9 +246,9 @@ public class AndFileFilterTestCase extends ConditionalFileFilterAbstractTestCase filters.add(trueFilters[2]); filters.add(trueFilters[3]); // test 7 true results - final boolean[] trueResults = new boolean[] {false, false, false}; + final boolean[] trueResults = {false, false, false}; // test 7 false results - final boolean[] falseResults = new boolean[] {true, false, false}; + final boolean[] falseResults = {true, false, false}; testFilters.add(7, filters); testTrueResults.add(7, trueResults); @@ -262,9 +265,9 @@ public class AndFileFilterTestCase extends ConditionalFileFilterAbstractTestCase filters.add(trueFilters[3]); filters.add(falseFilters[1]); // test 8 true results - final boolean[] trueResults = new boolean[] {true, true, true}; + final boolean[] trueResults = {true, true, true}; // test 8 false results - final boolean[] falseResults = new boolean[] {true, false, false}; + final boolean[] falseResults = {true, false, false}; testFilters.add(8, filters); testTrueResults.add(8, trueResults); @@ -280,9 +283,9 @@ public class AndFileFilterTestCase extends ConditionalFileFilterAbstractTestCase filters.add(falseFilters[2]); filters.add(falseFilters[3]); // test 9 true results - final boolean[] trueResults = new boolean[] {false, false, false}; + final boolean[] trueResults = {false, false, false}; // test 9 false results - final boolean[] falseResults = new boolean[] {true, false, false}; + final boolean[] falseResults = {true, false, false}; testFilters.add(9, filters); testTrueResults.add(9, trueResults); diff --git a/src/test/java/org/apache/commons/io/filefilter/FileFilterTestCase.java b/src/test/java/org/apache/commons/io/filefilter/FileFilterTestCase.java index e1300ec..aebdf27 100644 --- a/src/test/java/org/apache/commons/io/filefilter/FileFilterTestCase.java +++ b/src/test/java/org/apache/commons/io/filefilter/FileFilterTestCase.java @@ -907,7 +907,7 @@ public class FileFilterTestCase { @Test public void testMagicNumberFileFilterBytes() throws Exception { - final byte[] classFileMagicNumber = new byte[] {(byte) 0xCA, (byte) 0xFE, (byte) 0xBA, (byte) 0xBE}; + final byte[] classFileMagicNumber = {(byte) 0xCA, (byte) 0xFE, (byte) 0xBA, (byte) 0xBE}; final String xmlFileContent = "<?xml version=\"1.0\" encoding=\"UTF-8\">\n" + "<element>text</element>"; final File classAFile = new File(temporaryFolder, "A.class"); @@ -953,7 +953,7 @@ public class FileFilterTestCase { @Test public void testMagicNumberFileFilterBytesOffset() throws Exception { - final byte[] tarMagicNumber = new byte[] {0x75, 0x73, 0x74, 0x61, 0x72}; + final byte[] tarMagicNumber = {0x75, 0x73, 0x74, 0x61, 0x72}; final long tarMagicNumberOffset = 257; final File tarFileA = new File(temporaryFolder, "A.tar"); @@ -990,7 +990,7 @@ public class FileFilterTestCase { @Test public void testMagicNumberFileFilterString() throws Exception { - final byte[] classFileMagicNumber = new byte[] {(byte) 0xCA, (byte) 0xFE, (byte) 0xBA, (byte) 0xBE}; + final byte[] classFileMagicNumber = {(byte) 0xCA, (byte) 0xFE, (byte) 0xBA, (byte) 0xBE}; final String xmlFileContent = "<?xml version=\"1.0\" encoding=\"UTF-8\">\n" + "<element>text</element>"; final String xmlMagicNumber = "<?xml version=\"1.0\""; diff --git a/src/test/java/org/apache/commons/io/filefilter/OrFileFilterTestCase.java b/src/test/java/org/apache/commons/io/filefilter/OrFileFilterTestCase.java index e01c01a..4194d91 100644 --- a/src/test/java/org/apache/commons/io/filefilter/OrFileFilterTestCase.java +++ b/src/test/java/org/apache/commons/io/filefilter/OrFileFilterTestCase.java @@ -21,6 +21,9 @@ import java.util.List; import org.junit.jupiter.api.BeforeEach; +/** + * Tests {@link IOFileFilter}. + */ public class OrFileFilterTestCase extends ConditionalFileFilterAbstractTestCase { private static final String DEFAULT_WORKING_PATH = "./OrFileFilterTestCase/"; @@ -113,9 +116,9 @@ public class OrFileFilterTestCase extends ConditionalFileFilterAbstractTestCase filters.add(trueFilters[2]); filters.add(trueFilters[3]); // test 1 true results - final boolean[] trueResults = new boolean[] {true, false, false}; + final boolean[] trueResults = {true, false, false}; // test 1 false results - final boolean[] falseResults = new boolean[] {false, false, false}; + final boolean[] falseResults = {false, false, false}; testFilters.add(1, filters); testTrueResults.add(1, trueResults); @@ -135,9 +138,9 @@ public class OrFileFilterTestCase extends ConditionalFileFilterAbstractTestCase filters.add(falseFilters[2]); filters.add(falseFilters[3]); // test 2 true results - final boolean[] trueResults = new boolean[] {true, false, false}; + final boolean[] trueResults = {true, false, false}; // test 2 false results - final boolean[] falseResults = new boolean[] {true, false, false}; + final boolean[] falseResults = {true, false, false}; testFilters.add(2, filters); testTrueResults.add(2, trueResults); @@ -157,9 +160,9 @@ public class OrFileFilterTestCase extends ConditionalFileFilterAbstractTestCase filters.add(falseFilters[2]); filters.add(falseFilters[3]); // test 3 true results - final boolean[] trueResults = new boolean[] {true, false, false}; + final boolean[] trueResults = {true, false, false}; // test 3 false results - final boolean[] falseResults = new boolean[] {false, false, false}; + final boolean[] falseResults = {false, false, false}; testFilters.add(3, filters); testTrueResults.add(3, trueResults); @@ -179,9 +182,9 @@ public class OrFileFilterTestCase extends ConditionalFileFilterAbstractTestCase filters.add(falseFilters[2]); filters.add(falseFilters[3]); // test 4 true results - final boolean[] trueResults = new boolean[] {true, false, false}; + final boolean[] trueResults = {true, false, false}; // test 4 false results - final boolean[] falseResults = new boolean[] {false, false, false}; + final boolean[] falseResults = {false, false, false}; testFilters.add(4, filters); testTrueResults.add(4, trueResults); @@ -201,9 +204,9 @@ public class OrFileFilterTestCase extends ConditionalFileFilterAbstractTestCase filters.add(trueFilters[2]); filters.add(trueFilters[3]); // test 5 true results - final boolean[] trueResults = new boolean[] {true, false, false}; + final boolean[] trueResults = {true, false, false}; // test 5 false results - final boolean[] falseResults = new boolean[] {true, false, false}; + final boolean[] falseResults = {true, false, false}; testFilters.add(5, filters); testTrueResults.add(5, trueResults); @@ -222,9 +225,9 @@ public class OrFileFilterTestCase extends ConditionalFileFilterAbstractTestCase filters.add(trueFilters[3]); filters.add(falseFilters[3]); // test 6 true results - final boolean[] trueResults = new boolean[] {true, false, false}; + final boolean[] trueResults = {true, false, false}; // test 6 false results - final boolean[] falseResults = new boolean[] {false, false, false}; + final boolean[] falseResults = {false, false, false}; testFilters.add(6, filters); testTrueResults.add(6, trueResults); @@ -243,9 +246,9 @@ public class OrFileFilterTestCase extends ConditionalFileFilterAbstractTestCase filters.add(trueFilters[2]); filters.add(trueFilters[3]); // test 7 true results - final boolean[] trueResults = new boolean[] {true, false, false}; + final boolean[] trueResults = {true, false, false}; // test 7 false results - final boolean[] falseResults = new boolean[] {true, true, false}; + final boolean[] falseResults = {true, true, false}; testFilters.add(7, filters); testTrueResults.add(7, trueResults); @@ -262,9 +265,9 @@ public class OrFileFilterTestCase extends ConditionalFileFilterAbstractTestCase filters.add(trueFilters[3]); filters.add(falseFilters[1]); // test 8 true results - final boolean[] trueResults = new boolean[] {true, false, false}; + final boolean[] trueResults = {true, false, false}; // test 8 false results - final boolean[] falseResults = new boolean[] {false, false, false}; + final boolean[] falseResults = {false, false, false}; testFilters.add(8, filters); testTrueResults.add(8, trueResults); @@ -280,9 +283,9 @@ public class OrFileFilterTestCase extends ConditionalFileFilterAbstractTestCase filters.add(falseFilters[2]); filters.add(falseFilters[3]); // test 9 true results - final boolean[] trueResults = new boolean[] {false, false, false}; + final boolean[] trueResults = {false, false, false}; // test 9 false results - final boolean[] falseResults = new boolean[] {true, true, true}; + final boolean[] falseResults = {true, true, true}; testFilters.add(9, filters); testTrueResults.add(9, trueResults); diff --git a/src/test/java/org/apache/commons/io/filefilter/RegexFileFilterTestCase.java b/src/test/java/org/apache/commons/io/filefilter/RegexFileFilterTestCase.java index 12d2ea1..707a0a4 100644 --- a/src/test/java/org/apache/commons/io/filefilter/RegexFileFilterTestCase.java +++ b/src/test/java/org/apache/commons/io/filefilter/RegexFileFilterTestCase.java @@ -28,7 +28,7 @@ import org.apache.commons.io.IOCase; import org.junit.jupiter.api.Test; /** - * Used to test RegexFileFilterUtils. + * Tests {@link RegexFileFilter}. */ public class RegexFileFilterTestCase { diff --git a/src/test/java/org/apache/commons/io/input/BOMInputStreamTest.java b/src/test/java/org/apache/commons/io/input/BOMInputStreamTest.java index d5fba7f..e149ec9 100644 --- a/src/test/java/org/apache/commons/io/input/BOMInputStreamTest.java +++ b/src/test/java/org/apache/commons/io/input/BOMInputStreamTest.java @@ -195,7 +195,7 @@ public class BOMInputStreamTest { @Test public void testAvailableWithBOM() throws Exception { - final byte[] data = new byte[] { 'A', 'B', 'C', 'D' }; + final byte[] data = { 'A', 'B', 'C', 'D' }; try (final InputStream in = new BOMInputStream(createUtf8DataStream(data, true))) { assertEquals(7, in.available()); } @@ -203,7 +203,7 @@ public class BOMInputStreamTest { @Test public void testAvailableWithoutBOM() throws Exception { - final byte[] data = new byte[] { 'A', 'B', 'C', 'D' }; + final byte[] data = { 'A', 'B', 'C', 'D' }; try (final InputStream in = new BOMInputStream(createUtf8DataStream(data, false))) { assertEquals(4, in.available()); } @@ -222,7 +222,7 @@ public class BOMInputStreamTest { @Test public void testEmptyBufferWithBOM() throws Exception { - final byte[] data = new byte[] {}; + final byte[] data = {}; try (final InputStream in = new BOMInputStream(createUtf8DataStream(data, true))) { final byte[] buf = new byte[1024]; assertEquals(-1, in.read(buf)); @@ -231,7 +231,7 @@ public class BOMInputStreamTest { @Test public void testEmptyBufferWithoutBOM() throws Exception { - final byte[] data = new byte[] {}; + final byte[] data = {}; try (final InputStream in = new BOMInputStream(createUtf8DataStream(data, false))) { final byte[] buf = new byte[1024]; assertEquals(-1, in.read(buf)); @@ -240,7 +240,7 @@ public class BOMInputStreamTest { @Test public void testGetBOMFirstThenRead() throws Exception { - final byte[] data = new byte[] { 'A', 'B', 'C' }; + final byte[] data = { 'A', 'B', 'C' }; try (final BOMInputStream in = new BOMInputStream(createUtf8DataStream(data, true))) { assertEquals(ByteOrderMark.UTF_8, in.getBOM(), "getBOM"); assertTrue(in.hasBOM(), "hasBOM()"); @@ -254,7 +254,7 @@ public class BOMInputStreamTest { @Test public void testGetBOMFirstThenReadInclude() throws Exception { - final byte[] data = new byte[] { 'A', 'B', 'C' }; + final byte[] data = { 'A', 'B', 'C' }; try (final BOMInputStream in = new BOMInputStream(createUtf8DataStream(data, true), true)) { assertTrue(in.hasBOM(), "hasBOM()"); assertTrue(in.hasBOM(ByteOrderMark.UTF_8), "hasBOM(UTF-8)"); @@ -271,7 +271,7 @@ public class BOMInputStreamTest { @Test public void testLargeBufferWithBOM() throws Exception { - final byte[] data = new byte[] { 'A', 'B', 'C' }; + final byte[] data = { 'A', 'B', 'C' }; try (final InputStream in = new BOMInputStream(createUtf8DataStream(data, true))) { final byte[] buf = new byte[1024]; assertData(data, buf, in.read(buf)); @@ -280,7 +280,7 @@ public class BOMInputStreamTest { @Test public void testLargeBufferWithoutBOM() throws Exception { - final byte[] data = new byte[] { 'A', 'B', 'C' }; + final byte[] data = { 'A', 'B', 'C' }; try (final InputStream in = new BOMInputStream(createUtf8DataStream(data, false))) { final byte[] buf = new byte[1024]; assertData(data, buf, in.read(buf)); @@ -289,7 +289,7 @@ public class BOMInputStreamTest { @Test public void testLeadingNonBOMBufferedRead() throws Exception { - final byte[] data = new byte[] { (byte) 0xEF, (byte) 0xAB, (byte) 0xCD }; + final byte[] data = { (byte) 0xEF, (byte) 0xAB, (byte) 0xCD }; try (final InputStream in = new BOMInputStream(createUtf8DataStream(data, false))) { final byte[] buf = new byte[1024]; assertData(data, buf, in.read(buf)); @@ -298,7 +298,7 @@ public class BOMInputStreamTest { @Test public void testLeadingNonBOMSingleRead() throws Exception { - final byte[] data = new byte[] { (byte) 0xEF, (byte) 0xAB, (byte) 0xCD }; + final byte[] data = { (byte) 0xEF, (byte) 0xAB, (byte) 0xCD }; try (final InputStream in = new BOMInputStream(createUtf8DataStream(data, false))) { assertEquals(0xEF, in.read()); assertEquals(0xAB, in.read()); @@ -309,7 +309,7 @@ public class BOMInputStreamTest { @Test public void testMarkResetAfterReadWithBOM() throws Exception { - final byte[] data = new byte[] { 'A', 'B', 'C', 'D' }; + final byte[] data = { 'A', 'B', 'C', 'D' }; try (final InputStream in = new BOMInputStream(createUtf8DataStream(data, true))) { assertTrue(in.markSupported()); @@ -325,7 +325,7 @@ public class BOMInputStreamTest { @Test public void testMarkResetAfterReadWithoutBOM() throws Exception { - final byte[] data = new byte[] { 'A', 'B', 'C', 'D' }; + final byte[] data = { 'A', 'B', 'C', 'D' }; try (final InputStream in = new BOMInputStream(createUtf8DataStream(data, false))) { assertTrue(in.markSupported()); @@ -341,7 +341,7 @@ public class BOMInputStreamTest { @Test public void testMarkResetBeforeReadWithBOM() throws Exception { - final byte[] data = new byte[] { 'A', 'B', 'C', 'D' }; + final byte[] data = { 'A', 'B', 'C', 'D' }; try (final InputStream in = new BOMInputStream(createUtf8DataStream(data, true))) { assertTrue(in.markSupported()); @@ -356,7 +356,7 @@ public class BOMInputStreamTest { @Test public void testMarkResetBeforeReadWithoutBOM() throws Exception { - final byte[] data = new byte[] { 'A', 'B', 'C', 'D' }; + final byte[] data = { 'A', 'B', 'C', 'D' }; try (final InputStream in = new BOMInputStream(createUtf8DataStream(data, false))) { assertTrue(in.markSupported()); @@ -371,7 +371,7 @@ public class BOMInputStreamTest { @Test public void testNoBoms() throws Exception { - final byte[] data = new byte[] { 'A', 'B', 'C' }; + final byte[] data = { 'A', 'B', 'C' }; try { (new BOMInputStream(createUtf8DataStream(data, true), false, (ByteOrderMark[])null)).close(); fail("Null BOMs, expected IllegalArgumentException"); @@ -392,7 +392,7 @@ public class BOMInputStreamTest { @Test public void testReadEmpty() throws Exception { - final byte[] data = new byte[] {}; + final byte[] data = {}; try (final BOMInputStream in = new BOMInputStream(createUtf8DataStream(data, false))) { assertEquals(-1, in.read()); assertFalse(in.hasBOM(), "hasBOM()"); @@ -403,7 +403,7 @@ public class BOMInputStreamTest { @Test public void testReadSmall() throws Exception { - final byte[] data = new byte[] { 'A', 'B' }; + final byte[] data = { 'A', 'B' }; try (final BOMInputStream in = new BOMInputStream(createUtf8DataStream(data, false))) { assertEquals('A', in.read()); assertEquals('B', in.read()); @@ -426,7 +426,7 @@ public class BOMInputStreamTest { @Test public void testReadWithBOMInclude() throws Exception { - final byte[] data = new byte[] { 'A', 'B', 'C' }; + final byte[] data = { 'A', 'B', 'C' }; try (final BOMInputStream in = new BOMInputStream(createUtf8DataStream(data, true), true)) { assertEquals(0xEF, in.read()); assertEquals(0xBB, in.read()); @@ -573,7 +573,7 @@ public class BOMInputStreamTest { @Test public void testReadWithMultipleBOM() throws Exception { - final byte[] data = new byte[] { 'A', 'B', 'C' }; + final byte[] data = { 'A', 'B', 'C' }; try (final BOMInputStream in = new BOMInputStream(createUtf8DataStream(data, true), ByteOrderMark.UTF_16BE, ByteOrderMark.UTF_8)) { assertEquals('A', in.read()); @@ -589,7 +589,7 @@ public class BOMInputStreamTest { @Test public void testReadWithoutBOM() throws Exception { - final byte[] data = new byte[] { 'A', 'B', 'C' }; + final byte[] data = { 'A', 'B', 'C' }; try (final BOMInputStream in = new BOMInputStream(createUtf8DataStream(data, false))) { assertEquals('A', in.read()); assertEquals('B', in.read()); @@ -704,7 +704,7 @@ public class BOMInputStreamTest { @Test public void testSkipWithBOM() throws Exception { - final byte[] data = new byte[] { 'A', 'B', 'C', 'D' }; + final byte[] data = { 'A', 'B', 'C', 'D' }; try (final InputStream in = new BOMInputStream(createUtf8DataStream(data, true))) { in.skip(2L); assertEquals('C', in.read()); @@ -713,7 +713,7 @@ public class BOMInputStreamTest { @Test public void testSkipWithoutBOM() throws Exception { - final byte[] data = new byte[] { 'A', 'B', 'C', 'D' }; + final byte[] data = { 'A', 'B', 'C', 'D' }; try (final InputStream in = new BOMInputStream(createUtf8DataStream(data, false))) { in.skip(2L); assertEquals('C', in.read()); @@ -723,7 +723,7 @@ public class BOMInputStreamTest { @Test public void skipReturnValueWithBom() throws IOException { - final byte[] baseData = new byte[] { (byte) 0x31, (byte) 0x32, (byte) 0x33 }; + final byte[] baseData = { (byte) 0x31, (byte) 0x32, (byte) 0x33 }; try (final BOMInputStream is1 = new BOMInputStream(createUtf8DataStream(baseData, true))) { assertEquals(2, is1.skip(2)); assertEquals((byte) 0x33, is1.read()); @@ -732,7 +732,7 @@ public class BOMInputStreamTest { @Test public void skipReturnValueWithoutBom() throws IOException { - final byte[] baseData = new byte[] { (byte) 0x31, (byte) 0x32, (byte) 0x33 }; + final byte[] baseData = { (byte) 0x31, (byte) 0x32, (byte) 0x33 }; try (final BOMInputStream is2 = new BOMInputStream(createUtf8DataStream(baseData, false))) { assertEquals(2, is2.skip(2)); // IO-428 assertEquals((byte) 0x33, is2.read()); @@ -741,7 +741,7 @@ public class BOMInputStreamTest { @Test public void testSmallBufferWithBOM() throws Exception { - final byte[] data = new byte[] { 'A', 'B', 'C' }; + final byte[] data = { 'A', 'B', 'C' }; try (final InputStream in = new BOMInputStream(createUtf8DataStream(data, true))) { final byte[] buf = new byte[1024]; assertData(new byte[] { 'A', 'B' }, buf, in.read(buf, 0, 2)); @@ -751,7 +751,7 @@ public class BOMInputStreamTest { @Test public void testSmallBufferWithoutBOM() throws Exception { - final byte[] data = new byte[] { 'A', 'B', 'C' }; + final byte[] data = { 'A', 'B', 'C' }; try (final InputStream in = new BOMInputStream(createUtf8DataStream(data, false))) { final byte[] buf = new byte[1024]; assertData(new byte[] { 'A', 'B' }, buf, in.read(buf, 0, 2)); diff --git a/src/test/java/org/apache/commons/io/input/CharSequenceInputStreamTest.java b/src/test/java/org/apache/commons/io/input/CharSequenceInputStreamTest.java index 0ebd443..3e995d9 100644 --- a/src/test/java/org/apache/commons/io/input/CharSequenceInputStreamTest.java +++ b/src/test/java/org/apache/commons/io/input/CharSequenceInputStreamTest.java @@ -109,7 +109,7 @@ public class CharSequenceInputStreamTest { private void testCharsetMismatchInfiniteLoop(final String csName) throws IOException { // Input is UTF-8 bytes: 0xE0 0xB2 0xA0 - final char[] inputChars = new char[] { (char) 0xE0, (char) 0xB2, (char) 0xA0 }; + final char[] inputChars = { (char) 0xE0, (char) 0xB2, (char) 0xA0 }; final Charset charset = Charset.forName(csName); // infinite loop for US-ASCII, UTF-8 OK try (InputStream stream = new CharSequenceInputStream(new String(inputChars), charset, 512)) { while (stream.read() != -1) { diff --git a/src/test/java/org/apache/commons/io/input/CircularInputStreamTest.java b/src/test/java/org/apache/commons/io/input/CircularInputStreamTest.java index 431f353..db8bb37 100644 --- a/src/test/java/org/apache/commons/io/input/CircularInputStreamTest.java +++ b/src/test/java/org/apache/commons/io/input/CircularInputStreamTest.java @@ -81,8 +81,8 @@ public class CircularInputStreamTest { @Test public void testCycleBytes() throws IOException { - final byte[] input = new byte[] { 1, 2 }; - final byte[] expected = new byte[] { 1, 2, 1, 2, 1 }; + final byte[] input = { 1, 2 }; + final byte[] expected = { 1, 2, 1, 2, 1 }; assertStreamOutput(input, expected); } diff --git a/src/test/java/org/apache/commons/io/input/ClassLoaderObjectInputStreamTest.java b/src/test/java/org/apache/commons/io/input/ClassLoaderObjectInputStreamTest.java index 115778f..67b437c 100644 --- a/src/test/java/org/apache/commons/io/input/ClassLoaderObjectInputStreamTest.java +++ b/src/test/java/org/apache/commons/io/input/ClassLoaderObjectInputStreamTest.java @@ -182,7 +182,7 @@ public class ClassLoaderObjectInputStreamTest { try (final ClassLoaderObjectInputStream clois = new ClassLoaderObjectInputStream(getClass().getClassLoader(), bais)) { - final String[] interfaces = new String[] { Comparable.class.getName() }; + final String[] interfaces = { Comparable.class.getName() }; final Class<?> result = clois.resolveProxyClass(interfaces); assertTrue(Comparable.class.isAssignableFrom(result), "Assignable"); } @@ -198,7 +198,7 @@ public class ClassLoaderObjectInputStreamTest { try (final ClassLoaderObjectInputStream clois = new ClassLoaderObjectInputStream(getClass().getClassLoader(), bais)) { - final String[] interfaces = new String[] { Comparable.class.getName(), Serializable.class.getName(), + final String[] interfaces = { Comparable.class.getName(), Serializable.class.getName(), Runnable.class.getName() }; final Class<?> result = clois.resolveProxyClass(interfaces); assertTrue(Comparable.class.isAssignableFrom(result), "Assignable"); diff --git a/src/test/java/org/apache/commons/io/input/InfiniteCircularInputStreamTest.java b/src/test/java/org/apache/commons/io/input/InfiniteCircularInputStreamTest.java index 6565855..67baaca 100644 --- a/src/test/java/org/apache/commons/io/input/InfiniteCircularInputStreamTest.java +++ b/src/test/java/org/apache/commons/io/input/InfiniteCircularInputStreamTest.java @@ -74,8 +74,8 @@ public class InfiniteCircularInputStreamTest { @Test public void testCycleBytes() throws IOException { - final byte[] input = new byte[] { 1, 2 }; - final byte[] expected = new byte[] { 1, 2, 1, 2, 1 }; + final byte[] input = { 1, 2 }; + final byte[] expected = { 1, 2, 1, 2, 1 }; assertStreamOutput(input, expected); } diff --git a/src/test/java/org/apache/commons/io/input/ReaderInputStreamTest.java b/src/test/java/org/apache/commons/io/input/ReaderInputStreamTest.java index 9f7a556..18e088e 100644 --- a/src/test/java/org/apache/commons/io/input/ReaderInputStreamTest.java +++ b/src/test/java/org/apache/commons/io/input/ReaderInputStreamTest.java @@ -44,40 +44,40 @@ public class ReaderInputStreamTest { private void testWithSingleByteRead(final String testString, final String charsetName) throws IOException { final byte[] bytes = testString.getBytes(charsetName); - final ReaderInputStream in = new ReaderInputStream(new StringReader(testString), charsetName); - for (final byte b : bytes) { - final int read = in.read(); - assertTrue(read >= 0); - assertTrue(read <= 255); - assertEquals(b, (byte)read); + try (final ReaderInputStream in = new ReaderInputStream(new StringReader(testString), charsetName)) { + for (final byte b : bytes) { + final int read = in.read(); + assertTrue(read >= 0); + assertTrue(read <= 255); + assertEquals(b, (byte) read); + } + assertEquals(-1, in.read()); } - assertEquals(-1, in.read()); - in.close(); } private void testWithBufferedRead(final String testString, final String charsetName) throws IOException { final byte[] expected = testString.getBytes(charsetName); - final ReaderInputStream in = new ReaderInputStream(new StringReader(testString), charsetName); - final byte[] buffer = new byte[128]; - int offset = 0; - while (true) { - int bufferOffset = random.nextInt(64); - final int bufferLength = random.nextInt(64); - int read = in.read(buffer, bufferOffset, bufferLength); - if (read == -1) { - assertEquals(offset, expected.length); - break; - } - assertTrue(read <= bufferLength); - while (read > 0) { - assertTrue(offset < expected.length); - assertEquals(expected[offset], buffer[bufferOffset]); - offset++; - bufferOffset++; - read--; + try (final ReaderInputStream in = new ReaderInputStream(new StringReader(testString), charsetName)) { + final byte[] buffer = new byte[128]; + int offset = 0; + while (true) { + int bufferOffset = random.nextInt(64); + final int bufferLength = random.nextInt(64); + int read = in.read(buffer, bufferOffset, bufferLength); + if (read == -1) { + assertEquals(offset, expected.length); + break; + } + assertTrue(read <= bufferLength); + while (read > 0) { + assertTrue(offset < expected.length); + assertEquals(expected[offset], buffer[bufferOffset]); + offset++; + bufferOffset++; + read--; + } } } - in.close(); } @Test @@ -109,26 +109,26 @@ public class ReaderInputStreamTest { @Test public void testReadZero() throws Exception { final String inStr = "test"; - final ReaderInputStream r = new ReaderInputStream(new StringReader(inStr)); - final byte[] bytes = new byte[30]; - assertEquals(0, r.read(bytes, 0, 0)); - assertEquals(inStr.length(), r.read(bytes, 0, inStr.length()+1)); - // Should always return 0 for length == 0 - assertEquals(0, r.read(bytes, 0, 0)); - r.close(); + try (final ReaderInputStream inputStream = new ReaderInputStream(new StringReader(inStr))) { + final byte[] bytes = new byte[30]; + assertEquals(0, inputStream.read(bytes, 0, 0)); + assertEquals(inStr.length(), inputStream.read(bytes, 0, inStr.length() + 1)); + // Should always return 0 for length == 0 + assertEquals(0, inputStream.read(bytes, 0, 0)); + } } @SuppressWarnings("deprecation") @Test public void testReadZeroEmptyString() throws Exception { - final ReaderInputStream r = new ReaderInputStream(new StringReader("")); - final byte[] bytes = new byte[30]; - // Should always return 0 for length == 0 - assertEquals(0, r.read(bytes, 0, 0)); - assertEquals(-1, r.read(bytes, 0, 1)); - assertEquals(0, r.read(bytes, 0, 0)); - assertEquals(-1, r.read(bytes, 0, 1)); - r.close(); + try (final ReaderInputStream inputStream = new ReaderInputStream(new StringReader(""))) { + final byte[] bytes = new byte[30]; + // Should always return 0 for length == 0 + assertEquals(0, inputStream.read(bytes, 0, 0)); + assertEquals(-1, inputStream.read(bytes, 0, 1)); + assertEquals(0, inputStream.read(bytes, 0, 0)); + assertEquals(-1, inputStream.read(bytes, 0, 1)); + } } /* @@ -137,7 +137,7 @@ public class ReaderInputStreamTest { @Test public void testCharsetMismatchInfiniteLoop() throws IOException { // Input is UTF-8 bytes: 0xE0 0xB2 0xA0 - final char[] inputChars = new char[] { (char) 0xE0, (char) 0xB2, (char) 0xA0 }; + final char[] inputChars = { (char) 0xE0, (char) 0xB2, (char) 0xA0 }; // Charset charset = Charset.forName("UTF-8"); // works final Charset charset = StandardCharsets.US_ASCII; // infinite loop try (ReaderInputStream stream = new ReaderInputStream(new CharArrayReader(inputChars), charset)) { diff --git a/src/test/java/org/apache/commons/io/input/buffer/CircularBufferInputStreamTest.java b/src/test/java/org/apache/commons/io/input/buffer/CircularBufferInputStreamTest.java index dbb7a25..c713ec0 100644 --- a/src/test/java/org/apache/commons/io/input/buffer/CircularBufferInputStreamTest.java +++ b/src/test/java/org/apache/commons/io/input/buffer/CircularBufferInputStreamTest.java @@ -79,7 +79,7 @@ public class CircularBufferInputStreamTest { @Test public void testIO683() throws IOException { - final byte[] buffer = new byte[]{0,1,-2,-2,-1,4}; + final byte[] buffer = {0,1,-2,-2,-1,4}; try ( final ByteArrayInputStream bais = new ByteArrayInputStream(buffer); final CircularBufferInputStream cbis = new CircularBufferInputStream(bais) diff --git a/src/test/java/org/apache/commons/io/output/FileWriterWithEncodingTest.java b/src/test/java/org/apache/commons/io/output/FileWriterWithEncodingTest.java index 1e014db..71c4966 100644 --- a/src/test/java/org/apache/commons/io/output/FileWriterWithEncodingTest.java +++ b/src/test/java/org/apache/commons/io/output/FileWriterWithEncodingTest.java @@ -48,7 +48,7 @@ public class FileWriterWithEncodingTest { private File file1; private File file2; private String textContent; - private final char[] anotherTestContent = new char[]{'f', 'z', 'x'}; + private final char[] anotherTestContent = {'f', 'z', 'x'}; @BeforeEach public void setUp() throws Exception { diff --git a/src/test/java/org/apache/commons/io/output/NullWriterTest.java b/src/test/java/org/apache/commons/io/output/NullWriterTest.java index 507d3fe..404dfd8 100644 --- a/src/test/java/org/apache/commons/io/output/NullWriterTest.java +++ b/src/test/java/org/apache/commons/io/output/NullWriterTest.java @@ -26,7 +26,7 @@ public class NullWriterTest { @Test public void testNull() { - final char[] chars = new char[] { 'A', 'B', 'C' }; + final char[] chars = { 'A', 'B', 'C' }; try (final NullWriter writer = NullWriter.NULL_WRITER) { writer.write(1); writer.write(chars); diff --git a/src/test/java/org/apache/commons/io/output/ProxyCollectionWriterTest.java b/src/test/java/org/apache/commons/io/output/ProxyCollectionWriterTest.java index 39785ac..2fd5374 100644 --- a/src/test/java/org/apache/commons/io/output/ProxyCollectionWriterTest.java +++ b/src/test/java/org/apache/commons/io/output/ProxyCollectionWriterTest.java @@ -209,7 +209,7 @@ public class ProxyCollectionWriterTest { final StringWriter goodW = mock(StringWriter.class); @SuppressWarnings("resource") // not necessary to close this final ProxyCollectionWriter tw = new ProxyCollectionWriter(badW, goodW, null); - final char[] data = new char[] { 'a' }; + final char[] data = { 'a' }; try { tw.write(data); fail("Expected " + IOException.class.getName()); @@ -226,7 +226,7 @@ public class ProxyCollectionWriterTest { final StringWriter goodW = mock(StringWriter.class); @SuppressWarnings("resource") // not necessary to close this final ProxyCollectionWriter tw = new ProxyCollectionWriter(goodW, badW, null); - final char[] data = new char[] { 'a' }; + final char[] data = { 'a' }; try { tw.write(data); fail("Expected " + IOException.class.getName()); @@ -243,7 +243,7 @@ public class ProxyCollectionWriterTest { final StringWriter goodW = mock(StringWriter.class); @SuppressWarnings("resource") // not necessary to close this final ProxyCollectionWriter tw = new ProxyCollectionWriter(badW, goodW, null); - final char[] data = new char[] { 'a' }; + final char[] data = { 'a' }; try { tw.write(data, 0, 0); fail("Expected " + IOException.class.getName()); @@ -260,7 +260,7 @@ public class ProxyCollectionWriterTest { final StringWriter goodW = mock(StringWriter.class); @SuppressWarnings("resource") // not necessary to close this final ProxyCollectionWriter tw = new ProxyCollectionWriter(goodW, badW, null); - final char[] data = new char[] { 'a' }; + final char[] data = { 'a' }; try { tw.write(data, 0, 0); fail("Expected " + IOException.class.getName()); diff --git a/src/test/java/org/apache/commons/io/output/StringBuilderWriterTest.java b/src/test/java/org/apache/commons/io/output/StringBuilderWriterTest.java index 5e1f959..36c92d4 100644 --- a/src/test/java/org/apache/commons/io/output/StringBuilderWriterTest.java +++ b/src/test/java/org/apache/commons/io/output/StringBuilderWriterTest.java @@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test; * */ public class StringBuilderWriterTest { - private static final char[] FOOBAR_CHARS = new char[] {'F', 'o', 'o', 'B', 'a', 'r'}; + private static final char[] FOOBAR_CHARS = {'F', 'o', 'o', 'B', 'a', 'r'}; @Test diff --git a/src/test/java/org/apache/commons/io/output/TeeWriterTest.java b/src/test/java/org/apache/commons/io/output/TeeWriterTest.java index ef86837..7a98877 100644 --- a/src/test/java/org/apache/commons/io/output/TeeWriterTest.java +++ b/src/test/java/org/apache/commons/io/output/TeeWriterTest.java @@ -199,7 +199,7 @@ public class TeeWriterTest { final Writer badW = new BrokenWriter(); final StringWriter goodW = mock(StringWriter.class); final TeeWriter tw = new TeeWriter(badW, goodW, null); - final char[] data = new char[] { 'a' }; + final char[] data = { 'a' }; try { tw.write(data); fail("Expected " + IOException.class.getName()); @@ -215,7 +215,7 @@ public class TeeWriterTest { final Writer badW = new BrokenWriter(); final StringWriter goodW = mock(StringWriter.class); final TeeWriter tw = new TeeWriter(goodW, badW, null); - final char[] data = new char[] { 'a' }; + final char[] data = { 'a' }; try { tw.write(data); fail("Expected " + IOException.class.getName()); @@ -231,7 +231,7 @@ public class TeeWriterTest { final Writer badW = new BrokenWriter(); final StringWriter goodW = mock(StringWriter.class); final TeeWriter tw = new TeeWriter(badW, goodW, null); - final char[] data = new char[] { 'a' }; + final char[] data = { 'a' }; try { tw.write(data, 0, 0); fail("Expected " + IOException.class.getName()); @@ -247,7 +247,7 @@ public class TeeWriterTest { final Writer badW = new BrokenWriter(); final StringWriter goodW = mock(StringWriter.class); final TeeWriter tw = new TeeWriter(goodW, badW, null); - final char[] data = new char[] { 'a' }; + final char[] data = { 'a' }; try { tw.write(data, 0, 0); fail("Expected " + IOException.class.getName());