You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/05/04 19:49:59 UTC
[commons-io] 02/02: Use final, remove superfluous parens, reduce nesting.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git
commit 1440a3018cb6793a20fe9fba971f1a6f939afba6
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu May 4 15:49:52 2023 -0400
Use final, remove superfluous parens, reduce nesting.
---
src/main/java/org/apache/commons/io/HexDump.java | 2 +-
src/main/java/org/apache/commons/io/function/IOSpliterator.java | 2 +-
.../apache/commons/io/function/IOBinaryOperatorStreamTest.java | 2 +-
.../java/org/apache/commons/io/input/BoundedInputStreamTest.java | 6 +++---
.../commons/io/input/ReversedLinesFileReaderTestParamFile.java | 4 ++--
.../java/org/apache/commons/io/input/SequenceReaderTest.java | 8 +++++---
.../java/org/apache/commons/io/input/XmlStreamReaderTest.java | 2 +-
.../apache/commons/io/input/compatibility/XmlStreamReader.java | 9 +--------
.../org/apache/commons/io/output/WriterOutputStreamTest.java | 2 +-
9 files changed, 16 insertions(+), 21 deletions(-)
diff --git a/src/main/java/org/apache/commons/io/HexDump.java b/src/main/java/org/apache/commons/io/HexDump.java
index 0360a494..9c32069c 100644
--- a/src/main/java/org/apache/commons/io/HexDump.java
+++ b/src/main/java/org/apache/commons/io/HexDump.java
@@ -119,7 +119,7 @@ public class HexDump {
final StringBuilder buffer = new StringBuilder(74);
// TODO Use Objects.checkFromIndexSize(index, length, data.length) when upgrading to JDK9
- if (length < 0 || (index + length) > data.length) {
+ if (length < 0 || index + length > data.length) {
throw new ArrayIndexOutOfBoundsException(String.format("Range [%s, %<s + %s) out of bounds for length %s", index, length, data.length));
}
diff --git a/src/main/java/org/apache/commons/io/function/IOSpliterator.java b/src/main/java/org/apache/commons/io/function/IOSpliterator.java
index 550f13a4..e9031cd3 100644
--- a/src/main/java/org/apache/commons/io/function/IOSpliterator.java
+++ b/src/main/java/org/apache/commons/io/function/IOSpliterator.java
@@ -119,7 +119,7 @@ public interface IOSpliterator<T> {
* @return {@code false} if no remaining elements existed upon entry to this method, else {@code true}.
* @throws NullPointerException if the specified action is null
*/
- default boolean tryAdvance(IOConsumer<? super T> action) {
+ default boolean tryAdvance(final IOConsumer<? super T> action) {
return unwrap().tryAdvance(Objects.requireNonNull(action, "action").asConsumer());
}
diff --git a/src/test/java/org/apache/commons/io/function/IOBinaryOperatorStreamTest.java b/src/test/java/org/apache/commons/io/function/IOBinaryOperatorStreamTest.java
index c395c61c..a591e780 100644
--- a/src/test/java/org/apache/commons/io/function/IOBinaryOperatorStreamTest.java
+++ b/src/test/java/org/apache/commons/io/function/IOBinaryOperatorStreamTest.java
@@ -47,7 +47,7 @@ public class IOBinaryOperatorStreamTest {
@Test
public void testAsBinaryOperator() {
assertThrows(UncheckedIOException.class,
- () -> Stream.of(TestConstants.ABS_PATH_A, TestConstants.ABS_PATH_A).reduce((TestUtils.<Path>throwingIOBinaryOperator()).asBinaryOperator()).get());
+ () -> Stream.of(TestConstants.ABS_PATH_A, TestConstants.ABS_PATH_A).reduce(TestUtils.<Path>throwingIOBinaryOperator().asBinaryOperator()).get());
assertEquals(TestConstants.ABS_PATH_A, Stream.of(TestConstants.ABS_PATH_A, TestConstants.ABS_PATH_A).reduce(MAX_BY_BO).get());
assertEquals(TestConstants.ABS_PATH_A, Stream.of(TestConstants.ABS_PATH_A, TestConstants.ABS_PATH_A).reduce(MIN_BY_BO).get());
}
diff --git a/src/test/java/org/apache/commons/io/input/BoundedInputStreamTest.java b/src/test/java/org/apache/commons/io/input/BoundedInputStreamTest.java
index 126b519a..36473361 100644
--- a/src/test/java/org/apache/commons/io/input/BoundedInputStreamTest.java
+++ b/src/test/java/org/apache/commons/io/input/BoundedInputStreamTest.java
@@ -48,7 +48,7 @@ public class BoundedInputStreamTest {
// limit = length
bounded = new BoundedInputStream(new ByteArrayInputStream(helloWorld), helloWorld.length) {
@Override
- protected void onMaxLength(long max, long readCount) {
+ protected void onMaxLength(final long max, final long readCount) {
boolRef.set(true);
}
};
@@ -63,7 +63,7 @@ public class BoundedInputStreamTest {
boolRef.set(false);
bounded = new BoundedInputStream(new ByteArrayInputStream(helloWorld), helloWorld.length + 1) {
@Override
- protected void onMaxLength(long max, long readCount) {
+ protected void onMaxLength(final long max, final long readCount) {
boolRef.set(true);
}
};
@@ -78,7 +78,7 @@ public class BoundedInputStreamTest {
boolRef.set(false);
bounded = new BoundedInputStream(new ByteArrayInputStream(helloWorld), hello.length) {
@Override
- protected void onMaxLength(long max, long readCount) {
+ protected void onMaxLength(final long max, final long readCount) {
boolRef.set(true);
}
};
diff --git a/src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamFile.java b/src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamFile.java
index c4029a81..f66907b2 100644
--- a/src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamFile.java
+++ b/src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamFile.java
@@ -85,8 +85,8 @@ public class ReversedLinesFileReaderTestParamFile {
// @formatter:on
}
- private void testDataIntegrityWithBufferedReader(Path filePath, FileSystem fileSystem, final Charset charset,
- ReversedLinesFileReader reversedLinesFileReader) throws IOException {
+ private void testDataIntegrityWithBufferedReader(final Path filePath, final FileSystem fileSystem, final Charset charset,
+ final ReversedLinesFileReader reversedLinesFileReader) throws IOException {
final Stack<String> lineStack = new Stack<>();
String line;
diff --git a/src/test/java/org/apache/commons/io/input/SequenceReaderTest.java b/src/test/java/org/apache/commons/io/input/SequenceReaderTest.java
index 99680959..4d205799 100644
--- a/src/test/java/org/apache/commons/io/input/SequenceReaderTest.java
+++ b/src/test/java/org/apache/commons/io/input/SequenceReaderTest.java
@@ -62,7 +62,7 @@ public class SequenceReaderTest {
close();
return EOF;
}
- };
+ }
private static final char NUL = 0;
@@ -115,9 +115,11 @@ public class SequenceReaderTest {
if (off < 0) {
throw new IndexOutOfBoundsException("off is negative");
- } else if (len < 0) {
+ }
+ if (len < 0) {
throw new IndexOutOfBoundsException("len is negative");
- } else if (len > cbuf.length - off) {
+ }
+ if (len > cbuf.length - off) {
throw new IndexOutOfBoundsException("len is greater than cbuf.length - off");
}
diff --git a/src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java b/src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java
index ebff2f13..1ee934fe 100644
--- a/src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java
+++ b/src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java
@@ -180,7 +180,7 @@ public class XmlStreamReaderTest {
}
}
- private void testAlternateDefaultEncoding(final String streamEnc, final String alternateEnc, XmlStreamReader xmlReader) {
+ private void testAlternateDefaultEncoding(final String streamEnc, final String alternateEnc, final XmlStreamReader xmlReader) {
assertEquals(xmlReader.getDefaultEncoding(), alternateEnc);
if (!streamEnc.equals(UTF_16)) {
// we can not assert things here because UTF-8, US-ASCII and
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 186da40b..d80818e2 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
@@ -518,14 +518,7 @@ public class XmlStreamReader extends Reader {
public XmlStreamReader(final URLConnection conn) throws IOException {
defaultEncoding = staticDefaultEncoding;
final boolean lenient = true;
- if (conn instanceof HttpURLConnection) {
- try {
- doHttpStream(conn.getInputStream(), conn.getContentType(),
- lenient);
- } catch (final XmlStreamReaderException ex) {
- doLenientDetection(conn.getContentType(), ex);
- }
- } else if (conn.getContentType() != null) {
+ if (conn instanceof HttpURLConnection || conn.getContentType() != null) {
try {
doHttpStream(conn.getInputStream(), conn.getContentType(),
lenient);
diff --git a/src/test/java/org/apache/commons/io/output/WriterOutputStreamTest.java b/src/test/java/org/apache/commons/io/output/WriterOutputStreamTest.java
index 551ce0e7..8125fed4 100644
--- a/src/test/java/org/apache/commons/io/output/WriterOutputStreamTest.java
+++ b/src/test/java/org/apache/commons/io/output/WriterOutputStreamTest.java
@@ -226,7 +226,7 @@ public class WriterOutputStreamTest {
}
}
- private void writeOneAtATime(final byte[] bytes, WriterOutputStream out) throws IOException {
+ private void writeOneAtATime(final byte[] bytes, final WriterOutputStream out) throws IOException {
for (final byte b : bytes) {
out.write(b);
}