This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git
The following commit(s) were added to refs/heads/master by this push:
new 02c1b67 No need to nest in else.
02c1b67 is described below
commit 02c1b678a50501cbbfcf1e584a99ebeac4832c79
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Fri Mar 5 17:34:09 2021 -0500
No need to nest in else.
---
.../org/apache/commons/io/FileSystemUtils.java | 7 +-
src/main/java/org/apache/commons/io/FileUtils.java | 6 +-
.../java/org/apache/commons/io/FilenameUtils.java | 27 ++++----
.../java/org/apache/commons/io/LineIterator.java | 31 ++++-----
.../io/comparator/LastModifiedFileComparator.java | 6 +-
.../commons/io/comparator/SizeFileComparator.java | 6 +-
.../java/org/apache/commons/io/file/PathUtils.java | 9 ++-
.../apache/commons/io/input/NullInputStream.java | 6 +-
.../commons/io/input/ObservableInputStream.java | 6 +-
.../commons/io/input/ReversedLinesFileReader.java | 5 +-
.../apache/commons/io/input/SequenceReader.java | 5 +-
.../io/input/WindowsLineEndingInputStream.java | 24 +++----
.../io/input/buffer/CircularBufferInputStream.java | 3 +-
.../commons/io/output/ByteArrayOutputStream.java | 3 +-
.../io/output/DeferredFileOutputStream.java | 3 +-
.../commons/io/output/FileWriterWithEncoding.java | 6 +-
.../UnsynchronizedByteArrayOutputStream.java | 3 +-
.../buffer/CircularBufferInputStreamTest.java | 16 ++---
.../io/input/compatibility/XmlStreamReader.java | 75 +++++++++++-----------
19 files changed, 123 insertions(+), 124 deletions(-)
diff --git a/src/main/java/org/apache/commons/io/FileSystemUtils.java
b/src/main/java/org/apache/commons/io/FileSystemUtils.java
index c493f2c..b58cef9 100644
--- a/src/main/java/org/apache/commons/io/FileSystemUtils.java
+++ b/src/main/java/org/apache/commons/io/FileSystemUtils.java
@@ -426,14 +426,13 @@ public class FileSystemUtils {
StringTokenizer tok = new StringTokenizer(line2, " ");
if (tok.countTokens() < 4) {
// could be long Filesystem, thus data on third line
- if (tok.countTokens() == 1 && lines.size() >= 3) {
- final String line3 = lines.get(2); // the line may be
interested in
- tok = new StringTokenizer(line3, " ");
- } else {
+ if ((tok.countTokens() != 1) || (lines.size() < 3)) {
throw new IOException(
"Command line '" + DF + "' did not return data as
expected " +
"for path '" + path + "'- check path is valid");
}
+ final String line3 = lines.get(2); // the line may be interested in
+ tok = new StringTokenizer(line3, " ");
} else {
tok.nextToken(); // Ignore Filesystem
}
diff --git a/src/main/java/org/apache/commons/io/FileUtils.java
b/src/main/java/org/apache/commons/io/FileUtils.java
index f464e9a..385a261 100644
--- a/src/main/java/org/apache/commons/io/FileUtils.java
+++ b/src/main/java/org/apache/commons/io/FileUtils.java
@@ -2251,12 +2251,12 @@ public class FileUtils {
if (!destDir.isDirectory()) {
if (destDir.exists()) {
throw new IOException("Destination '" + destDir + "' is not a
directory");
- } else if (createDestDir) {
- mkdirs(destDir);
- } else {
+ }
+ if (!createDestDir) {
throw new FileNotFoundException("Destination directory '" +
destDir +
"' does not exist [createDestDir=" + createDestDir +
"]");
}
+ mkdirs(destDir);
}
moveDirectory(src, new File(destDir, src.getName()));
}
diff --git a/src/main/java/org/apache/commons/io/FilenameUtils.java
b/src/main/java/org/apache/commons/io/FilenameUtils.java
index 3a99731..5505752 100644
--- a/src/main/java/org/apache/commons/io/FilenameUtils.java
+++ b/src/main/java/org/apache/commons/io/FilenameUtils.java
@@ -667,25 +667,26 @@ public class FilenameUtils {
return 2;
}
return 3;
- } else if (ch0 == UNIX_SEPARATOR) {
+ }
+ if (ch0 == UNIX_SEPARATOR) {
return 1;
}
return NOT_FOUND;
- } else if (isSeparator(ch0) && isSeparator(ch1)) {
- int posUnix = fileName.indexOf(UNIX_SEPARATOR, 2);
- int posWin = fileName.indexOf(WINDOWS_SEPARATOR, 2);
- if (posUnix == NOT_FOUND && posWin == NOT_FOUND || posUnix == 2 ||
posWin == 2) {
- return NOT_FOUND;
- }
- posUnix = posUnix == NOT_FOUND ? posWin : posUnix;
- posWin = posWin == NOT_FOUND ? posUnix : posWin;
- final int pos = Math.min(posUnix, posWin) + 1;
- final String hostnamePart = fileName.substring(2, pos - 1);
- return isValidHostName(hostnamePart) ? pos : NOT_FOUND;
- } else {
+ }
+ if (!isSeparator(ch0) || !isSeparator(ch1)) {
return isSeparator(ch0) ? 1 : 0;
}
+ int posUnix = fileName.indexOf(UNIX_SEPARATOR, 2);
+ int posWin = fileName.indexOf(WINDOWS_SEPARATOR, 2);
+ if (posUnix == NOT_FOUND && posWin == NOT_FOUND || posUnix == 2 ||
posWin == 2) {
+ return NOT_FOUND;
+ }
+ posUnix = posUnix == NOT_FOUND ? posWin : posUnix;
+ posWin = posWin == NOT_FOUND ? posUnix : posWin;
+ final int pos = Math.min(posUnix, posWin) + 1;
+ final String hostnamePart = fileName.substring(2, pos - 1);
+ return isValidHostName(hostnamePart) ? pos : NOT_FOUND;
}
/**
diff --git a/src/main/java/org/apache/commons/io/LineIterator.java
b/src/main/java/org/apache/commons/io/LineIterator.java
index 94f86e0..1cce4f1 100644
--- a/src/main/java/org/apache/commons/io/LineIterator.java
+++ b/src/main/java/org/apache/commons/io/LineIterator.java
@@ -88,24 +88,25 @@ public class LineIterator implements Iterator<String>,
Closeable {
public boolean hasNext() {
if (cachedLine != null) {
return true;
- } else if (finished) {
+ }
+ if (finished) {
return false;
- } else {
- try {
- while (true) {
- final String line = bufferedReader.readLine();
- if (line == null) {
- finished = true;
- return false;
- } else if (isValidLine(line)) {
- cachedLine = line;
- return true;
- }
+ }
+ try {
+ while (true) {
+ final String line = bufferedReader.readLine();
+ if (line == null) {
+ finished = true;
+ return false;
+ }
+ if (isValidLine(line)) {
+ cachedLine = line;
+ return true;
}
- } catch(final IOException ioe) {
- IOUtils.closeQuietly(this, e -> ioe.addSuppressed(e));
- throw new IllegalStateException(ioe);
}
+ } catch(final IOException ioe) {
+ IOUtils.closeQuietly(this, e -> ioe.addSuppressed(e));
+ throw new IllegalStateException(ioe);
}
}
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 b46f1e1..bd2d350 100644
---
a/src/main/java/org/apache/commons/io/comparator/LastModifiedFileComparator.java
+++
b/src/main/java/org/apache/commons/io/comparator/LastModifiedFileComparator.java
@@ -70,10 +70,10 @@ public class LastModifiedFileComparator extends
AbstractFileComparator implement
final long result = FileUtils.lastModifiedUnchecked(file1) -
FileUtils.lastModifiedUnchecked(file2);
if (result < 0) {
return -1;
- } else if (result > 0) {
+ }
+ if (result > 0) {
return 1;
- } else {
- return 0;
}
+ return 0;
}
}
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 0ac3716..ef15003 100644
--- a/src/main/java/org/apache/commons/io/comparator/SizeFileComparator.java
+++ b/src/main/java/org/apache/commons/io/comparator/SizeFileComparator.java
@@ -123,11 +123,11 @@ public class SizeFileComparator extends
AbstractFileComparator implements Serial
final long result = size1 - size2;
if (result < 0) {
return -1;
- } else if (result > 0) {
+ }
+ if (result > 0) {
return 1;
- } else {
- return 0;
}
+ return 0;
}
/**
diff --git a/src/main/java/org/apache/commons/io/file/PathUtils.java
b/src/main/java/org/apache/commons/io/file/PathUtils.java
index 8ff6dbd..958d06d 100644
--- a/src/main/java/org/apache/commons/io/file/PathUtils.java
+++ b/src/main/java/org/apache/commons/io/file/PathUtils.java
@@ -541,13 +541,12 @@ public final class PathUtils {
final List<Path> fileList2 = relativeSortedPaths.relativeFileList2;
for (final Path path : fileList1) {
final int binarySearch = Collections.binarySearch(fileList2, path);
- if (binarySearch > -1) {
- if (!fileContentEquals(path1.resolve(path),
path2.resolve(path), linkOptions, openOptions)) {
- return false;
- }
- } else {
+ if (binarySearch <= -1) {
throw new IllegalStateException("Unexpected mismatch.");
}
+ if (!fileContentEquals(path1.resolve(path), path2.resolve(path),
linkOptions, openOptions)) {
+ return false;
+ }
}
return true;
}
diff --git a/src/main/java/org/apache/commons/io/input/NullInputStream.java
b/src/main/java/org/apache/commons/io/input/NullInputStream.java
index 7197bfd..80d7f4a 100644
--- a/src/main/java/org/apache/commons/io/input/NullInputStream.java
+++ b/src/main/java/org/apache/commons/io/input/NullInputStream.java
@@ -140,11 +140,11 @@ public class NullInputStream extends InputStream {
final long avail = size - position;
if (avail <= 0) {
return 0;
- } else if (avail > Integer.MAX_VALUE) {
+ }
+ if (avail > Integer.MAX_VALUE) {
return Integer.MAX_VALUE;
- } else {
- return (int)avail;
}
+ return (int) avail;
}
/**
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 6f448e7..21946f3 100644
--- a/src/main/java/org/apache/commons/io/input/ObservableInputStream.java
+++ b/src/main/java/org/apache/commons/io/input/ObservableInputStream.java
@@ -245,7 +245,8 @@ public class ObservableInputStream extends ProxyInputStream
{
if (ioe != null) {
noteError(ioe);
throw ioe;
- } else if (result == EOF) {
+ }
+ if (result == EOF) {
noteFinished();
} else if (result > 0) {
noteDataBytes(buffer, offset, result);
@@ -264,7 +265,8 @@ public class ObservableInputStream extends ProxyInputStream
{
if (ioe != null) {
noteError(ioe);
throw ioe;
- } else if (result == EOF) {
+ }
+ if (result == EOF) {
noteFinished();
} else {
noteDataByte(result);
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 860e3dd..3cd8a96 100644
--- a/src/main/java/org/apache/commons/io/input/ReversedLinesFileReader.java
+++ b/src/main/java/org/apache/commons/io/input/ReversedLinesFileReader.java
@@ -403,12 +403,11 @@ public class ReversedLinesFileReader implements Closeable
{
String line = currentFilePart.readLine();
while (line == null) {
currentFilePart = currentFilePart.rollOver();
- if (currentFilePart != null) {
- line = currentFilePart.readLine();
- } else {
+ if (currentFilePart == null) {
// no more fileparts: we're done, leave line set to null
break;
}
+ line = currentFilePart.readLine();
}
// aligned behavior with BufferedReader that doesn't return a last,
empty line
diff --git a/src/main/java/org/apache/commons/io/input/SequenceReader.java
b/src/main/java/org/apache/commons/io/input/SequenceReader.java
index 433fda7..a80552f 100644
--- a/src/main/java/org/apache/commons/io/input/SequenceReader.java
+++ b/src/main/java/org/apache/commons/io/input/SequenceReader.java
@@ -83,11 +83,10 @@ public class SequenceReader extends Reader {
int c = EOF;
while (reader != null) {
c = reader.read();
- if (c == EOF) {
- reader = nextReader();
- } else {
+ if (c != EOF) {
break;
}
+ reader = nextReader();
}
return c;
}
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 9a42e74..921b334 100644
---
a/src/main/java/org/apache/commons/io/input/WindowsLineEndingInputStream.java
+++
b/src/main/java/org/apache/commons/io/input/WindowsLineEndingInputStream.java
@@ -76,21 +76,21 @@ public class WindowsLineEndingInputStream extends
InputStream {
public int read() throws IOException {
if (eofSeen) {
return eofGame();
- } else if (injectSlashN) {
+ }
+ if (injectSlashN) {
injectSlashN = false;
return LF;
- } else {
- final boolean prevWasSlashR = slashRSeen;
- final int target = readWithUpdate();
- if (eofSeen) {
- return eofGame();
- }
- if ((target == LF) && !prevWasSlashR) {
- injectSlashN = true;
- return CR;
- }
- return target;
}
+ final boolean prevWasSlashR = slashRSeen;
+ final int target = readWithUpdate();
+ if (eofSeen) {
+ return eofGame();
+ }
+ if ((target == LF) && !prevWasSlashR) {
+ injectSlashN = true;
+ return CR;
+ }
+ return target;
}
/**
diff --git
a/src/main/java/org/apache/commons/io/input/buffer/CircularBufferInputStream.java
b/src/main/java/org/apache/commons/io/input/buffer/CircularBufferInputStream.java
index b6c51ab..7853533 100644
---
a/src/main/java/org/apache/commons/io/input/buffer/CircularBufferInputStream.java
+++
b/src/main/java/org/apache/commons/io/input/buffer/CircularBufferInputStream.java
@@ -84,7 +84,8 @@ public class CircularBufferInputStream extends InputStream {
if (res == EOF) {
eof = true;
return;
- } else if (res > 0) {
+ }
+ if (res > 0) {
buffer.add(buf, 0, res);
space -= res;
}
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 fecce3a..7032004 100644
--- a/src/main/java/org/apache/commons/io/output/ByteArrayOutputStream.java
+++ b/src/main/java/org/apache/commons/io/output/ByteArrayOutputStream.java
@@ -59,7 +59,8 @@ public class ByteArrayOutputStream extends
AbstractByteArrayOutputStream {
|| ((off + len) > b.length)
|| ((off + len) < 0)) {
throw new IndexOutOfBoundsException();
- } else if (len == 0) {
+ }
+ if (len == 0) {
return;
}
synchronized (this) {
diff --git
a/src/main/java/org/apache/commons/io/output/DeferredFileOutputStream.java
b/src/main/java/org/apache/commons/io/output/DeferredFileOutputStream.java
index a99c01a..756f825 100644
--- a/src/main/java/org/apache/commons/io/output/DeferredFileOutputStream.java
+++ b/src/main/java/org/apache/commons/io/output/DeferredFileOutputStream.java
@@ -275,9 +275,8 @@ public class DeferredFileOutputStream extends
ThresholdingOutputStream {
if (isInMemory()) {
return memoryOutputStream.toInputStream();
- } else {
- return Files.newInputStream(outputFile.toPath());
}
+ return Files.newInputStream(outputFile.toPath());
}
/**
diff --git
a/src/main/java/org/apache/commons/io/output/FileWriterWithEncoding.java
b/src/main/java/org/apache/commons/io/output/FileWriterWithEncoding.java
index 50cb2ba..80bbc2b 100644
--- a/src/main/java/org/apache/commons/io/output/FileWriterWithEncoding.java
+++ b/src/main/java/org/apache/commons/io/output/FileWriterWithEncoding.java
@@ -230,11 +230,11 @@ public class FileWriterWithEncoding extends Writer {
stream = new FileOutputStream(file, append);
if (encoding instanceof Charset) {
return new OutputStreamWriter(stream, (Charset)encoding);
- } else if (encoding instanceof CharsetEncoder) {
+ }
+ if (encoding instanceof CharsetEncoder) {
return new OutputStreamWriter(stream,
(CharsetEncoder)encoding);
- } else {
- return new OutputStreamWriter(stream, (String)encoding);
}
+ return new OutputStreamWriter(stream, (String)encoding);
} catch (final IOException | RuntimeException ex) {
try {
IOUtils.close(stream);
diff --git
a/src/main/java/org/apache/commons/io/output/UnsynchronizedByteArrayOutputStream.java
b/src/main/java/org/apache/commons/io/output/UnsynchronizedByteArrayOutputStream.java
index 868bed4..dbf2e1b 100644
---
a/src/main/java/org/apache/commons/io/output/UnsynchronizedByteArrayOutputStream.java
+++
b/src/main/java/org/apache/commons/io/output/UnsynchronizedByteArrayOutputStream.java
@@ -55,7 +55,8 @@ public final class UnsynchronizedByteArrayOutputStream
extends AbstractByteArray
public void write(final byte[] b, final int off, final int len) {
if ((off < 0) || (off > b.length) || (len < 0) || ((off + len) >
b.length) || ((off + len) < 0)) {
throw new IndexOutOfBoundsException(String.format("offset=%,d,
length=%,d", off, len));
- } else if (len == 0) {
+ }
+ if (len == 0) {
return;
}
writeImpl(b, off, len);
diff --git
a/src/test/java/org/apache/commons/io/input/buffer/CircularBufferInputStreamTest.java
b/src/test/java/org/apache/commons/io/input/buffer/CircularBufferInputStreamTest.java
index a5000ce..dbb7a25 100644
---
a/src/test/java/org/apache/commons/io/input/buffer/CircularBufferInputStreamTest.java
+++
b/src/test/java/org/apache/commons/io/input/buffer/CircularBufferInputStreamTest.java
@@ -58,16 +58,16 @@ public class CircularBufferInputStreamTest {
final int res = cbis.read(readBuffer, 0,
rnd.nextInt(readBuffer.length+1));
if (res == -1) {
throw new
IllegalStateException("Unexpected EOF at offset " + offset);
- } else if (res == 0) {
+ }
+ if (res == 0) {
throw new
IllegalStateException("Unexpected zero-byte-result at offset " + offset);
- } else {
- for (int i = 0; i < res; i++) {
- if (inputBuffer[offset] !=
readBuffer[i]) {
- throw new
IllegalStateException("Expected " + inputBuffer[offset] + " at offset " +
offset + ", got " + readBuffer[i]);
- }
- ++offset;
- }
}
+ for (int i = 0; i < res; i++) {
+ if (inputBuffer[offset] != readBuffer[i]) {
+ throw new IllegalStateException("Expected " +
inputBuffer[offset] + " at offset " + offset + ", got " + readBuffer[i]);
+ }
+ ++offset;
+ }
break;
}
default:
diff --git
a/src/test/java/org/apache/commons/io/input/compatibility/XmlStreamReader.java
b/src/test/java/org/apache/commons/io/input/compatibility/XmlStreamReader.java
index 36920ed..2291bc3 100644
---
a/src/test/java/org/apache/commons/io/input/compatibility/XmlStreamReader.java
+++
b/src/test/java/org/apache/commons/io/input/compatibility/XmlStreamReader.java
@@ -516,53 +516,50 @@ public class XmlStreamReader extends Reader {
} else {
final boolean appXml = isAppXml(cTMime);
final boolean textXml = isTextXml(cTMime);
- if (appXml || textXml) {
- if (cTEnc == null) {
- if (appXml) {
- encoding = calculateRawEncoding(bomEnc, xmlGuessEnc,
- xmlEnc, is);
- } else {
- encoding = defaultEncoding == null ? US_ASCII
- : defaultEncoding;
- }
- } else if (bomEnc != null
- && (cTEnc.equals(UTF_16BE) || cTEnc.equals(UTF_16LE)))
{
- throw new XmlStreamReaderException(HTTP_EX_1
+ if (!appXml && !textXml) {
+ throw new XmlStreamReaderException(HTTP_EX_3
+ .format(new Object[] { cTMime, cTEnc, bomEnc,
+ xmlGuessEnc, xmlEnc }), cTMime, cTEnc, bomEnc,
+ xmlGuessEnc, xmlEnc, is);
+ }
+ if (cTEnc == null) {
+ if (appXml) {
+ encoding = calculateRawEncoding(bomEnc, xmlGuessEnc,
+ xmlEnc, is);
+ } else {
+ encoding = defaultEncoding == null ? US_ASCII
+ : defaultEncoding;
+ }
+ } else if (bomEnc != null
+ && (cTEnc.equals(UTF_16BE) || cTEnc.equals(UTF_16LE))) {
+ throw new XmlStreamReaderException(HTTP_EX_1
+ .format(new Object[] { cTMime, cTEnc, bomEnc,
+ xmlGuessEnc, xmlEnc }), cTMime, cTEnc,
+ bomEnc, xmlGuessEnc, xmlEnc, is);
+ } else if (cTEnc.equals(UTF_16)) {
+ if ((bomEnc == null) || !bomEnc.startsWith(UTF_16)) {
+ throw new XmlStreamReaderException(HTTP_EX_2
.format(new Object[] { cTMime, cTEnc, bomEnc,
xmlGuessEnc, xmlEnc }), cTMime, cTEnc,
bomEnc, xmlGuessEnc, xmlEnc, is);
- } else if (cTEnc.equals(UTF_16)) {
- if (bomEnc != null && bomEnc.startsWith(UTF_16)) {
- encoding = bomEnc;
- } else {
- throw new XmlStreamReaderException(HTTP_EX_2
- .format(new Object[] { cTMime, cTEnc, bomEnc,
- xmlGuessEnc, xmlEnc }), cTMime, cTEnc,
- bomEnc, xmlGuessEnc, xmlEnc, is);
- }
- } else if (bomEnc != null
- && (cTEnc.equals(UTF_32BE) || cTEnc.equals(UTF_32LE)))
{
- throw new XmlStreamReaderException(HTTP_EX_1
+ }
+ encoding = bomEnc;
+ } else if (bomEnc != null
+ && (cTEnc.equals(UTF_32BE) || cTEnc.equals(UTF_32LE))) {
+ throw new XmlStreamReaderException(HTTP_EX_1
+ .format(new Object[] { cTMime, cTEnc, bomEnc,
+ xmlGuessEnc, xmlEnc }), cTMime, cTEnc,
+ bomEnc, xmlGuessEnc, xmlEnc, is);
+ } else if (cTEnc.equals(UTF_32)) {
+ if ((bomEnc == null) || !bomEnc.startsWith(UTF_32)) {
+ throw new XmlStreamReaderException(HTTP_EX_2
.format(new Object[] { cTMime, cTEnc, bomEnc,
xmlGuessEnc, xmlEnc }), cTMime, cTEnc,
bomEnc, xmlGuessEnc, xmlEnc, is);
- } else if (cTEnc.equals(UTF_32)) {
- if (bomEnc != null && bomEnc.startsWith(UTF_32)) {
- encoding = bomEnc;
- } else {
- throw new XmlStreamReaderException(HTTP_EX_2
- .format(new Object[] { cTMime, cTEnc, bomEnc,
- xmlGuessEnc, xmlEnc }), cTMime, cTEnc,
- bomEnc, xmlGuessEnc, xmlEnc, is);
- }
- } else {
- encoding = cTEnc;
}
+ encoding = bomEnc;
} else {
- throw new XmlStreamReaderException(HTTP_EX_3
- .format(new Object[] { cTMime, cTEnc, bomEnc,
- xmlGuessEnc, xmlEnc }), cTMime, cTEnc, bomEnc,
- xmlGuessEnc, xmlEnc, is);
+ encoding = cTEnc;
}
}
return encoding;
