* Remove redundant initializer
* Remove not use return value
diff --git a/src/main/java/org/apache/commons/compress/archivers/ArchiveInputStream.java b/src/main/java/org/apache/commons/compress/archivers/ArchiveInputStream.java
index 9c4e978..2f03a45 100644
--- a/src/main/java/org/apache/commons/compress/archivers/ArchiveInputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/ArchiveInputStream.java
@@ -43,7 +43,7 @@
private static final int BYTE_MASK = 0xFF;
/** holds the number of bytes read in this stream */
- private long bytesRead = 0;
+ private long bytesRead;
/**
* Returns the next Archive Entry in this Stream.
diff --git a/src/main/java/org/apache/commons/compress/archivers/ArchiveOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/ArchiveOutputStream.java
index deadde5..a686c46 100644
--- a/src/main/java/org/apache/commons/compress/archivers/ArchiveOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/ArchiveOutputStream.java
@@ -53,7 +53,7 @@
static final int BYTE_MASK = 0xFF;
/** holds the number of bytes written to this stream */
- private long bytesWritten = 0;
+ private long bytesWritten;
// Methods specific to ArchiveOutputStream
/**
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 b696555..36ef33f 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
@@ -37,17 +37,17 @@
public class ArArchiveInputStream extends ArchiveInputStream {
private final InputStream input;
- private long offset = 0;
+ private long offset;
private boolean closed;
/*
* If getNextEntry has been called, the entry metadata is stored in
* currentEntry.
*/
- private ArArchiveEntry currentEntry = null;
+ private ArArchiveEntry currentEntry;
// Storage area for extra long names (GNU ar)
- private byte[] namebuffer = null;
+ private byte[] namebuffer;
/*
* The offset where the current entry started. -1 if no entry has been
diff --git a/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java
index 2de91ca..7eb4071 100644
--- a/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java
@@ -42,13 +42,13 @@
public static final int LONGFILE_BSD = 1;
private final OutputStream out;
- private long entryOffset = 0;
+ private long entryOffset;
private ArArchiveEntry prevEntry;
- private boolean haveUnclosedEntry = false;
+ private boolean haveUnclosedEntry;
private int longFileMode = LONGFILE_ERROR;
/** indicates if this archive is finished */
- private boolean finished = false;
+ private boolean finished;
public ArArchiveOutputStream(final OutputStream pOut) {
this.out = pOut;
@@ -66,10 +66,9 @@
this.longFileMode = longFileMode;
}
- private long writeArchiveHeader() throws IOException {
+ private void writeArchiveHeader() throws IOException {
final byte [] header = ArchiveUtils.toAsciiBytes(ArArchiveEntry.HEADER);
out.write(header);
- return header.length;
}
@Override
@@ -131,7 +130,7 @@
return bytes.length;
}
- private long writeEntryHeader(final ArArchiveEntry pEntry) throws IOException {
+ private void writeEntryHeader(final ArArchiveEntry pEntry) throws IOException {
long offset = 0;
boolean mustAppendName = false;
@@ -195,7 +194,6 @@
offset += write(n);
}
- return offset;
}
@Override
diff --git a/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveInputStream.java b/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveInputStream.java
index 06b3274..8a420c0 100644
--- a/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveInputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveInputStream.java
@@ -47,8 +47,8 @@
private final DataInputStream in;
private final String charsetName;
private final MainHeader mainHeader;
- private LocalFileHeader currentLocalFileHeader = null;
- private InputStream currentInputStream = null;
+ private LocalFileHeader currentLocalFileHeader;
+ private InputStream currentInputStream;
/**
* Constructs the ArjInputStream, taking ownership of the inputStream that is passed in.
diff --git a/src/main/java/org/apache/commons/compress/archivers/arj/LocalFileHeader.java b/src/main/java/org/apache/commons/compress/archivers/arj/LocalFileHeader.java
index b77a8a5..d33bb6c 100644
--- a/src/main/java/org/apache/commons/compress/archivers/arj/LocalFileHeader.java
+++ b/src/main/java/org/apache/commons/compress/archivers/arj/LocalFileHeader.java
@@ -45,7 +45,7 @@
String name;
String comment;
- byte[][] extendedHeaders = null;
+ byte[][] extendedHeaders;
static class Flags {
static final int GARBLED = 0x01;
diff --git a/src/main/java/org/apache/commons/compress/archivers/arj/MainHeader.java b/src/main/java/org/apache/commons/compress/archivers/arj/MainHeader.java
index 954fef9..2dba92e 100644
--- a/src/main/java/org/apache/commons/compress/archivers/arj/MainHeader.java
+++ b/src/main/java/org/apache/commons/compress/archivers/arj/MainHeader.java
@@ -39,7 +39,7 @@
int arjFlags2;
String name;
String comment;
- byte[] extendedHeaderBytes = null;
+ byte[] extendedHeaderBytes;
static class Flags {
static final int GARBLED = 0x01;
diff --git a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveEntry.java b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveEntry.java
index 6797e5d..9fa4948 100644
--- a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveEntry.java
+++ b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveEntry.java
@@ -168,32 +168,32 @@
// Header fields
- private long chksum = 0;
+ private long chksum;
/** Number of bytes in the file */
- private long filesize = 0;
+ private long filesize;
- private long gid = 0;
+ private long gid;
- private long inode = 0;
+ private long inode;
- private long maj = 0;
+ private long maj;
- private long min = 0;
+ private long min;
- private long mode = 0;
+ private long mode;
- private long mtime = 0;
+ private long mtime;
private String name;
- private long nlink = 0;
+ private long nlink;
- private long rmaj = 0;
+ private long rmaj;
- private long rmin = 0;
+ private long rmin;
- private long uid = 0;
+ private long uid;
/**
* Creates a CpioArchiveEntry with a specified format.
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 9316bbf..38a8e0c 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
@@ -67,17 +67,17 @@
public class CpioArchiveInputStream extends ArchiveInputStream implements
CpioConstants {
- private boolean closed = false;
+ private boolean closed;
private CpioArchiveEntry entry;
- private long entryBytesRead = 0;
+ private long entryBytesRead;
- private boolean entryEOF = false;
+ private boolean entryEOF;
private final byte[] tmpbuf = new byte[4096];
- private long crc = 0;
+ private long crc;
private final InputStream in;
diff --git a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
index e605c32..0aa6065 100644
--- a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
@@ -69,7 +69,7 @@
private CpioArchiveEntry entry;
- private boolean closed = false;
+ private boolean closed;
/** indicates if this archive is finished */
private boolean finished;
@@ -82,7 +82,7 @@
private final HashMap<String, CpioArchiveEntry> names =
new HashMap<>();
- private long crc = 0;
+ private long crc;
private long written;
diff --git a/src/main/java/org/apache/commons/compress/archivers/dump/TapeInputStream.java b/src/main/java/org/apache/commons/compress/archivers/dump/TapeInputStream.java
index dee53dd..25829f2 100644
--- a/src/main/java/org/apache/commons/compress/archivers/dump/TapeInputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/dump/TapeInputStream.java
@@ -40,8 +40,8 @@
private int blockSize = DumpArchiveConstants.TP_SIZE;
private static final int RECORD_SIZE = DumpArchiveConstants.TP_SIZE;
private int readOffset = DumpArchiveConstants.TP_SIZE;
- private boolean isCompressed = false;
- private long bytesRead = 0;
+ private boolean isCompressed;
+ private long bytesRead;
/**
* Constructor
diff --git a/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveOutputStream.java
index 5e2c7a8..4e47c53 100644
--- a/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveOutputStream.java
@@ -35,7 +35,7 @@
*/
public class JarArchiveOutputStream extends ZipArchiveOutputStream {
- private boolean jarMarkerAdded = false;
+ private boolean jarMarkerAdded;
public JarArchiveOutputStream(final OutputStream out) {
super(out);
diff --git a/src/main/java/org/apache/commons/compress/archivers/sevenz/AES256SHA256Decoder.java b/src/main/java/org/apache/commons/compress/archivers/sevenz/AES256SHA256Decoder.java
index 45f468b..3cac16b 100644
--- a/src/main/java/org/apache/commons/compress/archivers/sevenz/AES256SHA256Decoder.java
+++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/AES256SHA256Decoder.java
@@ -34,8 +34,8 @@
InputStream decode(final String archiveName, final InputStream in, final long uncompressedLength,
final Coder coder, final byte[] passwordBytes, final int maxMemoryLimitInKb) throws IOException {
return new InputStream() {
- private boolean isInitialized = false;
- private CipherInputStream cipherInputStream = null;
+ private boolean isInitialized;
+ private CipherInputStream cipherInputStream;
private CipherInputStream init() throws IOException {
if (isInitialized) {
diff --git a/src/main/java/org/apache/commons/compress/archivers/sevenz/Coder.java b/src/main/java/org/apache/commons/compress/archivers/sevenz/Coder.java
index cbd271d..e8cbe25 100644
--- a/src/main/java/org/apache/commons/compress/archivers/sevenz/Coder.java
+++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/Coder.java
@@ -21,5 +21,5 @@
byte[] decompressionMethodId;
long numInStreams;
long numOutStreams;
- byte[] properties = null;
+ byte[] properties;
}
diff --git a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
index 80d2f8a..dcdb5e3 100644
--- a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
+++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
@@ -93,7 +93,7 @@
private final Archive archive;
private int currentEntryIndex = -1;
private int currentFolderIndex = -1;
- private InputStream currentFolderInputStream = null;
+ private InputStream currentFolderInputStream;
private byte[] password;
private final SevenZFileOptions options;
diff --git a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java
index 743b94c..21be436 100644
--- a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java
+++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java
@@ -56,11 +56,11 @@
public class SevenZOutputFile implements Closeable {
private final SeekableByteChannel channel;
private final List<SevenZArchiveEntry> files = new ArrayList<>();
- private int numNonEmptyStreams = 0;
+ private int numNonEmptyStreams;
private final CRC32 crc32 = new CRC32();
private final CRC32 compressedCrc32 = new CRC32();
- private long fileBytesWritten = 0;
- private boolean finished = false;
+ private long fileBytesWritten;
+ private boolean finished;
private CountingOutputStream currentOutputStream;
private CountingOutputStream[] additionalCountingStreams;
private Iterable<? extends SevenZMethodConfiguration> contentMethods =
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 7522ad9..12da7bb 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
@@ -179,13 +179,13 @@
private int mode;
/** The entry's user id. */
- private long userId = 0;
+ private long userId;
/** The entry's group id. */
- private long groupId = 0;
+ private long groupId;
/** The entry's size. */
- private long size = 0;
+ private long size;
/** The entry's modification time. */
private long modTime;
@@ -211,10 +211,10 @@
private String groupName = "";
/** The entry's major device number. */
- private int devMajor = 0;
+ private int devMajor;
/** The entry's minor device number. */
- private int devMinor = 0;
+ private int devMinor;
/** The sparse headers in tar */
private List<TarArchiveStructSparse> sparseHeaders;
@@ -230,7 +230,7 @@
/** is this entry a GNU sparse entry using 1.X PAX formats?
* the sparse headers of 1.x PAX Format is stored in file data block */
- private boolean paxGNU1XSparse = false;
+ private boolean paxGNU1XSparse;
/** is this entry a star sparse entry using the PAX header? */
private boolean starSparse;
diff --git a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
index 1645957..c0cbebb 100644
--- a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
@@ -100,17 +100,17 @@
private int recordsWritten;
private final int recordsPerBlock;
- private boolean closed = false;
+ private boolean closed;
/**
* Indicates if putArchiveEntry has been called without closeArchiveEntry
*/
- private boolean haveUnclosedEntry = false;
+ private boolean haveUnclosedEntry;
/**
* indicates if this archive is finished
*/
- private boolean finished = false;
+ private boolean finished;
private final FixedLengthBlockOutputStream out;
private final CountingOutputStream countingOut;
@@ -120,7 +120,7 @@
// the provided encoding (for unit tests)
final String encoding;
- private boolean addPaxHeadersForNonAsciiNames = false;
+ private boolean addPaxHeadersForNonAsciiNames;
private static final ZipEncoding ASCII =
ZipEncodingHelper.getZipEncoding("ASCII");
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/AsiExtraField.java b/src/main/java/org/apache/commons/compress/archivers/zip/AsiExtraField.java
index 5cd9de9..98194cd 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/AsiExtraField.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/AsiExtraField.java
@@ -56,15 +56,15 @@
/**
* Standard Unix stat(2) file mode.
*/
- private int mode = 0;
+ private int mode;
/**
* User ID.
*/
- private int uid = 0;
+ private int uid;
/**
* Group ID.
*/
- private int gid = 0;
+ private int gid;
/**
* File this entry points to, if it is a symbolic link.
*
@@ -74,7 +74,7 @@
/**
* Is this an entry for a directory?
*/
- private boolean dirFlag = false;
+ private boolean dirFlag;
/**
* Instance used to calculate checksums.
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ExplodingInputStream.java b/src/main/java/org/apache/commons/compress/archivers/zip/ExplodingInputStream.java
index 4cf331c..0886939 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ExplodingInputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ExplodingInputStream.java
@@ -66,9 +66,9 @@
/** Output buffer holding the decompressed data */
private final CircularBuffer buffer = new CircularBuffer(32 * 1024);
- private long uncompressedCount = 0;
+ private long uncompressedCount;
- private long treeSizes = 0;
+ private long treeSizes;
/**
* Create a new stream decompressing the content of the specified stream
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/GeneralPurposeBit.java b/src/main/java/org/apache/commons/compress/archivers/zip/GeneralPurposeBit.java
index 8f35f18..e87f661 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/GeneralPurposeBit.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/GeneralPurposeBit.java
@@ -69,10 +69,10 @@
*/
public static final int UFT8_NAMES_FLAG = 1 << 11;
- private boolean languageEncodingFlag = false;
- private boolean dataDescriptorFlag = false;
- private boolean encryptionFlag = false;
- private boolean strongEncryptionFlag = false;
+ private boolean languageEncodingFlag;
+ private boolean dataDescriptorFlag;
+ private boolean encryptionFlag;
+ private boolean strongEncryptionFlag;
private int slidingDictionarySize;
private int numberOfShannonFanoTrees;
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/InflaterInputStreamWithStatistics.java b/src/main/java/org/apache/commons/compress/archivers/zip/InflaterInputStreamWithStatistics.java
index a58e43e..6a5ceab 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/InflaterInputStreamWithStatistics.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/InflaterInputStreamWithStatistics.java
@@ -32,8 +32,8 @@
*/
/* package */ class InflaterInputStreamWithStatistics extends InflaterInputStream
implements InputStreamStatistics {
- private long compressedCount = 0;
- private long uncompressedCount = 0;
+ private long compressedCount;
+ private long uncompressedCount;
public InflaterInputStreamWithStatistics(final InputStream in) {
super(in);
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreator.java b/src/main/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreator.java
index a73c965..3bced78 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreator.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreator.java
@@ -57,7 +57,7 @@
private final Deque<Future<? extends ScatterZipOutputStream>> futures = new ConcurrentLinkedDeque<>();
private final long startedAt = System.currentTimeMillis();
- private long compressionDoneAt = 0;
+ private long compressionDoneAt;
private long scatterDoneAt;
private final int compressionLevel;
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ResourceAlignmentExtraField.java b/src/main/java/org/apache/commons/compress/archivers/zip/ResourceAlignmentExtraField.java
index 2dda68b..1057b0c 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ResourceAlignmentExtraField.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ResourceAlignmentExtraField.java
@@ -50,7 +50,7 @@
private boolean allowMethodChange;
- private int padding = 0;
+ private int padding;
public ResourceAlignmentExtraField() {
}
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStream.java
index f9edf53..3e61666 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStream.java
@@ -52,7 +52,7 @@
private final ScatterGatherBackingStore backingStore;
private final StreamCompressor streamCompressor;
private final AtomicBoolean isClosed = new AtomicBoolean();
- private ZipEntryWriter zipEntryWriter = null;
+ private ZipEntryWriter zipEntryWriter;
private static class CompressedEntry {
final ZipArchiveEntryRequest zipArchiveEntryRequest;
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/StreamCompressor.java b/src/main/java/org/apache/commons/compress/archivers/zip/StreamCompressor.java
index c9a9169..afcc810 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/StreamCompressor.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/StreamCompressor.java
@@ -52,9 +52,9 @@
private final CRC32 crc = new CRC32();
- private long writtenToOutputStreamForLastEntry = 0;
- private long sourcePayloadLength = 0;
- private long totalWrittenToOutputStream = 0;
+ private long writtenToOutputStreamForLastEntry;
+ private long sourcePayloadLength;
+ private long totalWrittenToOutputStream;
private static final int BUFFER_SIZE = 4096;
private final byte[] outputBuffer = new byte[BUFFER_SIZE];
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 f23392d..d8af0e0 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
@@ -131,21 +131,21 @@
*/
private long size = SIZE_UNKNOWN;
- private int internalAttributes = 0;
+ private int internalAttributes;
private int versionRequired;
private int versionMadeBy;
private int platform = PLATFORM_FAT;
private int rawFlag;
- private long externalAttributes = 0;
- private int alignment = 0;
+ private long externalAttributes;
+ private int alignment;
private ZipExtraField[] extraFields;
- private UnparseableExtraFieldData unparseableExtra = null;
- private String name = null;
- private byte[] rawName = null;
+ private UnparseableExtraFieldData unparseableExtra;
+ private String name;
+ private byte[] rawName;
private GeneralPurposeBit gpb = new GeneralPurposeBit();
private long localHeaderOffset = OFFSET_UNKNOWN;
private long dataOffset = OFFSET_UNKNOWN;
- private boolean isStreamContiguous = false;
+ private boolean isStreamContiguous;
private NameSource nameSource = NameSource.NAME;
private CommentSource commentSource = CommentSource.COMMENT;
private long diskNumberStart;
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 f84c596..2652294 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
@@ -99,20 +99,20 @@
private final ByteBuffer buf = ByteBuffer.allocate(ZipArchiveOutputStream.BUFFER_SIZE);
/** The entry that is currently being read. */
- private CurrentEntry current = null;
+ private CurrentEntry current;
/** Whether the stream has been closed. */
- private boolean closed = false;
+ private boolean closed;
/** Whether the stream has reached the central directory - and thus found all entries. */
- private boolean hitCentralDirectory = false;
+ private boolean hitCentralDirectory;
/**
* When reading a stored entry that uses the data descriptor this
* stream has to read the full entry and caches it. This is the
* cache.
*/
- private ByteArrayInputStream lastStoredEntry = null;
+ private ByteArrayInputStream lastStoredEntry;
/**
* Whether the stream will try to read STORED entries that use a data descriptor.
@@ -125,10 +125,10 @@
* https://issues.apache.org/jira/projects/COMPRESS/issues/COMPRESS-555
* https://github.com/apache/commons-compress/pull/137#issuecomment-690835644
*/
- private boolean allowStoredEntriesWithDataDescriptor = false;
+ private boolean allowStoredEntriesWithDataDescriptor;
/** Count decompressed bytes for current entry */
- private long uncompressedCount = 0;
+ private long uncompressedCount;
/** Whether the stream will try to skip the zip split signature(08074B50) at the beginning **/
private final boolean skipSplitSig;
@@ -178,7 +178,7 @@
private final byte[] wordBuf = new byte[WORD];
private final byte[] twoDwordBuf = new byte[2 * DWORD];
- private int entriesRead = 0;
+ private int entriesRead;
/**
* Create an instance using UTF-8 encoding
@@ -1323,7 +1323,7 @@
private final long max;
/** the number of bytes already returned */
- private long pos = 0;
+ private long pos;
/**
* Creates a new <code>BoundedInputStream</code> that wraps the given input
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
index 3f20c29..5808bf5 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
@@ -117,7 +117,7 @@
private static final int CFH_FILENAME_OFFSET = 46;
/** indicates if this archive is finished. protected for use in Jar implementation */
- protected boolean finished = false;
+ protected boolean finished;
/**
* Compression method for deflated entries.
@@ -166,7 +166,7 @@
* Has the compression level changed when compared to the last
* entry?
*/
- private boolean hasCompressionLevelChanged = false;
+ private boolean hasCompressionLevelChanged;
/**
* Default compression method for next entry.
@@ -184,22 +184,22 @@
/**
* Start of central directory.
*/
- private long cdOffset = 0;
+ private long cdOffset;
/**
* Length of central directory.
*/
- private long cdLength = 0;
+ private long cdLength;
/**
* Disk number start of central directory.
*/
- private long cdDiskNumberStart = 0;
+ private long cdDiskNumberStart;
/**
* Length of end of central directory
*/
- private long eocdLength = 0;
+ private long eocdLength;
/**
* Helper, a 0 as ZipShort.
@@ -259,7 +259,7 @@
/**
* Whether to encode non-encodable file names as UTF-8.
*/
- private boolean fallbackToUTF8 = false;
+ private boolean fallbackToUTF8;
/**
* whether to create UnicodePathExtraField-s for each entry.
@@ -271,7 +271,7 @@
*
* @since 1.3
*/
- private boolean hasUsedZip64 = false;
+ private boolean hasUsedZip64;
private Zip64Mode zip64Mode = Zip64Mode.AsNeeded;
@@ -1959,20 +1959,20 @@
* Offset for CRC entry in the local file header data for the
* current entry starts here.
*/
- private long localDataStart = 0;
+ private long localDataStart;
/**
* Data for local header data
*/
- private long dataStart = 0;
+ private long dataStart;
/**
* Number of bytes read for the current entry (can't rely on
* Deflater#getBytesRead) when using DEFLATED.
*/
- private long bytesRead = 0;
+ private long bytesRead;
/**
* Whether current entry was the first one using ZIP64 features.
*/
- private boolean causedUseOfZip64 = false;
+ private boolean causedUseOfZip64;
/**
* Whether write() has been called at all.
*
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipSplitOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipSplitOutputStream.java
index 499c213..4e23e83 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipSplitOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipSplitOutputStream.java
@@ -33,9 +33,9 @@
private OutputStream outputStream;
private File zipFile;
private final long splitSize;
- private int currentSplitSegmentIndex = 0;
- private long currentSplitSegmentBytesWritten = 0;
- private boolean finished = false;
+ private int currentSplitSegmentIndex;
+ private long currentSplitSegmentBytesWritten;
+ private boolean finished;
private final byte[] singleByte = new byte[1];
/**
@@ -161,10 +161,9 @@
/**
* Create a new zip split segment and prepare to write to the new segment
*
- * @return
* @throws IOException
*/
- private OutputStream openNewSplitSegment() throws IOException {
+ private void openNewSplitSegment() throws IOException {
File newFile;
if (currentSplitSegmentIndex == 0) {
outputStream.close();
@@ -182,7 +181,6 @@
zipFile = newFile;
currentSplitSegmentIndex++;
- return outputStream;
}
/**
diff --git a/src/main/java/org/apache/commons/compress/compressors/CompressorInputStream.java b/src/main/java/org/apache/commons/compress/compressors/CompressorInputStream.java
index 67de705..49bc8ae 100644
--- a/src/main/java/org/apache/commons/compress/compressors/CompressorInputStream.java
+++ b/src/main/java/org/apache/commons/compress/compressors/CompressorInputStream.java
@@ -21,7 +21,7 @@
import java.io.InputStream;
public abstract class CompressorInputStream extends InputStream {
- private long bytesRead = 0;
+ private long bytesRead;
/**
* Increments the counter of already read bytes.
diff --git a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
index 863cd8b..db0d305 100644
--- a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
+++ b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
@@ -395,7 +395,7 @@
* first stream and leave the input position to point to the next byte after
* the stream
*/
- private volatile boolean decompressConcatenated = false;
+ private volatile boolean decompressConcatenated;
private final int memoryLimitInKb;
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 9321be8..72c7a9f 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
@@ -310,7 +310,7 @@
private int nMTF;
private int currentChar = -1;
- private int runLength = 0;
+ private int runLength;
private int blockCRC;
private int combinedCRC;
diff --git a/src/main/java/org/apache/commons/compress/compressors/deflate64/HuffmanDecoder.java b/src/main/java/org/apache/commons/compress/compressors/deflate64/HuffmanDecoder.java
index 633b672..65daec7 100644
--- a/src/main/java/org/apache/commons/compress/compressors/deflate64/HuffmanDecoder.java
+++ b/src/main/java/org/apache/commons/compress/compressors/deflate64/HuffmanDecoder.java
@@ -110,7 +110,7 @@
Arrays.fill(FIXED_DISTANCE, 5);
}
- private boolean finalBlock = false;
+ private boolean finalBlock;
private DecoderState state;
private BitInputStream reader;
private final InputStream in;
@@ -283,14 +283,14 @@
}
private class HuffmanCodes extends DecoderState {
- private boolean endOfBlock = false;
+ private boolean endOfBlock;
private final HuffmanState state;
private final BinaryTreeNode lengthTree;
private final BinaryTreeNode distanceTree;
- private int runBufferPos = 0;
+ private int runBufferPos;
private byte[] runBuffer = ByteUtils.EMPTY_BYTE_ARRAY;
- private int runBufferLength = 0;
+ private int runBufferLength;
HuffmanCodes(final HuffmanState state, final int[] lengths, final int[] distance) {
this.state = state;
diff --git a/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.java b/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.java
index ff600bc..9a8c879 100644
--- a/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.java
+++ b/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.java
@@ -106,7 +106,7 @@
private final CRC32 crc = new CRC32();
// True once everything has been decompressed
- private boolean endReached = false;
+ private boolean endReached;
// used in no-arg read method
private final byte[] oneByte = new byte[1];
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 c937875..a0550f6 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
@@ -81,7 +81,7 @@
// used in one-arg write method
private final byte[] oneByte = new byte[1];
- private boolean finished = false;
+ private boolean finished;
private final Deque<Pair> pairs = new LinkedList<>();
// keeps track of the last window-size bytes (64k) in order to be
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 c36f7e5..55a3ee7 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
@@ -44,8 +44,8 @@
private final byte[] blockData;
private final OutputStream out;
private final Parameters params;
- private boolean finished = false;
- private int currentIndex = 0;
+ private boolean finished;
+ private int currentIndex;
// used for frame header checksum and content checksum, if requested
private final XXHash32 contentHash = new XXHash32();
diff --git a/src/main/java/org/apache/commons/compress/compressors/lz77support/AbstractLZ77CompressorInputStream.java b/src/main/java/org/apache/commons/compress/compressors/lz77support/AbstractLZ77CompressorInputStream.java
index 240dc11..25546f7 100644
--- a/src/main/java/org/apache/commons/compress/compressors/lz77support/AbstractLZ77CompressorInputStream.java
+++ b/src/main/java/org/apache/commons/compress/compressors/lz77support/AbstractLZ77CompressorInputStream.java
@@ -106,7 +106,7 @@
private int backReferenceOffset;
/** uncompressed size */
- private int size = 0;
+ private int size;
// used in no-arg read method
private final byte[] oneByte = new byte[1];
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 f8f9abc..688c3e3 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
@@ -231,23 +231,23 @@
// bit mask used when indexing into prev
private final int wMask;
- private boolean initialized = false;
+ private boolean initialized;
// the position inside of window that shall be encoded right now
private int currentPosition;
// the number of bytes available to compress including the one at
// currentPosition
- private int lookahead = 0;
+ private int lookahead;
// the hash of the three bytes stating at the current position
- private int insertHash = 0;
+ private int insertHash;
// the position inside of the window where the current literal
// block starts (in case we are inside of a literal block).
- private int blockStart = 0;
+ private int blockStart;
// position of the current match
private int matchStart = NO_MATCH;
// number of missed insertString calls for the up to three last
// bytes of the last match that can only be performed once more
// data has been read
- private int missedInserts = 0;
+ private int missedInserts;
/**
* Initializes a compressor with parameters and a callback.
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 e5be87b..d67a203 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
@@ -34,7 +34,7 @@
* @since 1.3
*/
public class Pack200CompressorOutputStream extends CompressorOutputStream {
- private boolean finished = false;
+ private boolean finished;
private final OutputStream originalOutput;
private final StreamBridge streamBridge;
private final Map<String, String> properties;
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 7e23194..586ec4b 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
@@ -48,7 +48,7 @@
// used in one-arg write method
private final byte[] oneByte = new byte[1];
private final byte[] buffer = new byte[MAX_COMPRESSED_BUFFER_SIZE];
- private int currentIndex = 0;
+ private int currentIndex;
private final ByteUtils.ByteConsumer consumer;
diff --git a/src/main/java/org/apache/commons/compress/compressors/snappy/SnappyCompressorInputStream.java b/src/main/java/org/apache/commons/compress/compressors/snappy/SnappyCompressorInputStream.java
index 5274e3d..8b5625b 100644
--- a/src/main/java/org/apache/commons/compress/compressors/snappy/SnappyCompressorInputStream.java
+++ b/src/main/java/org/apache/commons/compress/compressors/snappy/SnappyCompressorInputStream.java
@@ -55,7 +55,7 @@
/** Current state of the stream */
private State state = State.NO_BLOCK;
- private boolean endReached = false;
+ private boolean endReached;
/**
* Constructor using the default buffer size of 32k.
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 01d984d..1b9c47c 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
@@ -59,7 +59,7 @@
// used in one-arg write method
private final byte[] oneByte = new byte[1];
- private boolean finished = false;
+ private boolean finished;
/**
* Constructor using the default block size of 32k.
diff --git a/src/main/java/org/apache/commons/compress/compressors/z/ZCompressorInputStream.java b/src/main/java/org/apache/commons/compress/compressors/z/ZCompressorInputStream.java
index 80f25e3..a2ee79c 100644
--- a/src/main/java/org/apache/commons/compress/compressors/z/ZCompressorInputStream.java
+++ b/src/main/java/org/apache/commons/compress/compressors/z/ZCompressorInputStream.java
@@ -36,7 +36,7 @@
private static final int MAX_CODE_SIZE_MASK = 0x1f;
private final boolean blockMode;
private final int maxCodeSize;
- private long totalCodesRead = 0;
+ private long totalCodesRead;
public ZCompressorInputStream(final InputStream inputStream, final int memoryLimitInKb)
throws IOException {
diff --git a/src/main/java/org/apache/commons/compress/utils/BitInputStream.java b/src/main/java/org/apache/commons/compress/utils/BitInputStream.java
index b8001c4..201d3e7 100644
--- a/src/main/java/org/apache/commons/compress/utils/BitInputStream.java
+++ b/src/main/java/org/apache/commons/compress/utils/BitInputStream.java
@@ -40,8 +40,8 @@
private final CountingInputStream in;
private final ByteOrder byteOrder;
- private long bitsCached = 0;
- private int bitsCachedSize = 0;
+ private long bitsCached;
+ private int bitsCachedSize;
/**
* Constructor taking an InputStream and its bit arrangement.
diff --git a/src/main/java/org/apache/commons/compress/utils/CountingOutputStream.java b/src/main/java/org/apache/commons/compress/utils/CountingOutputStream.java
index ac886bc..9802272 100644
--- a/src/main/java/org/apache/commons/compress/utils/CountingOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/utils/CountingOutputStream.java
@@ -28,7 +28,7 @@
* @NotThreadSafe
*/
public class CountingOutputStream extends FilterOutputStream {
- private long bytesWritten = 0;
+ private long bytesWritten;
public CountingOutputStream(final OutputStream out) {
super(out);
