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
commit a28f806cf0144748d08da8e1991a0f4f012c7a33 Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Fri Oct 27 15:41:58 2023 -0400 Add and update for Checkstyle WhitespaceAfter --- src/conf/checkstyle.xml | 1 + .../org/apache/commons/io/DirectoryWalker.java | 2 +- .../java/org/apache/commons/io/EndianUtils.java | 10 ++-- .../java/org/apache/commons/io/LineIterator.java | 2 +- .../io/filefilter/MagicNumberFileFilter.java | 4 +- .../commons/io/input/CharSequenceReader.java | 2 +- .../apache/commons/io/input/NullInputStream.java | 2 +- .../org/apache/commons/io/input/NullReader.java | 2 +- .../commons/io/output/AppendableOutputStream.java | 2 +- .../apache/commons/io/output/AppendableWriter.java | 2 +- .../org/apache/commons/io/DirectoryWalkerTest.java | 62 +++++++++++----------- .../org/apache/commons/io/EndianUtilsTest.java | 2 +- .../commons/io/FileUtilsCleanSymlinksTest.java | 3 +- .../apache/commons/io/FileUtilsCopyToFileTest.java | 4 +- .../org/apache/commons/io/IOUtilsCopyTest.java | 6 +-- .../java/org/apache/commons/io/IOUtilsTest.java | 2 +- .../io/comparator/ComparatorAbstractTest.java | 4 +- .../io/comparator/CompositeFileComparatorTest.java | 4 +- .../commons/io/input/CharSequenceReaderTest.java | 2 +- .../apache/commons/io/input/NullReaderTest.java | 9 ++-- .../io/input/SwappedDataInputStreamTest.java | 6 +-- .../io/serialization/MockSerializedClass.java | 2 +- .../io/serialization/MoreComplexObject.java | 9 ++-- .../io/serialization/MoreComplexObjectTest.java | 4 +- .../ValidatingObjectInputStreamTest.java | 6 +-- 25 files changed, 77 insertions(+), 77 deletions(-) diff --git a/src/conf/checkstyle.xml b/src/conf/checkstyle.xml index 4ff52333..e8dab51b 100644 --- a/src/conf/checkstyle.xml +++ b/src/conf/checkstyle.xml @@ -31,6 +31,7 @@ limitations under the License. <property name="max" value="160" /> </module> <module name="TreeWalker"> + <module name="WhitespaceAfter" /> <module name="AvoidStarImport" /> <module name="RedundantImport" /> <module name="UnusedImports" /> diff --git a/src/main/java/org/apache/commons/io/DirectoryWalker.java b/src/main/java/org/apache/commons/io/DirectoryWalker.java index 2269c2af..468682e8 100644 --- a/src/main/java/org/apache/commons/io/DirectoryWalker.java +++ b/src/main/java/org/apache/commons/io/DirectoryWalker.java @@ -624,7 +624,7 @@ public abstract class DirectoryWalker<T> { handleStart(startDirectory, results); walk(startDirectory, 0, results); handleEnd(results); - } catch(final CancelException cancel) { + } catch (final CancelException cancel) { handleCancelled(startDirectory, results, cancel); } } diff --git a/src/main/java/org/apache/commons/io/EndianUtils.java b/src/main/java/org/apache/commons/io/EndianUtils.java index 83c2ce25..e23545f1 100644 --- a/src/main/java/org/apache/commons/io/EndianUtils.java +++ b/src/main/java/org/apache/commons/io/EndianUtils.java @@ -164,8 +164,7 @@ public class EndianUtils { * @return the value read */ public static short readSwappedShort(final byte[] data, final int offset) { - return (short)(((data[offset + 0] & 0xff) << 0) + - ((data[offset + 1] & 0xff) << 8)); + return (short) (((data[offset + 0] & 0xff) << 0) + ((data[offset + 1] & 0xff) << 8)); } /** @@ -221,8 +220,7 @@ public class EndianUtils { * @return the value read */ public static int readSwappedUnsignedShort(final byte[] data, final int offset) { - return ((data[offset + 0] & 0xff) << 0) + - ((data[offset + 1] & 0xff) << 8); + return ((data[offset + 0] & 0xff) << 0) + ((data[offset + 1] & 0xff) << 8); } /** @@ -413,8 +411,8 @@ public class EndianUtils { * @param value value to write */ public static void writeSwappedShort(final byte[] data, final int offset, final short value) { - data[offset + 0] = (byte)(value >> 0 & 0xff); - data[offset + 1] = (byte)(value >> 8 & 0xff); + data[offset + 0] = (byte) (value >> 0 & 0xff); + data[offset + 1] = (byte) (value >> 8 & 0xff); } /** diff --git a/src/main/java/org/apache/commons/io/LineIterator.java b/src/main/java/org/apache/commons/io/LineIterator.java index d32f7540..437360da 100644 --- a/src/main/java/org/apache/commons/io/LineIterator.java +++ b/src/main/java/org/apache/commons/io/LineIterator.java @@ -134,7 +134,7 @@ public class LineIterator implements Iterator<String>, Closeable { return true; } } - } catch(final IOException ioe) { + } catch (final IOException ioe) { IOUtils.closeQuietly(this, ioe::addSuppressed); throw new IllegalStateException(ioe); } diff --git a/src/main/java/org/apache/commons/io/filefilter/MagicNumberFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/MagicNumberFileFilter.java index 1793ef2a..ee95e104 100644 --- a/src/main/java/org/apache/commons/io/filefilter/MagicNumberFileFilter.java +++ b/src/main/java/org/apache/commons/io/filefilter/MagicNumberFileFilter.java @@ -318,8 +318,8 @@ public class MagicNumberFileFilter extends AbstractFileFilter implements Seriali public String toString() { final StringBuilder builder = new StringBuilder(super.toString()); builder.append("("); - builder.append(new String(magicNumbers, Charset.defaultCharset()));// TODO perhaps use hex if value is not - // printable + // TODO perhaps use hex if value is not printable + builder.append(new String(magicNumbers, Charset.defaultCharset())); builder.append(","); builder.append(this.byteOffset); builder.append(")"); diff --git a/src/main/java/org/apache/commons/io/input/CharSequenceReader.java b/src/main/java/org/apache/commons/io/input/CharSequenceReader.java index f77777ae..f8cc8202 100644 --- a/src/main/java/org/apache/commons/io/input/CharSequenceReader.java +++ b/src/main/java/org/apache/commons/io/input/CharSequenceReader.java @@ -237,7 +237,7 @@ public class CharSequenceReader extends Reader implements Serializable { if (c == EOF) { return count; } - array[offset + i] = (char)c; + array[offset + i] = (char) c; count++; } return count; diff --git a/src/main/java/org/apache/commons/io/input/NullInputStream.java b/src/main/java/org/apache/commons/io/input/NullInputStream.java index 4b550a71..83cb277a 100644 --- a/src/main/java/org/apache/commons/io/input/NullInputStream.java +++ b/src/main/java/org/apache/commons/io/input/NullInputStream.java @@ -296,7 +296,7 @@ public class NullInputStream extends InputStream { position += length; int returnLength = length; if (position > size) { - returnLength = length - (int)(position - size); + returnLength = length - (int) (position - size); position = size; } processBytes(bytes, offset, returnLength); diff --git a/src/main/java/org/apache/commons/io/input/NullReader.java b/src/main/java/org/apache/commons/io/input/NullReader.java index ba221e04..69d11c07 100644 --- a/src/main/java/org/apache/commons/io/input/NullReader.java +++ b/src/main/java/org/apache/commons/io/input/NullReader.java @@ -281,7 +281,7 @@ public class NullReader extends Reader { position += length; int returnLength = length; if (position > size) { - returnLength = length - (int)(position - size); + returnLength = length - (int) (position - size); position = size; } processChars(chars, offset, returnLength); diff --git a/src/main/java/org/apache/commons/io/output/AppendableOutputStream.java b/src/main/java/org/apache/commons/io/output/AppendableOutputStream.java index 17886b53..498c6c95 100644 --- a/src/main/java/org/apache/commons/io/output/AppendableOutputStream.java +++ b/src/main/java/org/apache/commons/io/output/AppendableOutputStream.java @@ -62,7 +62,7 @@ public class AppendableOutputStream <T extends Appendable> extends OutputStream */ @Override public void write(final int b) throws IOException { - appendable.append((char)b); + appendable.append((char) b); } } diff --git a/src/main/java/org/apache/commons/io/output/AppendableWriter.java b/src/main/java/org/apache/commons/io/output/AppendableWriter.java index 8e234e64..38b5ba8d 100644 --- a/src/main/java/org/apache/commons/io/output/AppendableWriter.java +++ b/src/main/java/org/apache/commons/io/output/AppendableWriter.java @@ -144,7 +144,7 @@ public class AppendableWriter <T extends Appendable> extends Writer { */ @Override public void write(final int c) throws IOException { - appendable.append((char)c); + appendable.append((char) c); } /** diff --git a/src/test/java/org/apache/commons/io/DirectoryWalkerTest.java b/src/test/java/org/apache/commons/io/DirectoryWalkerTest.java index ccb5c110..aeff9435 100644 --- a/src/test/java/org/apache/commons/io/DirectoryWalkerTest.java +++ b/src/test/java/org/apache/commons/io/DirectoryWalkerTest.java @@ -54,15 +54,14 @@ public class DirectoryWalkerTest { /** find files. */ protected List<File> find(final File startDirectory) throws IOException { - final List<File> results = new ArrayList<>(); - walk(startDirectory, results); - return results; + final List<File> results = new ArrayList<>(); + walk(startDirectory, results); + return results; } /** Handles Cancel. */ @Override - protected void handleCancelled(final File startDirectory, final Collection<File> results, - final CancelException cancel) throws IOException { + protected void handleCancelled(final File startDirectory, final Collection<File> results, final CancelException cancel) throws IOException { if (!suppressCancel) { super.handleCancelled(startDirectory, results, cancel); } @@ -118,13 +117,13 @@ public class DirectoryWalkerTest { /** find files. */ protected List<File> find(final File startDirectory) { - final List<File> results = new ArrayList<>(); - try { - walk(startDirectory, results); - } catch(final IOException ex) { - fail(ex.toString()); - } - return results; + final List<File> results = new ArrayList<>(); + try { + walk(startDirectory, results); + } catch (final IOException ex) { + fail(ex.toString()); + } + return results; } /** Handles a directory end by adding the File to the result set. */ @@ -151,13 +150,13 @@ public class DirectoryWalkerTest { /** find files. */ protected List<String> find(final File startDirectory) { - final List<String> results = new ArrayList<>(); - try { - walk(startDirectory, results); - } catch(final IOException ex) { - fail(ex.toString()); - } - return results; + final List<String> results = new ArrayList<>(); + try { + walk(startDirectory, results); + } catch (final IOException ex) { + fail(ex.toString()); + } + return results; } /** Handles a file by adding the File to the result set. */ @@ -183,15 +182,14 @@ public class DirectoryWalkerTest { /** find files. */ protected List<File> find(final File startDirectory) throws IOException { - results = new ArrayList<>(); - walk(startDirectory, results); - return results; + results = new ArrayList<>(); + walk(startDirectory, results); + return results; } /** Handles Cancel. */ @Override - protected void handleCancelled(final File startDirectory, final Collection<File> results, - final CancelException cancel) throws IOException { + protected void handleCancelled(final File startDirectory, final Collection<File> results, final CancelException cancel) throws IOException { if (!suppressCancel) { super.handleCancelled(startDirectory, results, cancel); } @@ -274,13 +272,13 @@ public class DirectoryWalkerTest { */ private void checkContainsFiles(final String prefix, final File[] files, final Collection<File> results) { for (int i = 0; i < files.length; i++) { - assertTrue(results.contains(files[i]), prefix + "["+i+"] " + files[i]); + assertTrue(results.contains(files[i]), prefix + "[" + i + "] " + files[i]); } } private void checkContainsString(final String prefix, final File[] files, final Collection<String> results) { for (int i = 0; i < files.length; i++) { - assertTrue(results.contains(files[i].toString()), prefix + "["+i+"] " + files[i]); + assertTrue(results.contains(files[i].toString()), prefix + "[" + i + "] " + files[i]); } } @@ -325,7 +323,7 @@ public class DirectoryWalkerTest { } catch (final DirectoryWalker.CancelException cancel) { assertEquals(cancelName, cancel.getFile().getName(), "File: " + cancelName); assertEquals(5, cancel.getDepth(), "Depth: " + cancelName); - } catch(final IOException ex) { + } catch (final IOException ex) { fail("IOException: " + cancelName + " " + ex); } @@ -337,7 +335,7 @@ public class DirectoryWalkerTest { } catch (final DirectoryWalker.CancelException cancel) { assertEquals(cancelName, cancel.getFile().getName(), "File: " + cancelName); assertEquals(3, cancel.getDepth(), "Depth: " + cancelName); - } catch(final IOException ex) { + } catch (final IOException ex) { fail("IOException: " + cancelName + " " + ex); } @@ -346,7 +344,7 @@ public class DirectoryWalkerTest { final List<File> results = new TestCancelWalker(cancelName, true).find(javaDir); final File lastFile = results.get(results.size() - 1); assertEquals(cancelName, lastFile.getName(), "Suppress: " + cancelName); - } catch(final IOException ex) { + } catch (final IOException ex) { fail("Suppress threw " + ex); } @@ -529,7 +527,7 @@ public class DirectoryWalkerTest { final File last = walker.results.get(walker.results.size() - 1); assertEquals(cancelName, last.getName()); assertEquals(5, cancel.getDepth(), "Depth: " + cancelName); - } catch(final IOException ex) { + } catch (final IOException ex) { fail("IOException: " + cancelName + " " + ex); } @@ -542,7 +540,7 @@ public class DirectoryWalkerTest { } catch (final DirectoryWalker.CancelException cancel) { assertEquals(cancelName, cancel.getFile().getName(), "File: " + cancelName); assertEquals(3, cancel.getDepth(), "Depth: " + cancelName); - } catch(final IOException ex) { + } catch (final IOException ex) { fail("IOException: " + cancelName + " " + ex); } @@ -552,7 +550,7 @@ public class DirectoryWalkerTest { final List<File> results = walker.find(javaDir); final File lastFile = results.get(results.size() - 1); assertEquals(cancelName, lastFile.getName(), "Suppress: " + cancelName); - } catch(final IOException ex) { + } catch (final IOException ex) { fail("Suppress threw " + ex); } diff --git a/src/test/java/org/apache/commons/io/EndianUtilsTest.java b/src/test/java/org/apache/commons/io/EndianUtilsTest.java index 4247644d..60e9e3ad 100644 --- a/src/test/java/org/apache/commons/io/EndianUtilsTest.java +++ b/src/test/java/org/apache/commons/io/EndianUtilsTest.java @@ -193,7 +193,7 @@ public class EndianUtilsTest { // tests #IO-117 @Test public void testUnsignedOverrun() throws Exception { - final byte[] target = { 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/FileUtilsCleanSymlinksTest.java b/src/test/java/org/apache/commons/io/FileUtilsCleanSymlinksTest.java index 38db7645..da8eecfc 100644 --- a/src/test/java/org/apache/commons/io/FileUtilsCleanSymlinksTest.java +++ b/src/test/java/org/apache/commons/io/FileUtilsCleanSymlinksTest.java @@ -119,7 +119,8 @@ public class FileUtilsCleanSymlinksTest { assertTrue(setupSymlink(realParent, symlinkParentDirectory)); // assert contents of the real directory were removed including the symlink - FileUtils.cleanDirectory(symlinkParentDirectory);// should clean the contents of this but not recurse into other links + // should clean the contents of this but not recurse into other links + FileUtils.cleanDirectory(symlinkParentDirectory); assertEquals(0, symlinkParentDirectory.list().length); assertEquals(0, realParent.list().length); diff --git a/src/test/java/org/apache/commons/io/FileUtilsCopyToFileTest.java b/src/test/java/org/apache/commons/io/FileUtilsCopyToFileTest.java index ac387856..64e27d18 100644 --- a/src/test/java/org/apache/commons/io/FileUtilsCopyToFileTest.java +++ b/src/test/java/org/apache/commons/io/FileUtilsCopyToFileTest.java @@ -77,7 +77,7 @@ public class FileUtilsCopyToFileTest { */ @Test public void testCopyInputStreamToFile() throws IOException { - try(CheckingInputStream inputStream = new CheckingInputStream(testData)) { + try (CheckingInputStream inputStream = new CheckingInputStream(testData)) { FileUtils.copyInputStreamToFile(inputStream, testFile); assertTrue(inputStream.isClosed(), "inputStream should be closed"); } @@ -92,7 +92,7 @@ public class FileUtilsCopyToFileTest { */ @Test public void testCopyToFile() throws IOException { - try(CheckingInputStream inputStream = new CheckingInputStream(testData)) { + try (CheckingInputStream inputStream = new CheckingInputStream(testData)) { FileUtils.copyToFile(inputStream, testFile); assertFalse(inputStream.isClosed(), "inputStream should NOT be closed"); } diff --git a/src/test/java/org/apache/commons/io/IOUtilsCopyTest.java b/src/test/java/org/apache/commons/io/IOUtilsCopyTest.java index 0cd5d169..220dae80 100644 --- a/src/test/java/org/apache/commons/io/IOUtilsCopyTest.java +++ b/src/test/java/org/apache/commons/io/IOUtilsCopyTest.java @@ -103,8 +103,8 @@ public class IOUtilsCopyTest { */ @Test public void testCopy_inputStreamToOutputStream_IO84() throws Exception { - final long size = (long)Integer.MAX_VALUE + (long)1; - final InputStream in = new NullInputStream(size); + final long size = (long) Integer.MAX_VALUE + (long) 1; + final InputStream in = new NullInputStream(size); final OutputStream out = NullOutputStream.INSTANCE; // Test copy() method @@ -420,7 +420,7 @@ public class IOUtilsCopyTest { */ @Test public void testCopy_readerToWriter_IO84() throws Exception { - final long size = (long)Integer.MAX_VALUE + (long)1; + final long size = (long) Integer.MAX_VALUE + (long) 1; final Reader reader = new NullReader(size); final Writer writer = new NullWriter(); diff --git a/src/test/java/org/apache/commons/io/IOUtilsTest.java b/src/test/java/org/apache/commons/io/IOUtilsTest.java index c921abc1..11fb9ccd 100644 --- a/src/test/java/org/apache/commons/io/IOUtilsTest.java +++ b/src/test/java/org/apache/commons/io/IOUtilsTest.java @@ -1269,7 +1269,7 @@ public class IOUtilsTest { assertTrue(IOUtils.contentEqualsIgnoreEOL( new CharArrayReader(s1.toCharArray()), new CharArrayReader(s1.toCharArray()) - ),"failed at :{" + s1 + "," + s1 + "}"); + ), "failed at :{" + s1 + "," + s1 + "}"); assertTrue(IOUtils.contentEqualsIgnoreEOL( new CharArrayReader(s2.toCharArray()), new CharArrayReader(s2.toCharArray()) diff --git a/src/test/java/org/apache/commons/io/comparator/ComparatorAbstractTest.java b/src/test/java/org/apache/commons/io/comparator/ComparatorAbstractTest.java index 5bcca947..f752ef34 100644 --- a/src/test/java/org/apache/commons/io/comparator/ComparatorAbstractTest.java +++ b/src/test/java/org/apache/commons/io/comparator/ComparatorAbstractTest.java @@ -96,7 +96,7 @@ public abstract class ComparatorAbstractTest { */ @Test public void testSortArrayNull() { - assertNull(comparator.sort((File[])null)); + assertNull(comparator.sort((File[]) null)); } /** @@ -119,7 +119,7 @@ public abstract class ComparatorAbstractTest { */ @Test public void testSortListNull() { - assertNull(comparator.sort((List<File>)null)); + assertNull(comparator.sort((List<File>) null)); } /** diff --git a/src/test/java/org/apache/commons/io/comparator/CompositeFileComparatorTest.java b/src/test/java/org/apache/commons/io/comparator/CompositeFileComparatorTest.java index ad5ada43..79a7c0a7 100644 --- a/src/test/java/org/apache/commons/io/comparator/CompositeFileComparatorTest.java +++ b/src/test/java/org/apache/commons/io/comparator/CompositeFileComparatorTest.java @@ -41,7 +41,7 @@ public class CompositeFileComparatorTest extends ComparatorAbstractTest { */ @Test public void constructorArray_Null() { - final Comparator<File> c = new CompositeFileComparator((Comparator<File>[])null); + final Comparator<File> c = new CompositeFileComparator((Comparator<File>[]) null); assertEquals(0, c.compare(lessFile, moreFile), "less,more"); assertEquals(0, c.compare(moreFile, lessFile), "more,less"); assertEquals("CompositeFileComparator{}", c.toString(), "toString"); @@ -52,7 +52,7 @@ public class CompositeFileComparatorTest extends ComparatorAbstractTest { */ @Test public void constructorIterable_Null() { - final Comparator<File> c = new CompositeFileComparator((Iterable<Comparator<File>>)null); + final Comparator<File> c = new CompositeFileComparator((Iterable<Comparator<File>>) null); assertEquals(0, c.compare(lessFile, moreFile), "less,more"); assertEquals(0, c.compare(moreFile, lessFile), "more,less"); assertEquals("CompositeFileComparator{}", c.toString(), "toString"); diff --git a/src/test/java/org/apache/commons/io/input/CharSequenceReaderTest.java b/src/test/java/org/apache/commons/io/input/CharSequenceReaderTest.java index 6ea34fab..131e2f75 100644 --- a/src/test/java/org/apache/commons/io/input/CharSequenceReaderTest.java +++ b/src/test/java/org/apache/commons/io/input/CharSequenceReaderTest.java @@ -47,7 +47,7 @@ public class CharSequenceReaderTest { private void checkRead(final Reader reader, final String expected) throws IOException { for (int i = 0; i < expected.length(); i++) { - assertEquals(expected.charAt(i), (char)reader.read(), "Read[" + i + "] of '" + expected + "'"); + assertEquals(expected.charAt(i), (char) reader.read(), "Read[" + i + "] of '" + expected + "'"); } } diff --git a/src/test/java/org/apache/commons/io/input/NullReaderTest.java b/src/test/java/org/apache/commons/io/input/NullReaderTest.java index 236a0f95..43958007 100644 --- a/src/test/java/org/apache/commons/io/input/NullReaderTest.java +++ b/src/test/java/org/apache/commons/io/input/NullReaderTest.java @@ -37,18 +37,21 @@ public class NullReaderTest { public TestNullReader(final int size) { super(size); } + public TestNullReader(final int size, final boolean markSupported, final boolean throwEofException) { super(size, markSupported, throwEofException); } + @Override protected int processChar() { - return (int)getPosition() - 1; + return (int) getPosition() - 1; } + @Override protected void processChars(final char[] chars, final int offset, final int length) { - final int startPos = (int)getPosition() - length; + final int startPos = (int) getPosition() - length; for (int i = offset; i < length; i++) { - chars[i] = (char)(startPos + i); + chars[i] = (char) (startPos + i); } } diff --git a/src/test/java/org/apache/commons/io/input/SwappedDataInputStreamTest.java b/src/test/java/org/apache/commons/io/input/SwappedDataInputStreamTest.java index 7695f7ee..f2193b69 100644 --- a/src/test/java/org/apache/commons/io/input/SwappedDataInputStreamTest.java +++ b/src/test/java/org/apache/commons/io/input/SwappedDataInputStreamTest.java @@ -63,7 +63,7 @@ public class SwappedDataInputStreamTest { @Test public void testReadBoolean() throws IOException { - bytes = new byte[] {0x00, 0x01, 0x02,}; + bytes = new byte[] { 0x00, 0x01, 0x02, }; try ( final ByteArrayInputStream bais = new ByteArrayInputStream(bytes); final SwappedDataInputStream sdis = new SwappedDataInputStream(bais) @@ -98,8 +98,8 @@ public class SwappedDataInputStreamTest { public void testReadFully() throws IOException { final byte[] bytesIn = new byte[8]; this.sdis.readFully(bytesIn); - for( int i=0; i<8; i++) { - assertEquals( bytes[i], bytesIn[i] ); + for (int i = 0; i < 8; i++) { + assertEquals(bytes[i], bytesIn[i]); } } diff --git a/src/test/java/org/apache/commons/io/serialization/MockSerializedClass.java b/src/test/java/org/apache/commons/io/serialization/MockSerializedClass.java index 8e0cb826..d7a250ad 100644 --- a/src/test/java/org/apache/commons/io/serialization/MockSerializedClass.java +++ b/src/test/java/org/apache/commons/io/serialization/MockSerializedClass.java @@ -34,7 +34,7 @@ public class MockSerializedClass implements Serializable { if (!(obj instanceof MockSerializedClass)) { return false; } - return str.equals(((MockSerializedClass)obj).str); + return str.equals(((MockSerializedClass) obj).str); } @Override diff --git a/src/test/java/org/apache/commons/io/serialization/MoreComplexObject.java b/src/test/java/org/apache/commons/io/serialization/MoreComplexObject.java index 201b52df..1e0a4997 100644 --- a/src/test/java/org/apache/commons/io/serialization/MoreComplexObject.java +++ b/src/test/java/org/apache/commons/io/serialization/MoreComplexObject.java @@ -25,9 +25,8 @@ import java.util.List; import java.util.Random; import java.util.UUID; -/** A test class that uses various java.* member objects, - * to show which settings are necessary to deserialize - * those. +/** + * A test class that uses various java.* member objects, to show which settings are necessary to deserialize those. */ public class MoreComplexObject implements Serializable { private static final long serialVersionUID = -5187124661539240729L; @@ -37,11 +36,11 @@ public class MoreComplexObject implements Serializable { private final Integer integer = random.nextInt(); private final int pInt = random.nextInt(); private final long pLong = random.nextLong(); - private final Integer [] intArray = { random.nextInt(), random.nextInt() }; + private final Integer[] intArray = { random.nextInt(), random.nextInt() }; private final List<Boolean> boolList = new ArrayList<>(); MoreComplexObject() { - for(int i=0 ; i < 5; i++) { + for (int i = 0; i < 5; i++) { boolList.add(random.nextBoolean()); } } diff --git a/src/test/java/org/apache/commons/io/serialization/MoreComplexObjectTest.java b/src/test/java/org/apache/commons/io/serialization/MoreComplexObjectTest.java index 82729508..87900d3b 100644 --- a/src/test/java/org/apache/commons/io/serialization/MoreComplexObjectTest.java +++ b/src/test/java/org/apache/commons/io/serialization/MoreComplexObjectTest.java @@ -64,7 +64,7 @@ public class MoreComplexObjectTest extends AbstractCloseableListTest { assertSerialization(closeAfterEachTest( new ValidatingObjectInputStream(inputStream) .accept(MoreComplexObject.class) - .accept("java.*","[Ljava.*") + .accept("java.*", "[Ljava.*") )); } @@ -77,7 +77,7 @@ public class MoreComplexObjectTest extends AbstractCloseableListTest { assertSerialization(closeAfterEachTest( new ValidatingObjectInputStream(inputStream) .accept(MoreComplexObject.class, ArrayList.class, Random.class) - .accept("java.lang.*","[Ljava.lang.*") + .accept("java.lang.*", "[Ljava.lang.*") )); } diff --git a/src/test/java/org/apache/commons/io/serialization/ValidatingObjectInputStreamTest.java b/src/test/java/org/apache/commons/io/serialization/ValidatingObjectInputStreamTest.java index ad33d846..00244248 100644 --- a/src/test/java/org/apache/commons/io/serialization/ValidatingObjectInputStreamTest.java +++ b/src/test/java/org/apache/commons/io/serialization/ValidatingObjectInputStreamTest.java @@ -100,7 +100,7 @@ public class ValidatingObjectInputStreamTest extends AbstractCloseableListTest { assertSerialization( closeAfterEachTest(new ValidatingObjectInputStream(testStream))); fail("Expected an InvalidClassException"); - } catch(final InvalidClassException ice) { + } catch (final InvalidClassException ice) { final String name = MockSerializedClass.class.getName(); assertTrue(ice.getMessage().contains(name), "Expecting message to contain " + name); } @@ -124,7 +124,7 @@ public class ValidatingObjectInputStreamTest extends AbstractCloseableListTest { public void ourTestClassAcceptedFirstWildcard() throws Exception { assertSerialization( closeAfterEachTest(new ValidatingObjectInputStream(testStream)) - .accept("*MockSerializedClass","*Integer") + .accept("*MockSerializedClass", "*Integer") ); } @@ -140,7 +140,7 @@ public class ValidatingObjectInputStreamTest extends AbstractCloseableListTest { public void ourTestClassAcceptedSecondWildcard() throws Exception { assertSerialization( closeAfterEachTest(new ValidatingObjectInputStream(testStream)) - .accept("*Integer","*MockSerializedClass") + .accept("*Integer", "*MockSerializedClass") ); }