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
commit 7685a3bff6ea740ef1dfeb81f3d6fe87362e093c
Author: Gary D. Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Dec 29 10:51:47 2024 -0500
Add Checkstyle MultipleVariableDeclarations
---
.../compress/archivers/sevenz/SevenZArchiveEntry.java | 6 ++++--
.../zip/Zip64ExtendedInformationExtraField.java | 4 +++-
.../compress/archivers/zip/ZipArchiveInputStream.java | 3 ++-
.../commons/compress/archivers/zip/ZipFile.java | 4 +++-
.../commons/compress/compressors/FileNameUtil.java | 6 ++++--
.../compressors/bzip2/BZip2CompressorInputStream.java | 3 ++-
.../commons/compress/compressors/bzip2/BlockSort.java | 18 +++++++++++++++---
.../lz4/BlockLZ4CompressorOutputStream.java | 4 +++-
.../lz4/FramedLZ4CompressorInputStream.java | 3 ++-
.../lz4/FramedLZ4CompressorOutputStream.java | 12 ++++++++++--
.../compressors/lz77support/LZ77Compressor.java | 8 ++++++--
.../compress/compressors/lz77support/Parameters.java | 19 +++++++++++++++----
.../snappy/FramedSnappyCompressorInputStream.java | 3 ++-
.../compressors/snappy/FramedSnappyDialect.java | 6 +++++-
.../compress/harmony/pack200/CodecEncoding.java | 3 ++-
.../compress/harmony/pack200/PopulationCodec.java | 6 ++++--
.../compress/harmony/unpack200/ClassBands.java | 10 +++++++++-
.../compress/utils/SeekableInMemoryByteChannel.java | 3 ++-
.../apache/commons/compress/archivers/SevenZTest.java | 3 ++-
.../compressors/lz77support/LZ77CompressorTest.java | 4 +++-
.../commons/compress/harmony/pack200/HelloWorld.java | 7 +++++--
21 files changed, 103 insertions(+), 32 deletions(-)
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 a7a2fceed..5686ebc79 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
@@ -78,8 +78,10 @@ public class SevenZArchiveEntry implements ArchiveEntry {
private boolean hasWindowsAttributes;
private int windowsAttributes;
private boolean hasCrc;
- private long crc, compressedCrc;
- private long size, compressedSize;
+ private long crc;
+ private long compressedCrc;
+ private long size;
+ private long compressedSize;
private Iterable<? extends SevenZMethodConfiguration> contentMethods;
/**
diff --git
a/src/main/java/org/apache/commons/compress/archivers/zip/Zip64ExtendedInformationExtraField.java
b/src/main/java/org/apache/commons/compress/archivers/zip/Zip64ExtendedInformationExtraField.java
index e3138bc04..fd79f4cdb 100644
---
a/src/main/java/org/apache/commons/compress/archivers/zip/Zip64ExtendedInformationExtraField.java
+++
b/src/main/java/org/apache/commons/compress/archivers/zip/Zip64ExtendedInformationExtraField.java
@@ -45,7 +45,9 @@ public class Zip64ExtendedInformationExtraField implements
ZipExtraField {
static final ZipShort HEADER_ID = new ZipShort(0x0001);
private static final String LFH_MUST_HAVE_BOTH_SIZES_MSG = "Zip64 extended
information must contain" + " both size values in the local file header.";
- private ZipEightByteInteger size, compressedSize, relativeHeaderOffset;
+ private ZipEightByteInteger size;
+ private ZipEightByteInteger compressedSize;
+ private ZipEightByteInteger relativeHeaderOffset;
private ZipLong diskStart;
/**
diff --git
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
index ecf38442c..c45e73973 100644
---
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
+++
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
@@ -703,7 +703,8 @@ public class ZipArchiveInputStream extends
ArchiveInputStream<ZipArchiveEntry> i
current.entry.setTime(time);
off += WORD;
- ZipLong size = null, cSize = null;
+ ZipLong size = null;
+ ZipLong cSize = null;
if (!current.hasDataDescriptor) {
current.entry.setCrc(ZipLong.getValue(lfhBuf, off));
off += WORD;
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 3bee216dd..b99a45e10 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
@@ -719,7 +719,9 @@ public class ZipFile implements Closeable {
private final ByteBuffer shortBbuf = ByteBuffer.wrap(shortBuf);
- private long centralDirectoryStartDiskNumber,
centralDirectoryStartRelativeOffset;
+ private long centralDirectoryStartDiskNumber;
+
+ private long centralDirectoryStartRelativeOffset;
private long centralDirectoryStartOffset;
diff --git
a/src/main/java/org/apache/commons/compress/compressors/FileNameUtil.java
b/src/main/java/org/apache/commons/compress/compressors/FileNameUtil.java
index d8c593bff..56969d4c0 100644
--- a/src/main/java/org/apache/commons/compress/compressors/FileNameUtil.java
+++ b/src/main/java/org/apache/commons/compress/compressors/FileNameUtil.java
@@ -80,8 +80,10 @@ public class FileNameUtil {
*/
public FileNameUtil(final Map<String, String> uncompressSuffix, final
String defaultExtension) {
this.uncompressSuffix = Collections.unmodifiableMap(uncompressSuffix);
- int lc = Integer.MIN_VALUE, sc = Integer.MAX_VALUE;
- int lu = Integer.MIN_VALUE, su = Integer.MAX_VALUE;
+ int lc = Integer.MIN_VALUE;
+ int sc = Integer.MAX_VALUE;
+ int lu = Integer.MIN_VALUE;
+ int su = Integer.MAX_VALUE;
for (final Map.Entry<String, String> ent :
uncompressSuffix.entrySet()) {
final int cl = ent.getKey().length();
if (cl > lc) {
diff --git
a/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java
b/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java
index cd4857444..bdf9ed6e2 100644
---
a/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java
+++
b/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java
@@ -228,7 +228,8 @@ public class BZip2CompressorInputStream extends
CompressorInputStream implements
private BitInputStream bin;
private final boolean decompressConcatenated;
private int currentState = START_BLOCK_STATE;
- private int storedBlockCRC, storedCombinedCRC;
+ private int storedBlockCRC;
+ private int storedCombinedCRC;
private int computedCombinedCRC;
private int su_count;
private int su_ch2;
diff --git
a/src/main/java/org/apache/commons/compress/compressors/bzip2/BlockSort.java
b/src/main/java/org/apache/commons/compress/compressors/bzip2/BlockSort.java
index 904f4ebd5..b4e77ab08 100644
--- a/src/main/java/org/apache/commons/compress/compressors/bzip2/BlockSort.java
+++ b/src/main/java/org/apache/commons/compress/compressors/bzip2/BlockSort.java
@@ -248,8 +248,13 @@ final class BlockSort {
* @param hiSt upper boundary of the fmap-interval to be sorted
*/
private void fallbackQSort3(final int[] fmap, final int[] eclass, final
int loSt, final int hiSt) {
- int lo, unLo, ltLo, hi, unHi, gtHi, n;
-
+ int lo;
+ int unLo;
+ int ltLo;
+ int hi;
+ int unHi;
+ int gtHi;
+ int n;
long r = 0;
int sp = 0;
fpush(sp++, loSt, hiSt);
@@ -416,7 +421,14 @@ final class BlockSort {
*/
void fallbackSort(final int[] fmap, final byte[] block, final int nblock) {
final int[] ftab = new int[257];
- int H, i, j, k, l, r, cc, cc1;
+ int H;
+ int i;
+ int j;
+ int k;
+ int l;
+ int r;
+ int cc;
+ int cc1;
int nNotDone;
final int nBhtab;
final int[] eclass = getEclass();
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 cfab36254..1631be275 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
@@ -59,7 +59,9 @@ public class BlockLZ4CompressorOutputStream extends
CompressorOutputStream<Outpu
private int literalLength;
- private int brOffset, brLength;
+ private int brOffset;
+
+ private int brLength;
private boolean written;
diff --git
a/src/main/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStream.java
b/src/main/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStream.java
index 4ec172468..5e5f19265 100644
---
a/src/main/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStream.java
+++
b/src/main/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStream.java
@@ -105,7 +105,8 @@ public class FramedLZ4CompressorInputStream extends
CompressorInputStream implem
private InputStream currentBlock;
- private boolean endReached, inUncompressed;
+ private boolean endReached;
+ private boolean inUncompressed;
/** Used for frame header checksum and content checksum, if present. */
private final org.apache.commons.codec.digest.XXHash32 contentHash = new
org.apache.commons.codec.digest.XXHash32();
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 02ebee128..73171b549 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
@@ -42,16 +42,21 @@ public class FramedLZ4CompressorOutputStream extends
CompressorOutputStream<Outp
* The block sizes supported by the format.
*/
public enum BlockSize {
+
/** Block size of 64K */
K64(64 * 1024, 4),
+
/** Block size of 256K */
K256(256 * 1024, 5),
+
/** Block size of 1M */
M1(1024 * 1024, 6),
+
/** Block size of 4M */
M4(4096 * 1024, 7);
- private final int size, index;
+ private final int size;
+ private final int index;
BlockSize(final int size, final int index) {
this.size = size;
@@ -71,6 +76,7 @@ public class FramedLZ4CompressorOutputStream extends
CompressorOutputStream<Outp
* Parameters of the LZ4 frame format.
*/
public static class Parameters {
+
/**
* The default parameters of 4M block size, enabled content checksum,
disabled block checksums and independent blocks.
*
@@ -80,7 +86,9 @@ public class FramedLZ4CompressorOutputStream extends
CompressorOutputStream<Outp
*/
public static final Parameters DEFAULT = new Parameters(BlockSize.M4,
true, false, false);
private final BlockSize blockSize;
- private final boolean withContentChecksum, withBlockChecksum,
withBlockDependency;
+ private final boolean withContentChecksum;
+ private final boolean withBlockChecksum;
+ private final boolean withBlockDependency;
private final
org.apache.commons.compress.compressors.lz77support.Parameters lz77params;
diff --git
a/src/main/java/org/apache/commons/compress/compressors/lz77support/LZ77Compressor.java
b/src/main/java/org/apache/commons/compress/compressors/lz77support/LZ77Compressor.java
index f839040eb..aafd84ef9 100644
---
a/src/main/java/org/apache/commons/compress/compressors/lz77support/LZ77Compressor.java
+++
b/src/main/java/org/apache/commons/compress/compressors/lz77support/LZ77Compressor.java
@@ -82,7 +82,9 @@ public class LZ77Compressor {
* Represents a back-reference.
*/
public static final class BackReference extends Block {
- private final int offset, length;
+
+ private final int offset;
+ private final int length;
public BackReference(final int offset, final int length) {
this.offset = offset;
@@ -170,8 +172,10 @@ public class LZ77Compressor {
* </p>
*/
public static final class LiteralBlock extends Block {
+
private final byte[] data;
- private final int offset, length;
+ private final int offset;
+ private final int length;
public LiteralBlock(final byte[] data, final int offset, final int
length) {
this.data = data;
diff --git
a/src/main/java/org/apache/commons/compress/compressors/lz77support/Parameters.java
b/src/main/java/org/apache/commons/compress/compressors/lz77support/Parameters.java
index 8a3384a5e..1342b19c9 100644
---
a/src/main/java/org/apache/commons/compress/compressors/lz77support/Parameters.java
+++
b/src/main/java/org/apache/commons/compress/compressors/lz77support/Parameters.java
@@ -29,8 +29,13 @@ public final class Parameters {
public static class Builder {
private final int windowSize;
- private int minBackReferenceLength, maxBackReferenceLength, maxOffset,
maxLiteralLength;
- private Integer niceBackReferenceLength, maxCandidates, lazyThreshold;
+ private int minBackReferenceLength;
+ private int maxBackReferenceLength;
+ private int maxOffset;
+ private int maxLiteralLength;
+ private Integer niceBackReferenceLength;
+ private Integer maxCandidates;
+ private Integer lazyThreshold;
private Boolean lazyMatches;
private Builder(final int windowSize) {
@@ -259,8 +264,14 @@ public final class Parameters {
return (x & x - 1) == 0;
}
- private final int windowSize, minBackReferenceLength,
maxBackReferenceLength, maxOffset, maxLiteralLength, niceBackReferenceLength,
maxCandidates,
- lazyThreshold;
+ private final int windowSize;
+ private final int minBackReferenceLength;
+ private final int maxBackReferenceLength;
+ private final int maxOffset;
+ private final int maxLiteralLength;
+ private final int niceBackReferenceLength;
+ private final int maxCandidates;
+ private final int lazyThreshold;
private final boolean lazyMatching;
diff --git
a/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java
b/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java
index 06ad986a2..d7298c90e 100644
---
a/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java
+++
b/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java
@@ -108,7 +108,8 @@ public class FramedSnappyCompressorInputStream extends
CompressorInputStream imp
// used in no-arg read method
private final byte[] oneByte = new byte[1];
- private boolean endReached, inUncompressedChunk;
+ private boolean endReached;
+ private boolean inUncompressedChunk;
private int uncompressedBytesRemaining;
private long expectedChecksum = -1;
diff --git
a/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyDialect.java
b/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyDialect.java
index 18a9d5d70..55a00f8f5 100644
---
a/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyDialect.java
+++
b/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyDialect.java
@@ -24,16 +24,20 @@ package org.apache.commons.compress.compressors.snappy;
* @since 1.12
*/
public enum FramedSnappyDialect {
+
/**
* The standard as defined by the <a
href="https://github.com/google/snappy/blob/master/framing_format.txt";>Snappy
framing format description</a>
*/
STANDARD(true, true),
+
/**
* The format used by Apple's iWork Archives (.iwa files).
*/
IWORK_ARCHIVE(false, false);
- private final boolean streamIdentifier, checksumWithCompressedChunks;
+ private final boolean streamIdentifier;
+
+ private final boolean checksumWithCompressedChunks;
FramedSnappyDialect(final boolean hasStreamIdentifier, final boolean
usesChecksumWithCompressedChunks) {
this.streamIdentifier = hasStreamIdentifier;
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 d0db53990..48499f894 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
@@ -133,7 +133,8 @@ public class CodecEncoding {
}
final int kb = kbflag ? in.read() : 3;
final int k = (kb + 1) * (int) Math.pow(16, kx);
- final Codec aCodec, bCodec;
+ final Codec aCodec;
+ final Codec bCodec;
if (adef) {
aCodec = defaultCodec;
} 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 e3d7ce7e7..92c7a8485 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
@@ -66,9 +66,11 @@ public class PopulationCodec extends Codec {
// less
final int[] result;
// read table of favorites first
- int smallest = Integer.MAX_VALUE, absoluteSmallest;
+ int smallest = Integer.MAX_VALUE;
+ int absoluteSmallest;
int last = 0;
- int value = 0, absoluteValue;
+ int value = 0;
+ int absoluteValue;
int k = -1;
while (true) {
value = favouredCodec.decode(in, last);
diff --git
a/src/main/java/org/apache/commons/compress/harmony/unpack200/ClassBands.java
b/src/main/java/org/apache/commons/compress/harmony/unpack200/ClassBands.java
index eaf7575a0..6cbfd41e9 100644
---
a/src/main/java/org/apache/commons/compress/harmony/unpack200/ClassBands.java
+++
b/src/main/java/org/apache/commons/compress/harmony/unpack200/ClassBands.java
@@ -923,7 +923,15 @@ public class ClassBands extends BandSet {
pairCount = RxACount[i];
}
mbg[i].T = decodeBandInt(contextName + "_" + rxa + "_T", in,
Codec.BYTE1, pairCount + backwardsCallCounts[i]);
- int ICount = 0, DCount = 0, FCount = 0, JCount = 0, cCount = 0,
eCount = 0, sCount = 0, arrayCount = 0, atCount = 0;
+ int ICount = 0;
+ int DCount = 0;
+ int FCount = 0;
+ int JCount = 0;
+ int cCount = 0;
+ int eCount = 0;
+ int sCount = 0;
+ int arrayCount = 0;
+ int atCount = 0;
for (final int element : mbg[i].T) {
final char c = (char) element;
switch (c) {
diff --git
a/src/main/java/org/apache/commons/compress/utils/SeekableInMemoryByteChannel.java
b/src/main/java/org/apache/commons/compress/utils/SeekableInMemoryByteChannel.java
index 3401c3157..0ee624aaf 100644
---
a/src/main/java/org/apache/commons/compress/utils/SeekableInMemoryByteChannel.java
+++
b/src/main/java/org/apache/commons/compress/utils/SeekableInMemoryByteChannel.java
@@ -43,7 +43,8 @@ public class SeekableInMemoryByteChannel implements
SeekableByteChannel {
private byte[] data;
private final AtomicBoolean closed = new AtomicBoolean();
- private int position, size;
+ private int position;
+ private int size;
/**
* Constructs a new instance using a default empty buffer.
diff --git
a/src/test/java/org/apache/commons/compress/archivers/SevenZTest.java
b/src/test/java/org/apache/commons/compress/archivers/SevenZTest.java
index 80502a213..3b97fe70c 100644
--- a/src/test/java/org/apache/commons/compress/archivers/SevenZTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/SevenZTest.java
@@ -49,7 +49,8 @@ public class SevenZTest extends AbstractTest {
private File output;
- private final File file1, file2;
+ private final File file1;
+ private final File file2;
public SevenZTest() throws IOException {
file1 = getFile("test1.xml");
diff --git
a/src/test/java/org/apache/commons/compress/compressors/lz77support/LZ77CompressorTest.java
b/src/test/java/org/apache/commons/compress/compressors/lz77support/LZ77CompressorTest.java
index 88b12a84e..cf3e8d894 100644
---
a/src/test/java/org/apache/commons/compress/compressors/lz77support/LZ77CompressorTest.java
+++
b/src/test/java/org/apache/commons/compress/compressors/lz77support/LZ77CompressorTest.java
@@ -32,7 +32,9 @@ import org.junit.jupiter.api.Test;
public class LZ77CompressorTest {
- private static final byte[] BLA, SAM, ONE_TO_TEN;
+ private static final byte[] BLA;
+ private static final byte[] SAM;
+ private static final byte[] ONE_TO_TEN;
static {
/*
diff --git
a/src/test/java/org/apache/commons/compress/harmony/pack200/HelloWorld.java
b/src/test/java/org/apache/commons/compress/harmony/pack200/HelloWorld.java
index 68480ecba..61acb7b47 100644
--- a/src/test/java/org/apache/commons/compress/harmony/pack200/HelloWorld.java
+++ b/src/test/java/org/apache/commons/compress/harmony/pack200/HelloWorld.java
@@ -27,8 +27,11 @@ public class HelloWorld {
System.out.println("Hello world");
}
- int i = 97, j = 42, k = 12345;
- float f = 3.142f, g = 2.718f;
+ int i = 97;
+ int j = 42;
+ int k = 12345;
+ float f = 3.142f;
+ float g = 2.718f;
long l = 299792458;
double d = 4.0d;
