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 2022/02/06 19:57:28 UTC
[commons-io] branch master updated: Add final and remove useless parentheses.
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 cce2631 Add final and remove useless parentheses.
cce2631 is described below
commit cce26318253e01ea6cc65a95808c16491d7e6a5e
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Feb 6 14:57:26 2022 -0500
Add final and remove useless parentheses.
---
.../org/apache/commons/io/FileSystemUtils.java | 2 +-
.../apache/commons/io/charset/CharsetDecoders.java | 2 +-
.../apache/commons/io/charset/CharsetEncoders.java | 2 +-
.../apache/commons/io/function/IOBiConsumer.java | 2 +-
.../apache/commons/io/input/BOMInputStream.java | 4 +-
.../commons/io/input/CharSequenceInputStream.java | 2 +-
.../apache/commons/io/input/QueueInputStream.java | 2 +-
.../java/org/apache/commons/io/input/Tailer.java | 2 +-
.../io/input/WindowsLineEndingInputStream.java | 2 +-
.../apache/commons/io/output/AppendableWriter.java | 2 +-
.../commons/io/output/ByteArrayOutputStream.java | 10 ++--
.../commons/io/output/WriterOutputStream.java | 2 +-
.../apache/commons/io/FileCleaningTrackerTest.java | 2 +-
.../commons/io/input/BOMInputStreamTest.java | 4 +-
.../commons/io/input/XmlStreamReaderTest.java | 2 +-
.../io/input/compatibility/XmlStreamReader.java | 61 +++++++++++-----------
.../io/serialization/MoreComplexObjectTest.java | 2 +-
.../ValidatingObjectInputStreamTest.java | 2 +-
.../java/org/apache/commons/io/test/TestUtils.java | 4 +-
19 files changed, 56 insertions(+), 55 deletions(-)
diff --git a/src/main/java/org/apache/commons/io/FileSystemUtils.java b/src/main/java/org/apache/commons/io/FileSystemUtils.java
index 3d612cd..42fce02 100644
--- a/src/main/java/org/apache/commons/io/FileSystemUtils.java
+++ b/src/main/java/org/apache/commons/io/FileSystemUtils.java
@@ -326,7 +326,7 @@ 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)) {
+ 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");
diff --git a/src/main/java/org/apache/commons/io/charset/CharsetDecoders.java b/src/main/java/org/apache/commons/io/charset/CharsetDecoders.java
index afb7977..180d585 100644
--- a/src/main/java/org/apache/commons/io/charset/CharsetDecoders.java
+++ b/src/main/java/org/apache/commons/io/charset/CharsetDecoders.java
@@ -33,7 +33,7 @@ public class CharsetDecoders {
* @param charsetDecoder The CharsetDecoder to test.
* @return the given non-null CharsetDecoder or a new default CharsetDecoder.
*/
- public static CharsetDecoder toCharsetDecoder(CharsetDecoder charsetDecoder) {
+ public static CharsetDecoder toCharsetDecoder(final CharsetDecoder charsetDecoder) {
return charsetDecoder != null ? charsetDecoder : Charset.defaultCharset().newDecoder();
}
diff --git a/src/main/java/org/apache/commons/io/charset/CharsetEncoders.java b/src/main/java/org/apache/commons/io/charset/CharsetEncoders.java
index c3ddcad..81961d1 100644
--- a/src/main/java/org/apache/commons/io/charset/CharsetEncoders.java
+++ b/src/main/java/org/apache/commons/io/charset/CharsetEncoders.java
@@ -33,7 +33,7 @@ public class CharsetEncoders {
* @param charsetEncoder The CharsetEncoder to test.
* @return the given non-null CharsetEncoder or a new default CharsetEncoder.
*/
- public static CharsetEncoder toCharsetEncoder(CharsetEncoder charsetEncoder) {
+ public static CharsetEncoder toCharsetEncoder(final CharsetEncoder charsetEncoder) {
return charsetEncoder != null ? charsetEncoder : Charset.defaultCharset().newEncoder();
}
diff --git a/src/main/java/org/apache/commons/io/function/IOBiConsumer.java b/src/main/java/org/apache/commons/io/function/IOBiConsumer.java
index eb0cc07..58cf79d 100644
--- a/src/main/java/org/apache/commons/io/function/IOBiConsumer.java
+++ b/src/main/java/org/apache/commons/io/function/IOBiConsumer.java
@@ -52,7 +52,7 @@ public interface IOBiConsumer<T, U> {
* operation
* @throws NullPointerException if {@code after} is null
*/
- default IOBiConsumer<T, U> andThen(IOBiConsumer<? super T, ? super U> after) {
+ default IOBiConsumer<T, U> andThen(final IOBiConsumer<? super T, ? super U> after) {
Objects.requireNonNull(after);
return (l, r) -> {
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 2cfe523..4dff715 100644
--- a/src/main/java/org/apache/commons/io/input/BOMInputStream.java
+++ b/src/main/java/org/apache/commons/io/input/BOMInputStream.java
@@ -203,7 +203,7 @@ public class BOMInputStream extends ProxyInputStream {
}
// match BOM in firstBytes
byteOrderMark = find();
- if ((byteOrderMark != null) && !include) {
+ if (byteOrderMark != null && !include) {
if (byteOrderMark.length() < firstBytes.length) {
fbIndex = byteOrderMark.length();
} else {
@@ -392,7 +392,7 @@ public class BOMInputStream extends ProxyInputStream {
@Override
public long skip(final long n) throws IOException {
int skipped = 0;
- while ((n > skipped) && (readFirstBytes() >= 0)) {
+ while (n > skipped && readFirstBytes() >= 0) {
skipped++;
}
return in.skip(n - skipped) + skipped;
diff --git a/src/main/java/org/apache/commons/io/input/CharSequenceInputStream.java b/src/main/java/org/apache/commons/io/input/CharSequenceInputStream.java
index 0ccbe50..5dd89d7 100644
--- a/src/main/java/org/apache/commons/io/input/CharSequenceInputStream.java
+++ b/src/main/java/org/apache/commons/io/input/CharSequenceInputStream.java
@@ -193,7 +193,7 @@ public class CharSequenceInputStream extends InputStream {
@Override
public int read(final byte[] array, int off, int len) throws IOException {
Objects.requireNonNull(array, "array");
- if (len < 0 || (off + len) > array.length) {
+ if (len < 0 || off + len > array.length) {
throw new IndexOutOfBoundsException("Array Size=" + array.length + ", offset=" + off + ", length=" + len);
}
if (len == 0) {
diff --git a/src/main/java/org/apache/commons/io/input/QueueInputStream.java b/src/main/java/org/apache/commons/io/input/QueueInputStream.java
index 752ab51..4e0f8e3 100644
--- a/src/main/java/org/apache/commons/io/input/QueueInputStream.java
+++ b/src/main/java/org/apache/commons/io/input/QueueInputStream.java
@@ -92,7 +92,7 @@ public class QueueInputStream extends InputStream {
@Override
public int read() {
final Integer value = blockingQueue.poll();
- return value == null ? EOF : ((0xFF) & value);
+ return value == null ? EOF : 0xFF & value;
}
}
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 d60a01c..6b26474 100644
--- a/src/main/java/org/apache/commons/io/input/Tailer.java
+++ b/src/main/java/org/apache/commons/io/input/Tailer.java
@@ -843,7 +843,7 @@ public class Tailer implements Runnable, AutoCloseable {
long rePos = pos; // position to re-read
int num;
boolean seenCR = false;
- while (getRun() && ((num = reader.read(inbuf)) != EOF)) {
+ while (getRun() && (num = reader.read(inbuf)) != EOF) {
for (int i = 0; i < num; i++) {
final byte ch = inbuf[i];
switch (ch) {
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 bbf1797..e6ec30f 100644
--- a/src/main/java/org/apache/commons/io/input/WindowsLineEndingInputStream.java
+++ b/src/main/java/org/apache/commons/io/input/WindowsLineEndingInputStream.java
@@ -108,7 +108,7 @@ public class WindowsLineEndingInputStream extends InputStream {
if (eofSeen) {
return eofGame();
}
- if ((target == LF) && !prevWasSlashR) {
+ if (target == LF && !prevWasSlashR) {
injectSlashN = true;
return CR;
}
diff --git a/src/main/java/org/apache/commons/io/output/AppendableWriter.java b/src/main/java/org/apache/commons/io/output/AppendableWriter.java
index d0ec457..316c5fe 100644
--- a/src/main/java/org/apache/commons/io/output/AppendableWriter.java
+++ b/src/main/java/org/apache/commons/io/output/AppendableWriter.java
@@ -127,7 +127,7 @@ public class AppendableWriter <T extends Appendable> extends Writer {
@Override
public void write(final char[] cbuf, final int off, final int len) throws IOException {
Objects.requireNonNull(cbuf, "Character array is missing");
- if (len < 0 || (off + len) > cbuf.length) {
+ if (len < 0 || off + len > cbuf.length) {
throw new IndexOutOfBoundsException("Array Size=" + cbuf.length +
", offset=" + off + ", length=" + len);
}
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 f5ecca5..025952e 100644
--- a/src/main/java/org/apache/commons/io/output/ByteArrayOutputStream.java
+++ b/src/main/java/org/apache/commons/io/output/ByteArrayOutputStream.java
@@ -134,11 +134,11 @@ public class ByteArrayOutputStream extends AbstractByteArrayOutputStream {
@Override
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)) {
+ if (off < 0
+ || off > b.length
+ || len < 0
+ || off + len > b.length
+ || off + len < 0) {
throw new IndexOutOfBoundsException();
}
if (len == 0) {
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 b5d6f46..e44647c 100644
--- a/src/main/java/org/apache/commons/io/output/WriterOutputStream.java
+++ b/src/main/java/org/apache/commons/io/output/WriterOutputStream.java
@@ -97,7 +97,7 @@ public class WriterOutputStream extends OutputStream {
bb2.put(bytes[i]);
bb2.flip();
try {
- charsetDecoder2.decode(bb2, cb2, i == (len - 1));
+ charsetDecoder2.decode(bb2, cb2, i == len - 1);
} catch ( final IllegalArgumentException e){
throw new UnsupportedOperationException("UTF-16 requested when running on an IBM JDK with broken UTF-16 support. " +
"Please find a JDK that supports UTF-16 if you intend to use UF-16 with WriterOutputStream");
diff --git a/src/test/java/org/apache/commons/io/FileCleaningTrackerTest.java b/src/test/java/org/apache/commons/io/FileCleaningTrackerTest.java
index 8a18e05..af8c28c 100644
--- a/src/test/java/org/apache/commons/io/FileCleaningTrackerTest.java
+++ b/src/test/java/org/apache/commons/io/FileCleaningTrackerTest.java
@@ -306,7 +306,7 @@ public class FileCleaningTrackerTest extends AbstractTempDirTest {
while (theInstance.getTrackCount() != 0) {
list.add(
"A Big String A Big String A Big String A Big String A Big String A Big String A Big String A Big String A Big String A Big String "
- + (i++));
+ + i++);
}
} catch (final Throwable ignored) {
}
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 fda2521..44d0924 100644
--- a/src/test/java/org/apache/commons/io/input/BOMInputStreamTest.java
+++ b/src/test/java/org/apache/commons/io/input/BOMInputStreamTest.java
@@ -409,13 +409,13 @@ public class BOMInputStreamTest {
public void testNoBoms() throws Exception {
final byte[] data = { 'A', 'B', 'C' };
try {
- (new BOMInputStream(createUtf8DataStream(data, true), false, (ByteOrderMark[])null)).close();
+ new BOMInputStream(createUtf8DataStream(data, true), false, (ByteOrderMark[])null).close();
fail("Null BOMs, expected IllegalArgumentException");
} catch (final IllegalArgumentException e) {
// expected
}
try {
- (new BOMInputStream(createUtf8DataStream(data, true), false, new ByteOrderMark[0])).close();
+ new BOMInputStream(createUtf8DataStream(data, true), false, new ByteOrderMark[0]).close();
fail("Null BOMs, expected IllegalArgumentException");
} catch (final IllegalArgumentException e) {
// expected
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 d0d7488..607ee1a 100644
--- a/src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java
+++ b/src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java
@@ -284,7 +284,7 @@ public class XmlStreamReaderTest {
final InputStream is = getXmlInputStream(bomEnc,
prologEnc == null ? XML2 : XML3, streamEnc, prologEnc);
try {
- (new XmlStreamReader(is, cT, false)).close();
+ new XmlStreamReader(is, cT, false).close();
fail("It should have failed for HTTP Content-type " + cT + ", BOM "
+ bomEnc + ", streamEnc " + streamEnc + " and prologEnc "
+ prologEnc);
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 04a0b4b..eb3d144 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
@@ -544,7 +544,7 @@ public class XmlStreamReader extends Reader {
final String bomEnc, final String xmlGuessEnc, final String xmlEnc, final InputStream is,
final boolean lenient) throws IOException {
final String encoding;
- if (lenient && (xmlEnc != null)) {
+ if (lenient && xmlEnc != null) {
encoding = xmlEnc;
} else {
final boolean appXml = isAppXml(cTMime);
@@ -570,7 +570,7 @@ public class XmlStreamReader extends Reader {
xmlGuessEnc, xmlEnc }), cTMime, cTEnc,
bomEnc, xmlGuessEnc, xmlEnc, is);
} else if (cTEnc.equals(UTF_16)) {
- if ((bomEnc == null) || !bomEnc.startsWith(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,
@@ -584,7 +584,7 @@ public class XmlStreamReader extends Reader {
xmlGuessEnc, xmlEnc }), cTMime, cTEnc,
bomEnc, xmlGuessEnc, xmlEnc, is);
} else if (cTEnc.equals(UTF_32)) {
- if ((bomEnc == null) || !bomEnc.startsWith(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,
@@ -628,34 +628,35 @@ public class XmlStreamReader extends Reader {
bomEnc, xmlGuessEnc, xmlEnc, is);
}
encoding = UTF_8;
- } else if (bomEnc.equals(UTF_16BE) || bomEnc.equals(UTF_16LE)) {
- if (xmlGuessEnc != null && !xmlGuessEnc.equals(bomEnc)) {
- throw new XmlStreamReaderException(RAW_EX_1.format(new Object[] { bomEnc,
- xmlGuessEnc, xmlEnc }), bomEnc, xmlGuessEnc, xmlEnc, is);
- }
- if (xmlEnc != null && !xmlEnc.equals(UTF_16)
- && !xmlEnc.equals(bomEnc)) {
- throw new XmlStreamReaderException(RAW_EX_1
- .format(new Object[] { bomEnc, xmlGuessEnc, xmlEnc }),
- bomEnc, xmlGuessEnc, xmlEnc, is);
- }
- encoding = bomEnc;
- } else if (bomEnc.equals(UTF_32BE) || bomEnc.equals(UTF_32LE)) {
- if (xmlGuessEnc != null && !xmlGuessEnc.equals(bomEnc)) {
- throw new XmlStreamReaderException(RAW_EX_1.format(new Object[] { bomEnc,
- xmlGuessEnc, xmlEnc }), bomEnc, xmlGuessEnc, xmlEnc, is);
- }
- if (xmlEnc != null && !xmlEnc.equals(UTF_32)
- && !xmlEnc.equals(bomEnc)) {
- throw new XmlStreamReaderException(RAW_EX_1
- .format(new Object[] { bomEnc, xmlGuessEnc, xmlEnc }),
- bomEnc, xmlGuessEnc, xmlEnc, is);
+ } else {
+ if (bomEnc.equals(UTF_16BE) || bomEnc.equals(UTF_16LE)) {
+ if (xmlGuessEnc != null && !xmlGuessEnc.equals(bomEnc)) {
+ throw new XmlStreamReaderException(RAW_EX_1.format(new Object[] { bomEnc,
+ xmlGuessEnc, xmlEnc }), bomEnc, xmlGuessEnc, xmlEnc, is);
+ }
+ if (xmlEnc != null && !xmlEnc.equals(UTF_16)
+ && !xmlEnc.equals(bomEnc)) {
+ throw new XmlStreamReaderException(RAW_EX_1
+ .format(new Object[] { bomEnc, xmlGuessEnc, xmlEnc }),
+ bomEnc, xmlGuessEnc, xmlEnc, is);
+ }
+ } else if (bomEnc.equals(UTF_32BE) || bomEnc.equals(UTF_32LE)) {
+ if (xmlGuessEnc != null && !xmlGuessEnc.equals(bomEnc)) {
+ throw new XmlStreamReaderException(RAW_EX_1.format(new Object[] { bomEnc,
+ xmlGuessEnc, xmlEnc }), bomEnc, xmlGuessEnc, xmlEnc, is);
+ }
+ if (xmlEnc != null && !xmlEnc.equals(UTF_32)
+ && !xmlEnc.equals(bomEnc)) {
+ throw new XmlStreamReaderException(RAW_EX_1
+ .format(new Object[] { bomEnc, xmlGuessEnc, xmlEnc }),
+ bomEnc, xmlGuessEnc, xmlEnc, is);
+ }
+ } else {
+ throw new XmlStreamReaderException(RAW_EX_2.format(new Object[] {
+ bomEnc, xmlGuessEnc, xmlEnc }), bomEnc, xmlGuessEnc,
+ xmlEnc, is);
}
encoding = bomEnc;
- } else {
- throw new XmlStreamReaderException(RAW_EX_2.format(new Object[] {
- bomEnc, xmlGuessEnc, xmlEnc }), bomEnc, xmlGuessEnc,
- xmlEnc, is);
}
return encoding;
}
@@ -685,7 +686,7 @@ public class XmlStreamReader extends Reader {
private void doLenientDetection(String httpContentType,
XmlStreamReaderException ex) throws IOException {
- if ((httpContentType != null) && httpContentType.startsWith("text/html")) {
+ if (httpContentType != null && httpContentType.startsWith("text/html")) {
httpContentType = httpContentType.substring("text/html"
.length());
httpContentType = "text/xml" + httpContentType;
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 bcd3974..a57a465 100644
--- a/src/test/java/org/apache/commons/io/serialization/MoreComplexObjectTest.java
+++ b/src/test/java/org/apache/commons/io/serialization/MoreComplexObjectTest.java
@@ -42,7 +42,7 @@ public class MoreComplexObjectTest extends AbstractCloseableListTest {
private MoreComplexObject original;
private void assertSerialization(final ObjectInputStream ois) throws ClassNotFoundException, IOException {
- final MoreComplexObject copy = (MoreComplexObject) (ois.readObject());
+ final MoreComplexObject copy = (MoreComplexObject) ois.readObject();
assertEquals(original.toString(), copy.toString(), "Expecting same data after deserializing");
}
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 ee73c20..fa58f67 100644
--- a/src/test/java/org/apache/commons/io/serialization/ValidatingObjectInputStreamTest.java
+++ b/src/test/java/org/apache/commons/io/serialization/ValidatingObjectInputStreamTest.java
@@ -67,7 +67,7 @@ public class ValidatingObjectInputStreamTest extends AbstractCloseableListTest {
}
private void assertSerialization(final ObjectInputStream ois) throws ClassNotFoundException, IOException {
- final MockSerializedClass result = (MockSerializedClass) (ois.readObject());
+ final MockSerializedClass result = (MockSerializedClass) ois.readObject();
assertEquals(testObject, result);
}
diff --git a/src/test/java/org/apache/commons/io/test/TestUtils.java b/src/test/java/org/apache/commons/io/test/TestUtils.java
index fc0c3a9..ca9ab34 100644
--- a/src/test/java/org/apache/commons/io/test/TestUtils.java
+++ b/src/test/java/org/apache/commons/io/test/TestUtils.java
@@ -132,7 +132,7 @@ public abstract class TestUtils {
while (-1 != n0) {
n0 = is0.read(buf0);
n1 = is1.read(buf1);
- assertTrue((n0 == n1),
+ assertTrue(n0 == n1,
"The files " + f0 + " and " + f1 +
" have differing number of bytes available (" + n0 + " vs " + n1 + ")");
@@ -214,7 +214,7 @@ public abstract class TestUtils {
for (int i = 0; i < size; i++) {
// output.write((byte)'X');
// nice varied byte pattern compatible with Readers and Writers
- out.write((byte) ((i % 127) + 1));
+ out.write((byte) (i % 127 + 1));
}
}