Repository: commons-io Updated Branches: refs/heads/master 933796e93 -> 2a915f587
Add missing '@Override' annotations. Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/2a915f58 Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/2a915f58 Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/2a915f58 Branch: refs/heads/master Commit: 2a915f5872beca562a72a1ded95652f87b5daaa3 Parents: 933796e Author: Gary Gregory <[email protected]> Authored: Fri Nov 18 13:31:08 2016 -0800 Committer: Gary Gregory <[email protected]> Committed: Fri Nov 18 13:31:08 2016 -0800 ---------------------------------------------------------------------- .../java/org/apache/commons/io/LineIterator.java | 3 +++ .../java/org/apache/commons/io/ThreadMonitor.java | 1 + .../io/comparator/CompositeFileComparator.java | 1 + .../commons/io/comparator/DefaultFileComparator.java | 1 + .../io/comparator/DirectoryFileComparator.java | 1 + .../io/comparator/ExtensionFileComparator.java | 1 + .../io/comparator/LastModifiedFileComparator.java | 1 + .../commons/io/comparator/NameFileComparator.java | 1 + .../commons/io/comparator/PathFileComparator.java | 1 + .../commons/io/comparator/ReverseComparator.java | 1 + .../commons/io/comparator/SizeFileComparator.java | 1 + .../commons/io/filefilter/AbstractFileFilter.java | 2 ++ .../apache/commons/io/filefilter/AndFileFilter.java | 4 ++++ .../commons/io/filefilter/FalseFileFilter.java | 2 ++ .../apache/commons/io/filefilter/IOFileFilter.java | 2 ++ .../apache/commons/io/filefilter/OrFileFilter.java | 4 ++++ .../apache/commons/io/filefilter/TrueFileFilter.java | 2 ++ .../org/apache/commons/io/input/BOMInputStream.java | 1 + .../commons/io/input/ReversedLinesFileReader.java | 1 + .../commons/io/input/SwappedDataInputStream.java | 15 +++++++++++++++ .../java/org/apache/commons/io/input/Tailer.java | 1 + .../commons/io/input/TailerListenerAdapter.java | 5 +++++ .../io/monitor/FileAlterationListenerAdaptor.java | 8 ++++++++ .../commons/io/monitor/FileAlterationMonitor.java | 1 + .../java/org/apache/commons/io/IOUtilsTestCase.java | 2 ++ .../io/comparator/DirectoryFileComparatorTest.java | 1 + .../java/org/apache/commons/io/input/TailerTest.java | 6 ++++++ .../commons/io/monitor/CollectionFileListener.java | 8 ++++++++ .../io/serialization/MoreComplexObjectTest.java | 1 + .../ValidatingObjectInputStreamTest.java | 1 + 30 files changed, 80 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-io/blob/2a915f58/src/main/java/org/apache/commons/io/LineIterator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/LineIterator.java b/src/main/java/org/apache/commons/io/LineIterator.java index 2b57041..680a87e 100644 --- a/src/main/java/org/apache/commons/io/LineIterator.java +++ b/src/main/java/org/apache/commons/io/LineIterator.java @@ -84,6 +84,7 @@ public class LineIterator implements Iterator<String>, Closeable { * @return {@code true} if the Reader has more lines * @throws IllegalStateException if an IO exception occurs */ + @Override public boolean hasNext() { if (cachedLine != null) { return true; @@ -128,6 +129,7 @@ public class LineIterator implements Iterator<String>, Closeable { * @return the next line from the input * @throws NoSuchElementException if there is no line to return */ + @Override public String next() { return nextLine(); } @@ -170,6 +172,7 @@ public class LineIterator implements Iterator<String>, Closeable { * * @throws UnsupportedOperationException always */ + @Override public void remove() { throw new UnsupportedOperationException("Remove unsupported on LineIterator"); } http://git-wip-us.apache.org/repos/asf/commons-io/blob/2a915f58/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 b91742c..d74895f 100644 --- a/src/main/java/org/apache/commons/io/ThreadMonitor.java +++ b/src/main/java/org/apache/commons/io/ThreadMonitor.java @@ -102,6 +102,7 @@ class ThreadMonitor implements Runnable { * * @see Runnable#run() */ + @Override public void run() { try { sleep(timeout); http://git-wip-us.apache.org/repos/asf/commons-io/blob/2a915f58/src/main/java/org/apache/commons/io/comparator/CompositeFileComparator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/comparator/CompositeFileComparator.java b/src/main/java/org/apache/commons/io/comparator/CompositeFileComparator.java index 1bcbbdd..49ee0e5 100644 --- a/src/main/java/org/apache/commons/io/comparator/CompositeFileComparator.java +++ b/src/main/java/org/apache/commons/io/comparator/CompositeFileComparator.java @@ -88,6 +88,7 @@ public class CompositeFileComparator extends AbstractFileComparator implements S * @return the first non-zero result returned from * the delegate comparators or zero. */ + @Override public int compare(final File file1, final File file2) { int result = 0; for (final Comparator<File> delegate : delegates) { http://git-wip-us.apache.org/repos/asf/commons-io/blob/2a915f58/src/main/java/org/apache/commons/io/comparator/DefaultFileComparator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/comparator/DefaultFileComparator.java b/src/main/java/org/apache/commons/io/comparator/DefaultFileComparator.java index 20b80f0..c786912 100644 --- a/src/main/java/org/apache/commons/io/comparator/DefaultFileComparator.java +++ b/src/main/java/org/apache/commons/io/comparator/DefaultFileComparator.java @@ -61,6 +61,7 @@ public class DefaultFileComparator extends AbstractFileComparator implements Ser * @return the result of calling file1's * {@link File#compareTo(File)} with file2 as the parameter. */ + @Override public int compare(final File file1, final File file2) { return file1.compareTo(file2); } http://git-wip-us.apache.org/repos/asf/commons-io/blob/2a915f58/src/main/java/org/apache/commons/io/comparator/DirectoryFileComparator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/comparator/DirectoryFileComparator.java b/src/main/java/org/apache/commons/io/comparator/DirectoryFileComparator.java index 142be6b..b49a6e3 100644 --- a/src/main/java/org/apache/commons/io/comparator/DirectoryFileComparator.java +++ b/src/main/java/org/apache/commons/io/comparator/DirectoryFileComparator.java @@ -60,6 +60,7 @@ public class DirectoryFileComparator extends AbstractFileComparator implements S * @return the result of calling file1's * {@link File#compareTo(File)} with file2 as the parameter. */ + @Override public int compare(final File file1, final File file2) { return getType(file1) - getType(file2); } http://git-wip-us.apache.org/repos/asf/commons-io/blob/2a915f58/src/main/java/org/apache/commons/io/comparator/ExtensionFileComparator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/comparator/ExtensionFileComparator.java b/src/main/java/org/apache/commons/io/comparator/ExtensionFileComparator.java index 60a6e05..fac6d15 100644 --- a/src/main/java/org/apache/commons/io/comparator/ExtensionFileComparator.java +++ b/src/main/java/org/apache/commons/io/comparator/ExtensionFileComparator.java @@ -104,6 +104,7 @@ public class ExtensionFileComparator extends AbstractFileComparator implements S * is greater than the second file. * */ + @Override public int compare(final File file1, final File file2) { final String suffix1 = FilenameUtils.getExtension(file1.getName()); final String suffix2 = FilenameUtils.getExtension(file2.getName()); http://git-wip-us.apache.org/repos/asf/commons-io/blob/2a915f58/src/main/java/org/apache/commons/io/comparator/LastModifiedFileComparator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/comparator/LastModifiedFileComparator.java b/src/main/java/org/apache/commons/io/comparator/LastModifiedFileComparator.java index 711a150..dda7d60 100644 --- a/src/main/java/org/apache/commons/io/comparator/LastModifiedFileComparator.java +++ b/src/main/java/org/apache/commons/io/comparator/LastModifiedFileComparator.java @@ -65,6 +65,7 @@ public class LastModifiedFileComparator extends AbstractFileComparator implement * is greater than the second file. * */ + @Override public int compare(final File file1, final File file2) { final long result = file1.lastModified() - file2.lastModified(); if (result < 0) { http://git-wip-us.apache.org/repos/asf/commons-io/blob/2a915f58/src/main/java/org/apache/commons/io/comparator/NameFileComparator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/comparator/NameFileComparator.java b/src/main/java/org/apache/commons/io/comparator/NameFileComparator.java index 18850e9..76302b4 100644 --- a/src/main/java/org/apache/commons/io/comparator/NameFileComparator.java +++ b/src/main/java/org/apache/commons/io/comparator/NameFileComparator.java @@ -99,6 +99,7 @@ public class NameFileComparator extends AbstractFileComparator implements Serial * same and a positive value if the first files name * is greater than the second file. */ + @Override public int compare(final File file1, final File file2) { return caseSensitivity.checkCompareTo(file1.getName(), file2.getName()); } http://git-wip-us.apache.org/repos/asf/commons-io/blob/2a915f58/src/main/java/org/apache/commons/io/comparator/PathFileComparator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/comparator/PathFileComparator.java b/src/main/java/org/apache/commons/io/comparator/PathFileComparator.java index 804cc53..b7da07e 100644 --- a/src/main/java/org/apache/commons/io/comparator/PathFileComparator.java +++ b/src/main/java/org/apache/commons/io/comparator/PathFileComparator.java @@ -100,6 +100,7 @@ public class PathFileComparator extends AbstractFileComparator implements Serial * is greater than the second file. * */ + @Override public int compare(final File file1, final File file2) { return caseSensitivity.checkCompareTo(file1.getPath(), file2.getPath()); } http://git-wip-us.apache.org/repos/asf/commons-io/blob/2a915f58/src/main/java/org/apache/commons/io/comparator/ReverseComparator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/comparator/ReverseComparator.java b/src/main/java/org/apache/commons/io/comparator/ReverseComparator.java index f3e17f5..9d4f0a3 100644 --- a/src/main/java/org/apache/commons/io/comparator/ReverseComparator.java +++ b/src/main/java/org/apache/commons/io/comparator/ReverseComparator.java @@ -51,6 +51,7 @@ class ReverseComparator extends AbstractFileComparator implements Serializable { * @return the result from the delegate {@link Comparator#compare(Object, Object)} * reversing the value (i.e. positive becomes negative and vice versa) */ + @Override public int compare(final File file1, final File file2) { return delegate.compare(file2, file1); // parameters switched round } http://git-wip-us.apache.org/repos/asf/commons-io/blob/2a915f58/src/main/java/org/apache/commons/io/comparator/SizeFileComparator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/comparator/SizeFileComparator.java b/src/main/java/org/apache/commons/io/comparator/SizeFileComparator.java index 0cdc0d1..4b1e679 100644 --- a/src/main/java/org/apache/commons/io/comparator/SizeFileComparator.java +++ b/src/main/java/org/apache/commons/io/comparator/SizeFileComparator.java @@ -106,6 +106,7 @@ public class SizeFileComparator extends AbstractFileComparator implements Serial * is greater than the second file. * */ + @Override public int compare(final File file1, final File file2) { long size1 = 0; if (file1.isDirectory()) { http://git-wip-us.apache.org/repos/asf/commons-io/blob/2a915f58/src/main/java/org/apache/commons/io/filefilter/AbstractFileFilter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/filefilter/AbstractFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/AbstractFileFilter.java index db45e8e..66f218d 100644 --- a/src/main/java/org/apache/commons/io/filefilter/AbstractFileFilter.java +++ b/src/main/java/org/apache/commons/io/filefilter/AbstractFileFilter.java @@ -36,6 +36,7 @@ public abstract class AbstractFileFilter implements IOFileFilter { * @param file the File to check * @return true if this file matches the test */ + @Override public boolean accept(final File file) { return accept(file.getParentFile(), file.getName()); } @@ -47,6 +48,7 @@ public abstract class AbstractFileFilter implements IOFileFilter { * @param name the filename within the directory to check * @return true if this file matches the test */ + @Override public boolean accept(final File dir, final String name) { return accept(new File(dir, name)); } http://git-wip-us.apache.org/repos/asf/commons-io/blob/2a915f58/src/main/java/org/apache/commons/io/filefilter/AndFileFilter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/filefilter/AndFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/AndFileFilter.java index 39e4cf5..1bece46 100644 --- a/src/main/java/org/apache/commons/io/filefilter/AndFileFilter.java +++ b/src/main/java/org/apache/commons/io/filefilter/AndFileFilter.java @@ -86,6 +86,7 @@ public class AndFileFilter /** * {@inheritDoc} */ + @Override public void addFileFilter(final IOFileFilter ioFileFilter) { this.fileFilters.add(ioFileFilter); } @@ -93,6 +94,7 @@ public class AndFileFilter /** * {@inheritDoc} */ + @Override public List<IOFileFilter> getFileFilters() { return Collections.unmodifiableList(this.fileFilters); } @@ -100,6 +102,7 @@ public class AndFileFilter /** * {@inheritDoc} */ + @Override public boolean removeFileFilter(final IOFileFilter ioFileFilter) { return this.fileFilters.remove(ioFileFilter); } @@ -107,6 +110,7 @@ public class AndFileFilter /** * {@inheritDoc} */ + @Override public void setFileFilters(final List<IOFileFilter> fileFilters) { this.fileFilters.clear(); this.fileFilters.addAll(fileFilters); http://git-wip-us.apache.org/repos/asf/commons-io/blob/2a915f58/src/main/java/org/apache/commons/io/filefilter/FalseFileFilter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/filefilter/FalseFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/FalseFileFilter.java index f8cb495..4576ff2 100644 --- a/src/main/java/org/apache/commons/io/filefilter/FalseFileFilter.java +++ b/src/main/java/org/apache/commons/io/filefilter/FalseFileFilter.java @@ -55,6 +55,7 @@ public class FalseFileFilter implements IOFileFilter, Serializable { * @param file the file to check (ignored) * @return false */ + @Override public boolean accept(final File file) { return false; } @@ -66,6 +67,7 @@ public class FalseFileFilter implements IOFileFilter, Serializable { * @param name the filename (ignored) * @return false */ + @Override public boolean accept(final File dir, final String name) { return false; } http://git-wip-us.apache.org/repos/asf/commons-io/blob/2a915f58/src/main/java/org/apache/commons/io/filefilter/IOFileFilter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/filefilter/IOFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/IOFileFilter.java index a384060..2037040 100644 --- a/src/main/java/org/apache/commons/io/filefilter/IOFileFilter.java +++ b/src/main/java/org/apache/commons/io/filefilter/IOFileFilter.java @@ -37,6 +37,7 @@ public interface IOFileFilter extends FileFilter, FilenameFilter { * @param file the File to check * @return true if this file matches the test */ + @Override boolean accept(File file); /** @@ -48,6 +49,7 @@ public interface IOFileFilter extends FileFilter, FilenameFilter { * @param name the filename within the directory to check * @return true if this file matches the test */ + @Override boolean accept(File dir, String name); } http://git-wip-us.apache.org/repos/asf/commons-io/blob/2a915f58/src/main/java/org/apache/commons/io/filefilter/OrFileFilter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/filefilter/OrFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/OrFileFilter.java index b468fdc..bc6cd14 100644 --- a/src/main/java/org/apache/commons/io/filefilter/OrFileFilter.java +++ b/src/main/java/org/apache/commons/io/filefilter/OrFileFilter.java @@ -84,6 +84,7 @@ public class OrFileFilter /** * {@inheritDoc} */ + @Override public void addFileFilter(final IOFileFilter ioFileFilter) { this.fileFilters.add(ioFileFilter); } @@ -91,6 +92,7 @@ public class OrFileFilter /** * {@inheritDoc} */ + @Override public List<IOFileFilter> getFileFilters() { return Collections.unmodifiableList(this.fileFilters); } @@ -98,6 +100,7 @@ public class OrFileFilter /** * {@inheritDoc} */ + @Override public boolean removeFileFilter(final IOFileFilter ioFileFilter) { return this.fileFilters.remove(ioFileFilter); } @@ -105,6 +108,7 @@ public class OrFileFilter /** * {@inheritDoc} */ + @Override public void setFileFilters(final List<IOFileFilter> fileFilters) { this.fileFilters.clear(); this.fileFilters.addAll(fileFilters); http://git-wip-us.apache.org/repos/asf/commons-io/blob/2a915f58/src/main/java/org/apache/commons/io/filefilter/TrueFileFilter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/filefilter/TrueFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/TrueFileFilter.java index a53bc60..f4d6435 100644 --- a/src/main/java/org/apache/commons/io/filefilter/TrueFileFilter.java +++ b/src/main/java/org/apache/commons/io/filefilter/TrueFileFilter.java @@ -54,6 +54,7 @@ public class TrueFileFilter implements IOFileFilter, Serializable { * @param file the file to check (ignored) * @return true */ + @Override public boolean accept(final File file) { return true; } @@ -65,6 +66,7 @@ public class TrueFileFilter implements IOFileFilter, Serializable { * @param name the filename (ignored) * @return true */ + @Override public boolean accept(final File dir, final String name) { return true; } http://git-wip-us.apache.org/repos/asf/commons-io/blob/2a915f58/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 9430847..9fed880 100644 --- a/src/main/java/org/apache/commons/io/input/BOMInputStream.java +++ b/src/main/java/org/apache/commons/io/input/BOMInputStream.java @@ -138,6 +138,7 @@ public class BOMInputStream extends ProxyInputStream { */ private static final Comparator<ByteOrderMark> ByteOrderMarkLengthComparator = new Comparator<ByteOrderMark>() { + @Override public int compare(final ByteOrderMark bom1, final ByteOrderMark bom2) { final int len1 = bom1.length(); final int len2 = bom2.length(); http://git-wip-us.apache.org/repos/asf/commons-io/blob/2a915f58/src/main/java/org/apache/commons/io/input/ReversedLinesFileReader.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/input/ReversedLinesFileReader.java b/src/main/java/org/apache/commons/io/input/ReversedLinesFileReader.java index 6dc2a46..1aece68 100644 --- a/src/main/java/org/apache/commons/io/input/ReversedLinesFileReader.java +++ b/src/main/java/org/apache/commons/io/input/ReversedLinesFileReader.java @@ -198,6 +198,7 @@ public class ReversedLinesFileReader implements Closeable { * * @throws IOException if an I/O error occurs */ + @Override public void close() throws IOException { randomAccessFile.close(); } http://git-wip-us.apache.org/repos/asf/commons-io/blob/2a915f58/src/main/java/org/apache/commons/io/input/SwappedDataInputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/input/SwappedDataInputStream.java b/src/main/java/org/apache/commons/io/input/SwappedDataInputStream.java index 62e9249..032daab 100644 --- a/src/main/java/org/apache/commons/io/input/SwappedDataInputStream.java +++ b/src/main/java/org/apache/commons/io/input/SwappedDataInputStream.java @@ -53,6 +53,7 @@ public class SwappedDataInputStream extends ProxyInputStream * @throws IOException if an I/O error occurs * @throws EOFException if an end of file is reached unexpectedly */ + @Override public boolean readBoolean() throws IOException, EOFException { @@ -65,6 +66,7 @@ public class SwappedDataInputStream extends ProxyInputStream * @throws IOException if an I/O error occurs * @throws EOFException if an end of file is reached unexpectedly */ + @Override public byte readByte() throws IOException, EOFException { @@ -77,6 +79,7 @@ public class SwappedDataInputStream extends ProxyInputStream * @throws IOException if an I/O error occurs * @throws EOFException if an end of file is reached unexpectedly */ + @Override public char readChar() throws IOException, EOFException { @@ -89,6 +92,7 @@ public class SwappedDataInputStream extends ProxyInputStream * @throws IOException if an I/O error occurs * @throws EOFException if an end of file is reached unexpectedly */ + @Override public double readDouble() throws IOException, EOFException { @@ -101,6 +105,7 @@ public class SwappedDataInputStream extends ProxyInputStream * @throws IOException if an I/O error occurs * @throws EOFException if an end of file is reached unexpectedly */ + @Override public float readFloat() throws IOException, EOFException { @@ -114,6 +119,7 @@ public class SwappedDataInputStream extends ProxyInputStream * @throws EOFException if an end of file is reached unexpectedly * @throws IOException if an I/O error occurs */ + @Override public void readFully( final byte[] data ) throws IOException, EOFException { @@ -130,6 +136,7 @@ public class SwappedDataInputStream extends ProxyInputStream * @throws EOFException if an end of file is reached unexpectedly * @throws IOException if an I/O error occurs */ + @Override public void readFully( final byte[] data, final int offset, final int length ) throws IOException, EOFException { @@ -155,6 +162,7 @@ public class SwappedDataInputStream extends ProxyInputStream * @throws EOFException if an end of file is reached unexpectedly * @throws IOException if an I/O error occurs */ + @Override public int readInt() throws IOException, EOFException { @@ -167,6 +175,7 @@ public class SwappedDataInputStream extends ProxyInputStream * @throws EOFException if an end of file is reached unexpectedly * @throws IOException if an I/O error occurs */ + @Override public String readLine() throws IOException, EOFException { @@ -180,6 +189,7 @@ public class SwappedDataInputStream extends ProxyInputStream * @throws EOFException if an end of file is reached unexpectedly * @throws IOException if an I/O error occurs */ + @Override public long readLong() throws IOException, EOFException { @@ -192,6 +202,7 @@ public class SwappedDataInputStream extends ProxyInputStream * @throws EOFException if an end of file is reached unexpectedly * @throws IOException if an I/O error occurs */ + @Override public short readShort() throws IOException, EOFException { @@ -204,6 +215,7 @@ public class SwappedDataInputStream extends ProxyInputStream * @throws EOFException if an end of file is reached unexpectedly * @throws IOException if an I/O error occurs */ + @Override public int readUnsignedByte() throws IOException, EOFException { @@ -216,6 +228,7 @@ public class SwappedDataInputStream extends ProxyInputStream * @throws EOFException if an end of file is reached unexpectedly * @throws IOException if an I/O error occurs */ + @Override public int readUnsignedShort() throws IOException, EOFException { @@ -228,6 +241,7 @@ public class SwappedDataInputStream extends ProxyInputStream * @throws EOFException if an end of file is reached unexpectedly * @throws IOException if an I/O error occurs */ + @Override public String readUTF() throws IOException, EOFException { @@ -242,6 +256,7 @@ public class SwappedDataInputStream extends ProxyInputStream * @throws EOFException if an end of file is reached unexpectedly * @throws IOException if an I/O error occurs */ + @Override public int skipBytes( final int count ) throws IOException, EOFException { http://git-wip-us.apache.org/repos/asf/commons-io/blob/2a915f58/src/main/java/org/apache/commons/io/input/Tailer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/input/Tailer.java b/src/main/java/org/apache/commons/io/input/Tailer.java index 5bba5a3..b955e83 100644 --- a/src/main/java/org/apache/commons/io/input/Tailer.java +++ b/src/main/java/org/apache/commons/io/input/Tailer.java @@ -402,6 +402,7 @@ public class Tailer implements Runnable { /** * Follows changes in the file, calling the TailerListener's handle method for each new line. */ + @Override public void run() { RandomAccessFile reader = null; try { http://git-wip-us.apache.org/repos/asf/commons-io/blob/2a915f58/src/main/java/org/apache/commons/io/input/TailerListenerAdapter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/input/TailerListenerAdapter.java b/src/main/java/org/apache/commons/io/input/TailerListenerAdapter.java index 29ab72c..29a05db 100644 --- a/src/main/java/org/apache/commons/io/input/TailerListenerAdapter.java +++ b/src/main/java/org/apache/commons/io/input/TailerListenerAdapter.java @@ -28,12 +28,14 @@ public class TailerListenerAdapter implements TailerListener { * giving the listener a method of stopping the tailer. * @param tailer the tailer. */ + @Override public void init(final Tailer tailer) { } /** * This method is called if the tailed file is not found. */ + @Override public void fileNotFound() { } @@ -43,6 +45,7 @@ public class TailerListenerAdapter implements TailerListener { * This method is called before the file is reopened, and fileNotFound may * be called if the new file has not yet been created. */ + @Override public void fileRotated() { } @@ -50,6 +53,7 @@ public class TailerListenerAdapter implements TailerListener { * Handles a line from a Tailer. * @param line the line. */ + @Override public void handle(final String line) { } @@ -57,6 +61,7 @@ public class TailerListenerAdapter implements TailerListener { * Handles an Exception . * @param ex the exception. */ + @Override public void handle(final Exception ex) { } http://git-wip-us.apache.org/repos/asf/commons-io/blob/2a915f58/src/main/java/org/apache/commons/io/monitor/FileAlterationListenerAdaptor.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/monitor/FileAlterationListenerAdaptor.java b/src/main/java/org/apache/commons/io/monitor/FileAlterationListenerAdaptor.java index 32a9f82..d505ef4 100644 --- a/src/main/java/org/apache/commons/io/monitor/FileAlterationListenerAdaptor.java +++ b/src/main/java/org/apache/commons/io/monitor/FileAlterationListenerAdaptor.java @@ -32,6 +32,7 @@ public class FileAlterationListenerAdaptor implements FileAlterationListener { * * @param observer The file system observer (ignored) */ + @Override public void onStart(final FileAlterationObserver observer) { } @@ -40,6 +41,7 @@ public class FileAlterationListenerAdaptor implements FileAlterationListener { * * @param directory The directory created (ignored) */ + @Override public void onDirectoryCreate(final File directory) { } @@ -48,6 +50,7 @@ public class FileAlterationListenerAdaptor implements FileAlterationListener { * * @param directory The directory changed (ignored) */ + @Override public void onDirectoryChange(final File directory) { } @@ -56,6 +59,7 @@ public class FileAlterationListenerAdaptor implements FileAlterationListener { * * @param directory The directory deleted (ignored) */ + @Override public void onDirectoryDelete(final File directory) { } @@ -64,6 +68,7 @@ public class FileAlterationListenerAdaptor implements FileAlterationListener { * * @param file The file created (ignored) */ + @Override public void onFileCreate(final File file) { } @@ -72,6 +77,7 @@ public class FileAlterationListenerAdaptor implements FileAlterationListener { * * @param file The file changed (ignored) */ + @Override public void onFileChange(final File file) { } @@ -80,6 +86,7 @@ public class FileAlterationListenerAdaptor implements FileAlterationListener { * * @param file The file deleted (ignored) */ + @Override public void onFileDelete(final File file) { } @@ -88,6 +95,7 @@ public class FileAlterationListenerAdaptor implements FileAlterationListener { * * @param observer The file system observer (ignored) */ + @Override public void onStop(final FileAlterationObserver observer) { } http://git-wip-us.apache.org/repos/asf/commons-io/blob/2a915f58/src/main/java/org/apache/commons/io/monitor/FileAlterationMonitor.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/monitor/FileAlterationMonitor.java b/src/main/java/org/apache/commons/io/monitor/FileAlterationMonitor.java index 8d7591d..fbc4c6f 100644 --- a/src/main/java/org/apache/commons/io/monitor/FileAlterationMonitor.java +++ b/src/main/java/org/apache/commons/io/monitor/FileAlterationMonitor.java @@ -176,6 +176,7 @@ public final class FileAlterationMonitor implements Runnable { /** * Run. */ + @Override public void run() { while (running) { for (final FileAlterationObserver observer : observers) { http://git-wip-us.apache.org/repos/asf/commons-io/blob/2a915f58/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 78297dd..1734b20 100644 --- a/src/test/java/org/apache/commons/io/IOUtilsTestCase.java +++ b/src/test/java/org/apache/commons/io/IOUtilsTestCase.java @@ -121,6 +121,7 @@ public class IOUtilsTestCase extends FileBasedTestCase { @Test public void testCloseQuietly_AllCloseableIOException() { final Closeable closeable = new Closeable() { + @Override public void close() throws IOException { throw new IOException(); } @@ -130,6 +131,7 @@ public class IOUtilsTestCase extends FileBasedTestCase { @Test public void testCloseQuietly_CloseableIOException() { IOUtils.closeQuietly(new Closeable() { + @Override public void close() throws IOException { throw new IOException(); } http://git-wip-us.apache.org/repos/asf/commons-io/blob/2a915f58/src/test/java/org/apache/commons/io/comparator/DirectoryFileComparatorTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/comparator/DirectoryFileComparatorTest.java b/src/test/java/org/apache/commons/io/comparator/DirectoryFileComparatorTest.java index 673937d..a24428e 100644 --- a/src/test/java/org/apache/commons/io/comparator/DirectoryFileComparatorTest.java +++ b/src/test/java/org/apache/commons/io/comparator/DirectoryFileComparatorTest.java @@ -40,6 +40,7 @@ public class DirectoryFileComparatorTest extends ComparatorAbstractTestCase { /** * Test the comparator array sort. */ + @Override @Test public void testSortArray() { // skip sort test http://git-wip-us.apache.org/repos/asf/commons-io/blob/2a915f58/src/test/java/org/apache/commons/io/input/TailerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/input/TailerTest.java b/src/test/java/org/apache/commons/io/input/TailerTest.java index 5e39fa0..5818f26 100644 --- a/src/test/java/org/apache/commons/io/input/TailerTest.java +++ b/src/test/java/org/apache/commons/io/input/TailerTest.java @@ -467,6 +467,7 @@ public class TailerTest extends FileBasedTestCase { volatile int reachedEndOfFile = 0; + @Override public void handle(final String line) { lines.add(line); } @@ -479,22 +480,27 @@ public class TailerTest extends FileBasedTestCase { lines.clear(); } + @Override public void handle(final Exception e) { exception = e; } + @Override public void init(final Tailer tailer) { initialised++; // not atomic, but OK because only updated here. } + @Override public void fileNotFound() { notFound++; // not atomic, but OK because only updated here. } + @Override public void fileRotated() { rotated++; // not atomic, but OK because only updated here. } + @Override public void endOfFileReached() { reachedEndOfFile++; // not atomic, but OK because only updated here. } http://git-wip-us.apache.org/repos/asf/commons-io/blob/2a915f58/src/test/java/org/apache/commons/io/monitor/CollectionFileListener.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/monitor/CollectionFileListener.java b/src/test/java/org/apache/commons/io/monitor/CollectionFileListener.java index beb0f66..e8c045b 100644 --- a/src/test/java/org/apache/commons/io/monitor/CollectionFileListener.java +++ b/src/test/java/org/apache/commons/io/monitor/CollectionFileListener.java @@ -50,6 +50,7 @@ public class CollectionFileListener implements FileAlterationListener, Serializa * * @param observer The file system observer */ + @Override public void onStart(final FileAlterationObserver observer) { if (clearOnStart) { clear(); @@ -127,6 +128,7 @@ public class CollectionFileListener implements FileAlterationListener, Serializa * * @param directory The directory created */ + @Override public void onDirectoryCreate(final File directory) { createdDirectories.add(directory); } @@ -136,6 +138,7 @@ public class CollectionFileListener implements FileAlterationListener, Serializa * * @param directory The directory changed */ + @Override public void onDirectoryChange(final File directory) { changedDirectories.add(directory); } @@ -145,6 +148,7 @@ public class CollectionFileListener implements FileAlterationListener, Serializa * * @param directory The directory deleted */ + @Override public void onDirectoryDelete(final File directory) { deletedDirectories.add(directory); } @@ -154,6 +158,7 @@ public class CollectionFileListener implements FileAlterationListener, Serializa * * @param file The file created */ + @Override public void onFileCreate(final File file) { createdFiles.add(file); } @@ -163,6 +168,7 @@ public class CollectionFileListener implements FileAlterationListener, Serializa * * @param file The file changed */ + @Override public void onFileChange(final File file) { changedFiles.add(file); } @@ -172,6 +178,7 @@ public class CollectionFileListener implements FileAlterationListener, Serializa * * @param file The file deleted */ + @Override public void onFileDelete(final File file) { deletedFiles.add(file); } @@ -181,6 +188,7 @@ public class CollectionFileListener implements FileAlterationListener, Serializa * * @param observer The file system observer */ + @Override public void onStop(final FileAlterationObserver observer) { } http://git-wip-us.apache.org/repos/asf/commons-io/blob/2a915f58/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 d55ed38..1ba7129 100644 --- a/src/test/java/org/apache/commons/io/serialization/MoreComplexObjectTest.java +++ b/src/test/java/org/apache/commons/io/serialization/MoreComplexObjectTest.java @@ -41,6 +41,7 @@ public class MoreComplexObjectTest extends ClosingBase { private InputStream inputStream; private MoreComplexObject original; + @Override @Before public void setup() throws IOException { original = new MoreComplexObject(); http://git-wip-us.apache.org/repos/asf/commons-io/blob/2a915f58/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 4f6e70b..f2e109c 100644 --- a/src/test/java/org/apache/commons/io/serialization/ValidatingObjectInputStreamTest.java +++ b/src/test/java/org/apache/commons/io/serialization/ValidatingObjectInputStreamTest.java @@ -46,6 +46,7 @@ public class ValidatingObjectInputStreamTest extends ClosingBase { } }; + @Override @Before public void setup() throws IOException { testObject = new MockSerializedClass(UUID.randomUUID().toString());
