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-codec.git
commit a841452b9f1bdd635710575b1b46163f573c072c
Author: Gary D. Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Dec 28 07:55:17 2024 -0500
Add Checkstyle RedundantModifier
---
src/conf/checkstyle.xml | 1 +
.../apache/commons/codec/digest/DigestUtils.java | 4 +--
.../org/apache/commons/codec/digest/HmacUtils.java | 2 +-
.../commons/codec/language/ColognePhonetic.java | 10 +++---
.../codec/language/DaitchMokotoffSoundex.java | 2 +-
.../org/apache/commons/codec/language/bm/Lang.java | 2 +-
.../commons/codec/language/bm/Languages.java | 2 +-
.../commons/codec/language/bm/PhoneticEngine.java | 2 +-
.../org/apache/commons/codec/language/bm/Rule.java | 6 ++--
.../commons/codec/net/QuotedPrintableCodec.java | 2 +-
.../codec/binary/Base16InputStreamTest.java | 40 +++++++++++-----------
.../codec/binary/Base16OutputStreamTest.java | 36 +++++++++----------
.../codec/binary/Base32InputStreamTest.java | 24 ++++++-------
.../codec/binary/Base32OutputStreamTest.java | 6 ++--
.../codec/binary/Base64InputStreamTest.java | 30 ++++++++--------
.../codec/binary/Base64OutputStreamTest.java | 6 ++--
.../commons/codec/digest/DigestUtilsTest.java | 8 ++---
.../commons/codec/digest/PureJavaCrc32Test.java | 2 +-
.../apache/commons/codec/digest/XXHash32Test.java | 4 +--
19 files changed, 96 insertions(+), 93 deletions(-)
diff --git a/src/conf/checkstyle.xml b/src/conf/checkstyle.xml
index 534998b6..f43e2388 100644
--- a/src/conf/checkstyle.xml
+++ b/src/conf/checkstyle.xml
@@ -72,6 +72,7 @@ limitations under the License.
</module>
<module name="ParenPad" />
<module name="RedundantImport" />
+ <module name="RedundantModifier" />
<module name="WhitespaceAfter" />
<module name="WhitespaceAround" />
</module>
diff --git a/src/main/java/org/apache/commons/codec/digest/DigestUtils.java
b/src/main/java/org/apache/commons/codec/digest/DigestUtils.java
index e4d9bc84..67abe9bb 100644
--- a/src/main/java/org/apache/commons/codec/digest/DigestUtils.java
+++ b/src/main/java/org/apache/commons/codec/digest/DigestUtils.java
@@ -1276,7 +1276,7 @@ public class DigestUtils {
* @since 1.11
*/
public static MessageDigest updateDigest(final MessageDigest digest, final
File data) throws IOException {
- try (final BufferedInputStream inputStream = new
BufferedInputStream(new FileInputStream(data))) {
+ try (BufferedInputStream inputStream = new BufferedInputStream(new
FileInputStream(data))) {
return updateDigest(digest, inputStream);
}
}
@@ -1334,7 +1334,7 @@ public class DigestUtils {
* @since 1.14
*/
public static MessageDigest updateDigest(final MessageDigest digest, final
Path path, final OpenOption... options) throws IOException {
- try (final BufferedInputStream inputStream = new
BufferedInputStream(Files.newInputStream(path, options))) {
+ try (BufferedInputStream inputStream = new
BufferedInputStream(Files.newInputStream(path, options))) {
return updateDigest(digest, inputStream);
}
}
diff --git a/src/main/java/org/apache/commons/codec/digest/HmacUtils.java
b/src/main/java/org/apache/commons/codec/digest/HmacUtils.java
index 08415b1d..90dc337d 100644
--- a/src/main/java/org/apache/commons/codec/digest/HmacUtils.java
+++ b/src/main/java/org/apache/commons/codec/digest/HmacUtils.java
@@ -971,7 +971,7 @@ public final class HmacUtils {
* @since 1.11
*/
public byte[] hmac(final File valueToDigest) throws IOException {
- try (final BufferedInputStream stream = new BufferedInputStream(new
FileInputStream(valueToDigest))) {
+ try (BufferedInputStream stream = new BufferedInputStream(new
FileInputStream(valueToDigest))) {
return hmac(stream);
}
}
diff --git
a/src/main/java/org/apache/commons/codec/language/ColognePhonetic.java
b/src/main/java/org/apache/commons/codec/language/ColognePhonetic.java
index f4db0aef..05b0af6a 100644
--- a/src/main/java/org/apache/commons/codec/language/ColognePhonetic.java
+++ b/src/main/java/org/apache/commons/codec/language/ColognePhonetic.java
@@ -193,12 +193,12 @@ public class ColognePhonetic implements StringEncoder {
protected int length;
- public CologneBuffer(final char[] data) {
+ CologneBuffer(final char[] data) {
this.data = data;
this.length = data.length;
}
- public CologneBuffer(final int buffSize) {
+ CologneBuffer(final int buffSize) {
this.data = new char[buffSize];
this.length = 0;
}
@@ -218,9 +218,10 @@ public class ColognePhonetic implements StringEncoder {
return new String(copyData(0, length));
}
}
+
private final class CologneInputBuffer extends CologneBuffer {
- public CologneInputBuffer(final char[] data) {
+ CologneInputBuffer(final char[] data) {
super(data);
}
@@ -245,11 +246,12 @@ public class ColognePhonetic implements StringEncoder {
return ch;
}
}
+
private final class CologneOutputBuffer extends CologneBuffer {
private char lastCode;
- public CologneOutputBuffer(final int buffSize) {
+ CologneOutputBuffer(final int buffSize) {
super(buffSize);
lastCode = '/'; // impossible value
}
diff --git
a/src/main/java/org/apache/commons/codec/language/DaitchMokotoffSoundex.java
b/src/main/java/org/apache/commons/codec/language/DaitchMokotoffSoundex.java
index c4921760..4daa082f 100644
--- a/src/main/java/org/apache/commons/codec/language/DaitchMokotoffSoundex.java
+++ b/src/main/java/org/apache/commons/codec/language/DaitchMokotoffSoundex.java
@@ -224,7 +224,7 @@ public class DaitchMokotoffSoundex implements StringEncoder
{
private static final Map<Character, Character> FOLDINGS = new HashMap<>();
static {
- try (final Scanner scanner = new
Scanner(Resources.getInputStream(RESOURCE_FILE), CharEncoding.UTF_8)) {
+ try (Scanner scanner = new
Scanner(Resources.getInputStream(RESOURCE_FILE), CharEncoding.UTF_8)) {
parseRules(scanner, RESOURCE_FILE, RULES, FOLDINGS);
}
diff --git a/src/main/java/org/apache/commons/codec/language/bm/Lang.java
b/src/main/java/org/apache/commons/codec/language/bm/Lang.java
index 916ff950..d92e37c4 100644
--- a/src/main/java/org/apache/commons/codec/language/bm/Lang.java
+++ b/src/main/java/org/apache/commons/codec/language/bm/Lang.java
@@ -135,7 +135,7 @@ public class Lang {
*/
public static Lang loadFromResource(final String
languageRulesResourceName, final Languages languages) {
final List<LangRule> rules = new ArrayList<>();
- try (final Scanner scanner = new
Scanner(Resources.getInputStream(languageRulesResourceName),
+ try (Scanner scanner = new
Scanner(Resources.getInputStream(languageRulesResourceName),
ResourceConstants.ENCODING)) {
boolean inExtendedComment = false;
while (scanner.hasNextLine()) {
diff --git a/src/main/java/org/apache/commons/codec/language/bm/Languages.java
b/src/main/java/org/apache/commons/codec/language/bm/Languages.java
index 92ecb2ec..479693c3 100644
--- a/src/main/java/org/apache/commons/codec/language/bm/Languages.java
+++ b/src/main/java/org/apache/commons/codec/language/bm/Languages.java
@@ -251,7 +251,7 @@ public class Languages {
public static Languages getInstance(final String languagesResourceName) {
// read languages list
final Set<String> ls = new HashSet<>();
- try (final Scanner lsScanner = new
Scanner(Resources.getInputStream(languagesResourceName),
+ try (Scanner lsScanner = new
Scanner(Resources.getInputStream(languagesResourceName),
ResourceConstants.ENCODING)) {
boolean inExtendedComment = false;
while (lsScanner.hasNextLine()) {
diff --git
a/src/main/java/org/apache/commons/codec/language/bm/PhoneticEngine.java
b/src/main/java/org/apache/commons/codec/language/bm/PhoneticEngine.java
index b1d848aa..482d6ffd 100644
--- a/src/main/java/org/apache/commons/codec/language/bm/PhoneticEngine.java
+++ b/src/main/java/org/apache/commons/codec/language/bm/PhoneticEngine.java
@@ -169,7 +169,7 @@ public class PhoneticEngine {
private final int maxPhonemes;
private boolean found;
- public RulesApplication(final Map<String, List<Rule>> finalRules,
final CharSequence input, final PhonemeBuilder phonemeBuilder, final int i,
+ RulesApplication(final Map<String, List<Rule>> finalRules, final
CharSequence input, final PhonemeBuilder phonemeBuilder, final int i,
final int maxPhonemes) {
Objects.requireNonNull(finalRules, "finalRules");
this.finalRules = finalRules;
diff --git a/src/main/java/org/apache/commons/codec/language/bm/Rule.java
b/src/main/java/org/apache/commons/codec/language/bm/Rule.java
index ab1b917e..a93969bf 100644
--- a/src/main/java/org/apache/commons/codec/language/bm/Rule.java
+++ b/src/main/java/org/apache/commons/codec/language/bm/Rule.java
@@ -241,14 +241,14 @@ public class Rule {
final Languages ls = Languages.getInstance(s);
ls.getLanguages().forEach(l -> {
- try (final Scanner scanner = createScanner(s, rt, l)) {
+ try (Scanner scanner = createScanner(s, rt, l)) {
rs.put(l, parseRules(scanner, createResourceName(s,
rt, l)));
} catch (final IllegalStateException e) {
throw new IllegalStateException("Problem processing "
+ createResourceName(s, rt, l), e);
}
});
if (!rt.equals(RuleType.RULES)) {
- try (final Scanner scanner = createScanner(s, rt,
"common")) {
+ try (Scanner scanner = createScanner(s, rt, "common")) {
rs.put("common", parseRules(scanner,
createResourceName(s, rt, "common")));
}
}
@@ -444,7 +444,7 @@ public class Rule {
throw new IllegalArgumentException("Malformed import
statement '" + rawLine + "' in " +
location);
}
- try (final Scanner hashIncludeScanner =
createScanner(incl)) {
+ try (Scanner hashIncludeScanner = createScanner(incl)) {
lines.putAll(parseRules(hashIncludeScanner, location +
"->" + incl));
}
} else {
diff --git
a/src/main/java/org/apache/commons/codec/net/QuotedPrintableCodec.java
b/src/main/java/org/apache/commons/codec/net/QuotedPrintableCodec.java
index 9f1cdc25..98a89bb6 100644
--- a/src/main/java/org/apache/commons/codec/net/QuotedPrintableCodec.java
+++ b/src/main/java/org/apache/commons/codec/net/QuotedPrintableCodec.java
@@ -281,7 +281,7 @@ public class QuotedPrintableCodec implements BinaryEncoder,
BinaryDecoder, Strin
* the buffer to write to
* @return The number of bytes written to the {@code buffer}
*/
- private static final int encodeQuotedPrintable(final int b, final
ByteArrayOutputStream buffer) {
+ private static int encodeQuotedPrintable(final int b, final
ByteArrayOutputStream buffer) {
buffer.write(ESCAPE_CHAR);
final char hex1 = Utils.hexDigit(b >> 4);
final char hex2 = Utils.hexDigit(b);
diff --git
a/src/test/java/org/apache/commons/codec/binary/Base16InputStreamTest.java
b/src/test/java/org/apache/commons/codec/binary/Base16InputStreamTest.java
index 4b9d9451..43462d92 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base16InputStreamTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base16InputStreamTest.java
@@ -47,7 +47,7 @@ public class Base16InputStreamTest {
@Test
public void testAvailable() throws IOException {
final InputStream ins = new
ByteArrayInputStream(StringUtils.getBytesIso8859_1(ENCODED_B16));
- try (final Base16InputStream b16Stream = new Base16InputStream(ins)) {
+ try (Base16InputStream b16Stream = new Base16InputStream(ins)) {
assertEquals(1, b16Stream.available());
assertEquals(6, b16Stream.skip(10));
// End of stream reached
@@ -163,7 +163,7 @@ public class Base16InputStreamTest {
private void testByChunk(final byte[] encoded, final byte[] decoded, final
boolean lowerCase) throws IOException {
// Start with encode.
- try (final InputStream in = new Base16InputStream(new
ByteArrayInputStream(decoded), true, lowerCase)) {
+ try (InputStream in = new Base16InputStream(new
ByteArrayInputStream(decoded), true, lowerCase)) {
final byte[] output = BaseNTestData.streamToBytes(in);
assertEquals(-1, in.read(), "EOF");
@@ -172,7 +172,7 @@ public class Base16InputStreamTest {
}
// Now let's try to decode.
- try (final InputStream in = new Base16InputStream(new
ByteArrayInputStream(encoded), false, lowerCase)) {
+ try (InputStream in = new Base16InputStream(new
ByteArrayInputStream(encoded), false, lowerCase)) {
final byte[] output = BaseNTestData.streamToBytes(in);
assertEquals(-1, in.read(), "EOF");
@@ -181,9 +181,9 @@ public class Base16InputStreamTest {
}
// wrap encoder with decoder
- try (final InputStream in = new ByteArrayInputStream(decoded);
- final InputStream inEncode = new Base16InputStream(in, true,
lowerCase);
- final InputStream inDecode = new Base16InputStream(inEncode,
false, lowerCase)) {
+ try (InputStream in = new ByteArrayInputStream(decoded);
+ InputStream inEncode = new Base16InputStream(in, true,
lowerCase);
+ InputStream inDecode = new Base16InputStream(inEncode, false,
lowerCase)) {
final byte[] output = BaseNTestData.streamToBytes(inDecode);
@@ -221,7 +221,7 @@ public class Base16InputStreamTest {
private void testByteByByte(final byte[] encoded, final byte[] decoded,
final boolean lowerCase) throws IOException {
// Start with encode.
- try (final InputStream in = new Base16InputStream(new
ByteArrayInputStream(decoded), true, lowerCase)) {
+ try (InputStream in = new Base16InputStream(new
ByteArrayInputStream(decoded), true, lowerCase)) {
final byte[] output = new byte[encoded.length];
for (int i = 0; i < output.length; i++) {
output[i] = (byte) in.read();
@@ -233,7 +233,7 @@ public class Base16InputStreamTest {
}
// Now let's try to decode.
- try (final InputStream in = new Base16InputStream(new
ByteArrayInputStream(encoded), false, lowerCase)) {
+ try (InputStream in = new Base16InputStream(new
ByteArrayInputStream(encoded), false, lowerCase)) {
final byte[] output = new byte[decoded.length];
for (int i = 0; i < output.length; i++) {
output[i] = (byte) in.read();
@@ -245,9 +245,9 @@ public class Base16InputStreamTest {
}
// wrap encoder with decoder
- try (final InputStream in = new ByteArrayInputStream(decoded);
- final InputStream inEncode = new Base16InputStream(in, true,
lowerCase);
- final InputStream inDecode = new Base16InputStream(inEncode,
false, lowerCase)) {
+ try (InputStream in = new ByteArrayInputStream(decoded);
+ InputStream inEncode = new Base16InputStream(in, true,
lowerCase);
+ InputStream inDecode = new Base16InputStream(inEncode, false,
lowerCase)) {
final byte[] output = new byte[decoded.length];
for (int i = 0; i < output.length; i++) {
@@ -269,7 +269,7 @@ public class Base16InputStreamTest {
public void testMarkSupported() throws IOException {
final byte[] decoded = StringUtils.getBytesUtf8(STRING_FIXTURE);
final ByteArrayInputStream bin = new ByteArrayInputStream(decoded);
- try (final Base16InputStream in = new Base16InputStream(bin, true)) {
+ try (Base16InputStream in = new Base16InputStream(bin, true)) {
// Always returns false for now.
assertFalse(in.markSupported(), "Base16InputStream.markSupported()
is false");
}
@@ -286,7 +286,7 @@ public class Base16InputStreamTest {
final byte[] buf = new byte[1024];
int bytesRead = 0;
final ByteArrayInputStream bin = new ByteArrayInputStream(decoded);
- try (final Base16InputStream in = new Base16InputStream(bin, true)) {
+ try (Base16InputStream in = new Base16InputStream(bin, true)) {
bytesRead = in.read(buf, 0, 0);
assertEquals(0, bytesRead, "Base16InputStream.read(buf, 0, 0)
returns 0");
}
@@ -301,7 +301,7 @@ public class Base16InputStreamTest {
public void testReadNull() throws IOException {
final byte[] decoded = StringUtils.getBytesUtf8(STRING_FIXTURE);
final ByteArrayInputStream bin = new ByteArrayInputStream(decoded);
- try (final Base16InputStream in = new Base16InputStream(bin, true)) {
+ try (Base16InputStream in = new Base16InputStream(bin, true)) {
assertThrows(NullPointerException.class, () -> in.read(null, 0,
0), "Base16InputStream.read(null, 0, 0)");
}
}
@@ -316,7 +316,7 @@ public class Base16InputStreamTest {
final byte[] decoded = StringUtils.getBytesUtf8(STRING_FIXTURE);
final byte[] buf = new byte[1024];
final ByteArrayInputStream bin = new ByteArrayInputStream(decoded);
- try (final Base16InputStream in = new Base16InputStream(bin, true)) {
+ try (Base16InputStream in = new Base16InputStream(bin, true)) {
assertThrows(IndexOutOfBoundsException.class, () -> in.read(buf,
-1, 0), "Base16InputStream.read(buf, -1, 0)");
assertThrows(IndexOutOfBoundsException.class, () -> in.read(buf,
0, -1), "Base16InputStream.read(buf, 0, -1)");
assertThrows(IndexOutOfBoundsException.class, () -> in.read(buf,
buf.length + 1, 0), "Base16InputStream.read(buf, buf.length + 1, 0)");
@@ -332,7 +332,7 @@ public class Base16InputStreamTest {
@Test
public void testSkipBig() throws IOException {
final InputStream ins = new
ByteArrayInputStream(StringUtils.getBytesIso8859_1(ENCODED_B16));
- try (final Base16InputStream b16Stream = new Base16InputStream(ins)) {
+ try (Base16InputStream b16Stream = new Base16InputStream(ins)) {
assertEquals(6, b16Stream.skip(Integer.MAX_VALUE));
// End of stream reached
assertEquals(-1, b16Stream.read());
@@ -348,7 +348,7 @@ public class Base16InputStreamTest {
@Test
public void testSkipNone() throws IOException {
final InputStream ins = new
ByteArrayInputStream(StringUtils.getBytesIso8859_1(ENCODED_B16));
- try (final Base16InputStream b16Stream = new Base16InputStream(ins)) {
+ try (Base16InputStream b16Stream = new Base16InputStream(ins)) {
final byte[] actualBytes = new byte[6];
assertEquals(0, b16Stream.skip(0));
b16Stream.read(actualBytes, 0, actualBytes.length);
@@ -366,7 +366,7 @@ public class Base16InputStreamTest {
@Test
public void testSkipPastEnd() throws IOException {
final InputStream ins = new
ByteArrayInputStream(StringUtils.getBytesIso8859_1(ENCODED_B16));
- try (final Base16InputStream b16Stream = new Base16InputStream(ins)) {
+ try (Base16InputStream b16Stream = new Base16InputStream(ins)) {
// due to CODEC-130, skip now skips correctly decoded characters
rather than encoded
assertEquals(6, b16Stream.skip(10));
// End of stream reached
@@ -383,7 +383,7 @@ public class Base16InputStreamTest {
@Test
public void testSkipToEnd() throws IOException {
final InputStream ins = new
ByteArrayInputStream(StringUtils.getBytesIso8859_1(ENCODED_B16));
- try (final Base16InputStream b16Stream = new Base16InputStream(ins)) {
+ try (Base16InputStream b16Stream = new Base16InputStream(ins)) {
// due to CODEC-130, skip now skips correctly decoded characters
rather than encoded
assertEquals(6, b16Stream.skip(6));
// End of stream reached
@@ -400,7 +400,7 @@ public class Base16InputStreamTest {
@Test
public void testSkipWrongArgument() throws IOException {
final InputStream ins = new
ByteArrayInputStream(StringUtils.getBytesIso8859_1(ENCODED_B16));
- try (final Base16InputStream b16Stream = new Base16InputStream(ins)) {
+ try (Base16InputStream b16Stream = new Base16InputStream(ins)) {
assertThrows(IllegalArgumentException.class, () ->
b16Stream.skip(-10));
}
}
diff --git
a/src/test/java/org/apache/commons/codec/binary/Base16OutputStreamTest.java
b/src/test/java/org/apache/commons/codec/binary/Base16OutputStreamTest.java
index db8152b1..cbfe8627 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base16OutputStreamTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base16OutputStreamTest.java
@@ -129,25 +129,25 @@ public class Base16OutputStreamTest {
private void testByChunk(final byte[] encoded, final byte[] decoded, final
boolean lowerCase) throws IOException {
// Start with encode.
- try (final ByteArrayOutputStream byteOut = new ByteArrayOutputStream();
- final OutputStream out = new Base16OutputStream(byteOut, true,
lowerCase)) {
+ try (ByteArrayOutputStream byteOut = new ByteArrayOutputStream();
+ OutputStream out = new Base16OutputStream(byteOut, true,
lowerCase)) {
out.write(decoded);
final byte[] output = byteOut.toByteArray();
assertArrayEquals(encoded, output, "Streaming chunked base16
encode");
}
// Now let's try to decode.
- try (final ByteArrayOutputStream byteOut = new ByteArrayOutputStream();
- final OutputStream out = new Base16OutputStream(byteOut,
false, lowerCase)) {
+ try (ByteArrayOutputStream byteOut = new ByteArrayOutputStream();
+ OutputStream out = new Base16OutputStream(byteOut, false,
lowerCase)) {
out.write(encoded);
final byte[] output = byteOut.toByteArray();
assertArrayEquals(decoded, output, "Streaming chunked base16
decode");
}
// wrap encoder with decoder
- try (final ByteArrayOutputStream byteOut = new ByteArrayOutputStream();
- final OutputStream decoderOut = new Base16OutputStream(byteOut,
false, lowerCase);
- final OutputStream encoderOut = new
Base16OutputStream(decoderOut, true, lowerCase)) {
+ try (ByteArrayOutputStream byteOut = new ByteArrayOutputStream();
+ OutputStream decoderOut = new Base16OutputStream(byteOut, false,
lowerCase);
+ OutputStream encoderOut = new Base16OutputStream(decoderOut,
true, lowerCase)) {
encoderOut.write(decoded);
final byte[] output = byteOut.toByteArray();
@@ -185,8 +185,8 @@ public class Base16OutputStreamTest {
private void testByteByByte(final byte[] encoded, final byte[] decoded,
final boolean lowerCase) throws IOException {
// Start with encode.
- try (final ByteArrayOutputStream byteOut = new ByteArrayOutputStream();
- final OutputStream out = new Base16OutputStream(byteOut, true,
lowerCase)) {
+ try (ByteArrayOutputStream byteOut = new ByteArrayOutputStream();
+ OutputStream out = new Base16OutputStream(byteOut, true,
lowerCase)) {
for (final byte element : decoded) {
out.write(element);
}
@@ -195,8 +195,8 @@ public class Base16OutputStreamTest {
}
// Now let's try to decode.
- try (final ByteArrayOutputStream byteOut = new ByteArrayOutputStream();
- final OutputStream out = new Base16OutputStream(byteOut,
false, lowerCase)) {
+ try (ByteArrayOutputStream byteOut = new ByteArrayOutputStream();
+ OutputStream out = new Base16OutputStream(byteOut, false,
lowerCase)) {
for (final byte element : encoded) {
out.write(element);
}
@@ -205,8 +205,8 @@ public class Base16OutputStreamTest {
}
// Now let's try to decode with tonnes of flushes.
- try (final ByteArrayOutputStream byteOut = new ByteArrayOutputStream();
- final OutputStream out = new Base16OutputStream(byteOut,
false, lowerCase)) {
+ try (ByteArrayOutputStream byteOut = new ByteArrayOutputStream();
+ OutputStream out = new Base16OutputStream(byteOut, false,
lowerCase)) {
for (final byte element : encoded) {
out.write(element);
out.flush();
@@ -216,9 +216,9 @@ public class Base16OutputStreamTest {
}
// wrap encoder with decoder
- try (final ByteArrayOutputStream byteOut = new ByteArrayOutputStream();
- final OutputStream decoderOut = new
Base16OutputStream(byteOut, false, lowerCase);
- final OutputStream encoderOut = new
Base16OutputStream(decoderOut, true, lowerCase)) {
+ try (ByteArrayOutputStream byteOut = new ByteArrayOutputStream();
+ OutputStream decoderOut = new Base16OutputStream(byteOut,
false, lowerCase);
+ OutputStream encoderOut = new Base16OutputStream(decoderOut,
true, lowerCase)) {
for (final byte element : decoded) {
encoderOut.write(element);
}
@@ -236,7 +236,7 @@ public class Base16OutputStreamTest {
public void testWriteOutOfBounds() throws IOException {
final byte[] buf = new byte[1024];
final ByteArrayOutputStream bout = new ByteArrayOutputStream();
- try (final Base16OutputStream out = new Base16OutputStream(bout)) {
+ try (Base16OutputStream out = new Base16OutputStream(bout)) {
assertThrows(IndexOutOfBoundsException.class, () -> out.write(buf,
-1, 1), "Base16InputStream.write(buf, -1, 0)");
assertThrows(IndexOutOfBoundsException.class, () -> out.write(buf,
1, -1), "Base16InputStream.write(buf, 1, -1)");
assertThrows(IndexOutOfBoundsException.class, () -> out.write(buf,
buf.length + 1, 0), "Base16InputStream.write(buf, buf.length + 1, 0)");
@@ -252,7 +252,7 @@ public class Base16OutputStreamTest {
@Test
public void testWriteToNullCoverage() throws IOException {
final ByteArrayOutputStream bout = new ByteArrayOutputStream();
- try (final Base16OutputStream out = new Base16OutputStream(bout)) {
+ try (Base16OutputStream out = new Base16OutputStream(bout)) {
assertThrows(NullPointerException.class, () -> out.write(null, 0,
0));
}
}
diff --git
a/src/test/java/org/apache/commons/codec/binary/Base32InputStreamTest.java
b/src/test/java/org/apache/commons/codec/binary/Base32InputStreamTest.java
index b61244dc..ce9754f0 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base32InputStreamTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base32InputStreamTest.java
@@ -50,7 +50,7 @@ public class Base32InputStreamTest {
@Test
public void testAvailable() throws Throwable {
final InputStream ins = new
ByteArrayInputStream(StringUtils.getBytesIso8859_1(ENCODED_FOO));
- try (final Base32InputStream b32stream = new Base32InputStream(ins)) {
+ try (Base32InputStream b32stream = new Base32InputStream(ins)) {
assertEquals(1, b32stream.available());
assertEquals(3, b32stream.skip(10));
// End of stream reached
@@ -344,7 +344,7 @@ public class Base32InputStreamTest {
*/
@Test
public void testCodec105() throws IOException {
- try (final Base32InputStream in = new Base32InputStream(new
Codec105ErrorInputStream(), true, 0, null)) {
+ try (Base32InputStream in = new Base32InputStream(new
Codec105ErrorInputStream(), true, 0, null)) {
for (int i = 0; i < 5; i++) {
in.read();
}
@@ -357,7 +357,7 @@ public class Base32InputStreamTest {
@Test
public void testCodec130() throws IOException {
final ByteArrayOutputStream bos = new ByteArrayOutputStream();
- try (final Base32OutputStream base32os = new Base32OutputStream(bos)) {
+ try (Base32OutputStream base32os = new Base32OutputStream(bos)) {
base32os.write(StringUtils.getBytesUtf8(STRING_FIXTURE));
}
@@ -382,7 +382,7 @@ public class Base32InputStreamTest {
public void testMarkSupported() throws Exception {
final byte[] decoded =
StringUtils.getBytesUtf8(Base32TestData.STRING_FIXTURE);
final ByteArrayInputStream bin = new ByteArrayInputStream(decoded);
- try (final Base32InputStream in = new Base32InputStream(bin, true, 4,
new byte[] { 0, 0, 0 })) {
+ try (Base32InputStream in = new Base32InputStream(bin, true, 4, new
byte[] { 0, 0, 0 })) {
// Always returns false for now.
assertFalse(in.markSupported(), "Base32InputStream.markSupported()
is false");
}
@@ -400,7 +400,7 @@ public class Base32InputStreamTest {
final byte[] buf = new byte[1024];
int bytesRead = 0;
final ByteArrayInputStream bin = new ByteArrayInputStream(decoded);
- try (final Base32InputStream in = new Base32InputStream(bin, true, 4,
new byte[] { 0, 0, 0 })) {
+ try (Base32InputStream in = new Base32InputStream(bin, true, 4, new
byte[] { 0, 0, 0 })) {
bytesRead = in.read(buf, 0, 0);
assertEquals(0, bytesRead, "Base32InputStream.read(buf, 0, 0)
returns 0");
}
@@ -416,7 +416,7 @@ public class Base32InputStreamTest {
public void testReadNull() throws Exception {
final byte[] decoded =
StringUtils.getBytesUtf8(Base32TestData.STRING_FIXTURE);
final ByteArrayInputStream bin = new ByteArrayInputStream(decoded);
- try (final Base32InputStream in = new Base32InputStream(bin, true, 4,
new byte[] {0, 0, 0})) {
+ try (Base32InputStream in = new Base32InputStream(bin, true, 4, new
byte[] {0, 0, 0})) {
assertThrows(NullPointerException.class, () -> in.read(null, 0,
0));
}
}
@@ -432,7 +432,7 @@ public class Base32InputStreamTest {
final byte[] decoded =
StringUtils.getBytesUtf8(Base32TestData.STRING_FIXTURE);
final byte[] buf = new byte[1024];
final ByteArrayInputStream bin = new ByteArrayInputStream(decoded);
- try (final Base32InputStream in = new Base32InputStream(bin, true, 4,
new byte[] { 0, 0, 0 })) {
+ try (Base32InputStream in = new Base32InputStream(bin, true, 4, new
byte[] { 0, 0, 0 })) {
assertThrows(IndexOutOfBoundsException.class, () -> in.read(buf,
-1, 0), "Base32InputStream.read(buf, -1, 0)");
assertThrows(IndexOutOfBoundsException.class, () -> in.read(buf,
0, -1), "Base32InputStream.read(buf, 0, -1)");
assertThrows(IndexOutOfBoundsException.class, () -> in.read(buf,
buf.length + 1, 0), "Base32InputStream.read(buf, buf.length + 1, 0)");
@@ -449,7 +449,7 @@ public class Base32InputStreamTest {
@Test
public void testSkipBig() throws Throwable {
final InputStream ins = new
ByteArrayInputStream(StringUtils.getBytesIso8859_1(ENCODED_FOO));
- try (final Base32InputStream b32stream = new Base32InputStream(ins)) {
+ try (Base32InputStream b32stream = new Base32InputStream(ins)) {
assertEquals(3, b32stream.skip(1024));
// End of stream reached
assertEquals(-1, b32stream.read());
@@ -466,7 +466,7 @@ public class Base32InputStreamTest {
@Test
public void testSkipNone() throws Throwable {
final InputStream ins = new
ByteArrayInputStream(StringUtils.getBytesIso8859_1(ENCODED_FOO));
- try (final Base32InputStream b32stream = new Base32InputStream(ins)) {
+ try (Base32InputStream b32stream = new Base32InputStream(ins)) {
final byte[] actualBytes = new byte[6];
assertEquals(0, b32stream.skip(0));
b32stream.read(actualBytes, 0, actualBytes.length);
@@ -485,7 +485,7 @@ public class Base32InputStreamTest {
@Test
public void testSkipPastEnd() throws Throwable {
final InputStream ins = new
ByteArrayInputStream(StringUtils.getBytesIso8859_1(ENCODED_FOO));
- try (final Base32InputStream b32stream = new Base32InputStream(ins)) {
+ try (Base32InputStream b32stream = new Base32InputStream(ins)) {
// due to CODEC-130, skip now skips correctly decoded characters
rather than encoded
assertEquals(3, b32stream.skip(10));
// End of stream reached
@@ -503,7 +503,7 @@ public class Base32InputStreamTest {
@Test
public void testSkipToEnd() throws Throwable {
final InputStream ins = new
ByteArrayInputStream(StringUtils.getBytesIso8859_1(ENCODED_FOO));
- try (final Base32InputStream b32stream = new Base32InputStream(ins)) {
+ try (Base32InputStream b32stream = new Base32InputStream(ins)) {
// due to CODEC-130, skip now skips correctly decoded characters
rather than encoded
assertEquals(3, b32stream.skip(3));
// End of stream reached
@@ -521,7 +521,7 @@ public class Base32InputStreamTest {
@Test
public void testSkipWrongArgument() throws Throwable {
final InputStream ins = new
ByteArrayInputStream(StringUtils.getBytesIso8859_1(ENCODED_FOO));
- try (final Base32InputStream b32stream = new Base32InputStream(ins)) {
+ try (Base32InputStream b32stream = new Base32InputStream(ins)) {
assertThrows(IllegalArgumentException.class, () ->
b32stream.skip(-10));
}
}
diff --git
a/src/test/java/org/apache/commons/codec/binary/Base32OutputStreamTest.java
b/src/test/java/org/apache/commons/codec/binary/Base32OutputStreamTest.java
index 68db9a3d..82c54496 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base32OutputStreamTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base32OutputStreamTest.java
@@ -291,7 +291,7 @@ public class Base32OutputStreamTest {
// Strict decoding should throw
bout = new ByteArrayOutputStream();
- try (final Base32OutputStream out2 = new
Base32OutputStream(bout, false, 0, null, CodecPolicy.STRICT)) {
+ try (Base32OutputStream out2 = new Base32OutputStream(bout,
false, 0, null, CodecPolicy.STRICT)) {
assertTrue(out2.isStrictDecoding());
assertThrows(IllegalArgumentException.class, () ->
out2.write(encoded));
}
@@ -309,7 +309,7 @@ public class Base32OutputStreamTest {
public void testWriteOutOfBounds() throws Exception {
final byte[] buf = new byte[1024];
final ByteArrayOutputStream bout = new ByteArrayOutputStream();
- try (final Base32OutputStream out = new Base32OutputStream(bout)) {
+ try (Base32OutputStream out = new Base32OutputStream(bout)) {
assertThrows(IndexOutOfBoundsException.class, () -> out.write(buf,
-1, 1), "Base32OutputStream.write(buf, -1, 1)");
assertThrows(IndexOutOfBoundsException.class, () -> out.write(buf,
1, -1), "Base32OutputStream.write(buf, 1, -1)");
assertThrows(IndexOutOfBoundsException.class, () -> out.write(buf,
buf.length + 1, 0), "Base32OutputStream.write(buf, buf, buf.length + 1, 0)");
@@ -326,7 +326,7 @@ public class Base32OutputStreamTest {
@Test
public void testWriteToNullCoverage() throws Exception {
final ByteArrayOutputStream bout = new ByteArrayOutputStream();
- try (final Base32OutputStream out = new Base32OutputStream(bout)) {
+ try (Base32OutputStream out = new Base32OutputStream(bout)) {
assertThrows(NullPointerException.class, () -> out.write(null, 0,
0));
}
}
diff --git
a/src/test/java/org/apache/commons/codec/binary/Base64InputStreamTest.java
b/src/test/java/org/apache/commons/codec/binary/Base64InputStreamTest.java
index ad2e39e2..7e5b22f6 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base64InputStreamTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base64InputStreamTest.java
@@ -58,7 +58,7 @@ public class Base64InputStreamTest {
@Test
public void testAvailable() throws Throwable {
final InputStream ins = new
ByteArrayInputStream(StringUtils.getBytesIso8859_1(ENCODED_B64));
- try (final Base64InputStream b64stream = new Base64InputStream(ins)) {
+ try (Base64InputStream b64stream = new Base64InputStream(ins)) {
assertEquals(1, b64stream.available());
assertEquals(6, b64stream.skip(10));
// End of stream reached
@@ -294,7 +294,7 @@ public class Base64InputStreamTest {
public void testCodec101() throws Exception {
final byte[] codec101 =
StringUtils.getBytesUtf8(Base64TestData.CODEC_101_INPUT_LENGTH_IS_MULTIPLE_OF_3);
final ByteArrayInputStream bais = new ByteArrayInputStream(codec101);
- try (final Base64InputStream in = new Base64InputStream(bais)) {
+ try (Base64InputStream in = new Base64InputStream(bais)) {
final byte[] result = new byte[8192];
int c = in.read(result);
assertTrue(c > 0, "Codec101: First read successful [c=" + c + "]");
@@ -309,7 +309,7 @@ public class Base64InputStreamTest {
*/
@Test
public void testCodec105() throws IOException {
- try (final Base64InputStream in = new Base64InputStream(new
Codec105ErrorInputStream(), true, 0, null)) {
+ try (Base64InputStream in = new Base64InputStream(new
Codec105ErrorInputStream(), true, 0, null)) {
for (int i = 0; i < 5; i++) {
in.read();
}
@@ -322,7 +322,7 @@ public class Base64InputStreamTest {
@Test
public void testCodec130() throws IOException {
final ByteArrayOutputStream bos = new ByteArrayOutputStream();
- try (final Base64OutputStream base64os = new Base64OutputStream(bos)) {
+ try (Base64OutputStream base64os = new Base64OutputStream(bos)) {
base64os.write(StringUtils.getBytesUtf8(STRING_FIXTURE));
}
@@ -377,7 +377,7 @@ public class Base64InputStreamTest {
final ByteArrayInputStream bais = new ByteArrayInputStream(codec101);
final Base64InputStream in = new Base64InputStream(bais);
final InputStreamReader isr = new InputStreamReader(in);
- try (final BufferedReader br = new BufferedReader(isr)) {
+ try (BufferedReader br = new BufferedReader(isr)) {
final String line = br.readLine();
assertNotNull(line, "Codec101: InputStreamReader works!");
}
@@ -393,7 +393,7 @@ public class Base64InputStreamTest {
public void testMarkSupported() throws Exception {
final byte[] decoded = StringUtils.getBytesUtf8(STRING_FIXTURE);
final ByteArrayInputStream bin = new ByteArrayInputStream(decoded);
- try (final Base64InputStream in = new Base64InputStream(bin, true, 4,
new byte[] { 0, 0, 0 })) {
+ try (Base64InputStream in = new Base64InputStream(bin, true, 4, new
byte[] { 0, 0, 0 })) {
// Always returns false for now.
assertFalse(in.markSupported(), "Base64InputStream.markSupported()
is false");
}
@@ -411,7 +411,7 @@ public class Base64InputStreamTest {
final byte[] buf = new byte[1024];
int bytesRead = 0;
final ByteArrayInputStream bin = new ByteArrayInputStream(decoded);
- try (final Base64InputStream in = new Base64InputStream(bin, true, 4,
new byte[] { 0, 0, 0 })) {
+ try (Base64InputStream in = new Base64InputStream(bin, true, 4, new
byte[] { 0, 0, 0 })) {
bytesRead = in.read(buf, 0, 0);
assertEquals(0, bytesRead, "Base64InputStream.read(buf, 0, 0)
returns 0");
}
@@ -430,7 +430,7 @@ public class Base64InputStreamTest {
final byte[] decoded = randomData[0];
final ByteArrayInputStream bin = new ByteArrayInputStream(encoded);
final ByteArrayOutputStream out = new ByteArrayOutputStream();
- try (final Base64InputStream in = new Base64InputStream(bin)) {
+ try (Base64InputStream in = new Base64InputStream(bin)) {
for (final int i : new int[] { 4 * 1024, 4 * 1024, 8 * 1024, 8 *
1024, 16 * 1024, 16 * 1024, 8 * 1024 }) {
final byte[] buf = new byte[i];
final int bytesRead = in.read(buf);
@@ -451,7 +451,7 @@ public class Base64InputStreamTest {
public void testReadNull() throws Exception {
final byte[] decoded = StringUtils.getBytesUtf8(STRING_FIXTURE);
final ByteArrayInputStream bin = new ByteArrayInputStream(decoded);
- try (final Base64InputStream in = new Base64InputStream(bin, true, 4,
new byte[] { 0, 0, 0 })) {
+ try (Base64InputStream in = new Base64InputStream(bin, true, 4, new
byte[] { 0, 0, 0 })) {
assertThrows(NullPointerException.class, () -> in.read(null, 0,
0));
}
}
@@ -467,7 +467,7 @@ public class Base64InputStreamTest {
final byte[] decoded = StringUtils.getBytesUtf8(STRING_FIXTURE);
final byte[] buf = new byte[1024];
final ByteArrayInputStream bin = new ByteArrayInputStream(decoded);
- try (final Base64InputStream in = new Base64InputStream(bin, true, 4,
new byte[] {0, 0, 0})) {
+ try (Base64InputStream in = new Base64InputStream(bin, true, 4, new
byte[] {0, 0, 0})) {
assertThrows(IndexOutOfBoundsException.class, () -> in.read(buf,
-1, 0), "Base64InputStream.read(buf, -1, 0)");
assertThrows(IndexOutOfBoundsException.class, () -> in.read(buf,
0, -1), "Base64InputStream.read(buf, 0, -1)");
assertThrows(IndexOutOfBoundsException.class, () -> in.read(buf,
buf.length + 1, 0), "Base64InputStream.read(buf, buf.length + 1, 0)");
@@ -484,7 +484,7 @@ public class Base64InputStreamTest {
@Test
public void testSkipBig() throws Throwable {
final InputStream ins = new
ByteArrayInputStream(StringUtils.getBytesIso8859_1(ENCODED_B64));
- try (final Base64InputStream b64stream = new Base64InputStream(ins)) {
+ try (Base64InputStream b64stream = new Base64InputStream(ins)) {
assertEquals(6, b64stream.skip(Integer.MAX_VALUE));
// End of stream reached
assertEquals(-1, b64stream.read());
@@ -501,7 +501,7 @@ public class Base64InputStreamTest {
@Test
public void testSkipNone() throws Throwable {
final InputStream ins = new
ByteArrayInputStream(StringUtils.getBytesIso8859_1(ENCODED_B64));
- try (final Base64InputStream b64stream = new Base64InputStream(ins)) {
+ try (Base64InputStream b64stream = new Base64InputStream(ins)) {
final byte[] actualBytes = new byte[6];
assertEquals(0, b64stream.skip(0));
b64stream.read(actualBytes, 0, actualBytes.length);
@@ -520,7 +520,7 @@ public class Base64InputStreamTest {
@Test
public void testSkipPastEnd() throws Throwable {
final InputStream ins = new
ByteArrayInputStream(StringUtils.getBytesIso8859_1(ENCODED_B64));
- try (final Base64InputStream b64stream = new Base64InputStream(ins)) {
+ try (Base64InputStream b64stream = new Base64InputStream(ins)) {
// due to CODEC-130, skip now skips correctly decoded characters
rather than encoded
assertEquals(6, b64stream.skip(10));
// End of stream reached
@@ -538,7 +538,7 @@ public class Base64InputStreamTest {
@Test
public void testSkipToEnd() throws Throwable {
final InputStream ins = new
ByteArrayInputStream(StringUtils.getBytesIso8859_1(ENCODED_B64));
- try (final Base64InputStream b64stream = new Base64InputStream(ins)) {
+ try (Base64InputStream b64stream = new Base64InputStream(ins)) {
// due to CODEC-130, skip now skips correctly decoded characters
rather than encoded
assertEquals(6, b64stream.skip(6));
// End of stream reached
@@ -556,7 +556,7 @@ public class Base64InputStreamTest {
@Test
public void testSkipWrongArgument() throws Throwable {
final InputStream ins = new
ByteArrayInputStream(StringUtils.getBytesIso8859_1(ENCODED_B64));
- try (final Base64InputStream b64stream = new Base64InputStream(ins)) {
+ try (Base64InputStream b64stream = new Base64InputStream(ins)) {
assertThrows(IllegalArgumentException.class, () ->
b64stream.skip(-10));
}
}
diff --git
a/src/test/java/org/apache/commons/codec/binary/Base64OutputStreamTest.java
b/src/test/java/org/apache/commons/codec/binary/Base64OutputStreamTest.java
index 76bed922..a3ceaf26 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base64OutputStreamTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base64OutputStreamTest.java
@@ -275,7 +275,7 @@ public class Base64OutputStreamTest {
final byte[] codec98_1024 = new byte[1024];
System.arraycopy(codec98, 0, codec98_1024, 0, codec98.length);
final ByteArrayOutputStream data = new ByteArrayOutputStream(1024);
- try (final Base64OutputStream stream = new Base64OutputStream(data,
false)) {
+ try (Base64OutputStream stream = new Base64OutputStream(data, false)) {
stream.write(codec98_1024, 0, 1024);
}
@@ -324,7 +324,7 @@ public class Base64OutputStreamTest {
public void testWriteOutOfBounds() throws Exception {
final byte[] buf = new byte[1024];
final ByteArrayOutputStream bout = new ByteArrayOutputStream();
- try (final Base64OutputStream out = new Base64OutputStream(bout)) {
+ try (Base64OutputStream out = new Base64OutputStream(bout)) {
assertThrows(IndexOutOfBoundsException.class, () -> out.write(buf,
-1, 1), "Base64OutputStream.write(buf, -1, 1)");
assertThrows(IndexOutOfBoundsException.class, () -> out.write(buf,
1, -1), "Base64OutputStream.write(buf, 1, -1)");
assertThrows(IndexOutOfBoundsException.class, () -> out.write(buf,
buf.length + 1, 0), "Base64OutputStream.write(buf, buf.length + 1, 0)");
@@ -341,7 +341,7 @@ public class Base64OutputStreamTest {
@Test
public void testWriteToNullCoverage() throws Exception {
final ByteArrayOutputStream bout = new ByteArrayOutputStream();
- try (final Base64OutputStream out = new Base64OutputStream(bout)) {
+ try (Base64OutputStream out = new Base64OutputStream(bout)) {
assertThrows(NullPointerException.class, () -> out.write(null, 0,
0));
}
}
diff --git a/src/test/java/org/apache/commons/codec/digest/DigestUtilsTest.java
b/src/test/java/org/apache/commons/codec/digest/DigestUtilsTest.java
index 5a9a28da..a2ac153e 100644
--- a/src/test/java/org/apache/commons/codec/digest/DigestUtilsTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/DigestUtilsTest.java
@@ -88,12 +88,12 @@ public class DigestUtilsTest {
public void setUp() throws Exception {
new Random().nextBytes(testData);
testFile = Files.createTempFile(DigestUtilsTest.class.getName(),
".dat");
- try (final OutputStream fos = Files.newOutputStream(testFile)) {
+ try (OutputStream fos = Files.newOutputStream(testFile)) {
fos.write(testData);
}
testRandomAccessFile =
Files.createTempFile(DigestUtilsTest.class.getName(), ".dat");
- try (final OutputStream fos =
Files.newOutputStream(testRandomAccessFile)) {
+ try (OutputStream fos = Files.newOutputStream(testRandomAccessFile)) {
fos.write(testData);
}
testRandomAccessFileWrapper =
RandomAccessFileMode.READ_WRITE.create(testRandomAccessFile);
@@ -114,7 +114,7 @@ public class DigestUtilsTest {
final String pathName =
"src/test/resources/org/apache/commons/codec/empty.bin";
final String algo = MessageDigestAlgorithms.MD5;
assertEquals(expected, new DigestUtils(algo).digestAsHex(new
File(pathName)));
- try (final FileInputStream inputStream = new
FileInputStream(pathName)) {
+ try (FileInputStream inputStream = new FileInputStream(pathName)) {
assertEquals(expected, new
DigestUtils(algo).digestAsHex(inputStream));
}
final byte[] allBytes = Files.readAllBytes(Paths.get(pathName));
@@ -312,7 +312,7 @@ public class DigestUtilsTest {
final String algo = MessageDigestAlgorithms.SHA_224;
final DigestUtils digestUtils = new DigestUtils(algo);
assertEquals(expected, digestUtils.digestAsHex(new File(pathName)));
- try (final FileInputStream inputStream = new
FileInputStream(pathName)) {
+ try (FileInputStream inputStream = new FileInputStream(pathName)) {
assertEquals(expected, digestUtils.digestAsHex(inputStream));
}
final byte[] allBytes = Files.readAllBytes(Paths.get(pathName));
diff --git
a/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32Test.java
b/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32Test.java
index 3718de01..4d9343a9 100644
--- a/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32Test.java
+++ b/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32Test.java
@@ -228,7 +228,7 @@ public class PureJavaCrc32Test {
System.out.println(s);
// print to a file
- try (final PrintStream out = new PrintStream(new
FileOutputStream("table" + i + ".txt"), true)) {
+ try (PrintStream out = new PrintStream(new
FileOutputStream("table" + i + ".txt"), true)) {
out.println(s);
}
}
diff --git a/src/test/java/org/apache/commons/codec/digest/XXHash32Test.java
b/src/test/java/org/apache/commons/codec/digest/XXHash32Test.java
index bb4c46c1..ee8a2b93 100644
--- a/src/test/java/org/apache/commons/codec/digest/XXHash32Test.java
+++ b/src/test/java/org/apache/commons/codec/digest/XXHash32Test.java
@@ -88,7 +88,7 @@ public class XXHash32Test {
public void verifyChecksum(final String path, final String c) throws
IOException {
initData(path, c);
final XXHash32 h = new XXHash32();
- try (final FileInputStream s = new FileInputStream(file)) {
+ try (FileInputStream s = new FileInputStream(file)) {
final byte[] b = toByteArray(s);
h.update(b, 0, b.length);
}
@@ -100,7 +100,7 @@ public class XXHash32Test {
public void verifyIncrementalChecksum(final String path, final String c)
throws IOException {
initData(path, c);
final XXHash32 h = new XXHash32();
- try (final FileInputStream s = new FileInputStream(file)) {
+ try (FileInputStream s = new FileInputStream(file)) {
final byte[] b = toByteArray(s);
// Hit the case where the hash should be reset
h.update(b[0]);
