Repository: commons-io Updated Branches: refs/heads/master f03149e07 -> 8993c0060
Don't need to nest else clause. Refactor magic numbers into constants. Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/8993c006 Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/8993c006 Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/8993c006 Branch: refs/heads/master Commit: 8993c0060e4eb2d5bca20e3529a829a9dd90efdf Parents: f03149e Author: Gary Gregory <garydgreg...@gmail.com> Authored: Tue Mar 6 10:00:42 2018 -0700 Committer: Gary Gregory <garydgreg...@gmail.com> Committed: Tue Mar 6 10:00:42 2018 -0700 ---------------------------------------------------------------------- .../java/org/apache/commons/io/FileUtils.java | 19 +++++-------- .../io/comparator/DirectoryFileComparator.java | 10 +++---- .../io/filefilter/DelegateFileFilter.java | 6 ++-- .../commons/io/filefilter/EmptyFileFilter.java | 3 +- .../commons/io/filefilter/FileFilterUtils.java | 12 ++------ .../commons/io/input/CharSequenceReader.java | 3 +- .../commons/io/input/DemuxInputStream.java | 5 +--- .../io/input/ReversedLinesFileReader.java | 13 ++++----- .../io/input/UnixLineEndingInputStream.java | 29 +++++++++----------- .../io/input/WindowsLineEndingInputStream.java | 3 +- .../commons/io/input/XmlStreamReader.java | 16 ++++------- 11 files changed, 45 insertions(+), 74 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-io/blob/8993c006/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 714f4c8..0049cbc 100644 --- a/src/main/java/org/apache/commons/io/FileUtils.java +++ b/src/main/java/org/apache/commons/io/FileUtils.java @@ -823,11 +823,10 @@ public class FileUtils { public static File toFile(final URL url) { if (url == null || !"file".equalsIgnoreCase(url.getProtocol())) { return null; - } else { - String filename = url.getFile().replace('/', File.separatorChar); - filename = decodeUrl(filename); - return new File(filename); } + String filename = url.getFile().replace('/', File.separatorChar); + filename = decodeUrl(filename); + return new File(filename); } /** @@ -2542,9 +2541,8 @@ public class FileUtils { if (file.isDirectory()) { return sizeOfDirectory0(file); // private method; expects directory - } else { - return file.length(); } + return file.length(); } @@ -2575,9 +2573,8 @@ public class FileUtils { if (file.isDirectory()) { return sizeOfDirectoryBig0(file); // internal method - } else { - return BigInteger.valueOf(file.length()); } + return BigInteger.valueOf(file.length()); } @@ -2638,9 +2635,8 @@ public class FileUtils { private static long sizeOf0(final File file) { if (file.isDirectory()) { return sizeOfDirectory0(file); - } else { - return file.length(); // will be 0 if file does not exist } + return file.length(); // will be 0 if file does not exist } /** @@ -2694,9 +2690,8 @@ public class FileUtils { private static BigInteger sizeOfBig0(final File fileOrDir) { if (fileOrDir.isDirectory()) { return sizeOfDirectoryBig0(fileOrDir); - } else { - return BigInteger.valueOf(fileOrDir.length()); } + return BigInteger.valueOf(fileOrDir.length()); } /** http://git-wip-us.apache.org/repos/asf/commons-io/blob/8993c006/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 1ab872b..c340191 100644 --- a/src/main/java/org/apache/commons/io/comparator/DirectoryFileComparator.java +++ b/src/main/java/org/apache/commons/io/comparator/DirectoryFileComparator.java @@ -44,6 +44,10 @@ import java.util.Comparator; */ public class DirectoryFileComparator extends AbstractFileComparator implements Serializable { + private static final int TYPE_FILE = 2; + + private static final int TYPE_DIRECTORY = 1; + private static final long serialVersionUID = 296132640160964395L; /** Singleton default comparator instance */ @@ -72,10 +76,6 @@ public class DirectoryFileComparator extends AbstractFileComparator implements S * @return 1 for directories and 2 for files */ private int getType(final File file) { - if (file.isDirectory()) { - return 1; - } else { - return 2; - } + return file.isDirectory() ? TYPE_DIRECTORY : TYPE_FILE; } } http://git-wip-us.apache.org/repos/asf/commons-io/blob/8993c006/src/main/java/org/apache/commons/io/filefilter/DelegateFileFilter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/filefilter/DelegateFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/DelegateFileFilter.java index e447e25..4328bf3 100644 --- a/src/main/java/org/apache/commons/io/filefilter/DelegateFileFilter.java +++ b/src/main/java/org/apache/commons/io/filefilter/DelegateFileFilter.java @@ -74,9 +74,8 @@ public class DelegateFileFilter extends AbstractFileFilter implements Serializab public boolean accept(final File file) { if (fileFilter != null) { return fileFilter.accept(file); - } else { - return super.accept(file); } + return super.accept(file); } /** @@ -90,9 +89,8 @@ public class DelegateFileFilter extends AbstractFileFilter implements Serializab public boolean accept(final File dir, final String name) { if (filenameFilter != null) { return filenameFilter.accept(dir, name); - } else { - return super.accept(dir, name); } + return super.accept(dir, name); } /** http://git-wip-us.apache.org/repos/asf/commons-io/blob/8993c006/src/main/java/org/apache/commons/io/filefilter/EmptyFileFilter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/filefilter/EmptyFileFilter.java b/src/main/java/org/apache/commons/io/filefilter/EmptyFileFilter.java index 9290679..a204b8a 100644 --- a/src/main/java/org/apache/commons/io/filefilter/EmptyFileFilter.java +++ b/src/main/java/org/apache/commons/io/filefilter/EmptyFileFilter.java @@ -79,9 +79,8 @@ public class EmptyFileFilter extends AbstractFileFilter implements Serializable if (file.isDirectory()) { final File[] files = file.listFiles(); return files == null || files.length == 0; - } else { - return file.length() == 0; } + return file.length() == 0; } } http://git-wip-us.apache.org/repos/asf/commons-io/blob/8993c006/src/main/java/org/apache/commons/io/filefilter/FileFilterUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/filefilter/FileFilterUtils.java b/src/main/java/org/apache/commons/io/filefilter/FileFilterUtils.java index 0326a40..f9a0818 100644 --- a/src/main/java/org/apache/commons/io/filefilter/FileFilterUtils.java +++ b/src/main/java/org/apache/commons/io/filefilter/FileFilterUtils.java @@ -738,11 +738,7 @@ public class FileFilterUtils { * @since 1.1 (method existed but had bug in 1.0) */ public static IOFileFilter makeCVSAware(final IOFileFilter filter) { - if (filter == null) { - return cvsFilter; - } else { - return and(filter, cvsFilter); - } + return filter == null ? cvsFilter : and(filter, cvsFilter); } /** @@ -755,11 +751,7 @@ public class FileFilterUtils { * @since 1.1 */ public static IOFileFilter makeSVNAware(final IOFileFilter filter) { - if (filter == null) { - return svnFilter; - } else { - return and(filter, svnFilter); - } + return filter == null ? svnFilter : and(filter, svnFilter); } //----------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-io/blob/8993c006/src/main/java/org/apache/commons/io/input/CharSequenceReader.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/input/CharSequenceReader.java b/src/main/java/org/apache/commons/io/input/CharSequenceReader.java index b561490..ea3bb28 100644 --- a/src/main/java/org/apache/commons/io/input/CharSequenceReader.java +++ b/src/main/java/org/apache/commons/io/input/CharSequenceReader.java @@ -84,9 +84,8 @@ public class CharSequenceReader extends Reader implements Serializable { public int read() { if (idx >= charSequence.length()) { return EOF; - } else { - return charSequence.charAt(idx++); } + return charSequence.charAt(idx++); } /** http://git-wip-us.apache.org/repos/asf/commons-io/blob/8993c006/src/main/java/org/apache/commons/io/input/DemuxInputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/input/DemuxInputStream.java b/src/main/java/org/apache/commons/io/input/DemuxInputStream.java index caccf0a..c65f065 100644 --- a/src/main/java/org/apache/commons/io/input/DemuxInputStream.java +++ b/src/main/java/org/apache/commons/io/input/DemuxInputStream.java @@ -75,9 +75,6 @@ public class DemuxInputStream { return input.read(); } - else - { - return EOF; - } + return EOF; } } http://git-wip-us.apache.org/repos/asf/commons-io/blob/8993c006/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 872ba27..308e5fc 100644 --- a/src/main/java/org/apache/commons/io/input/ReversedLinesFileReader.java +++ b/src/main/java/org/apache/commons/io/input/ReversedLinesFileReader.java @@ -256,14 +256,13 @@ public class ReversedLinesFileReader implements Closeable { if (no > 1) { return new FilePart(no - 1, blockSize, leftOver); - } else { - // NO 1 was the last FilePart, we're finished - if (leftOver != null) { - throw new IllegalStateException("Unexpected leftover of the last block: leftOverOfThisFilePart=" - + new String(leftOver, encoding)); - } - return null; } + // NO 1 was the last FilePart, we're finished + if (leftOver != null) { + throw new IllegalStateException("Unexpected leftover of the last block: leftOverOfThisFilePart=" + + new String(leftOver, encoding)); + } + return null; } /** http://git-wip-us.apache.org/repos/asf/commons-io/blob/8993c006/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 0fbd903..fba1944 100644 --- a/src/main/java/org/apache/commons/io/input/UnixLineEndingInputStream.java +++ b/src/main/java/org/apache/commons/io/input/UnixLineEndingInputStream.java @@ -73,22 +73,20 @@ public class UnixLineEndingInputStream extends InputStream { if ( eofSeen ) { return eofGame(previousWasSlashR); } - else { - final int target = readWithUpdate(); - if ( eofSeen ) { - return eofGame(previousWasSlashR); - } - if (slashRSeen) - { - return '\n'; - } - - if ( previousWasSlashR && slashNSeen){ - return read(); - } + final int target = readWithUpdate(); + if ( eofSeen ) { + return eofGame(previousWasSlashR); + } + if (slashRSeen) + { + return '\n'; + } - return target; + if ( previousWasSlashR && slashNSeen){ + return read(); } + + return target; } /** @@ -103,9 +101,8 @@ public class UnixLineEndingInputStream extends InputStream { if ( !slashNSeen ) { slashNSeen = true; return '\n'; - } else { - return -1; } + return -1; } /** http://git-wip-us.apache.org/repos/asf/commons-io/blob/8993c006/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 a153a53..ccf321e 100644 --- a/src/main/java/org/apache/commons/io/input/WindowsLineEndingInputStream.java +++ b/src/main/java/org/apache/commons/io/input/WindowsLineEndingInputStream.java @@ -109,9 +109,8 @@ public class WindowsLineEndingInputStream extends InputStream { slashRSeen = false; slashNSeen = true; return '\n'; - } else { - return -1; } + return -1; } /** http://git-wip-us.apache.org/repos/asf/commons-io/blob/8993c006/src/main/java/org/apache/commons/io/input/XmlStreamReader.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/input/XmlStreamReader.java b/src/main/java/org/apache/commons/io/input/XmlStreamReader.java index f729b54..4a521b5 100644 --- a/src/main/java/org/apache/commons/io/input/XmlStreamReader.java +++ b/src/main/java/org/apache/commons/io/input/XmlStreamReader.java @@ -430,9 +430,8 @@ public class XmlStreamReader extends Reader { } catch (final XmlStreamReaderException ex) { if (lenient) { return doLenientDetection(null, ex); - } else { - throw ex; } + throw ex; } } @@ -458,9 +457,8 @@ public class XmlStreamReader extends Reader { } catch (final XmlStreamReaderException ex) { if (lenient) { return doLenientDetection(httpContentType, ex); - } else { - throw ex; } + throw ex; } } @@ -601,9 +599,8 @@ public class XmlStreamReader extends Reader { if (cTEnc == null) { if (appXml) { return calculateRawEncoding(bomEnc, xmlGuessEnc, xmlEnc); - } else { - return defaultEncoding == null ? US_ASCII : defaultEncoding; } + return defaultEncoding == null ? US_ASCII : defaultEncoding; } // UTF-16BE or UTF-16LE content type encoding @@ -722,11 +719,10 @@ public class XmlStreamReader extends Reader { if (firstGT == -1) { if (c == -1) { throw new IOException("Unexpected end of XML stream"); - } else { - throw new IOException( - "XML prolog or ROOT element not found on first " - + offset + " bytes"); } + throw new IOException( + "XML prolog or ROOT element not found on first " + + offset + " bytes"); } final int bytesRead = offset; if (bytesRead > 0) {
