Repository: commons-io Updated Branches: refs/heads/master fcca356d6 -> 14b52eb4f
Use final for parameters. Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/14b52eb4 Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/14b52eb4 Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/14b52eb4 Branch: refs/heads/master Commit: 14b52eb4f630f32c66122977331bd894b9474978 Parents: fcca356 Author: Gary Gregory <ggreg...@apache.org> Authored: Wed Sep 27 13:29:43 2017 -0600 Committer: Gary Gregory <ggreg...@apache.org> Committed: Wed Sep 27 13:29:43 2017 -0600 ---------------------------------------------------------------------- .../org/apache/commons/io/FileSystemUtils.java | 2 +- .../java/org/apache/commons/io/FileUtils.java | 6 ++--- .../org/apache/commons/io/FilenameUtils.java | 2 +- .../java/org/apache/commons/io/IOUtils.java | 14 ++++++------ .../org/apache/commons/io/ThreadMonitor.java | 2 +- .../apache/commons/io/input/BOMInputStream.java | 2 +- .../apache/commons/io/input/BoundedReader.java | 6 ++--- .../io/input/InfiniteCircularInputStream.java | 2 +- .../MessageDigestCalculatingInputStream.java | 12 +++++----- .../commons/io/input/ObservableInputStream.java | 22 +++++++++--------- .../io/input/UnixLineEndingInputStream.java | 6 ++--- .../io/input/WindowsLineEndingInputStream.java | 4 ++-- .../io/monitor/FileAlterationObserver.java | 2 +- .../io/output/AppendableOutputStream.java | 4 ++-- .../io/output/ByteArrayOutputStream.java | 2 +- .../commons/io/output/ChunkedOutputStream.java | 4 ++-- .../apache/commons/io/output/ChunkedWriter.java | 4 ++-- .../commons/io/output/WriterOutputStream.java | 2 +- .../io/serialization/FullClassNameMatcher.java | 4 ++-- .../serialization/RegexpClassNameMatcher.java | 6 ++--- .../ValidatingObjectInputStream.java | 24 ++++++++++---------- .../serialization/WildcardClassNameMatcher.java | 4 ++-- .../apache/commons/io/FileUtilsTestCase.java | 2 +- .../org/apache/commons/io/IOUtilsTestCase.java | 16 ++++++------- .../commons/io/input/BOMInputStreamTest.java | 4 ++-- .../io/input/CharSequenceInputStreamTest.java | 4 ++-- .../input/ClassLoaderObjectInputStreamTest.java | 6 ++--- .../input/InfiniteCircularInputStreamTest.java | 2 +- ...MessageDigestCalculatingInputStreamTest.java | 2 +- .../io/input/ObservableInputStreamTest.java | 4 ++-- .../io/input/UnixLineEndingInputStreamTest.java | 4 ++-- .../input/WindowsLineEndingInputStreamTest.java | 4 ++-- .../io/output/ChunkedOutputStreamTest.java | 2 +- .../commons/io/output/ChunkedWriterTest.java | 2 +- .../io/output/FileWriterWithEncodingTest.java | 4 ++-- .../commons/io/output/ProxyWriterTest.java | 16 ++++++------- .../commons/io/serialization/ClosingBase.java | 2 +- .../io/serialization/MockSerializedClass.java | 4 ++-- .../io/serialization/MoreComplexObjectTest.java | 2 +- .../ValidatingObjectInputStreamTest.java | 8 +++---- .../apache/commons/io/testtools/TestUtils.java | 6 ++--- 41 files changed, 115 insertions(+), 115 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/main/java/org/apache/commons/io/FileSystemUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/FileSystemUtils.java b/src/main/java/org/apache/commons/io/FileSystemUtils.java index a560c0b..861cc66 100644 --- a/src/main/java/org/apache/commons/io/FileSystemUtils.java +++ b/src/main/java/org/apache/commons/io/FileSystemUtils.java @@ -293,7 +293,7 @@ public class FileSystemUtils { * @return the amount of free drive space on the drive * @throws IOException if an error occurs */ - long freeSpaceWindows(String path, final long timeout) throws IOException { + long freeSpaceWindows(final String path, final long timeout) throws IOException { String normPath = FilenameUtils.normalize(path, false); if (normPath == null) { throw new IllegalArgumentException(path); http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/main/java/org/apache/commons/io/FileUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/FileUtils.java b/src/main/java/org/apache/commons/io/FileUtils.java index e9ea792..116e44b 100644 --- a/src/main/java/org/apache/commons/io/FileUtils.java +++ b/src/main/java/org/apache/commons/io/FileUtils.java @@ -1372,7 +1372,7 @@ public class FileUtils { * @param dest the destination * @throws FileNotFoundException if the destination does not exist */ - private static void checkFileRequirements(File src, File dest) throws FileNotFoundException { + private static void checkFileRequirements(final File src, final File dest) throws FileNotFoundException { if (src == null) { throw new NullPointerException("Source must not be null"); } @@ -1735,7 +1735,7 @@ public class FileUtils { * @return The files in the directory, never null. * @throws IOException if an I/O error occurs */ - private static File[] verifiedListFiles(File directory) throws IOException { + private static File[] verifiedListFiles(final File directory) throws IOException { if (!directory.exists()) { final String message = directory + " does not exist"; throw new IllegalArgumentException(message); @@ -2636,7 +2636,7 @@ public class FileUtils { * @param file the file to check * @return the size of the file */ - private static long sizeOf0(File file) { + private static long sizeOf0(final File file) { if (file.isDirectory()) { return sizeOfDirectory0(file); } else { http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/main/java/org/apache/commons/io/FilenameUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/FilenameUtils.java b/src/main/java/org/apache/commons/io/FilenameUtils.java index 54084ff..718a374 100644 --- a/src/main/java/org/apache/commons/io/FilenameUtils.java +++ b/src/main/java/org/apache/commons/io/FilenameUtils.java @@ -982,7 +982,7 @@ public class FilenameUtils { * This may be used for poison byte attacks. * @param path the path to check */ - private static void failIfNullBytePresent(String path) { + private static void failIfNullBytePresent(final String path) { int len = path.length(); for (int i = 0; i < len; i++) { if (path.charAt(i) == 0) { http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/main/java/org/apache/commons/io/IOUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/IOUtils.java b/src/main/java/org/apache/commons/io/IOUtils.java index 7645f51..8d558f0 100644 --- a/src/main/java/org/apache/commons/io/IOUtils.java +++ b/src/main/java/org/apache/commons/io/IOUtils.java @@ -585,7 +585,7 @@ public class IOUtils { * @throws IOException if an I/O error occurs * @since 2.5 */ - public static InputStream toBufferedInputStream(final InputStream input, int size) throws IOException { + public static InputStream toBufferedInputStream(final InputStream input, final int size) throws IOException { return ByteArrayOutputStream.toBufferedInputStream(input, size); } @@ -614,7 +614,7 @@ public class IOUtils { * @see #buffer(Reader) * @since 2.5 */ - public static BufferedReader toBufferedReader(final Reader reader, int size) { + public static BufferedReader toBufferedReader(final Reader reader, final int size) { return reader instanceof BufferedReader ? (BufferedReader) reader : new BufferedReader(reader, size); } @@ -641,7 +641,7 @@ public class IOUtils { * @throws NullPointerException if the input parameter is null * @since 2.5 */ - public static BufferedReader buffer(final Reader reader, int size) { + public static BufferedReader buffer(final Reader reader, final int size) { return reader instanceof BufferedReader ? (BufferedReader) reader : new BufferedReader(reader, size); } @@ -668,7 +668,7 @@ public class IOUtils { * @throws NullPointerException if the input parameter is null * @since 2.5 */ - public static BufferedWriter buffer(final Writer writer, int size) { + public static BufferedWriter buffer(final Writer writer, final int size) { return writer instanceof BufferedWriter ? (BufferedWriter) writer : new BufferedWriter(writer, size); } @@ -700,7 +700,7 @@ public class IOUtils { * @throws NullPointerException if the input parameter is null * @since 2.5 */ - public static BufferedOutputStream buffer(final OutputStream outputStream, int size) { + public static BufferedOutputStream buffer(final OutputStream outputStream, final int size) { // reject null early on rather than waiting for IO operation to fail if (outputStream == null) { // not checked by BufferedOutputStream throw new NullPointerException(); @@ -737,7 +737,7 @@ public class IOUtils { * @throws NullPointerException if the input parameter is null * @since 2.5 */ - public static BufferedInputStream buffer(final InputStream inputStream, int size) { + public static BufferedInputStream buffer(final InputStream inputStream, final int size) { // reject null early on rather than waiting for IO operation to fail if (inputStream == null) { // not checked by BufferedInputStream throw new NullPointerException(); @@ -1289,7 +1289,7 @@ public class IOUtils { * * @since 2.6 */ - public static String resourceToString(final String name, final Charset encoding, ClassLoader classLoader) throws IOException { + public static String resourceToString(final String name, final Charset encoding, final ClassLoader classLoader) throws IOException { return toString(resourceToURL(name, classLoader), encoding); } http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/main/java/org/apache/commons/io/ThreadMonitor.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/ThreadMonitor.java b/src/main/java/org/apache/commons/io/ThreadMonitor.java index 1ca37c7..12ec610 100644 --- a/src/main/java/org/apache/commons/io/ThreadMonitor.java +++ b/src/main/java/org/apache/commons/io/ThreadMonitor.java @@ -121,7 +121,7 @@ class ThreadMonitor implements Runnable { * @param ms the number of milliseconds to sleep for * @throws InterruptedException if interrupted */ - private static void sleep(long ms) throws InterruptedException { + private static void sleep(final long ms) throws InterruptedException { long finishAt = System.currentTimeMillis() + ms; long remaining = ms; do { http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/main/java/org/apache/commons/io/input/BOMInputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/input/BOMInputStream.java b/src/main/java/org/apache/commons/io/input/BOMInputStream.java index c9ef85f..9e34547 100644 --- a/src/main/java/org/apache/commons/io/input/BOMInputStream.java +++ b/src/main/java/org/apache/commons/io/input/BOMInputStream.java @@ -401,7 +401,7 @@ public class BOMInputStream extends ProxyInputStream { * if an I/O error occurs */ @Override - public long skip(long n) throws IOException { + public long skip(final long n) throws IOException { int skipped = 0; while ((n > skipped) && (readFirstBytes() >= 0)) { skipped++; http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/main/java/org/apache/commons/io/input/BoundedReader.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/input/BoundedReader.java b/src/main/java/org/apache/commons/io/input/BoundedReader.java index 4d7e772..75328cc 100644 --- a/src/main/java/org/apache/commons/io/input/BoundedReader.java +++ b/src/main/java/org/apache/commons/io/input/BoundedReader.java @@ -57,7 +57,7 @@ public class BoundedReader * @param maxCharsFromTargetReader The maximum number of characters that can be read from target * @throws IOException if mark fails */ - public BoundedReader( Reader target, int maxCharsFromTargetReader ) throws IOException { + public BoundedReader( final Reader target, final int maxCharsFromTargetReader ) throws IOException { this.target = target; this.maxCharsFromTargetReader = maxCharsFromTargetReader; } @@ -98,7 +98,7 @@ public class BoundedReader * @see java.io.Reader#mark(int). */ @Override - public void mark( int readAheadLimit ) throws IOException { + public void mark( final int readAheadLimit ) throws IOException { this.readAheadLimit = readAheadLimit - charsRead; markedAt = charsRead; @@ -138,7 +138,7 @@ public class BoundedReader * @see java.io.Reader#read(char[], int, int) */ @Override - public int read( char[] cbuf, int off, int len ) throws IOException { + public int read( final char[] cbuf, final int off, final int len ) throws IOException { int c; for ( int i = 0; i < len; i++ ) { c = read(); http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/main/java/org/apache/commons/io/input/InfiniteCircularInputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/input/InfiniteCircularInputStream.java b/src/main/java/org/apache/commons/io/input/InfiniteCircularInputStream.java index a2a8973..64995c0 100644 --- a/src/main/java/org/apache/commons/io/input/InfiniteCircularInputStream.java +++ b/src/main/java/org/apache/commons/io/input/InfiniteCircularInputStream.java @@ -38,7 +38,7 @@ public class InfiniteCircularInputStream extends InputStream { * @param repeatedContent * Input buffer to be repeated (not copied) */ - public InfiniteCircularInputStream(byte[] repeatedContent) { + public InfiniteCircularInputStream(final byte[] repeatedContent) { this.repeatedContent = repeatedContent; } http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/main/java/org/apache/commons/io/input/MessageDigestCalculatingInputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/input/MessageDigestCalculatingInputStream.java b/src/main/java/org/apache/commons/io/input/MessageDigestCalculatingInputStream.java index 6c9577e..d24e828 100644 --- a/src/main/java/org/apache/commons/io/input/MessageDigestCalculatingInputStream.java +++ b/src/main/java/org/apache/commons/io/input/MessageDigestCalculatingInputStream.java @@ -41,17 +41,17 @@ public class MessageDigestCalculatingInputStream extends ObservableInputStream { * Creates an MessageDigestMaintainingObserver for the given MessageDigest. * @param pMd the message digest to use */ - public MessageDigestMaintainingObserver(MessageDigest pMd) { + public MessageDigestMaintainingObserver(final MessageDigest pMd) { md = pMd; } @Override - void data(int pByte) throws IOException { + void data(final int pByte) throws IOException { md.update((byte) pByte); } @Override - void data(byte[] pBuffer, int pOffset, int pLength) throws IOException { + void data(final byte[] pBuffer, final int pOffset, final int pLength) throws IOException { md.update(pBuffer, pOffset, pLength); } } @@ -63,7 +63,7 @@ public class MessageDigestCalculatingInputStream extends ObservableInputStream { * @param pStream the stream to calculate the message digest for * @param pDigest the message digest to use */ - public MessageDigestCalculatingInputStream(InputStream pStream, MessageDigest pDigest) { + public MessageDigestCalculatingInputStream(final InputStream pStream, final MessageDigest pDigest) { super(pStream); messageDigest = pDigest; add(new MessageDigestMaintainingObserver(pDigest)); @@ -75,7 +75,7 @@ public class MessageDigestCalculatingInputStream extends ObservableInputStream { * @param pAlgorithm the name of the algorithm to use * @throws NoSuchAlgorithmException if no Provider supports a MessageDigestSpi implementation for the specified algorithm. */ - public MessageDigestCalculatingInputStream(InputStream pStream, String pAlgorithm) throws NoSuchAlgorithmException { + public MessageDigestCalculatingInputStream(final InputStream pStream, final String pAlgorithm) throws NoSuchAlgorithmException { this(pStream, MessageDigest.getInstance(pAlgorithm)); } @@ -84,7 +84,7 @@ public class MessageDigestCalculatingInputStream extends ObservableInputStream { * @param pStream the stream to calculate the message digest for * @throws NoSuchAlgorithmException if no Provider supports a MessageDigestSpi implementation for the specified algorithm. */ - public MessageDigestCalculatingInputStream(InputStream pStream) throws NoSuchAlgorithmException { + public MessageDigestCalculatingInputStream(final InputStream pStream) throws NoSuchAlgorithmException { this(pStream, MessageDigest.getInstance("MD5")); } http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/main/java/org/apache/commons/io/input/ObservableInputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/input/ObservableInputStream.java b/src/main/java/org/apache/commons/io/input/ObservableInputStream.java index 2d50bb7..cf24299 100644 --- a/src/main/java/org/apache/commons/io/input/ObservableInputStream.java +++ b/src/main/java/org/apache/commons/io/input/ObservableInputStream.java @@ -44,7 +44,7 @@ public class ObservableInputStream extends ProxyInputStream { * because, in that case, {@link #finished()} will be invoked instead. * @throws IOException if an i/o-error occurs */ - void data(int pByte) throws IOException {} + void data(final int pByte) throws IOException {} /** Called to indicate, that {@link InputStream#read(byte[])}, or * {@link InputStream#read(byte[], int, int)} have been called, and are about to @@ -55,7 +55,7 @@ public class ObservableInputStream extends ProxyInputStream { * @param pLength The number of bytes, which have been stored in the byte array. * @throws IOException if an i/o-error occurs */ - void data(byte[] pBuffer, int pOffset, int pLength) throws IOException {} + void data(final byte[] pBuffer, final int pOffset, final int pLength) throws IOException {} /** Called to indicate, that EOF has been seen on the underlying stream. * This method may be called multiple times, if the reader keeps invoking @@ -74,7 +74,7 @@ public class ObservableInputStream extends ProxyInputStream { * Called to indicate, that an error occurred on the underlying stream. * @throws IOException if an i/o-error occurs */ - void error(IOException pException) throws IOException { throw pException; } + void error(final IOException pException) throws IOException { throw pException; } } private final List<Observer> observers = new ArrayList<>(); @@ -83,7 +83,7 @@ public class ObservableInputStream extends ProxyInputStream { * Creates a new ObservableInputStream for the given InputStream. * @param pProxy the input stream to proxy */ - public ObservableInputStream(InputStream pProxy) { + public ObservableInputStream(final InputStream pProxy) { super(pProxy); } @@ -91,7 +91,7 @@ public class ObservableInputStream extends ProxyInputStream { * Adds an Observer. * @param pObserver the observer to add */ - public void add(Observer pObserver) { + public void add(final Observer pObserver) { observers.add(pObserver); } @@ -99,7 +99,7 @@ public class ObservableInputStream extends ProxyInputStream { * Removes an Observer. * @param pObserver the observer to remove */ - public void remove(Observer pObserver) { + public void remove(final Observer pObserver) { observers.remove(pObserver); } @@ -130,7 +130,7 @@ public class ObservableInputStream extends ProxyInputStream { } @Override - public int read(byte[] pBuffer) throws IOException { + public int read(final byte[] pBuffer) throws IOException { int result = 0; IOException ioe = null; try { @@ -149,7 +149,7 @@ public class ObservableInputStream extends ProxyInputStream { } @Override - public int read(byte[] pBuffer, int pOffset, int pLength) throws IOException { + public int read(final byte[] pBuffer, final int pOffset, final int pLength) throws IOException { int result = 0; IOException ioe = null; try { @@ -175,7 +175,7 @@ public class ObservableInputStream extends ProxyInputStream { * @throws IOException Some observer has thrown an exception, which is being * passed down. */ - protected void noteDataBytes(byte[] pBuffer, int pOffset, int pLength) throws IOException { + protected void noteDataBytes(final byte[] pBuffer, final int pOffset, final int pLength) throws IOException { for (Observer observer : getObservers()) { observer.data(pBuffer, pOffset, pLength); } @@ -197,7 +197,7 @@ public class ObservableInputStream extends ProxyInputStream { * @throws IOException Some observer has thrown an exception, which is being * passed down. */ - protected void noteDataByte(int pDataByte) throws IOException { + protected void noteDataByte(final int pDataByte) throws IOException { for (Observer observer : getObservers()) { observer.data(pDataByte); } @@ -210,7 +210,7 @@ public class ObservableInputStream extends ProxyInputStream { * passed down. This may be the same exception, which has been passed as an * argument. */ - protected void noteError(IOException pException) throws IOException { + protected void noteError(final IOException pException) throws IOException { for (Observer observer : getObservers()) { observer.error(pException); } http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/main/java/org/apache/commons/io/input/UnixLineEndingInputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/input/UnixLineEndingInputStream.java b/src/main/java/org/apache/commons/io/input/UnixLineEndingInputStream.java index 7464c35..5c4c319 100644 --- a/src/main/java/org/apache/commons/io/input/UnixLineEndingInputStream.java +++ b/src/main/java/org/apache/commons/io/input/UnixLineEndingInputStream.java @@ -43,7 +43,7 @@ public class UnixLineEndingInputStream extends InputStream { * @param in The input stream to wrap * @param ensureLineFeedAtEndOfFile true to ensure that the file ends with LF */ - public UnixLineEndingInputStream( InputStream in, boolean ensureLineFeedAtEndOfFile ) { + public UnixLineEndingInputStream( final InputStream in, final boolean ensureLineFeedAtEndOfFile ) { this.target = in; this.ensureLineFeedAtEndOfFile = ensureLineFeedAtEndOfFile; } @@ -96,7 +96,7 @@ public class UnixLineEndingInputStream extends InputStream { * @param previousWasSlashR Indicates if the last seen was a \r * @return The next char to output to the stream */ - private int eofGame(boolean previousWasSlashR) { + private int eofGame(final boolean previousWasSlashR) { if ( previousWasSlashR || !ensureLineFeedAtEndOfFile ) { return -1; } @@ -122,7 +122,7 @@ public class UnixLineEndingInputStream extends InputStream { * {@inheritDoc} */ @Override - public synchronized void mark( int readlimit ) { + public synchronized void mark( final int readlimit ) { throw new UnsupportedOperationException( "Mark notsupported" ); } } http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/main/java/org/apache/commons/io/input/WindowsLineEndingInputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/input/WindowsLineEndingInputStream.java b/src/main/java/org/apache/commons/io/input/WindowsLineEndingInputStream.java index e166518..907ecce 100644 --- a/src/main/java/org/apache/commons/io/input/WindowsLineEndingInputStream.java +++ b/src/main/java/org/apache/commons/io/input/WindowsLineEndingInputStream.java @@ -44,7 +44,7 @@ public class WindowsLineEndingInputStream extends InputStream { * @param in The input stream to wrap * @param ensureLineFeedAtEndOfFile true to ensure that the file ends with CRLF */ - public WindowsLineEndingInputStream( InputStream in, boolean ensureLineFeedAtEndOfFile ) { + public WindowsLineEndingInputStream( final InputStream in, final boolean ensureLineFeedAtEndOfFile ) { this.target = in; this.ensureLineFeedAtEndOfFile = ensureLineFeedAtEndOfFile; } @@ -128,7 +128,7 @@ public class WindowsLineEndingInputStream extends InputStream { * {@inheritDoc} */ @Override - public synchronized void mark( int readlimit ) { + public synchronized void mark( final int readlimit ) { throw new UnsupportedOperationException( "Mark not supported" ); } } http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/main/java/org/apache/commons/io/monitor/FileAlterationObserver.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/monitor/FileAlterationObserver.java b/src/main/java/org/apache/commons/io/monitor/FileAlterationObserver.java index a2a5a18..2f89010 100644 --- a/src/main/java/org/apache/commons/io/monitor/FileAlterationObserver.java +++ b/src/main/java/org/apache/commons/io/monitor/FileAlterationObserver.java @@ -367,7 +367,7 @@ public class FileAlterationObserver implements Serializable { * @param entry the parent entry * @return The child files */ - private FileEntry[] doListFiles(File file, FileEntry entry) { + private FileEntry[] doListFiles(final File file, final FileEntry entry) { final File[] files = listFiles(file); final FileEntry[] children = files.length > 0 ? new FileEntry[files.length] : FileEntry.EMPTY_ENTRIES; for (int i = 0; i < files.length; i++) { http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/main/java/org/apache/commons/io/output/AppendableOutputStream.java ---------------------------------------------------------------------- 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 53b2a73..5099cc2 100644 --- a/src/main/java/org/apache/commons/io/output/AppendableOutputStream.java +++ b/src/main/java/org/apache/commons/io/output/AppendableOutputStream.java @@ -39,7 +39,7 @@ public class AppendableOutputStream <T extends Appendable> extends OutputStream * * @param appendable the appendable to write to */ - public AppendableOutputStream(T appendable) { + public AppendableOutputStream(final T appendable) { this.appendable = appendable; } @@ -50,7 +50,7 @@ public class AppendableOutputStream <T extends Appendable> extends OutputStream * @throws IOException upon error */ @Override - public void write(int b) throws IOException { + public void write(final int b) throws IOException { appendable.append((char)b); } http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/main/java/org/apache/commons/io/output/ByteArrayOutputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/output/ByteArrayOutputStream.java b/src/main/java/org/apache/commons/io/output/ByteArrayOutputStream.java index 3359cf1..58ec160 100644 --- a/src/main/java/org/apache/commons/io/output/ByteArrayOutputStream.java +++ b/src/main/java/org/apache/commons/io/output/ByteArrayOutputStream.java @@ -315,7 +315,7 @@ public class ByteArrayOutputStream extends OutputStream { * @throws IOException if an I/O error occurs * @since 2.5 */ - public static InputStream toBufferedInputStream(final InputStream input, int size) + public static InputStream toBufferedInputStream(final InputStream input, final int size) throws IOException { // It does not matter if a ByteArrayOutputStream is not closed as close() is a no-op @SuppressWarnings("resource") http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/main/java/org/apache/commons/io/output/ChunkedOutputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/output/ChunkedOutputStream.java b/src/main/java/org/apache/commons/io/output/ChunkedOutputStream.java index 7caffe2..c004303 100644 --- a/src/main/java/org/apache/commons/io/output/ChunkedOutputStream.java +++ b/src/main/java/org/apache/commons/io/output/ChunkedOutputStream.java @@ -46,7 +46,7 @@ public class ChunkedOutputStream extends FilterOutputStream { * @param chunkSize the chunk size to use; must be a positive number. * @throws IllegalArgumentException if the chunk size is <= 0 */ - public ChunkedOutputStream(final OutputStream stream, int chunkSize) { + public ChunkedOutputStream(final OutputStream stream, final int chunkSize) { super(stream); if (chunkSize <= 0) { throw new IllegalArgumentException(); @@ -73,7 +73,7 @@ public class ChunkedOutputStream extends FilterOutputStream { * @throws IOException if an I/O error occurs. */ @Override - public void write(byte[] data, int srcOffset, int length) throws IOException { + public void write(final byte[] data, final int srcOffset, final int length) throws IOException { int bytes = length; int dstOffset = srcOffset; while(bytes > 0) { http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/main/java/org/apache/commons/io/output/ChunkedWriter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/output/ChunkedWriter.java b/src/main/java/org/apache/commons/io/output/ChunkedWriter.java index dbb9f92..1485178 100644 --- a/src/main/java/org/apache/commons/io/output/ChunkedWriter.java +++ b/src/main/java/org/apache/commons/io/output/ChunkedWriter.java @@ -46,7 +46,7 @@ public class ChunkedWriter extends FilterWriter { * @param chunkSize the chunk size to use; must be a positive number. * @throws IllegalArgumentException if the chunk size is <= 0 */ - public ChunkedWriter(final Writer writer, int chunkSize) { + public ChunkedWriter(final Writer writer, final int chunkSize) { super(writer); if (chunkSize <= 0) { throw new IllegalArgumentException(); @@ -71,7 +71,7 @@ public class ChunkedWriter extends FilterWriter { * @throws IOException upon error */ @Override - public void write(char[] data, int srcOffset, int length) throws IOException { + public void write(final char[] data, final int srcOffset, final int length) throws IOException { int bytes = length; int dstOffset = srcOffset; while(bytes > 0) { http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/main/java/org/apache/commons/io/output/WriterOutputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/output/WriterOutputStream.java b/src/main/java/org/apache/commons/io/output/WriterOutputStream.java index 6d10c55..67d1e5f 100644 --- a/src/main/java/org/apache/commons/io/output/WriterOutputStream.java +++ b/src/main/java/org/apache/commons/io/output/WriterOutputStream.java @@ -315,7 +315,7 @@ public class WriterOutputStream extends OutputStream { * * @param charset the charset to check the support for */ - private static void checkIbmJdkWithBrokenUTF16(Charset charset){ + private static void checkIbmJdkWithBrokenUTF16(final Charset charset){ if (!"UTF-16".equals(charset.name())) { return; } http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/main/java/org/apache/commons/io/serialization/FullClassNameMatcher.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/serialization/FullClassNameMatcher.java b/src/main/java/org/apache/commons/io/serialization/FullClassNameMatcher.java index 30f9db7..873b433 100644 --- a/src/main/java/org/apache/commons/io/serialization/FullClassNameMatcher.java +++ b/src/main/java/org/apache/commons/io/serialization/FullClassNameMatcher.java @@ -38,12 +38,12 @@ final class FullClassNameMatcher implements ClassNameMatcher { * * @param classes a list of class names */ - public FullClassNameMatcher(String... classes) { + public FullClassNameMatcher(final String... classes) { classesSet = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(classes))); } @Override - public boolean matches(String className) { + public boolean matches(final String className) { return classesSet.contains(className); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/main/java/org/apache/commons/io/serialization/RegexpClassNameMatcher.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/serialization/RegexpClassNameMatcher.java b/src/main/java/org/apache/commons/io/serialization/RegexpClassNameMatcher.java index 3660c72..8d2597f 100644 --- a/src/main/java/org/apache/commons/io/serialization/RegexpClassNameMatcher.java +++ b/src/main/java/org/apache/commons/io/serialization/RegexpClassNameMatcher.java @@ -35,7 +35,7 @@ final class RegexpClassNameMatcher implements ClassNameMatcher { * * @param regex a regular expression for evaluating acceptable class names */ - public RegexpClassNameMatcher(String regex) { + public RegexpClassNameMatcher(final String regex) { this(Pattern.compile(regex)); } @@ -45,7 +45,7 @@ final class RegexpClassNameMatcher implements ClassNameMatcher { * @param pattern a pattern for evaluating acceptable class names * @throws IllegalArgumentException if <code>pattern</code> is null */ - public RegexpClassNameMatcher(Pattern pattern) { + public RegexpClassNameMatcher(final Pattern pattern) { if (pattern == null) { throw new IllegalArgumentException("Null pattern"); } @@ -53,7 +53,7 @@ final class RegexpClassNameMatcher implements ClassNameMatcher { } @Override - public boolean matches(String className) { + public boolean matches(final String className) { return pattern.matcher(className).matches(); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/main/java/org/apache/commons/io/serialization/ValidatingObjectInputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/serialization/ValidatingObjectInputStream.java b/src/main/java/org/apache/commons/io/serialization/ValidatingObjectInputStream.java index f7ced46..06e68ab 100644 --- a/src/main/java/org/apache/commons/io/serialization/ValidatingObjectInputStream.java +++ b/src/main/java/org/apache/commons/io/serialization/ValidatingObjectInputStream.java @@ -55,7 +55,7 @@ public class ValidatingObjectInputStream extends ObjectInputStream { * @param input an input stream * @throws IOException if an I/O error occurs while reading stream header */ - public ValidatingObjectInputStream(InputStream input) throws IOException { + public ValidatingObjectInputStream(final InputStream input) throws IOException { super(input); } @@ -63,7 +63,7 @@ public class ValidatingObjectInputStream extends ObjectInputStream { * @param name The class name * @throws InvalidClassException when a non-accepted class is encountered */ - private void validateClassName(String name) throws InvalidClassException { + private void validateClassName(final String name) throws InvalidClassException { // Reject has precedence over accept for (ClassNameMatcher m : rejectMatchers) { if (m.matches(name)) { @@ -91,12 +91,12 @@ public class ValidatingObjectInputStream extends ObjectInputStream { * @param className name of the invalid class * @throws InvalidClassException if the specified class is not allowed */ - protected void invalidClassNameFound(String className) throws InvalidClassException { + protected void invalidClassNameFound(final String className) throws InvalidClassException { throw new InvalidClassException("Class name not accepted: " + className); } @Override - protected Class<?> resolveClass(ObjectStreamClass osc) throws IOException, ClassNotFoundException { + protected Class<?> resolveClass(final ObjectStreamClass osc) throws IOException, ClassNotFoundException { validateClassName(osc.getName()); return super.resolveClass(osc); } @@ -108,7 +108,7 @@ public class ValidatingObjectInputStream extends ObjectInputStream { * @param classes Classes to accept * @return this object */ - public ValidatingObjectInputStream accept(Class<?>... classes) { + public ValidatingObjectInputStream accept(final Class<?>... classes) { for (Class<?> c : classes) { acceptMatchers.add(new FullClassNameMatcher(c.getName())); } @@ -122,7 +122,7 @@ public class ValidatingObjectInputStream extends ObjectInputStream { * @param classes Classes to reject * @return this object */ - public ValidatingObjectInputStream reject(Class<?>... classes) { + public ValidatingObjectInputStream reject(final Class<?>... classes) { for (Class<?> c : classes) { rejectMatchers.add(new FullClassNameMatcher(c.getName())); } @@ -137,7 +137,7 @@ public class ValidatingObjectInputStream extends ObjectInputStream { * {@link org.apache.commons.io.FilenameUtils#wildcardMatch(String, String) FilenameUtils.wildcardMatch} * @return this object */ - public ValidatingObjectInputStream accept(String... patterns) { + public ValidatingObjectInputStream accept(final String... patterns) { for (String pattern : patterns) { acceptMatchers.add(new WildcardClassNameMatcher(pattern)); } @@ -152,7 +152,7 @@ public class ValidatingObjectInputStream extends ObjectInputStream { * {@link org.apache.commons.io.FilenameUtils#wildcardMatch(String, String) FilenameUtils.wildcardMatch} * @return this object */ - public ValidatingObjectInputStream reject(String... patterns) { + public ValidatingObjectInputStream reject(final String... patterns) { for (String pattern : patterns) { rejectMatchers.add(new WildcardClassNameMatcher(pattern)); } @@ -166,7 +166,7 @@ public class ValidatingObjectInputStream extends ObjectInputStream { * @param pattern standard Java regexp * @return this object */ - public ValidatingObjectInputStream accept(Pattern pattern) { + public ValidatingObjectInputStream accept(final Pattern pattern) { acceptMatchers.add(new RegexpClassNameMatcher(pattern)); return this; } @@ -178,7 +178,7 @@ public class ValidatingObjectInputStream extends ObjectInputStream { * @param pattern standard Java regexp * @return this object */ - public ValidatingObjectInputStream reject(Pattern pattern) { + public ValidatingObjectInputStream reject(final Pattern pattern) { rejectMatchers.add(new RegexpClassNameMatcher(pattern)); return this; } @@ -190,7 +190,7 @@ public class ValidatingObjectInputStream extends ObjectInputStream { * @param m the matcher to use * @return this object */ - public ValidatingObjectInputStream accept(ClassNameMatcher m) { + public ValidatingObjectInputStream accept(final ClassNameMatcher m) { acceptMatchers.add(m); return this; } @@ -202,7 +202,7 @@ public class ValidatingObjectInputStream extends ObjectInputStream { * @param m the matcher to use * @return this object */ - public ValidatingObjectInputStream reject(ClassNameMatcher m) { + public ValidatingObjectInputStream reject(final ClassNameMatcher m) { rejectMatchers.add(m); return this; } http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/main/java/org/apache/commons/io/serialization/WildcardClassNameMatcher.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/serialization/WildcardClassNameMatcher.java b/src/main/java/org/apache/commons/io/serialization/WildcardClassNameMatcher.java index c130c83..de57c39 100644 --- a/src/main/java/org/apache/commons/io/serialization/WildcardClassNameMatcher.java +++ b/src/main/java/org/apache/commons/io/serialization/WildcardClassNameMatcher.java @@ -36,12 +36,12 @@ final class WildcardClassNameMatcher implements ClassNameMatcher { * * @param pattern a {@link FilenameUtils#wildcardMatch} pattern. */ - public WildcardClassNameMatcher(String pattern) { + public WildcardClassNameMatcher(final String pattern) { this.pattern = pattern; } @Override - public boolean matches(String className) { + public boolean matches(final String className) { return FilenameUtils.wildcardMatch(className, pattern); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/test/java/org/apache/commons/io/FileUtilsTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/FileUtilsTestCase.java b/src/test/java/org/apache/commons/io/FileUtilsTestCase.java index e4a7e45..07a49dc 100644 --- a/src/test/java/org/apache/commons/io/FileUtilsTestCase.java +++ b/src/test/java/org/apache/commons/io/FileUtilsTestCase.java @@ -3081,7 +3081,7 @@ public class FileUtilsTestCase { private static class ShorterFile extends File { private static final long serialVersionUID = 1L; - public ShorterFile(String pathname) { + public ShorterFile(final String pathname) { super(pathname); } http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/test/java/org/apache/commons/io/IOUtilsTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/IOUtilsTestCase.java b/src/test/java/org/apache/commons/io/IOUtilsTestCase.java index b359a8e..228e028 100644 --- a/src/test/java/org/apache/commons/io/IOUtilsTestCase.java +++ b/src/test/java/org/apache/commons/io/IOUtilsTestCase.java @@ -1440,7 +1440,7 @@ public class IOUtilsTestCase { @Test public void testAsBufferedOutputStream() { OutputStream is = new OutputStream() { @Override - public void write(int b) throws IOException { } + public void write(final int b) throws IOException { } }; final BufferedOutputStream bis = IOUtils.buffer(is); assertNotSame(is, bis); @@ -1450,7 +1450,7 @@ public class IOUtilsTestCase { @Test public void testAsBufferedOutputStreamWithBufferSize() { OutputStream os = new OutputStream() { @Override - public void write(int b) throws IOException { } + public void write(final int b) throws IOException { } }; final BufferedOutputStream bos = IOUtils.buffer(os, 2048); assertNotSame(os, bos); @@ -1461,7 +1461,7 @@ public class IOUtilsTestCase { @Test public void testAsBufferedReader() { Reader is = new Reader() { @Override - public int read(char[] cbuf, int off, int len) throws IOException { + public int read(final char[] cbuf, final int off, final int len) throws IOException { return 0; } @Override @@ -1475,7 +1475,7 @@ public class IOUtilsTestCase { @Test public void testAsBufferedReaderWithBufferSize() { Reader r = new Reader() { @Override - public int read(char[] cbuf, int off, int len) throws IOException { + public int read(final char[] cbuf, final int off, final int len) throws IOException { return 0; } @Override @@ -1490,10 +1490,10 @@ public class IOUtilsTestCase { @Test public void testAsBufferedWriter() { Writer is = new Writer() { @Override - public void write(int b) throws IOException { } + public void write(final int b) throws IOException { } @Override - public void write(char[] cbuf, int off, int len) throws IOException { } + public void write(final char[] cbuf, final int off, final int len) throws IOException { } @Override public void flush() throws IOException { } @@ -1510,10 +1510,10 @@ public class IOUtilsTestCase { public void testAsBufferedWriterWithBufferSize() { Writer w = new Writer() { @Override - public void write(int b) throws IOException { } + public void write(final int b) throws IOException { } @Override - public void write(char[] cbuf, int off, int len) throws IOException { } + public void write(final char[] cbuf, final int off, final int len) throws IOException { } @Override public void flush() throws IOException { } http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/test/java/org/apache/commons/io/input/BOMInputStreamTest.java ---------------------------------------------------------------------- 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 c88f784..43b4970 100644 --- a/src/test/java/org/apache/commons/io/input/BOMInputStreamTest.java +++ b/src/test/java/org/apache/commons/io/input/BOMInputStreamTest.java @@ -752,11 +752,11 @@ public class BOMInputStreamTest { buf, len); } - private boolean jvmAndSaxBothSupportCharset(String charSetName) throws ParserConfigurationException, SAXException, IOException { + private boolean jvmAndSaxBothSupportCharset(final String charSetName) throws ParserConfigurationException, SAXException, IOException { return Charset.isSupported(charSetName) && doesSaxSupportCharacterSet(charSetName); } - private boolean doesSaxSupportCharacterSet(String charSetName) throws ParserConfigurationException, SAXException, IOException { + private boolean doesSaxSupportCharacterSet(final String charSetName) throws ParserConfigurationException, SAXException, IOException { final byte[] data = ("<?xml version=\"1.0\" encoding=\"" + charSetName + "\"?><Z/>").getBytes(charSetName); final DocumentBuilder documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder(); try { http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/test/java/org/apache/commons/io/input/CharSequenceInputStreamTest.java ---------------------------------------------------------------------- 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 bdf8293..a66d37c 100644 --- a/src/test/java/org/apache/commons/io/input/CharSequenceInputStreamTest.java +++ b/src/test/java/org/apache/commons/io/input/CharSequenceInputStreamTest.java @@ -355,7 +355,7 @@ public class CharSequenceInputStreamTest { testSkip("UTF-8"); } - private int checkAvail(InputStream is, int min) throws Exception { + private int checkAvail(final InputStream is, final int min) throws Exception { int available = is.available(); assertTrue("avail should be >= " + min + ", but was " + available, available >= min); return available; @@ -415,7 +415,7 @@ public class CharSequenceInputStreamTest { && !isOddBallLegacyCharsetThatDoesNotSupportFrenchCharacters(csName); } - private boolean isOddBallLegacyCharsetThatDoesNotSupportFrenchCharacters(String csName) { + private boolean isOddBallLegacyCharsetThatDoesNotSupportFrenchCharacters(final String csName) { return "x-IBM1388".equalsIgnoreCase(csName) || "ISO-2022-CN".equalsIgnoreCase(csName) || "ISO-2022-JP".equalsIgnoreCase(csName) || http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/test/java/org/apache/commons/io/input/ClassLoaderObjectInputStreamTest.java ---------------------------------------------------------------------- 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 bb69c8e..27fd445 100644 --- a/src/test/java/org/apache/commons/io/input/ClassLoaderObjectInputStreamTest.java +++ b/src/test/java/org/apache/commons/io/input/ClassLoaderObjectInputStreamTest.java @@ -104,14 +104,14 @@ public class ClassLoaderObjectInputStreamTest { private final E e; - Test(int i, Object o) { + Test(final int i, final Object o) { this.i = i; this.e = E.A; this.o = o; } @Override - public boolean equals(Object other) { + public boolean equals(final Object other) { if (other instanceof Test) { Test tother = (Test) other; return (this.i == tother.i) @@ -122,7 +122,7 @@ public class ClassLoaderObjectInputStreamTest { } } - private boolean equalObject(Object other) { + private boolean equalObject(final Object other) { if (this.o == null) { return other == null; } http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/test/java/org/apache/commons/io/input/InfiniteCircularInputStreamTest.java ---------------------------------------------------------------------- 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 711a3f0..7468393 100644 --- a/src/test/java/org/apache/commons/io/input/InfiniteCircularInputStreamTest.java +++ b/src/test/java/org/apache/commons/io/input/InfiniteCircularInputStreamTest.java @@ -47,7 +47,7 @@ public class InfiniteCircularInputStreamTest { assertStreamOutput(contentToCycle, expectedOutput); } - private void assertStreamOutput(byte[] toCycle, byte[] expected) throws IOException { + private void assertStreamOutput(final byte[] toCycle, final byte[] expected) throws IOException { byte[] actual = new byte[expected.length]; try (InputStream infStream = new InfiniteCircularInputStream(toCycle)) { http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/test/java/org/apache/commons/io/input/MessageDigestCalculatingInputStreamTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/input/MessageDigestCalculatingInputStreamTest.java b/src/test/java/org/apache/commons/io/input/MessageDigestCalculatingInputStreamTest.java index adb0cc7..7d5b7ce 100644 --- a/src/test/java/org/apache/commons/io/input/MessageDigestCalculatingInputStreamTest.java +++ b/src/test/java/org/apache/commons/io/input/MessageDigestCalculatingInputStreamTest.java @@ -25,7 +25,7 @@ import java.util.Random; import org.junit.Test; public class MessageDigestCalculatingInputStreamTest { - public static byte[] generateRandomByteStream(int pSize) { + public static byte[] generateRandomByteStream(final int pSize) { final byte[] buffer = new byte[pSize]; final Random rnd = new Random(); rnd.nextBytes(buffer); http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/test/java/org/apache/commons/io/input/ObservableInputStreamTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/input/ObservableInputStreamTest.java b/src/test/java/org/apache/commons/io/input/ObservableInputStreamTest.java index edb8c62..d75ee46 100644 --- a/src/test/java/org/apache/commons/io/input/ObservableInputStreamTest.java +++ b/src/test/java/org/apache/commons/io/input/ObservableInputStreamTest.java @@ -33,7 +33,7 @@ public class ObservableInputStreamTest { private boolean closed; @Override - void data(int pByte) throws IOException { + void data(final int pByte) throws IOException { super.data(pByte); lastByteSeen = pByte; } @@ -56,7 +56,7 @@ public class ObservableInputStreamTest { private int length = -1; @Override - void data(byte[] pBuffer, int pOffset, int pLength) throws IOException { + void data(final byte[] pBuffer, final int pOffset, final int pLength) throws IOException { super.data(pBuffer, pOffset, pLength); buffer = pBuffer; offset = pOffset; http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/test/java/org/apache/commons/io/input/UnixLineEndingInputStreamTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/input/UnixLineEndingInputStreamTest.java b/src/test/java/org/apache/commons/io/input/UnixLineEndingInputStreamTest.java index da34a89..2f5020a 100644 --- a/src/test/java/org/apache/commons/io/input/UnixLineEndingInputStreamTest.java +++ b/src/test/java/org/apache/commons/io/input/UnixLineEndingInputStreamTest.java @@ -72,11 +72,11 @@ public class UnixLineEndingInputStreamTest assertEquals( "a", roundtrip( "a", false ) ); } - private String roundtrip( String msg ) throws IOException { + private String roundtrip( final String msg ) throws IOException { return roundtrip( msg, true ); } - private String roundtrip( String msg, boolean ensure ) throws IOException { + private String roundtrip( final String msg, final boolean ensure ) throws IOException { ByteArrayInputStream baos = new ByteArrayInputStream( msg.getBytes( "UTF-8" ) ); UnixLineEndingInputStream lf = new UnixLineEndingInputStream( baos, ensure ); byte[] buf = new byte[100]; http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/test/java/org/apache/commons/io/input/WindowsLineEndingInputStreamTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/input/WindowsLineEndingInputStreamTest.java b/src/test/java/org/apache/commons/io/input/WindowsLineEndingInputStreamTest.java index 5e4c544..fc01bf8 100644 --- a/src/test/java/org/apache/commons/io/input/WindowsLineEndingInputStreamTest.java +++ b/src/test/java/org/apache/commons/io/input/WindowsLineEndingInputStreamTest.java @@ -62,11 +62,11 @@ public class WindowsLineEndingInputStreamTest { assertEquals( "a", roundtrip( "a", false ) ); } - private String roundtrip( String msg ) throws IOException { + private String roundtrip( final String msg ) throws IOException { return roundtrip( msg, true ); } - private String roundtrip( String msg, boolean ensure ) throws IOException { + private String roundtrip( final String msg, final boolean ensure ) throws IOException { ByteArrayInputStream baos = new ByteArrayInputStream( msg.getBytes( "UTF-8" ) ); WindowsLineEndingInputStream lf = new WindowsLineEndingInputStream( baos, ensure ); byte[] buf = new byte[100]; http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/test/java/org/apache/commons/io/output/ChunkedOutputStreamTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/output/ChunkedOutputStreamTest.java b/src/test/java/org/apache/commons/io/output/ChunkedOutputStreamTest.java index 0792961..2eb3865 100644 --- a/src/test/java/org/apache/commons/io/output/ChunkedOutputStreamTest.java +++ b/src/test/java/org/apache/commons/io/output/ChunkedOutputStreamTest.java @@ -57,7 +57,7 @@ public class ChunkedOutputStreamTest { private ByteArrayOutputStream getByteArrayOutputStream(final AtomicInteger numWrites) { return new ByteArrayOutputStream() { @Override - public void write(byte[] b, int off, int len) { + public void write(final byte[] b, final int off, final int len) { numWrites.incrementAndGet(); super.write(b, off, len); } http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/test/java/org/apache/commons/io/output/ChunkedWriterTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/output/ChunkedWriterTest.java b/src/test/java/org/apache/commons/io/output/ChunkedWriterTest.java index 924d75a..cb937eb 100644 --- a/src/test/java/org/apache/commons/io/output/ChunkedWriterTest.java +++ b/src/test/java/org/apache/commons/io/output/ChunkedWriterTest.java @@ -53,7 +53,7 @@ public class ChunkedWriterTest { ByteArrayOutputStream baos = new ByteArrayOutputStream(); return new OutputStreamWriter(baos) { @Override - public void write(char[] cbuf, int off, int len) throws IOException { + public void write(final char[] cbuf, final int off, final int len) throws IOException { numWrites.incrementAndGet(); super.write(cbuf, off, len); } http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/test/java/org/apache/commons/io/output/FileWriterWithEncodingTest.java ---------------------------------------------------------------------- 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 cbb4b08..83f590d 100644 --- a/src/test/java/org/apache/commons/io/output/FileWriterWithEncodingTest.java +++ b/src/test/java/org/apache/commons/io/output/FileWriterWithEncodingTest.java @@ -119,7 +119,7 @@ public class FileWriterWithEncodingTest { succesfulRun(new FileWriterWithEncoding(file2.getPath(), enc)); } - private void succesfulRun(FileWriterWithEncoding fw21) throws Exception { + private void succesfulRun(final FileWriterWithEncoding fw21) throws Exception { FileWriter fw1 = null; FileWriterWithEncoding fw2 = null; try { @@ -182,7 +182,7 @@ public class FileWriterWithEncodingTest { } } - private void writeTestPayload(FileWriter fw1, FileWriterWithEncoding fw2) throws IOException { + private void writeTestPayload(final FileWriter fw1, final FileWriterWithEncoding fw2) throws IOException { assertTrue(file1.exists()); assertTrue(file2.exists()); http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/test/java/org/apache/commons/io/output/ProxyWriterTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/output/ProxyWriterTest.java b/src/test/java/org/apache/commons/io/output/ProxyWriterTest.java index 5f163f4..d5fb70b 100644 --- a/src/test/java/org/apache/commons/io/output/ProxyWriterTest.java +++ b/src/test/java/org/apache/commons/io/output/ProxyWriterTest.java @@ -138,7 +138,7 @@ public class ProxyWriterTest { public void exceptions_in_append_char() throws IOException { OutputStreamWriter osw = new OutputStreamWriter(new ByteArrayOutputStream()) { @Override - public void write(int c) throws IOException { + public void write(final int c) throws IOException { throw new UnsupportedEncodingException("Bah"); } }; @@ -151,7 +151,7 @@ public class ProxyWriterTest { public void exceptions_in_append_charSequence() throws IOException { OutputStreamWriter osw = new OutputStreamWriter(new ByteArrayOutputStream()) { @Override - public Writer append(CharSequence csq) throws IOException { + public Writer append(final CharSequence csq) throws IOException { throw new UnsupportedEncodingException("Bah"); } }; @@ -164,7 +164,7 @@ public class ProxyWriterTest { public void exceptions_in_append_charSequence_offset() throws IOException { OutputStreamWriter osw = new OutputStreamWriter(new ByteArrayOutputStream()) { @Override - public Writer append(CharSequence csq, int start, int end) throws IOException { + public Writer append(final CharSequence csq, final int start, final int end) throws IOException { throw new UnsupportedEncodingException("Bah"); } }; @@ -177,7 +177,7 @@ public class ProxyWriterTest { public void exceptions_in_write_int() throws IOException { OutputStreamWriter osw = new OutputStreamWriter(new ByteArrayOutputStream()) { @Override - public void write(int c) throws IOException { + public void write(final int c) throws IOException { throw new UnsupportedEncodingException("Bah"); } }; @@ -190,7 +190,7 @@ public class ProxyWriterTest { public void exceptions_in_write_char_array() throws IOException { OutputStreamWriter osw = new OutputStreamWriter(new ByteArrayOutputStream()) { @Override - public void write(char[] cbuf) throws IOException { + public void write(final char[] cbuf) throws IOException { throw new UnsupportedEncodingException("Bah"); } }; @@ -203,7 +203,7 @@ public class ProxyWriterTest { public void exceptions_in_write_offset_char_array() throws IOException { OutputStreamWriter osw = new OutputStreamWriter(new ByteArrayOutputStream()) { @Override - public void write(char[] cbuf, int off, int len) throws IOException { + public void write(final char[] cbuf, final int off, final int len) throws IOException { throw new UnsupportedEncodingException("Bah"); } }; @@ -216,7 +216,7 @@ public class ProxyWriterTest { public void exceptions_in_write_string() throws IOException { OutputStreamWriter osw = new OutputStreamWriter(new ByteArrayOutputStream()) { @Override - public void write(String str) throws IOException { + public void write(final String str) throws IOException { throw new UnsupportedEncodingException("Bah"); } }; @@ -229,7 +229,7 @@ public class ProxyWriterTest { public void exceptions_in_write_string_offset() throws IOException { OutputStreamWriter osw = new OutputStreamWriter(new ByteArrayOutputStream()) { @Override - public void write(String str, int off, int len) throws IOException { + public void write(final String str, final int off, final int len) throws IOException { throw new UnsupportedEncodingException("Bah"); } }; http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/test/java/org/apache/commons/io/serialization/ClosingBase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/serialization/ClosingBase.java b/src/test/java/org/apache/commons/io/serialization/ClosingBase.java index 33bbd32..ea3bce5 100644 --- a/src/test/java/org/apache/commons/io/serialization/ClosingBase.java +++ b/src/test/java/org/apache/commons/io/serialization/ClosingBase.java @@ -32,7 +32,7 @@ import org.junit.Before; public class ClosingBase { private final List<Closeable> toClose = new ArrayList<>(); - protected <T extends Closeable> T willClose(T t) { + protected <T extends Closeable> T willClose(final T t) { toClose.add(t); return t; } http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/test/java/org/apache/commons/io/serialization/MockSerializedClass.java ---------------------------------------------------------------------- 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 cd0d8a4..cb08a93 100644 --- a/src/test/java/org/apache/commons/io/serialization/MockSerializedClass.java +++ b/src/test/java/org/apache/commons/io/serialization/MockSerializedClass.java @@ -25,7 +25,7 @@ public class MockSerializedClass implements Serializable { private final String str; - MockSerializedClass(String str) { + MockSerializedClass(final String str) { this.str = str; } @@ -35,7 +35,7 @@ public class MockSerializedClass implements Serializable { } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if(!(obj instanceof MockSerializedClass)) { return false; } http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/test/java/org/apache/commons/io/serialization/MoreComplexObjectTest.java ---------------------------------------------------------------------- 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 941a9c0..840b049 100644 --- a/src/test/java/org/apache/commons/io/serialization/MoreComplexObjectTest.java +++ b/src/test/java/org/apache/commons/io/serialization/MoreComplexObjectTest.java @@ -51,7 +51,7 @@ public class MoreComplexObjectTest extends ClosingBase { inputStream = willClose(new ByteArrayInputStream(bos.toByteArray())); } - private void assertSerialization(ObjectInputStream ois) throws ClassNotFoundException, IOException { + private void assertSerialization(final ObjectInputStream ois) throws ClassNotFoundException, IOException { final MoreComplexObject copy = (MoreComplexObject) (ois.readObject()); assertEquals("Expecting same data after deserializing", original.toString(), copy.toString()); } http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/test/java/org/apache/commons/io/serialization/ValidatingObjectInputStreamTest.java ---------------------------------------------------------------------- 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 f2c3429..76e8cfe 100644 --- a/src/test/java/org/apache/commons/io/serialization/ValidatingObjectInputStreamTest.java +++ b/src/test/java/org/apache/commons/io/serialization/ValidatingObjectInputStreamTest.java @@ -41,7 +41,7 @@ public class ValidatingObjectInputStreamTest extends ClosingBase { static private final ClassNameMatcher ALWAYS_TRUE = new ClassNameMatcher() { @Override - public boolean matches(String className) { + public boolean matches(final String className) { return true; } }; @@ -56,7 +56,7 @@ public class ValidatingObjectInputStreamTest extends ClosingBase { testStream = willClose(new ByteArrayInputStream(bos.toByteArray())); } - private void assertSerialization(ObjectInputStream ois) throws ClassNotFoundException, IOException { + private void assertSerialization(final ObjectInputStream ois) throws ClassNotFoundException, IOException { final MockSerializedClass result = (MockSerializedClass) (ois.readObject()); assertEquals(testObject, result); } @@ -207,12 +207,12 @@ public class ValidatingObjectInputStreamTest extends ClosingBase { @Test(expected = RuntimeException.class) public void customInvalidMethod() throws Exception { class CustomVOIS extends ValidatingObjectInputStream { - CustomVOIS(InputStream is) throws IOException { + CustomVOIS(final InputStream is) throws IOException { super(is); } @Override - protected void invalidClassNameFound(String className) throws InvalidClassException { + protected void invalidClassNameFound(final String className) throws InvalidClassException { throw new RuntimeException("Custom exception"); } }; http://git-wip-us.apache.org/repos/asf/commons-io/blob/14b52eb4/src/test/java/org/apache/commons/io/testtools/TestUtils.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/testtools/TestUtils.java b/src/test/java/org/apache/commons/io/testtools/TestUtils.java index c97d951..a2fe36f 100644 --- a/src/test/java/org/apache/commons/io/testtools/TestUtils.java +++ b/src/test/java/org/apache/commons/io/testtools/TestUtils.java @@ -90,7 +90,7 @@ public abstract class TestUtils { } } - public static File newFile(File testDirectory, final String filename) throws IOException { + public static File newFile(final File testDirectory, final String filename) throws IOException { final File destination = new File(testDirectory, filename); /* assertTrue( filename + "Test output data file shouldn't previously exist", @@ -222,7 +222,7 @@ public abstract class TestUtils { * @param ms the number of milliseconds to sleep for * @throws InterruptedException if interrupted */ - public static void sleep(long ms) throws InterruptedException { + public static void sleep(final long ms) throws InterruptedException { long finishAt = System.currentTimeMillis() + ms; long remaining = ms; do { @@ -231,7 +231,7 @@ public abstract class TestUtils { } while (remaining > 0); } - public static void sleepQuietly(long ms) { + public static void sleepQuietly(final long ms) { try { sleep(ms); } catch (InterruptedException ignored){
