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-compress.git
The following commit(s) were added to refs/heads/master by this push:
new e773fa658 Add Checkstyle FinalLocalVariable
e773fa658 is described below
commit e773fa658277b3ca5ff2bee242381b34e261db49
Author: Gary D. Gregory <[email protected]>
AuthorDate: Sat Dec 21 10:51:13 2024 -0500
Add Checkstyle FinalLocalVariable
- Use @Override
- Use final
- Use one if instead of two
- Merge local variable declaration and initialization
- Remove redundant parentheses
---
src/conf/checkstyle.xml | 1 +
.../commons/compress/archivers/ar/ArArchiveInputStream.java | 2 +-
.../compress/archivers/cpio/CpioArchiveInputStream.java | 5 +----
.../commons/compress/archivers/dump/DumpArchiveSummary.java | 5 +----
.../commons/compress/archivers/sevenz/SevenZArchiveEntry.java | 5 +----
.../apache/commons/compress/archivers/tar/TarArchiveEntry.java | 9 ++-------
.../apache/commons/compress/archivers/zip/ZipArchiveEntry.java | 2 +-
.../org/apache/commons/compress/archivers/zip/ZipFile.java | 2 +-
.../apache/commons/compress/changes/ChangeSetPerformer.java | 6 +-----
.../compressors/bzip2/BZip2CompressorOutputStream.java | 1 +
.../compressors/deflate/DeflateCompressorOutputStream.java | 1 +
.../compress/compressors/gzip/GzipCompressorOutputStream.java | 3 ++-
.../compressors/lz4/BlockLZ4CompressorInputStream.java | 2 +-
.../compressors/lz4/BlockLZ4CompressorOutputStream.java | 1 +
.../compressors/lz4/FramedLZ4CompressorOutputStream.java | 1 +
.../compress/compressors/lzma/LZMACompressorOutputStream.java | 1 +
.../compressors/pack200/Pack200CompressorOutputStream.java | 1 +
.../compressors/snappy/FramedSnappyCompressorOutputStream.java | 1 +
.../compressors/snappy/SnappyCompressorOutputStream.java | 1 +
.../compress/compressors/xz/XZCompressorOutputStream.java | 1 +
.../org/apache/commons/compress/harmony/pack200/Archive.java | 2 +-
.../org/apache/commons/compress/harmony/pack200/BHSDCodec.java | 4 ++--
.../org/apache/commons/compress/harmony/pack200/BandSet.java | 2 +-
.../org/apache/commons/compress/harmony/pack200/Codec.java | 5 +----
.../apache/commons/compress/harmony/pack200/CodecEncoding.java | 6 +++---
.../org/apache/commons/compress/harmony/pack200/CpBands.java | 2 +-
.../org/apache/commons/compress/harmony/pack200/IntList.java | 2 +-
.../commons/compress/harmony/pack200/MetadataBandGroup.java | 2 +-
.../commons/compress/harmony/pack200/NewAttributeBands.java | 2 +-
.../commons/compress/harmony/pack200/PopulationCodec.java | 2 +-
.../org/apache/commons/compress/harmony/unpack200/BandSet.java | 4 ++--
.../org/apache/commons/compress/harmony/unpack200/BcBands.java | 2 +-
.../org/apache/commons/compress/harmony/unpack200/CpBands.java | 2 +-
.../org/apache/commons/compress/harmony/unpack200/Segment.java | 3 +--
.../compress/harmony/unpack200/SegmentConstantPool.java | 2 +-
.../commons/compress/harmony/unpack200/bytecode/Attribute.java | 5 +----
.../commons/compress/harmony/unpack200/bytecode/CPClass.java | 5 +----
.../compress/harmony/unpack200/bytecode/CPConstant.java | 5 +----
.../compress/harmony/unpack200/bytecode/CPFieldRef.java | 5 +----
.../commons/compress/harmony/unpack200/bytecode/CPMember.java | 5 +----
.../compress/harmony/unpack200/bytecode/CPNameAndType.java | 5 +----
.../commons/compress/harmony/unpack200/bytecode/CPRef.java | 10 ++--------
.../commons/compress/harmony/unpack200/bytecode/CPUTF8.java | 5 +----
.../commons/compress/harmony/unpack200/bytecode/ClassFile.java | 2 +-
.../harmony/unpack200/bytecode/ConstantValueAttribute.java | 5 +----
.../harmony/unpack200/bytecode/ExceptionsAttribute.java | 5 +----
.../harmony/unpack200/bytecode/InnerClassesAttribute.java | 5 +----
.../harmony/unpack200/bytecode/SourceFileAttribute.java | 5 +----
.../compress/utils/BoundedSeekableByteChannelInputStream.java | 2 +-
.../java/org/apache/commons/compress/archivers/ZipTest.java | 2 +-
.../compress/archivers/tar/TarArchiveOutputStreamTest.java | 4 ++--
.../apache/commons/compress/archivers/tar/TarUtilsTest.java | 6 ++----
.../compress/archivers/zip/X5455_ExtendedTimestampTest.java | 2 +-
.../apache/commons/compress/archivers/zip/Zip64SupportIT.java | 2 +-
.../org/apache/commons/compress/archivers/zip/ZipFileTest.java | 6 +++---
.../compress/archivers/zip/ZipMemoryFileSystemTest.java | 4 ++--
.../org/apache/commons/compress/compressors/BZip2Test.java | 2 +-
.../compressors/gzip/GzipCompressorOutputStreamTest.java | 2 +-
.../compressors/lz4/FramedLZ4CompressorInputStreamTest.java | 2 +-
.../compressors/lz4/FramedLZ4CompressorRoundtripTest.java | 2 +-
.../utils/BoundedSeekableByteChannelInputStreamTest.java | 2 +-
61 files changed, 73 insertions(+), 125 deletions(-)
diff --git a/src/conf/checkstyle.xml b/src/conf/checkstyle.xml
index 66c53b64e..d58ba0b00 100644
--- a/src/conf/checkstyle.xml
+++ b/src/conf/checkstyle.xml
@@ -38,6 +38,7 @@ limitations under the License.
<property name="file" value="checkstyle-suppressions.xml" />
</module>
<module name="TreeWalker">
+ <module name="FinalLocalVariable" />
<module name="AvoidStarImport" />
<module name="IllegalImport" />
<module name="RedundantImport" />
diff --git
a/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
b/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
index dbfb486ed..c5318dd97 100644
---
a/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
+++
b/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
@@ -386,7 +386,7 @@ public class ArArchiveInputStream extends
ArchiveInputStream<ArArchiveEntry> {
* @see #isGNUStringTable
*/
private ArArchiveEntry readGNUStringTable(final byte[] length, final int
offset, final int len) throws IOException {
- int bufflen;
+ final int bufflen;
try {
bufflen = asInt(length, offset, len); // Assume length will fit in
an int
} catch (final NumberFormatException ex) {
diff --git
a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java
b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java
index 975828a5b..f5cbc777b 100644
---
a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java
+++
b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java
@@ -84,10 +84,7 @@ public class CpioArchiveInputStream extends
ArchiveInputStream<CpioArchiveEntry>
}
// Check binary values
- if (signature[0] == 0x71 && (signature[1] & 0xFF) == 0xc7) {
- return true;
- }
- if (signature[1] == 0x71 && (signature[0] & 0xFF) == 0xc7) {
+ if ((signature[0] == 0x71 && (signature[1] & 0xFF) == 0xc7) ||
(signature[1] == 0x71 && (signature[0] & 0xFF) == 0xc7)) {
return true;
}
diff --git
a/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveSummary.java
b/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveSummary.java
index 8207eb1de..708bc1c79 100644
---
a/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveSummary.java
+++
b/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveSummary.java
@@ -66,10 +66,7 @@ public class DumpArchiveSummary {
if (this == obj) {
return true;
}
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
+ if (obj == null || getClass() != obj.getClass()) {
return false;
}
final DumpArchiveSummary other = (DumpArchiveSummary) obj;
diff --git
a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZArchiveEntry.java
b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZArchiveEntry.java
index 93544cb73..2fd76f851 100644
---
a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZArchiveEntry.java
+++
b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZArchiveEntry.java
@@ -112,10 +112,7 @@ public class SevenZArchiveEntry implements ArchiveEntry {
}
final Iterator<? extends SevenZMethodConfiguration> i2 = c2.iterator();
for (final SevenZMethodConfiguration element : c1) {
- if (!i2.hasNext()) {
- return false;
- }
- if (!element.equals(i2.next())) {
+ if (!i2.hasNext() || !element.equals(i2.next())) {
return false;
}
}
diff --git
a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
index 65a8c4520..8ad14306d 100644
---
a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
+++
b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
@@ -1392,13 +1392,8 @@ public class TarArchiveEntry implements ArchiveEntry,
TarConstants, EntryStreamO
return "xustar".equals(archType) || "exustar".equals(archType);
}
// Check if this is XUSTAR
- if (isInvalidPrefix(header)) {
- return false;
- }
- if (isInvalidXtarTime(header, XSTAR_ATIME_OFFSET, ATIMELEN_XSTAR)) {
- return false;
- }
- if (isInvalidXtarTime(header, XSTAR_CTIME_OFFSET, CTIMELEN_XSTAR)) {
+ if (isInvalidPrefix(header) || isInvalidXtarTime(header,
XSTAR_ATIME_OFFSET, ATIMELEN_XSTAR)
+ || isInvalidXtarTime(header, XSTAR_CTIME_OFFSET,
CTIMELEN_XSTAR)) {
return false;
}
return true;
diff --git
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
index a1e50077a..7a27910ad 100644
---
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
+++
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
@@ -736,7 +736,7 @@ public class ZipArchiveEntry extends ZipEntry implements
ArchiveEntry, EntryStre
final List<ZipExtraField> centralFields = new
ArrayList<>(Arrays.asList(parseExtraFields(central, false, parsingBehavior)));
final List<ZipExtraField> merged = new ArrayList<>();
for (final ZipExtraField l : localFields) {
- ZipExtraField c;
+ final ZipExtraField c;
if (l instanceof UnparseableExtraFieldData) {
c = findUnparseable(centralFields);
} else {
diff --git
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
index ab57f1297..15cecab33 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
@@ -503,7 +503,7 @@ public class ZipFile implements Closeable {
final FileChannel channel = FileChannel.open(path,
StandardOpenOption.READ);
try {
final boolean is64 =
positionAtEndOfCentralDirectoryRecord(channel);
- long numberOfDisks;
+ final long numberOfDisks;
if (is64) {
channel.position(channel.position() + ZipConstants.WORD +
ZipConstants.WORD + ZipConstants.DWORD);
final ByteBuffer buf = ByteBuffer.allocate(ZipConstants.WORD);
diff --git
a/src/main/java/org/apache/commons/compress/changes/ChangeSetPerformer.java
b/src/main/java/org/apache/commons/compress/changes/ChangeSetPerformer.java
index 8472d4dfd..01c794a88 100644
--- a/src/main/java/org/apache/commons/compress/changes/ChangeSetPerformer.java
+++ b/src/main/java/org/apache/commons/compress/changes/ChangeSetPerformer.java
@@ -152,11 +152,7 @@ public class ChangeSetPerformer<I extends
ArchiveInputStream<E>, O extends Archi
for (final Change<E> change : workingSet) {
final ChangeType type = change.getType();
final String target = change.getTargetFileName();
- if (type == ChangeType.DELETE && source.equals(target)) {
- return true;
- }
-
- if (type == ChangeType.DELETE_DIR && source.startsWith(target
+ "/")) {
+ if (type == ChangeType.DELETE && source.equals(target) || type
== ChangeType.DELETE_DIR && source.startsWith(target + "/")) {
return true;
}
}
diff --git
a/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java
b/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java
index 1c5b4be4f..50c85ac1b 100644
---
a/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java
+++
b/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java
@@ -535,6 +535,7 @@ public class BZip2CompressorOutputStream extends
CompressorOutputStream<OutputSt
bsFinishedWithStream();
}
+ @Override
public void finish() throws IOException {
if (!isClosed()) {
try {
diff --git
a/src/main/java/org/apache/commons/compress/compressors/deflate/DeflateCompressorOutputStream.java
b/src/main/java/org/apache/commons/compress/compressors/deflate/DeflateCompressorOutputStream.java
index d33b5fd84..87ae24e40 100644
---
a/src/main/java/org/apache/commons/compress/compressors/deflate/DeflateCompressorOutputStream.java
+++
b/src/main/java/org/apache/commons/compress/compressors/deflate/DeflateCompressorOutputStream.java
@@ -76,6 +76,7 @@ public class DeflateCompressorOutputStream extends
CompressorOutputStream<Deflat
*
* @throws IOException on error
*/
+ @Override
@SuppressWarnings("resource") // instance variable access
public void finish() throws IOException {
out().finish();
diff --git
a/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorOutputStream.java
b/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorOutputStream.java
index d4e8bb0b6..b78a67813 100644
---
a/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorOutputStream.java
+++
b/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorOutputStream.java
@@ -107,6 +107,7 @@ public class GzipCompressorOutputStream extends
CompressorOutputStream<OutputStr
* @since 1.7
* @throws IOException on error
*/
+ @Override
public void finish() throws IOException {
if (!deflater.finished()) {
deflater.finish();
@@ -174,7 +175,7 @@ public class GzipCompressorOutputStream extends
CompressorOutputStream<OutputStr
buffer.putShort((short) GZIPInputStream.GZIP_MAGIC);
buffer.put((byte) Deflater.DEFLATED); // compression method (8:
deflate)
buffer.put((byte) ((extra != null ? FEXTRA : 0) | (fileName != null ?
FNAME : 0) | (comment != null ? FCOMMENT : 0))); // flags
- buffer.putInt((int)
(parameters.getModificationInstant().getEpochSecond()));
+ buffer.putInt((int)
parameters.getModificationInstant().getEpochSecond());
// extra flags
final int compressionLevel = parameters.getCompressionLevel();
if (compressionLevel == Deflater.BEST_COMPRESSION) {
diff --git
a/src/main/java/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorInputStream.java
b/src/main/java/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorInputStream.java
index e4807ae06..9d0722780 100644
---
a/src/main/java/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorInputStream.java
+++
b/src/main/java/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorInputStream.java
@@ -62,7 +62,7 @@ public class BlockLZ4CompressorInputStream extends
AbstractLZ77CompressorInputSt
* @return false if there is no more back-reference - this means this is
the last block of the stream.
*/
private boolean initializeBackReference() throws IOException {
- int backReferenceOffset;
+ final int backReferenceOffset;
try {
backReferenceOffset = (int) ByteUtils.fromLittleEndian(supplier,
2);
} catch (final IOException ex) {
diff --git
a/src/main/java/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorOutputStream.java
b/src/main/java/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorOutputStream.java
index 3c5969008..c766c230f 100644
---
a/src/main/java/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorOutputStream.java
+++
b/src/main/java/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorOutputStream.java
@@ -345,6 +345,7 @@ public class BlockLZ4CompressorOutputStream extends
CompressorOutputStream<Outpu
*
* @throws IOException if an error occurs
*/
+ @Override
public void finish() throws IOException {
if (!isFinished()) {
compressor.finish();
diff --git
a/src/main/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorOutputStream.java
b/src/main/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorOutputStream.java
index 437f1034b..5a658ce99 100644
---
a/src/main/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorOutputStream.java
+++
b/src/main/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorOutputStream.java
@@ -216,6 +216,7 @@ public class FramedLZ4CompressorOutputStream extends
CompressorOutputStream<Outp
*
* @throws IOException if an error occurs
*/
+ @Override
public void finish() throws IOException {
if (!isFinished()) {
flushBlock();
diff --git
a/src/main/java/org/apache/commons/compress/compressors/lzma/LZMACompressorOutputStream.java
b/src/main/java/org/apache/commons/compress/compressors/lzma/LZMACompressorOutputStream.java
index 054320087..326c23a63 100644
---
a/src/main/java/org/apache/commons/compress/compressors/lzma/LZMACompressorOutputStream.java
+++
b/src/main/java/org/apache/commons/compress/compressors/lzma/LZMACompressorOutputStream.java
@@ -48,6 +48,7 @@ public class LZMACompressorOutputStream extends
CompressorOutputStream<LZMAOutpu
*
* @throws IOException on error
*/
+ @Override
@SuppressWarnings("resource") // instance variable access
public void finish() throws IOException {
out().finish();
diff --git
a/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200CompressorOutputStream.java
b/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200CompressorOutputStream.java
index d26b88d90..79d78230d 100644
---
a/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200CompressorOutputStream.java
+++
b/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200CompressorOutputStream.java
@@ -96,6 +96,7 @@ public class Pack200CompressorOutputStream extends
CompressorOutputStream<Output
}
}
+ @Override
public void finish() throws IOException {
if (!isFinished()) {
super.finish();
diff --git
a/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorOutputStream.java
b/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorOutputStream.java
index 5da3ad3aa..7a0c756fc 100644
---
a/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorOutputStream.java
+++
b/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorOutputStream.java
@@ -102,6 +102,7 @@ public class FramedSnappyCompressorOutputStream extends
CompressorOutputStream<O
*
* @throws IOException if an error occurs
*/
+ @Override
public void finish() throws IOException {
flushBuffer();
}
diff --git
a/src/main/java/org/apache/commons/compress/compressors/snappy/SnappyCompressorOutputStream.java
b/src/main/java/org/apache/commons/compress/compressors/snappy/SnappyCompressorOutputStream.java
index 243515ae8..07092837e 100644
---
a/src/main/java/org/apache/commons/compress/compressors/snappy/SnappyCompressorOutputStream.java
+++
b/src/main/java/org/apache/commons/compress/compressors/snappy/SnappyCompressorOutputStream.java
@@ -167,6 +167,7 @@ public class SnappyCompressorOutputStream extends
CompressorOutputStream<OutputS
*
* @throws IOException if an error occurs
*/
+ @Override
public void finish() throws IOException {
if (!isFinished()) {
compressor.finish();
diff --git
a/src/main/java/org/apache/commons/compress/compressors/xz/XZCompressorOutputStream.java
b/src/main/java/org/apache/commons/compress/compressors/xz/XZCompressorOutputStream.java
index 975d8e0d8..80a394b7f 100644
---
a/src/main/java/org/apache/commons/compress/compressors/xz/XZCompressorOutputStream.java
+++
b/src/main/java/org/apache/commons/compress/compressors/xz/XZCompressorOutputStream.java
@@ -73,6 +73,7 @@ public class XZCompressorOutputStream extends
CompressorOutputStream<XZOutputStr
*
* @throws IOException on error
*/
+ @Override
@SuppressWarnings("resource") // instance variable access
public void finish() throws IOException {
out().finish();
diff --git
a/src/main/java/org/apache/commons/compress/harmony/pack200/Archive.java
b/src/main/java/org/apache/commons/compress/harmony/pack200/Archive.java
index e0f1cdd9e..1fe1ed29d 100644
--- a/src/main/java/org/apache/commons/compress/harmony/pack200/Archive.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/Archive.java
@@ -217,7 +217,7 @@ public class Archive {
private void doNormalPack() throws IOException, Pack200Exception {
PackingUtils.log("Start to perform a normal packing");
- List<PackingFile> packingFileList;
+ final List<PackingFile> packingFileList;
if (jarInputStream != null) {
packingFileList =
PackingUtils.getPackingFileListFromJar(jarInputStream,
options.isKeepFileOrder());
} else {
diff --git
a/src/main/java/org/apache/commons/compress/harmony/pack200/BHSDCodec.java
b/src/main/java/org/apache/commons/compress/harmony/pack200/BHSDCodec.java
index bcb515857..3ebe3f33d 100644
--- a/src/main/java/org/apache/commons/compress/harmony/pack200/BHSDCodec.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/BHSDCodec.java
@@ -165,7 +165,7 @@ public final class BHSDCodec extends Codec {
}
private long calculateLargest() {
- long result;
+ final long result;
// TODO This can probably be optimized into a better mathematical
statement
if (d == 1) {
return new BHSDCodec(b, h).largest();
@@ -187,7 +187,7 @@ public final class BHSDCodec extends Codec {
}
private long calculateSmallest() {
- long result;
+ final long result;
if (d == 1 || !isSigned()) {
if (cardinality >= 4294967296L) { // 2^32
result = Integer.MIN_VALUE;
diff --git
a/src/main/java/org/apache/commons/compress/harmony/pack200/BandSet.java
b/src/main/java/org/apache/commons/compress/harmony/pack200/BandSet.java
index b70532a76..079df0603 100644
--- a/src/main/java/org/apache/commons/compress/harmony/pack200/BandSet.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/BandSet.java
@@ -548,7 +548,7 @@ public abstract class BandSet {
int tdefL = 0;
int l = 0;
Codec tokenCodec = null;
- byte[] tokensEncoded;
+ final byte[] tokensEncoded;
final int k = favored.size() - 1;
if (k < 256) {
tdefL = 1;
diff --git
a/src/main/java/org/apache/commons/compress/harmony/pack200/Codec.java
b/src/main/java/org/apache/commons/compress/harmony/pack200/Codec.java
index 0dd5563a3..82556b78c 100644
--- a/src/main/java/org/apache/commons/compress/harmony/pack200/Codec.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/Codec.java
@@ -89,10 +89,7 @@ public abstract class Codec {
if (maxLength > -1) {
final long remaining = maxLength - count;
final String format = "Can't read beyond end of stream (n =
%,d, count = %,d, maxLength = %,d, remaining = %,d)";
- if (count < -1) {
- throw new Pack200Exception(String.format(format, n, count,
maxLength, remaining));
- }
- if (n > remaining) {
+ if (count < -1 || n > remaining) {
throw new Pack200Exception(String.format(format, n, count,
maxLength, remaining));
}
}
diff --git
a/src/main/java/org/apache/commons/compress/harmony/pack200/CodecEncoding.java
b/src/main/java/org/apache/commons/compress/harmony/pack200/CodecEncoding.java
index ce4f7dac1..be44b050e 100644
---
a/src/main/java/org/apache/commons/compress/harmony/pack200/CodecEncoding.java
+++
b/src/main/java/org/apache/commons/compress/harmony/pack200/CodecEncoding.java
@@ -131,7 +131,7 @@ public class CodecEncoding {
}
final int kb = kbflag ? in.read() : 3;
final int k = (kb + 1) * (int) Math.pow(16, kx);
- Codec aCodec, bCodec;
+ final Codec aCodec, bCodec;
if (adef) {
aCodec = defaultCodec;
} else {
@@ -190,8 +190,8 @@ public class CodecEncoding {
if (codec instanceof RunCodec) {
final RunCodec runCodec = (RunCodec) codec;
final int k = runCodec.getK();
- int kb;
- int kx;
+ final int kb;
+ final int kx;
if (k <= 256) {
kb = 0;
kx = k - 1;
diff --git
a/src/main/java/org/apache/commons/compress/harmony/pack200/CpBands.java
b/src/main/java/org/apache/commons/compress/harmony/pack200/CpBands.java
index 40df3bce6..018f53a1f 100644
--- a/src/main/java/org/apache/commons/compress/harmony/pack200/CpBands.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/CpBands.java
@@ -265,7 +265,7 @@ public class CpBands extends BandSet {
CPSignature cpS = stringsToCpSignature.get(signature);
if (cpS == null) {
final List<CPClass> cpClasses = new ArrayList<>();
- CPUTF8 signatureUTF8;
+ final CPUTF8 signatureUTF8;
if (signature.length() > 1 && signature.indexOf('L') != -1) {
final List<String> classes = new ArrayList<>();
final char[] chars = signature.toCharArray();
diff --git
a/src/main/java/org/apache/commons/compress/harmony/pack200/IntList.java
b/src/main/java/org/apache/commons/compress/harmony/pack200/IntList.java
index a68dc0198..d2717c52a 100644
--- a/src/main/java/org/apache/commons/compress/harmony/pack200/IntList.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/IntList.java
@@ -204,7 +204,7 @@ public class IntList {
}
public int remove(final int location) {
- int result;
+ final int result;
final int size = lastIndex - firstIndex;
if (0 > location || location >= size) {
throw new IndexOutOfBoundsException();
diff --git
a/src/main/java/org/apache/commons/compress/harmony/pack200/MetadataBandGroup.java
b/src/main/java/org/apache/commons/compress/harmony/pack200/MetadataBandGroup.java
index 621bf1c0e..ffd46e0cb 100644
---
a/src/main/java/org/apache/commons/compress/harmony/pack200/MetadataBandGroup.java
+++
b/src/main/java/org/apache/commons/compress/harmony/pack200/MetadataBandGroup.java
@@ -255,7 +255,7 @@ public class MetadataBandGroup extends BandSet {
public void pack(final OutputStream out) throws IOException,
Pack200Exception {
PackingUtils.log("Writing metadata band group...");
if (hasContent()) {
- String contextStr;
+ final String contextStr;
if (context == CONTEXT_CLASS) {
contextStr = "Class";
} else if (context == CONTEXT_FIELD) {
diff --git
a/src/main/java/org/apache/commons/compress/harmony/pack200/NewAttributeBands.java
b/src/main/java/org/apache/commons/compress/harmony/pack200/NewAttributeBands.java
index 4d740bfbe..23e976c68 100644
---
a/src/main/java/org/apache/commons/compress/harmony/pack200/NewAttributeBands.java
+++
b/src/main/java/org/apache/commons/compress/harmony/pack200/NewAttributeBands.java
@@ -342,7 +342,7 @@ public class NewAttributeBands extends BandSet {
@Override
public void pack(final OutputStream outputStream) throws IOException,
Pack200Exception {
- int[] ints;
+ final int[] ints;
if (nullsAllowed) {
ints = cpEntryOrNullListToArray(band);
} else {
diff --git
a/src/main/java/org/apache/commons/compress/harmony/pack200/PopulationCodec.java
b/src/main/java/org/apache/commons/compress/harmony/pack200/PopulationCodec.java
index d929dfe04..14a350e4d 100644
---
a/src/main/java/org/apache/commons/compress/harmony/pack200/PopulationCodec.java
+++
b/src/main/java/org/apache/commons/compress/harmony/pack200/PopulationCodec.java
@@ -62,7 +62,7 @@ public class PopulationCodec extends Codec {
lastBandLength = 0;
favoured = new int[check(n, in)]; // there must be <= n values, but
probably a lot
// less
- int[] result;
+ final int[] result;
// read table of favorites first
int smallest = Integer.MAX_VALUE, absoluteSmallest;
int last = 0;
diff --git
a/src/main/java/org/apache/commons/compress/harmony/unpack200/BandSet.java
b/src/main/java/org/apache/commons/compress/harmony/unpack200/BandSet.java
index ba447b62b..1e83f7895 100644
--- a/src/main/java/org/apache/commons/compress/harmony/unpack200/BandSet.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/BandSet.java
@@ -80,7 +80,7 @@ public abstract class BandSet {
return getFirst;
}
final int first = getFirst[0];
- int[] band;
+ final int[] band;
if (codec.isSigned() && first >= -256 && first <= -1) {
// Non-default codec should be used
codecUsed = CodecEncoding.getCodec(-1 - first,
header.getBandHeadersInputStream(), codec);
@@ -375,7 +375,7 @@ public abstract class BandSet {
sum += counts[i];
}
int[] hi = null;
- int[] lo;
+ final int[] lo;
if (hiCodec != null) {
hi = decodeBandInt(name, in, hiCodec, sum);
}
diff --git
a/src/main/java/org/apache/commons/compress/harmony/unpack200/BcBands.java
b/src/main/java/org/apache/commons/compress/harmony/unpack200/BcBands.java
index 539a17ad5..647d9b6b2 100644
--- a/src/main/java/org/apache/commons/compress/harmony/unpack200/BcBands.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/BcBands.java
@@ -502,7 +502,7 @@ public class BcBands extends BandSet {
}
methodAttributesList.add(indexForCodeAttr, codeAttr);
codeAttr.renumber(codeAttr.byteCodeOffsets);
- List<Attribute> currentAttributes;
+ final List<Attribute> currentAttributes;
if (allCodeHasFlags) {
currentAttributes = orderedCodeAttributes.get(i);
} else if (codeHasFlags[i]) {
diff --git
a/src/main/java/org/apache/commons/compress/harmony/unpack200/CpBands.java
b/src/main/java/org/apache/commons/compress/harmony/unpack200/CpBands.java
index ff0c87740..2d827eabe 100644
--- a/src/main/java/org/apache/commons/compress/harmony/unpack200/CpBands.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/CpBands.java
@@ -184,7 +184,7 @@ public class CpBands extends BandSet {
}
public CPUTF8 cpSignatureValue(final int index) {
- int globalIndex;
+ final int globalIndex;
if (cpSignatureInts[index] != -1) {
globalIndex = cpSignatureInts[index];
} else {
diff --git
a/src/main/java/org/apache/commons/compress/harmony/unpack200/Segment.java
b/src/main/java/org/apache/commons/compress/harmony/unpack200/Segment.java
index ede3da1f1..0ba29b540 100644
--- a/src/main/java/org/apache/commons/compress/harmony/unpack200/Segment.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/Segment.java
@@ -145,8 +145,7 @@ public class Segment {
firstDollar = index;
}
}
- String fileName;
-
+ final String fileName;
if (firstDollar > -1 && i <= firstDollar) {
fileName = fullName.substring(i, firstDollar) + ".java";
} else {
diff --git
a/src/main/java/org/apache/commons/compress/harmony/unpack200/SegmentConstantPool.java
b/src/main/java/org/apache/commons/compress/harmony/unpack200/SegmentConstantPool.java
index 491f7f39b..02d04a947 100644
---
a/src/main/java/org/apache/commons/compress/harmony/unpack200/SegmentConstantPool.java
+++
b/src/main/java/org/apache/commons/compress/harmony/unpack200/SegmentConstantPool.java
@@ -112,7 +112,7 @@ public class SegmentConstantPool {
public ConstantPoolEntry getClassSpecificPoolEntry(final int cp, final
long desiredIndex, final String desiredClassName) throws Pack200Exception {
final int index = (int) desiredIndex;
int realIndex = -1;
- String[] array;
+ final String[] array;
switch (cp) {
case CP_FIELD:
array = bands.getCpFieldClass();
diff --git
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/Attribute.java
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/Attribute.java
index a0b796caf..1d94c4cff 100644
---
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/Attribute.java
+++
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/Attribute.java
@@ -45,10 +45,7 @@ public abstract class Attribute extends ClassFileEntry {
if (this == obj) {
return true;
}
- if (obj == null) {
- return false;
- }
- if (this.getClass() != obj.getClass()) {
+ if (obj == null || this.getClass() != obj.getClass()) {
return false;
}
final Attribute other = (Attribute) obj;
diff --git
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPClass.java
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPClass.java
index 529332d50..72f1e04b1 100644
---
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPClass.java
+++
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPClass.java
@@ -53,10 +53,7 @@ public class CPClass extends ConstantPoolEntry {
if (this == obj) {
return true;
}
- if (obj == null) {
- return false;
- }
- if (this.getClass() != obj.getClass()) {
+ if (obj == null || this.getClass() != obj.getClass()) {
return false;
}
final CPClass other = (CPClass) obj;
diff --git
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPConstant.java
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPConstant.java
index 356e89ef3..ae9f37a3a 100644
---
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPConstant.java
+++
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPConstant.java
@@ -43,10 +43,7 @@ public abstract class CPConstant extends ConstantPoolEntry {
if (this == obj) {
return true;
}
- if (obj == null) {
- return false;
- }
- if (this.getClass() != obj.getClass()) {
+ if (obj == null || this.getClass() != obj.getClass()) {
return false;
}
final CPConstant other = (CPConstant) obj;
diff --git
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPFieldRef.java
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPFieldRef.java
index 423ebf117..c2ba4e800 100644
---
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPFieldRef.java
+++
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPFieldRef.java
@@ -45,10 +45,7 @@ public class CPFieldRef extends ConstantPoolEntry {
if (this == obj) {
return true;
}
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
+ if (obj == null || getClass() != obj.getClass()) {
return false;
}
final CPFieldRef other = (CPFieldRef) obj;
diff --git
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPMember.java
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPMember.java
index bd71c6f64..9b274e608 100644
---
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPMember.java
+++
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPMember.java
@@ -68,10 +68,7 @@ public class CPMember extends ClassFileEntry {
if (this == obj) {
return true;
}
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
+ if (obj == null || getClass() != obj.getClass()) {
return false;
}
final CPMember other = (CPMember) obj;
diff --git
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPNameAndType.java
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPNameAndType.java
index c5247bd42..ded206022 100644
---
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPNameAndType.java
+++
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPNameAndType.java
@@ -62,10 +62,7 @@ public class CPNameAndType extends ConstantPoolEntry {
if (this == obj) {
return true;
}
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
+ if (obj == null || getClass() != obj.getClass()) {
return false;
}
final CPNameAndType other = (CPNameAndType) obj;
diff --git
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPRef.java
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPRef.java
index 1752e8655..75029bbc9 100644
---
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPRef.java
+++
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPRef.java
@@ -53,13 +53,7 @@ public abstract class CPRef extends ConstantPoolEntry {
if (this == obj) {
return true;
}
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- if (hashCode() != obj.hashCode()) {
+ if (obj == null || getClass() != obj.getClass() || hashCode() !=
obj.hashCode()) {
return false;
}
final CPRef other = (CPRef) obj;
@@ -85,7 +79,7 @@ public abstract class CPRef extends ConstantPoolEntry {
@Override
public String toString() {
if (cachedToString == null) {
- String type;
+ final String type;
if (getTag() == CP_Fieldref) {
type = "FieldRef"; //$NON-NLS-1$
} else if (getTag() == CP_Methodref) {
diff --git
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPUTF8.java
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPUTF8.java
index e3ff30107..df062aad4 100644
---
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPUTF8.java
+++
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPUTF8.java
@@ -53,10 +53,7 @@ public class CPUTF8 extends ConstantPoolEntry {
if (this == obj) {
return true;
}
- if (obj == null) {
- return false;
- }
- if (this.getClass() != obj.getClass()) {
+ if (obj == null || this.getClass() != obj.getClass()) {
return false;
}
final CPUTF8 other = (CPUTF8) obj;
diff --git
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ClassFile.java
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ClassFile.java
index 3a61ff763..386321295 100644
---
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ClassFile.java
+++
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ClassFile.java
@@ -43,7 +43,7 @@ public class ClassFile {
dos.writeShort(major);
dos.writeShort(pool.size() + 1);
for (int i = 1; i <= pool.size(); i++) {
- ConstantPoolEntry entry;
+ final ConstantPoolEntry entry;
(entry = (ConstantPoolEntry) pool.get(i)).doWrite(dos);
// Doubles and longs take up two spaces in the pool, but only one
// gets written
diff --git
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ConstantValueAttribute.java
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ConstantValueAttribute.java
index 39371eb80..f9e4d2dfe 100644
---
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ConstantValueAttribute.java
+++
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ConstantValueAttribute.java
@@ -45,10 +45,7 @@ public class ConstantValueAttribute extends Attribute {
if (this == obj) {
return true;
}
- if (!super.equals(obj)) {
- return false;
- }
- if (this.getClass() != obj.getClass()) {
+ if (!super.equals(obj) || this.getClass() != obj.getClass()) {
return false;
}
final ConstantValueAttribute other = (ConstantValueAttribute) obj;
diff --git
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ExceptionsAttribute.java
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ExceptionsAttribute.java
index a1c068d63..0f0fa9e76 100644
---
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ExceptionsAttribute.java
+++
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ExceptionsAttribute.java
@@ -57,10 +57,7 @@ public class ExceptionsAttribute extends Attribute {
if (this == obj) {
return true;
}
- if (!super.equals(obj)) {
- return false;
- }
- if (getClass() != obj.getClass()) {
+ if (!super.equals(obj) || getClass() != obj.getClass()) {
return false;
}
final ExceptionsAttribute other = (ExceptionsAttribute) obj;
diff --git
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/InnerClassesAttribute.java
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/InnerClassesAttribute.java
index 5d4dbe620..17fb503e9 100644
---
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/InnerClassesAttribute.java
+++
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/InnerClassesAttribute.java
@@ -117,10 +117,7 @@ public class InnerClassesAttribute extends Attribute {
if (this == obj) {
return true;
}
- if (!super.equals(obj)) {
- return false;
- }
- if (this.getClass() != obj.getClass()) {
+ if (!super.equals(obj) || this.getClass() != obj.getClass()) {
return false;
}
final InnerClassesAttribute other = (InnerClassesAttribute) obj;
diff --git
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/SourceFileAttribute.java
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/SourceFileAttribute.java
index fa9b0df1f..e4a588ed1 100644
---
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/SourceFileAttribute.java
+++
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/SourceFileAttribute.java
@@ -45,10 +45,7 @@ public class SourceFileAttribute extends Attribute {
if (this == obj) {
return true;
}
- if (!super.equals(obj)) {
- return false;
- }
- if (this.getClass() != obj.getClass()) {
+ if (!super.equals(obj) || this.getClass() != obj.getClass()) {
return false;
}
final SourceFileAttribute other = (SourceFileAttribute) obj;
diff --git
a/src/main/java/org/apache/commons/compress/utils/BoundedSeekableByteChannelInputStream.java
b/src/main/java/org/apache/commons/compress/utils/BoundedSeekableByteChannelInputStream.java
index 2d40e1f29..6d514f092 100644
---
a/src/main/java/org/apache/commons/compress/utils/BoundedSeekableByteChannelInputStream.java
+++
b/src/main/java/org/apache/commons/compress/utils/BoundedSeekableByteChannelInputStream.java
@@ -44,7 +44,7 @@ public class BoundedSeekableByteChannelInputStream extends
BoundedArchiveInputSt
@Override
protected int read(final long pos, final ByteBuffer buf) throws
IOException {
- int read;
+ final int read;
synchronized (channel) {
channel.position(pos);
read = channel.read(buf);
diff --git a/src/test/java/org/apache/commons/compress/archivers/ZipTest.java
b/src/test/java/org/apache/commons/compress/archivers/ZipTest.java
index 9bc80d046..d8f90592d 100644
--- a/src/test/java/org/apache/commons/compress/archivers/ZipTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/ZipTest.java
@@ -797,7 +797,7 @@ public final class ZipTest extends AbstractTest {
@Test
public void testZipArchiveEntryNewFromPath() throws Exception {
- Path archivePath;
+ final Path archivePath;
final File tmpFile = createTempFile();
final Path tmpFilePath = tmpFile.toPath();
final File archiveFile = createTempFile("test.", ".zip");
diff --git
a/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java
b/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java
index 6beaacf02..bd78c258a 100644
---
a/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java
@@ -73,7 +73,7 @@ public class TarArchiveOutputStreamTest extends AbstractTest {
}
private byte[] getResourceContents(final String name) throws IOException {
- ByteArrayOutputStream bos;
+ final ByteArrayOutputStream bos;
try (InputStream resourceAsStream =
getClass().getResourceAsStream(name)) {
bos = new ByteArrayOutputStream();
IOUtils.copy(resourceAsStream, bos);
@@ -294,7 +294,7 @@ public class TarArchiveOutputStreamTest extends
AbstractTest {
blockSize = 512;
tos = new TarArchiveOutputStream(fos);
}
- TarArchiveEntry sEntry;
+ final TarArchiveEntry sEntry;
sEntry = new TarArchiveEntry(fileName);
sEntry.setSize(contents.length);
tos.putArchiveEntry(sEntry);
diff --git
a/src/test/java/org/apache/commons/compress/archivers/tar/TarUtilsTest.java
b/src/test/java/org/apache/commons/compress/archivers/tar/TarUtilsTest.java
index b7b99941e..176b4963e 100644
--- a/src/test/java/org/apache/commons/compress/archivers/tar/TarUtilsTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/tar/TarUtilsTest.java
@@ -54,17 +54,15 @@ public class TarUtilsTest extends AbstractTest {
private void checkRoundTripOctal(final long value, final int bufsize) {
final byte[] buffer = new byte[bufsize];
- long parseValue;
TarUtils.formatLongOctalBytes(value, buffer, 0, buffer.length);
- parseValue = TarUtils.parseOctal(buffer, 0, buffer.length);
+ final long parseValue = TarUtils.parseOctal(buffer, 0, buffer.length);
assertEquals(value, parseValue);
}
private void checkRoundTripOctalOrBinary(final long value, final int
bufsize) {
final byte[] buffer = new byte[bufsize];
- long parseValue;
TarUtils.formatLongOctalOrBinaryBytes(value, buffer, 0, buffer.length);
- parseValue = TarUtils.parseOctalOrBinary(buffer, 0, buffer.length);
+ final long parseValue = TarUtils.parseOctalOrBinary(buffer, 0,
buffer.length);
assertEquals(value, parseValue);
}
diff --git
a/src/test/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestampTest.java
b/src/test/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestampTest.java
index d18b54bae..595ac6e46 100644
---
a/src/test/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestampTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestampTest.java
@@ -492,7 +492,7 @@ public class X5455_ExtendedTimestampTest {
final String name = zae.getName();
final int x = name.lastIndexOf('/');
final String yearString = name.substring(x + 1);
- int year;
+ final int year;
try {
year = Integer.parseInt(yearString);
} catch (final NumberFormatException nfe) {
diff --git
a/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportIT.java
b/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportIT.java
index b9ef1a0c7..b1879e2ba 100644
---
a/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportIT.java
+++
b/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportIT.java
@@ -166,7 +166,7 @@ public class Zip64SupportIT {
ZipFile zipFile = null;
try {
zipFile = ZipFile.builder().setFile(file).get();
- AtomicInteger files = new AtomicInteger();
+ final AtomicInteger files = new AtomicInteger();
zipFile.stream().filter(e -> !e.isDirectory()).forEach(e -> {
files.incrementAndGet();
assertEquals(0, e.getSize());
diff --git
a/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java
b/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java
index 79b76cee1..9dd62290d 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java
@@ -92,7 +92,7 @@ public class ZipFileTest extends AbstractTest {
// big buffer at the beginning and then chunks by IOUtils read
try (InputStream stream = zf.getInputStream(entry)) {
- byte[] full;
+ final byte[] full;
final byte[] bytes = new byte[0x40000];
final int read = stream.read(bytes);
if (read < 0) {
@@ -105,7 +105,7 @@ public class ZipFileTest extends AbstractTest {
// small chunk / single byte and big buffer then
try (InputStream stream = zf.getInputStream(entry)) {
- byte[] full;
+ final byte[] full;
final int single = stream.read();
if (single < 0) {
full = ByteUtils.EMPTY_BYTE_ARRAY;
@@ -286,7 +286,7 @@ public class ZipFileTest extends AbstractTest {
@Test
public void testConcurrentReadSeekable() throws Exception {
// mixed.zip contains both inflated and stored files
- byte[] data;
+ final byte[] data;
try (InputStream fis = newInputStream("mixed.zip")) {
data = IOUtils.toByteArray(fis);
}
diff --git
a/src/test/java/org/apache/commons/compress/archivers/zip/ZipMemoryFileSystemTest.java
b/src/test/java/org/apache/commons/compress/archivers/zip/ZipMemoryFileSystemTest.java
index 577db0794..bf75e170f 100644
---
a/src/test/java/org/apache/commons/compress/archivers/zip/ZipMemoryFileSystemTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/zip/ZipMemoryFileSystemTest.java
@@ -438,7 +438,7 @@ public class ZipMemoryFileSystemTest {
outputStream.write(textFileInMemSys);
outputStream.closeArchiveEntry();
outputStream.finish();
- List<Path> splitZips;
+ final List<Path> splitZips;
try (Stream<Path> paths = Files.walk(dir, 1)) {
splitZips = paths.filter(Files::isRegularFile).peek(path
-> println("Found: " + path.toAbsolutePath())).collect(Collectors.toList());
}
@@ -529,7 +529,7 @@ public class ZipMemoryFileSystemTest {
zipOut.closeArchiveEntry();
zipOut.finish();
- List<Path> splitZips;
+ final List<Path> splitZips;
try (Stream<Path> paths = Files.walk(fileSystem.getPath("."),
1)) {
splitZips = paths.filter(Files::isRegularFile).peek(path
-> println("Found: " + path.toAbsolutePath())).collect(Collectors.toList());
}
diff --git
a/src/test/java/org/apache/commons/compress/compressors/BZip2Test.java
b/src/test/java/org/apache/commons/compress/compressors/BZip2Test.java
index 1d9b32c74..752141e1e 100644
--- a/src/test/java/org/apache/commons/compress/compressors/BZip2Test.java
+++ b/src/test/java/org/apache/commons/compress/compressors/BZip2Test.java
@@ -43,7 +43,7 @@ public final class BZip2Test extends AbstractTest {
@Test
public void testBzipCreation() throws Exception {
- File output;
+ final File output;
final File input = getFile("test.txt");
{
output = newTempFile("test.txt.bz2");
diff --git
a/src/test/java/org/apache/commons/compress/compressors/gzip/GzipCompressorOutputStreamTest.java
b/src/test/java/org/apache/commons/compress/compressors/gzip/GzipCompressorOutputStreamTest.java
index 83cc78f9a..1fd9bced0 100644
---
a/src/test/java/org/apache/commons/compress/compressors/gzip/GzipCompressorOutputStreamTest.java
+++
b/src/test/java/org/apache/commons/compress/compressors/gzip/GzipCompressorOutputStreamTest.java
@@ -151,7 +151,7 @@ public class GzipCompressorOutputStreamTest {
assertEquals(subFieldCount == 0, extra2.isEmpty());
assertEquals(subFieldCount, extra2.size());
assertEquals(4 * subFieldCount + subFieldCount * payloadSize,
extra2.getEncodedSize());
- ArrayList<SubField> listCopy = new ArrayList<>();
+ final ArrayList<SubField> listCopy = new ArrayList<>();
extra2.forEach(listCopy::add);
assertEquals(subFieldCount, listCopy.size());
for (int i = 0; i < subFieldCount; i++) {
diff --git
a/src/test/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStreamTest.java
b/src/test/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStreamTest.java
index 3bf817747..07d40f257 100644
---
a/src/test/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStreamTest.java
+++
b/src/test/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStreamTest.java
@@ -60,7 +60,7 @@ public final class FramedLZ4CompressorInputStreamTest extends
AbstractTest {
}
private void readDoubledBlaLz4(final StreamWrapper wrapper, final boolean
expectDuplicateOutput) throws Exception {
- byte[] singleInput;
+ final byte[] singleInput;
try (InputStream i = newInputStream("bla.tar.lz4")) {
singleInput = IOUtils.toByteArray(i);
}
diff --git
a/src/test/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorRoundtripTest.java
b/src/test/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorRoundtripTest.java
index 4f1d27cd6..fef30c24f 100644
---
a/src/test/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorRoundtripTest.java
+++
b/src/test/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorRoundtripTest.java
@@ -77,7 +77,7 @@ public final class FramedLZ4CompressorRoundtripTest extends
AbstractTest {
private void roundTripTest(final String testFile, final
FramedLZ4CompressorOutputStream.Parameters params) throws IOException {
final File input = getFile(testFile);
- byte[] expected;
+ final byte[] expected;
try (InputStream is = Files.newInputStream(input.toPath())) {
expected = IOUtils.toByteArray(is);
}
diff --git
a/src/test/java/org/apache/commons/compress/utils/BoundedSeekableByteChannelInputStreamTest.java
b/src/test/java/org/apache/commons/compress/utils/BoundedSeekableByteChannelInputStreamTest.java
index 41f1a9741..58729c5ec 100644
---
a/src/test/java/org/apache/commons/compress/utils/BoundedSeekableByteChannelInputStreamTest.java
+++
b/src/test/java/org/apache/commons/compress/utils/BoundedSeekableByteChannelInputStreamTest.java
@@ -28,7 +28,7 @@ public class BoundedSeekableByteChannelInputStreamTest {
@Test
public void testCheckRestrictedRead() throws IOException {
- byte[] readContent;
+ final byte[] readContent;
try (SeekableInMemoryByteChannel channel = new
SeekableInMemoryByteChannel("Hello World!".getBytes(UTF_8));
BoundedSeekableByteChannelInputStream input = new
BoundedSeekableByteChannelInputStream(0, 5, channel)) {
readContent = IOUtils.toByteArray(input);
