http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/main/java/org/apache/commons/compress/archivers/zip/PKWareExtraHeader.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/PKWareExtraHeader.java b/src/main/java/org/apache/commons/compress/archivers/zip/PKWareExtraHeader.java index ce52c6f..3faea06 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/PKWareExtraHeader.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/PKWareExtraHeader.java @@ -77,7 +77,7 @@ public abstract class PKWareExtraHeader implements ZipExtraField { */ private byte[] centralData; - protected PKWareExtraHeader(ZipShort headerId) { + protected PKWareExtraHeader(final ZipShort headerId) { this.headerId = headerId; } @@ -98,7 +98,7 @@ public abstract class PKWareExtraHeader implements ZipExtraField { * @param data * the field data to use */ - public void setLocalFileDataData(byte[] data) { + public void setLocalFileDataData(final byte[] data) { localData = ZipUtil.copy(data); } @@ -128,7 +128,7 @@ public abstract class PKWareExtraHeader implements ZipExtraField { * @param data * the data to use */ - public void setCentralDirectoryData(byte[] data) { + public void setCentralDirectoryData(final byte[] data) { centralData = ZipUtil.copy(data); } @@ -169,7 +169,7 @@ public abstract class PKWareExtraHeader implements ZipExtraField { * @see ZipExtraField#parseFromLocalFileData(byte[], int, int) */ @Override - public void parseFromLocalFileData(byte[] data, int offset, int length) { + public void parseFromLocalFileData(final byte[] data, final int offset, final int length) { byte[] tmp = new byte[length]; System.arraycopy(data, offset, tmp, 0, length); setLocalFileDataData(tmp); @@ -185,7 +185,7 @@ public abstract class PKWareExtraHeader implements ZipExtraField { * @see ZipExtraField#parseFromCentralDirectoryData(byte[], int, int) */ @Override - public void parseFromCentralDirectoryData(byte[] data, int offset, int length) { + public void parseFromCentralDirectoryData(final byte[] data, final int offset, final int length) { byte[] tmp = new byte[length]; System.arraycopy(data, offset, tmp, 0, length); setCentralDirectoryData(tmp); @@ -226,7 +226,7 @@ public abstract class PKWareExtraHeader implements ZipExtraField { /** * private constructor for enum style class. */ - EncryptionAlgorithm(int code) { + EncryptionAlgorithm(final int code) { this.code = code; } @@ -246,7 +246,7 @@ public abstract class PKWareExtraHeader implements ZipExtraField { * @return the EncryptionAlgorithm for the given code or null * if the method is not known */ - public static EncryptionAlgorithm getAlgorithmByCode(int code) { + public static EncryptionAlgorithm getAlgorithmByCode(final int code) { return codeToEnum.get(Integer.valueOf(code)); } } @@ -281,7 +281,7 @@ public abstract class PKWareExtraHeader implements ZipExtraField { /** * private constructor for enum style class. */ - HashAlgorithm(int code) { + HashAlgorithm(final int code) { this.code = code; } @@ -301,7 +301,7 @@ public abstract class PKWareExtraHeader implements ZipExtraField { * @return the HashAlgorithm for the given code or null * if the method is not known */ - public static HashAlgorithm getAlgorithmByCode(int code) { + public static HashAlgorithm getAlgorithmByCode(final int code) { return codeToEnum.get(Integer.valueOf(code)); } }
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/main/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreator.java ---------------------------------------------------------------------- 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 26d9807..49e1906 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 @@ -71,7 +71,7 @@ public class ParallelScatterZipCreator { } } - private ScatterZipOutputStream createDeferred(ScatterGatherBackingStoreSupplier scatterGatherBackingStoreSupplier) + private ScatterZipOutputStream createDeferred(final ScatterGatherBackingStoreSupplier scatterGatherBackingStoreSupplier) throws IOException { ScatterGatherBackingStore bs = scatterGatherBackingStoreSupplier.get(); StreamCompressor sc = StreamCompressor.create(Deflater.DEFAULT_COMPRESSION, bs); @@ -105,7 +105,7 @@ public class ParallelScatterZipCreator { * @param executorService The executorService to use for parallel scheduling. For technical reasons, * this will be shut down by this class. */ - public ParallelScatterZipCreator(ExecutorService executorService) { + public ParallelScatterZipCreator(final ExecutorService executorService) { this(executorService, new DefaultBackingStoreSupplier()); } @@ -116,8 +116,8 @@ public class ParallelScatterZipCreator { * by this class. * @param backingStoreSupplier The supplier of backing store which shall be used */ - public ParallelScatterZipCreator(ExecutorService executorService, - ScatterGatherBackingStoreSupplier backingStoreSupplier) { + public ParallelScatterZipCreator(final ExecutorService executorService, + final ScatterGatherBackingStoreSupplier backingStoreSupplier) { this.backingStoreSupplier = backingStoreSupplier; es = executorService; } @@ -143,7 +143,7 @@ public class ParallelScatterZipCreator { * * @param callable The callable to run, created by {@link #createCallable createCallable}, possibly wrapped by caller. */ - public final void submit(Callable<Object> callable) { + public final void submit(final Callable<Object> callable) { futures.add(es.submit(callable)); } @@ -165,7 +165,7 @@ public class ParallelScatterZipCreator { * will be propagated through the callable. */ - public final Callable<Object> createCallable(ZipArchiveEntry zipArchiveEntry, InputStreamSupplier source) { + public final Callable<Object> createCallable(final ZipArchiveEntry zipArchiveEntry, final InputStreamSupplier source) { final int method = zipArchiveEntry.getMethod(); if (method == ZipMethod.UNKNOWN_CODE) { throw new IllegalArgumentException("Method must be set on zipArchiveEntry: " + zipArchiveEntry); @@ -193,7 +193,7 @@ public class ParallelScatterZipCreator { * @throws InterruptedException If we get interrupted * @throws ExecutionException If something happens in the parallel execution */ - public void writeTo(ZipArchiveOutputStream targetStream) + public void writeTo(final ZipArchiveOutputStream targetStream) throws IOException, InterruptedException, ExecutionException { // Make sure we catch any exceptions from parallel phase http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/main/java/org/apache/commons/compress/archivers/zip/ScatterStatistics.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ScatterStatistics.java b/src/main/java/org/apache/commons/compress/archivers/zip/ScatterStatistics.java index 3839af1..83c5bb5 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/ScatterStatistics.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/ScatterStatistics.java @@ -27,7 +27,7 @@ public class ScatterStatistics { private final long compressionElapsed; private final long mergingElapsed; - ScatterStatistics(long compressionElapsed, long mergingElapsed) { + ScatterStatistics(final long compressionElapsed, final long mergingElapsed) { this.compressionElapsed = compressionElapsed; this.mergingElapsed = mergingElapsed; } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/main/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStream.java ---------------------------------------------------------------------- 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 0edaa3f..ed7195f 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 @@ -56,7 +56,7 @@ public class ScatterZipOutputStream implements Closeable { final long compressedSize; final long size; - public CompressedEntry(ZipArchiveEntryRequest zipArchiveEntryRequest, long crc, long compressedSize, long size) { + public CompressedEntry(final ZipArchiveEntryRequest zipArchiveEntryRequest, final long crc, final long compressedSize, final long size) { this.zipArchiveEntryRequest = zipArchiveEntryRequest; this.crc = crc; this.compressedSize = compressedSize; @@ -79,8 +79,8 @@ public class ScatterZipOutputStream implements Closeable { } } - public ScatterZipOutputStream(ScatterGatherBackingStore backingStore, - StreamCompressor streamCompressor) { + public ScatterZipOutputStream(final ScatterGatherBackingStore backingStore, + final StreamCompressor streamCompressor) { this.backingStore = backingStore; this.streamCompressor = streamCompressor; } @@ -91,7 +91,7 @@ public class ScatterZipOutputStream implements Closeable { * @param zipArchiveEntryRequest The entry to write. * @throws IOException If writing fails */ - public void addArchiveEntry(ZipArchiveEntryRequest zipArchiveEntryRequest) throws IOException { + public void addArchiveEntry(final ZipArchiveEntryRequest zipArchiveEntryRequest) throws IOException { final InputStream payloadStream = zipArchiveEntryRequest.getPayloadStream(); try { streamCompressor.deflate(payloadStream, zipArchiveEntryRequest.getMethod()); @@ -108,7 +108,7 @@ public class ScatterZipOutputStream implements Closeable { * @param target The archive to receive the contents of this {@link ScatterZipOutputStream}. * @throws IOException If writing fails */ - public void writeTo(ZipArchiveOutputStream target) throws IOException { + public void writeTo(final ZipArchiveOutputStream target) throws IOException { backingStore.closeForWriting(); InputStream data = backingStore.getInputStream(); for (CompressedEntry compressedEntry : items) { @@ -136,7 +136,7 @@ public class ScatterZipOutputStream implements Closeable { * @return A ScatterZipOutputStream that is ready for use. * @throws FileNotFoundException if the file cannot be found */ - public static ScatterZipOutputStream fileBased(File file) throws FileNotFoundException { + public static ScatterZipOutputStream fileBased(final File file) throws FileNotFoundException { return fileBased(file, Deflater.DEFAULT_COMPRESSION); } @@ -148,7 +148,7 @@ public class ScatterZipOutputStream implements Closeable { * @return A ScatterZipOutputStream that is ready for use. * @throws FileNotFoundException if the file cannot be found */ - public static ScatterZipOutputStream fileBased(File file, int compressionLevel) throws FileNotFoundException { + public static ScatterZipOutputStream fileBased(final File file, final int compressionLevel) throws FileNotFoundException { ScatterGatherBackingStore bs = new FileBasedScatterGatherBackingStore(file); StreamCompressor sc = StreamCompressor.create(compressionLevel, bs); return new ScatterZipOutputStream(bs, sc); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java b/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java index f6f7b35..56c4007 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java @@ -54,13 +54,13 @@ class Simple8BitZipEncoding implements ZipEncoding { public final char unicode; public final byte code; - Simple8BitChar(byte code, char unicode) { + Simple8BitChar(final byte code, final char unicode) { this.code = code; this.unicode = unicode; } @Override - public int compareTo(Simple8BitChar a) { + public int compareTo(final Simple8BitChar a) { return this.unicode - a.unicode; } @@ -71,7 +71,7 @@ class Simple8BitZipEncoding implements ZipEncoding { } @Override - public boolean equals(Object o) { + public boolean equals(final Object o) { if (o instanceof Simple8BitChar) { Simple8BitChar other = (Simple8BitChar) o; return unicode == other.unicode && code == other.code; @@ -102,7 +102,7 @@ class Simple8BitZipEncoding implements ZipEncoding { * @param highChars The characters for byte values of 128 to 255 * stored as an array of 128 chars. */ - public Simple8BitZipEncoding(char[] highChars) { + public Simple8BitZipEncoding(final char[] highChars) { this.highChars = highChars.clone(); List<Simple8BitChar> temp = new ArrayList<Simple8BitChar>(this.highChars.length); @@ -123,7 +123,7 @@ class Simple8BitZipEncoding implements ZipEncoding { * @param b The byte to decode. * @return The associated character value. */ - public char decodeByte(byte b) { + public char decodeByte(final byte b) { // code 0-127 if (b >= 0) { return (char) b; @@ -137,7 +137,7 @@ class Simple8BitZipEncoding implements ZipEncoding { * @param c The character to encode. * @return Whether the given unicode character is covered by this encoding. */ - public boolean canEncodeChar(char c) { + public boolean canEncodeChar(final char c) { if (c >= 0 && c < 128) { return true; @@ -156,7 +156,7 @@ class Simple8BitZipEncoding implements ZipEncoding { * If {@code false} is returned, nothing is pushed to the * byte buffer. */ - public boolean pushEncodedChar(ByteBuffer bb, char c) { + public boolean pushEncodedChar(final ByteBuffer bb, final char c) { if (c >= 0 && c < 128) { bb.put((byte) c); @@ -177,7 +177,7 @@ class Simple8BitZipEncoding implements ZipEncoding { * A {@code null} value is returned, if this character is not * covered by this encoding. */ - private Simple8BitChar encodeHighChar(char c) { + private Simple8BitChar encodeHighChar(final char c) { // for performance an simplicity, yet another reincarnation of // binary search... int i0 = 0; @@ -218,7 +218,7 @@ class Simple8BitZipEncoding implements ZipEncoding { * org.apache.commons.compress.archivers.zip.ZipEncoding#canEncode(java.lang.String) */ @Override - public boolean canEncode(String name) { + public boolean canEncode(final String name) { for (int i=0;i<name.length();++i) { @@ -237,7 +237,7 @@ class Simple8BitZipEncoding implements ZipEncoding { * org.apache.commons.compress.archivers.zip.ZipEncoding#encode(java.lang.String) */ @Override - public ByteBuffer encode(String name) { + public ByteBuffer encode(final String name) { ByteBuffer out = ByteBuffer.allocate(name.length() + 6 + (name.length() + 1) / 2); @@ -265,7 +265,7 @@ class Simple8BitZipEncoding implements ZipEncoding { * org.apache.commons.compress.archivers.zip.ZipEncoding#decode(byte[]) */ @Override - public String decode(byte[] data) throws IOException { + public String decode(final byte[] data) throws IOException { char [] ret = new char[data.length]; for (int i=0;i<data.length;++i) { http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/main/java/org/apache/commons/compress/archivers/zip/StreamCompressor.java ---------------------------------------------------------------------- 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 d4925c1..aef35d9 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 @@ -58,7 +58,7 @@ public abstract class StreamCompressor implements Closeable { private final byte[] outputBuffer = new byte[bufferSize]; private final byte[] readerBuf = new byte[bufferSize]; - StreamCompressor(Deflater deflater) { + StreamCompressor(final Deflater deflater) { this.def = deflater; } @@ -69,7 +69,7 @@ public abstract class StreamCompressor implements Closeable { * @param deflater The deflater to use * @return A stream compressor */ - static StreamCompressor create(OutputStream os, Deflater deflater) { + static StreamCompressor create(final OutputStream os, final Deflater deflater) { return new OutputStreamCompressor(deflater, os); } @@ -79,7 +79,7 @@ public abstract class StreamCompressor implements Closeable { * @param os The stream to receive output * @return A stream compressor */ - static StreamCompressor create(OutputStream os) { + static StreamCompressor create(final OutputStream os) { return create(os, new Deflater(Deflater.DEFAULT_COMPRESSION, true)); } @@ -90,7 +90,7 @@ public abstract class StreamCompressor implements Closeable { * @param deflater The deflater to use for the compressor * @return A stream compressor */ - static StreamCompressor create(DataOutput os, Deflater deflater) { + static StreamCompressor create(final DataOutput os, final Deflater deflater) { return new DataOutputCompressor(deflater, os); } @@ -101,7 +101,7 @@ public abstract class StreamCompressor implements Closeable { * @param bs The ScatterGatherBackingStore to receive output * @return A stream compressor */ - public static StreamCompressor create(int compressionLevel, ScatterGatherBackingStore bs) { + public static StreamCompressor create(final int compressionLevel, final ScatterGatherBackingStore bs) { final Deflater deflater = new Deflater(compressionLevel, true); return new ScatterGatherBackingStoreCompressor(deflater, bs); } @@ -112,7 +112,7 @@ public abstract class StreamCompressor implements Closeable { * @param bs The ScatterGatherBackingStore to receive output * @return A stream compressor */ - public static StreamCompressor create(ScatterGatherBackingStore bs) { + public static StreamCompressor create(final ScatterGatherBackingStore bs) { return create(Deflater.DEFAULT_COMPRESSION, bs); } @@ -162,7 +162,7 @@ public abstract class StreamCompressor implements Closeable { * @throws IOException When failures happen */ - public void deflate(InputStream source, int method) throws IOException { + public void deflate(final InputStream source, final int method) throws IOException { reset(); int length; @@ -184,7 +184,7 @@ public abstract class StreamCompressor implements Closeable { * @return the number of bytes written to the stream this time * @throws IOException on error */ - long write(byte[] b, int offset, int length, int method) throws IOException { + long write(final byte[] b, final int offset, final int length, final int method) throws IOException { long current = writtenToOutputStreamForLastEntry; crc.update(b, offset, length); if (method == ZipEntry.DEFLATED) { @@ -216,7 +216,7 @@ public abstract class StreamCompressor implements Closeable { } } - private void writeDeflated(byte[] b, int offset, int length) + private void writeDeflated(final byte[] b, final int offset, final int length) throws IOException { if (length > 0 && !def.finished()) { if (length <= DEFLATER_BLOCK_SIZE) { @@ -251,11 +251,11 @@ public abstract class StreamCompressor implements Closeable { } } - public void writeCounted(byte[] data) throws IOException { + public void writeCounted(final byte[] data) throws IOException { writeCounted(data, 0, data.length); } - public void writeCounted(byte[] data, int offset, int length) throws IOException { + public void writeCounted(final byte[] data, final int offset, final int length) throws IOException { writeOut(data, offset, length); writtenToOutputStreamForLastEntry += length; totalWrittenToOutputStream += length; @@ -266,13 +266,13 @@ public abstract class StreamCompressor implements Closeable { private static final class ScatterGatherBackingStoreCompressor extends StreamCompressor { private final ScatterGatherBackingStore bs; - public ScatterGatherBackingStoreCompressor(Deflater deflater, ScatterGatherBackingStore bs) { + public ScatterGatherBackingStoreCompressor(final Deflater deflater, final ScatterGatherBackingStore bs) { super(deflater); this.bs = bs; } @Override - protected final void writeOut(byte[] data, int offset, int length) + protected final void writeOut(final byte[] data, final int offset, final int length) throws IOException { bs.writeOut(data, offset, length); } @@ -281,13 +281,13 @@ public abstract class StreamCompressor implements Closeable { private static final class OutputStreamCompressor extends StreamCompressor { private final OutputStream os; - public OutputStreamCompressor(Deflater deflater, OutputStream os) { + public OutputStreamCompressor(final Deflater deflater, final OutputStream os) { super(deflater); this.os = os; } @Override - protected final void writeOut(byte[] data, int offset, int length) + protected final void writeOut(final byte[] data, final int offset, final int length) throws IOException { os.write(data, offset, length); } @@ -296,13 +296,13 @@ public abstract class StreamCompressor implements Closeable { private static final class DataOutputCompressor extends StreamCompressor { private final DataOutput raf; - public DataOutputCompressor(Deflater deflater, DataOutput raf) { + public DataOutputCompressor(final Deflater deflater, final DataOutput raf) { super(deflater); this.raf = raf; } @Override - protected final void writeOut(byte[] data, int offset, int length) + protected final void writeOut(final byte[] data, final int offset, final int length) throws IOException { raf.write(data, offset, length); } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/main/java/org/apache/commons/compress/archivers/zip/UnicodeCommentExtraField.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/UnicodeCommentExtraField.java b/src/main/java/org/apache/commons/compress/archivers/zip/UnicodeCommentExtraField.java index 1289583..b961114 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/UnicodeCommentExtraField.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/UnicodeCommentExtraField.java @@ -46,8 +46,8 @@ public class UnicodeCommentExtraField extends AbstractUnicodeExtraField { * @param len The length of the encoded comment or comment in * <code>bytes</code>. */ - public UnicodeCommentExtraField(String text, byte[] bytes, int off, - int len) { + public UnicodeCommentExtraField(final String text, final byte[] bytes, final int off, + final int len) { super(text, bytes, off, len); } @@ -58,7 +58,7 @@ public class UnicodeCommentExtraField extends AbstractUnicodeExtraField { * @param comment The file comment * @param bytes the bytes actually written to the archive */ - public UnicodeCommentExtraField(String comment, byte[] bytes) { + public UnicodeCommentExtraField(final String comment, final byte[] bytes) { super(comment, bytes); } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/main/java/org/apache/commons/compress/archivers/zip/UnicodePathExtraField.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/UnicodePathExtraField.java b/src/main/java/org/apache/commons/compress/archivers/zip/UnicodePathExtraField.java index 35935f3..f1cf6c1 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/UnicodePathExtraField.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/UnicodePathExtraField.java @@ -46,7 +46,7 @@ public class UnicodePathExtraField extends AbstractUnicodeExtraField { * @param len The length of the encoded filename or comment in * <code>bytes</code>. */ - public UnicodePathExtraField(String text, byte[] bytes, int off, int len) { + public UnicodePathExtraField(final String text, final byte[] bytes, final int off, final int len) { super(text, bytes, off, len); } @@ -57,7 +57,7 @@ public class UnicodePathExtraField extends AbstractUnicodeExtraField { * @param name The file name * @param bytes the bytes actually written to the archive */ - public UnicodePathExtraField(String name, byte[] bytes) { + public UnicodePathExtraField(final String name, final byte[] bytes) { super(name, bytes); } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/main/java/org/apache/commons/compress/archivers/zip/UnparseableExtraFieldData.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/UnparseableExtraFieldData.java b/src/main/java/org/apache/commons/compress/archivers/zip/UnparseableExtraFieldData.java index b4a92bb..55deea7 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/UnparseableExtraFieldData.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/UnparseableExtraFieldData.java @@ -95,7 +95,7 @@ public final class UnparseableExtraFieldData implements ZipExtraField { * @param length the length of data */ @Override - public void parseFromLocalFileData(byte[] buffer, int offset, int length) { + public void parseFromLocalFileData(final byte[] buffer, final int offset, final int length) { localFileData = new byte[length]; System.arraycopy(buffer, offset, localFileData, 0, length); } @@ -108,8 +108,8 @@ public final class UnparseableExtraFieldData implements ZipExtraField { * @param length the length of data */ @Override - public void parseFromCentralDirectoryData(byte[] buffer, int offset, - int length) { + public void parseFromCentralDirectoryData(final byte[] buffer, final int offset, + final int length) { centralDirectoryData = new byte[length]; System.arraycopy(buffer, offset, centralDirectoryData, 0, length); if (localFileData == null) { http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/main/java/org/apache/commons/compress/archivers/zip/UnrecognizedExtraField.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/UnrecognizedExtraField.java b/src/main/java/org/apache/commons/compress/archivers/zip/UnrecognizedExtraField.java index a4a532d..aec800d 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/UnrecognizedExtraField.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/UnrecognizedExtraField.java @@ -37,7 +37,7 @@ public class UnrecognizedExtraField implements ZipExtraField { * Set the header id. * @param headerId the header id to use */ - public void setHeaderId(ZipShort headerId) { + public void setHeaderId(final ZipShort headerId) { this.headerId = headerId; } @@ -61,7 +61,7 @@ public class UnrecognizedExtraField implements ZipExtraField { * without Header-ID or length specifier. * @param data the field data to use */ - public void setLocalFileDataData(byte[] data) { + public void setLocalFileDataData(final byte[] data) { localData = ZipUtil.copy(data); } @@ -93,7 +93,7 @@ public class UnrecognizedExtraField implements ZipExtraField { * Set the extra field data in central directory. * @param data the data to use */ - public void setCentralDirectoryData(byte[] data) { + public void setCentralDirectoryData(final byte[] data) { centralData = ZipUtil.copy(data); } @@ -129,7 +129,7 @@ public class UnrecognizedExtraField implements ZipExtraField { * @see ZipExtraField#parseFromLocalFileData(byte[], int, int) */ @Override - public void parseFromLocalFileData(byte[] data, int offset, int length) { + public void parseFromLocalFileData(final byte[] data, final int offset, final int length) { byte[] tmp = new byte[length]; System.arraycopy(data, offset, tmp, 0, length); setLocalFileDataData(tmp); @@ -142,8 +142,8 @@ public class UnrecognizedExtraField implements ZipExtraField { * @see ZipExtraField#parseFromCentralDirectoryData(byte[], int, int) */ @Override - public void parseFromCentralDirectoryData(byte[] data, int offset, - int length) { + public void parseFromCentralDirectoryData(final byte[] data, final int offset, + final int length) { byte[] tmp = new byte[length]; System.arraycopy(data, offset, tmp, 0, length); setCentralDirectoryData(tmp); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/main/java/org/apache/commons/compress/archivers/zip/UnshrinkingInputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/UnshrinkingInputStream.java b/src/main/java/org/apache/commons/compress/archivers/zip/UnshrinkingInputStream.java index a09b72e..3e223e8 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/UnshrinkingInputStream.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/UnshrinkingInputStream.java @@ -34,7 +34,7 @@ class UnshrinkingInputStream extends LZWInputStream { private static final int MAX_TABLE_SIZE = 1 << MAX_CODE_SIZE; private final boolean[] isUsed; - public UnshrinkingInputStream(InputStream inputStream) throws IOException { + public UnshrinkingInputStream(final InputStream inputStream) throws IOException { super(inputStream, ByteOrder.LITTLE_ENDIAN); setClearCode(DEFAULT_CODE_SIZE); initializeTables(MAX_CODE_SIZE); @@ -46,7 +46,7 @@ class UnshrinkingInputStream extends LZWInputStream { } @Override - protected int addEntry(int previousCode, byte character) throws IOException { + protected int addEntry(final int previousCode, final byte character) throws IOException { int tableSize = getTableSize(); while ((tableSize < MAX_TABLE_SIZE) && isUsed[tableSize]) { tableSize++; http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/main/java/org/apache/commons/compress/archivers/zip/UnsupportedZipFeatureException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/UnsupportedZipFeatureException.java b/src/main/java/org/apache/commons/compress/archivers/zip/UnsupportedZipFeatureException.java index 8316ab4..a808c51 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/UnsupportedZipFeatureException.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/UnsupportedZipFeatureException.java @@ -36,8 +36,8 @@ public class UnsupportedZipFeatureException extends ZipException { * @param reason the feature that is not supported * @param entry the entry using the feature */ - public UnsupportedZipFeatureException(Feature reason, - ZipArchiveEntry entry) { + public UnsupportedZipFeatureException(final Feature reason, + final ZipArchiveEntry entry) { super("unsupported feature " + reason + " used in entry " + entry.getName()); this.reason = reason; @@ -51,8 +51,8 @@ public class UnsupportedZipFeatureException extends ZipException { * @param entry the entry using the feature * @since 1.5 */ - public UnsupportedZipFeatureException(ZipMethod method, - ZipArchiveEntry entry) { + public UnsupportedZipFeatureException(final ZipMethod method, + final ZipArchiveEntry entry) { super("unsupported feature method '" + method.name() + "' used in entry " + entry.getName()); this.reason = Feature.METHOD; @@ -66,7 +66,7 @@ public class UnsupportedZipFeatureException extends ZipException { * @param reason the feature that is not supported * @since 1.5 */ - public UnsupportedZipFeatureException(Feature reason) { + public UnsupportedZipFeatureException(final Feature reason) { super("unsupported feature " + reason + " used in archive."); this.reason = reason; this.entry = null; @@ -113,7 +113,7 @@ public class UnsupportedZipFeatureException extends ZipException { private final String name; - private Feature(String name) { + private Feature(final String name) { this.name = name; } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/main/java/org/apache/commons/compress/archivers/zip/X000A_NTFS.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/X000A_NTFS.java b/src/main/java/org/apache/commons/compress/archivers/zip/X000A_NTFS.java index e020720..ee08d0a 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/X000A_NTFS.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/X000A_NTFS.java @@ -154,7 +154,7 @@ public class X000A_NTFS implements ZipExtraField { */ @Override public void parseFromLocalFileData( - byte[] data, int offset, int length + final byte[] data, int offset, final int length ) throws ZipException { final int len = offset + length; @@ -179,7 +179,7 @@ public class X000A_NTFS implements ZipExtraField { */ @Override public void parseFromCentralDirectoryData( - byte[] buffer, int offset, int length + final byte[] buffer, final int offset, final int length ) throws ZipException { reset(); parseFromLocalFileData(buffer, offset, length); @@ -249,7 +249,7 @@ public class X000A_NTFS implements ZipExtraField { * * @param t ZipEightByteInteger of the modify time */ - public void setModifyTime(ZipEightByteInteger t) { + public void setModifyTime(final ZipEightByteInteger t) { modifyTime = t == null ? ZipEightByteInteger.ZERO : t; } @@ -259,7 +259,7 @@ public class X000A_NTFS implements ZipExtraField { * * @param t ZipEightByteInteger of the access time */ - public void setAccessTime(ZipEightByteInteger t) { + public void setAccessTime(final ZipEightByteInteger t) { accessTime = t == null ? ZipEightByteInteger.ZERO : t; } @@ -269,7 +269,7 @@ public class X000A_NTFS implements ZipExtraField { * * @param t ZipEightByteInteger of the create time */ - public void setCreateTime(ZipEightByteInteger t) { + public void setCreateTime(final ZipEightByteInteger t) { createTime = t == null ? ZipEightByteInteger.ZERO : t; } @@ -278,7 +278,7 @@ public class X000A_NTFS implements ZipExtraField { * * @param d modify time as java.util.Date */ - public void setModifyJavaTime(Date d) { setModifyTime(dateToZip(d)); } + public void setModifyJavaTime(final Date d) { setModifyTime(dateToZip(d)); } /** * Sets the access time as a java.util.Date @@ -286,7 +286,7 @@ public class X000A_NTFS implements ZipExtraField { * * @param d access time as java.util.Date */ - public void setAccessJavaTime(Date d) { setAccessTime(dateToZip(d)); } + public void setAccessJavaTime(final Date d) { setAccessTime(dateToZip(d)); } /** * <p> @@ -301,7 +301,7 @@ public class X000A_NTFS implements ZipExtraField { * * @param d create time as java.util.Date */ - public void setCreateJavaTime(Date d) { setCreateTime(dateToZip(d)); } + public void setCreateJavaTime(final Date d) { setCreateTime(dateToZip(d)); } /** * Returns a String representation of this class useful for @@ -321,7 +321,7 @@ public class X000A_NTFS implements ZipExtraField { } @Override - public boolean equals(Object o) { + public boolean equals(final Object o) { if (o instanceof X000A_NTFS) { X000A_NTFS xf = (X000A_NTFS) o; @@ -359,7 +359,7 @@ public class X000A_NTFS implements ZipExtraField { this.createTime = ZipEightByteInteger.ZERO; } - private void readTimeAttr(byte[] data, int offset, int length) { + private void readTimeAttr(final byte[] data, int offset, final int length) { if (length >= 2 + 3 * 8) { ZipShort tagValueLength = new ZipShort(data, offset); if (TIME_ATTR_SIZE.equals(tagValueLength)) { @@ -385,7 +385,7 @@ public class X000A_NTFS implements ZipExtraField { return new ZipEightByteInteger((d.getTime() * 10000l) - EPOCH_OFFSET); } - private static Date zipToDate(ZipEightByteInteger z) { + private static Date zipToDate(final ZipEightByteInteger z) { if (z == null || ZipEightByteInteger.ZERO.equals(z)) { return null; } long l = (z.getLongValue() + EPOCH_OFFSET) / 10000l; return new Date(l); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/main/java/org/apache/commons/compress/archivers/zip/X0015_CertificateIdForFile.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/X0015_CertificateIdForFile.java b/src/main/java/org/apache/commons/compress/archivers/zip/X0015_CertificateIdForFile.java index 1735bbb..89b327b 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/X0015_CertificateIdForFile.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/X0015_CertificateIdForFile.java @@ -67,7 +67,7 @@ public class X0015_CertificateIdForFile extends PKWareExtraHeader { } @Override - public void parseFromCentralDirectoryData(byte[] data, int offset, int length) { + public void parseFromCentralDirectoryData(final byte[] data, final int offset, final int length) { super.parseFromCentralDirectoryData(data, offset, length); this.rcount = ZipShort.getValue(data, offset); this.hashAlg = HashAlgorithm.getAlgorithmByCode(ZipShort.getValue(data, offset + 2)); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/main/java/org/apache/commons/compress/archivers/zip/X0016_CertificateIdForCentralDirectory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/X0016_CertificateIdForCentralDirectory.java b/src/main/java/org/apache/commons/compress/archivers/zip/X0016_CertificateIdForCentralDirectory.java index 788491d..bab1e61 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/X0016_CertificateIdForCentralDirectory.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/X0016_CertificateIdForCentralDirectory.java @@ -68,7 +68,7 @@ public class X0016_CertificateIdForCentralDirectory extends PKWareExtraHeader { } @Override - public void parseFromCentralDirectoryData(byte[] data, int offset, int length) { + public void parseFromCentralDirectoryData(final byte[] data, final int offset, final int length) { this.rcount = ZipShort.getValue(data, offset); this.hashAlg = HashAlgorithm.getAlgorithmByCode(ZipShort.getValue(data, offset + 2)); } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/main/java/org/apache/commons/compress/archivers/zip/X0017_StrongEncryptionHeader.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/X0017_StrongEncryptionHeader.java b/src/main/java/org/apache/commons/compress/archivers/zip/X0017_StrongEncryptionHeader.java index e45abd8..1a9a46e 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/X0017_StrongEncryptionHeader.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/X0017_StrongEncryptionHeader.java @@ -299,7 +299,7 @@ public class X0017_StrongEncryptionHeader extends PKWareExtraHeader { * @param offset offset into buffer to read data * @param length the length of data */ - public void parseCentralDirectoryFormat(byte[] data, int offset, int length) { + public void parseCentralDirectoryFormat(final byte[] data, final int offset, final int length) { this.format = ZipShort.getValue(data, offset); this.algId = EncryptionAlgorithm.getAlgorithmByCode(ZipShort.getValue(data, offset + 2)); this.bitlen = ZipShort.getValue(data, offset + 4); @@ -327,7 +327,7 @@ public class X0017_StrongEncryptionHeader extends PKWareExtraHeader { * @param offset offset into buffer to read data * @param length the length of data */ - public void parseFileFormat(byte[] data, int offset, int length) { + public void parseFileFormat(final byte[] data, final int offset, final int length) { int ivSize = ZipShort.getValue(data, offset); this.ivData = new byte[ivSize]; System.arraycopy(data, offset + 4, this.ivData, 0, ivSize); @@ -369,13 +369,13 @@ public class X0017_StrongEncryptionHeader extends PKWareExtraHeader { } @Override - public void parseFromLocalFileData(byte[] data, int offset, int length) { + public void parseFromLocalFileData(final byte[] data, final int offset, final int length) { super.parseFromLocalFileData(data, offset, length); parseFileFormat(data, offset, length); } @Override - public void parseFromCentralDirectoryData(byte[] data, int offset, int length) { + public void parseFromCentralDirectoryData(final byte[] data, final int offset, final int length) { super.parseFromCentralDirectoryData(data, offset, length); parseCentralDirectoryFormat(data, offset, length); } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/main/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestamp.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestamp.java b/src/main/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestamp.java index 81bd9ca..612ace6 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestamp.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestamp.java @@ -219,7 +219,7 @@ public class X5455_ExtendedTimestamp implements ZipExtraField, Cloneable, Serial */ @Override public void parseFromLocalFileData( - byte[] data, int offset, int length + final byte[] data, int offset, final int length ) throws ZipException { reset(); final int len = offset + length; @@ -247,7 +247,7 @@ public class X5455_ExtendedTimestamp implements ZipExtraField, Cloneable, Serial */ @Override public void parseFromCentralDirectoryData( - byte[] buffer, int offset, int length + final byte[] buffer, final int offset, final int length ) throws ZipException { reset(); parseFromLocalFileData(buffer, offset, length); @@ -278,7 +278,7 @@ public class X5455_ExtendedTimestamp implements ZipExtraField, Cloneable, Serial * @param flags flags byte indicating which of the * three datestamp fields are present. */ - public void setFlags(byte flags) { + public void setFlags(final byte flags) { this.flags = flags; this.bit0_modifyTimePresent = (flags & MODIFY_TIME_BIT) == MODIFY_TIME_BIT; this.bit1_accessTimePresent = (flags & ACCESS_TIME_BIT) == ACCESS_TIME_BIT; @@ -415,7 +415,7 @@ public class X5455_ExtendedTimestamp implements ZipExtraField, Cloneable, Serial * * @param l ZipLong of the modify time (seconds per epoch) */ - public void setModifyTime(ZipLong l) { + public void setModifyTime(final ZipLong l) { bit0_modifyTimePresent = l != null; flags = (byte) (l != null ? (flags | MODIFY_TIME_BIT) : (flags & ~MODIFY_TIME_BIT)); @@ -434,7 +434,7 @@ public class X5455_ExtendedTimestamp implements ZipExtraField, Cloneable, Serial * * @param l ZipLong of the access time (seconds per epoch) */ - public void setAccessTime(ZipLong l) { + public void setAccessTime(final ZipLong l) { bit1_accessTimePresent = l != null; flags = (byte) (l != null ? (flags | ACCESS_TIME_BIT) : (flags & ~ACCESS_TIME_BIT)); @@ -453,7 +453,7 @@ public class X5455_ExtendedTimestamp implements ZipExtraField, Cloneable, Serial * * @param l ZipLong of the create time (seconds per epoch) */ - public void setCreateTime(ZipLong l) { + public void setCreateTime(final ZipLong l) { bit2_createTimePresent = l != null; flags = (byte) (l != null ? (flags | CREATE_TIME_BIT) : (flags & ~CREATE_TIME_BIT)); @@ -473,7 +473,7 @@ public class X5455_ExtendedTimestamp implements ZipExtraField, Cloneable, Serial * * @param d modify time as java.util.Date */ - public void setModifyJavaTime(Date d) { setModifyTime(dateToZipLong(d)); } + public void setModifyJavaTime(final Date d) { setModifyTime(dateToZipLong(d)); } /** * <p> @@ -488,7 +488,7 @@ public class X5455_ExtendedTimestamp implements ZipExtraField, Cloneable, Serial * * @param d access time as java.util.Date */ - public void setAccessJavaTime(Date d) { setAccessTime(dateToZipLong(d)); } + public void setAccessJavaTime(final Date d) { setAccessTime(dateToZipLong(d)); } /** * <p> @@ -503,7 +503,7 @@ public class X5455_ExtendedTimestamp implements ZipExtraField, Cloneable, Serial * * @param d create time as java.util.Date */ - public void setCreateJavaTime(Date d) { setCreateTime(dateToZipLong(d)); } + public void setCreateJavaTime(final Date d) { setCreateTime(dateToZipLong(d)); } /** * Utility method converts java.util.Date (milliseconds since epoch) @@ -559,7 +559,7 @@ public class X5455_ExtendedTimestamp implements ZipExtraField, Cloneable, Serial } @Override - public boolean equals(Object o) { + public boolean equals(final Object o) { if (o instanceof X5455_ExtendedTimestamp) { X5455_ExtendedTimestamp xf = (X5455_ExtendedTimestamp) o; http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/main/java/org/apache/commons/compress/archivers/zip/X7875_NewUnix.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/X7875_NewUnix.java b/src/main/java/org/apache/commons/compress/archivers/zip/X7875_NewUnix.java index 007ca50..4d5397c 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/X7875_NewUnix.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/X7875_NewUnix.java @@ -111,7 +111,7 @@ public class X7875_NewUnix implements ZipExtraField, Cloneable, Serializable { * * @param l UID value to set on this extra field. */ - public void setUID(long l) { + public void setUID(final long l) { this.uid = ZipUtil.longToBig(l); } @@ -120,7 +120,7 @@ public class X7875_NewUnix implements ZipExtraField, Cloneable, Serializable { * * @param l GID value to set on this extra field. */ - public void setGID(long l) { + public void setGID(final long l) { this.gid = ZipUtil.longToBig(l); } @@ -209,7 +209,7 @@ public class X7875_NewUnix implements ZipExtraField, Cloneable, Serializable { */ @Override public void parseFromLocalFileData( - byte[] data, int offset, int length + final byte[] data, int offset, final int length ) throws ZipException { reset(); this.version = signedByteToUnsignedInt(data[offset++]); @@ -231,7 +231,7 @@ public class X7875_NewUnix implements ZipExtraField, Cloneable, Serializable { */ @Override public void parseFromCentralDirectoryData( - byte[] buffer, int offset, int length + final byte[] buffer, final int offset, final int length ) throws ZipException { } @@ -263,7 +263,7 @@ public class X7875_NewUnix implements ZipExtraField, Cloneable, Serializable { } @Override - public boolean equals(Object o) { + public boolean equals(final Object o) { if (o instanceof X7875_NewUnix) { X7875_NewUnix xf = (X7875_NewUnix) o; // We assume uid and gid can never be null. @@ -292,7 +292,7 @@ public class X7875_NewUnix implements ZipExtraField, Cloneable, Serializable { * @param array byte[] array to trim & pad. * @return trimmed & padded byte[] array. */ - static byte[] trimLeadingZeroesForceMinLength(byte[] array) { + static byte[] trimLeadingZeroesForceMinLength(final byte[] array) { if (array == null) { return array; } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/main/java/org/apache/commons/compress/archivers/zip/Zip64ExtendedInformationExtraField.java ---------------------------------------------------------------------- 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 0c5ec02..9f77e89 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 @@ -78,8 +78,8 @@ public class Zip64ExtendedInformationExtraField implements ZipExtraField { * * @throws IllegalArgumentException if size or compressedSize is null */ - public Zip64ExtendedInformationExtraField(ZipEightByteInteger size, - ZipEightByteInteger compressedSize) { + public Zip64ExtendedInformationExtraField(final ZipEightByteInteger size, + final ZipEightByteInteger compressedSize) { this(size, compressedSize, null, null); } @@ -93,10 +93,10 @@ public class Zip64ExtendedInformationExtraField implements ZipExtraField { * * @throws IllegalArgumentException if size or compressedSize is null */ - public Zip64ExtendedInformationExtraField(ZipEightByteInteger size, - ZipEightByteInteger compressedSize, - ZipEightByteInteger relativeHeaderOffset, - ZipLong diskStart) { + public Zip64ExtendedInformationExtraField(final ZipEightByteInteger size, + final ZipEightByteInteger compressedSize, + final ZipEightByteInteger relativeHeaderOffset, + final ZipLong diskStart) { this.size = size; this.compressedSize = compressedSize; this.relativeHeaderOffset = relativeHeaderOffset; @@ -150,7 +150,7 @@ public class Zip64ExtendedInformationExtraField implements ZipExtraField { } @Override - public void parseFromLocalFileData(byte[] buffer, int offset, int length) + public void parseFromLocalFileData(final byte[] buffer, int offset, final int length) throws ZipException { if (length == 0) { // no local file data at all, may happen if an archive @@ -180,8 +180,8 @@ public class Zip64ExtendedInformationExtraField implements ZipExtraField { } @Override - public void parseFromCentralDirectoryData(byte[] buffer, int offset, - int length) + public void parseFromCentralDirectoryData(final byte[] buffer, int offset, + final int length) throws ZipException { // store for processing in reparseCentralDirectoryData rawCentralDirectoryData = new byte[length]; @@ -221,10 +221,10 @@ public class Zip64ExtendedInformationExtraField implements ZipExtraField { * @param hasDiskStart flag to read from central directory * @throws ZipException on error */ - public void reparseCentralDirectoryData(boolean hasUncompressedSize, - boolean hasCompressedSize, - boolean hasRelativeHeaderOffset, - boolean hasDiskStart) + public void reparseCentralDirectoryData(final boolean hasUncompressedSize, + final boolean hasCompressedSize, + final boolean hasRelativeHeaderOffset, + final boolean hasDiskStart) throws ZipException { if (rawCentralDirectoryData != null) { int expectedLength = (hasUncompressedSize ? DWORD : 0) @@ -273,7 +273,7 @@ public class Zip64ExtendedInformationExtraField implements ZipExtraField { * The uncompressed size stored in this extra field. * @param size The uncompressed size stored in this extra field. */ - public void setSize(ZipEightByteInteger size) { + public void setSize(final ZipEightByteInteger size) { this.size = size; } @@ -289,7 +289,7 @@ public class Zip64ExtendedInformationExtraField implements ZipExtraField { * The uncompressed size stored in this extra field. * @param compressedSize The uncompressed size stored in this extra field. */ - public void setCompressedSize(ZipEightByteInteger compressedSize) { + public void setCompressedSize(final ZipEightByteInteger compressedSize) { this.compressedSize = compressedSize; } @@ -305,7 +305,7 @@ public class Zip64ExtendedInformationExtraField implements ZipExtraField { * The relative header offset stored in this extra field. * @param rho The relative header offset stored in this extra field. */ - public void setRelativeHeaderOffset(ZipEightByteInteger rho) { + public void setRelativeHeaderOffset(final ZipEightByteInteger rho) { relativeHeaderOffset = rho; } @@ -321,11 +321,11 @@ public class Zip64ExtendedInformationExtraField implements ZipExtraField { * The disk start number stored in this extra field. * @param ds The disk start number stored in this extra field. */ - public void setDiskStartNumber(ZipLong ds) { + public void setDiskStartNumber(final ZipLong ds) { diskStart = ds; } - private int addSizes(byte[] data) { + private int addSizes(final byte[] data) { int off = 0; if (size != null) { System.arraycopy(size.getBytes(), 0, data, 0, DWORD); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/main/java/org/apache/commons/compress/archivers/zip/Zip64RequiredException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/Zip64RequiredException.java b/src/main/java/org/apache/commons/compress/archivers/zip/Zip64RequiredException.java index 677b4e6..1ec7e70 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/Zip64RequiredException.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/Zip64RequiredException.java @@ -33,7 +33,7 @@ public class Zip64RequiredException extends ZipException { /** * Helper to format "entry too big" messages. */ - static String getEntryTooBigMessage(ZipArchiveEntry ze) { + static String getEntryTooBigMessage(final ZipArchiveEntry ze) { return ze.getName() + "'s size exceeds the limit of 4GByte."; } @@ -43,7 +43,7 @@ public class Zip64RequiredException extends ZipException { static final String TOO_MANY_ENTRIES_MESSAGE = "archive contains more than 65535 entries."; - public Zip64RequiredException(String reason) { + public Zip64RequiredException(final String reason) { super(reason); } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java ---------------------------------------------------------------------- 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 504646d..d66d068 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 @@ -98,7 +98,7 @@ public class ZipArchiveEntry extends java.util.zip.ZipEntry * * @param name the name of the entry */ - public ZipArchiveEntry(String name) { + public ZipArchiveEntry(final String name) { super(name); setName(name); } @@ -112,7 +112,7 @@ public class ZipArchiveEntry extends java.util.zip.ZipEntry * @param entry the entry to get fields from * @throws ZipException on error */ - public ZipArchiveEntry(java.util.zip.ZipEntry entry) throws ZipException { + public ZipArchiveEntry(final java.util.zip.ZipEntry entry) throws ZipException { super(entry); setName(entry.getName()); byte[] extra = entry.getExtra(); @@ -137,7 +137,7 @@ public class ZipArchiveEntry extends java.util.zip.ZipEntry * @param entry the entry to get fields from * @throws ZipException on error */ - public ZipArchiveEntry(ZipArchiveEntry entry) throws ZipException { + public ZipArchiveEntry(final ZipArchiveEntry entry) throws ZipException { this((java.util.zip.ZipEntry) entry); setInternalAttributes(entry.getInternalAttributes()); setExternalAttributes(entry.getExternalAttributes()); @@ -165,7 +165,7 @@ public class ZipArchiveEntry extends java.util.zip.ZipEntry * @param inputFile file to create the entry from * @param entryName name of the entry */ - public ZipArchiveEntry(File inputFile, String entryName) { + public ZipArchiveEntry(final File inputFile, final String entryName) { this(inputFile.isDirectory() && !entryName.endsWith("/") ? entryName + "/" : entryName); if (inputFile.isFile()){ @@ -210,7 +210,7 @@ public class ZipArchiveEntry extends java.util.zip.ZipEntry * @since 1.1 */ @Override - public void setMethod(int method) { + public void setMethod(final int method) { if (method < 0) { throw new IllegalArgumentException( "ZIP compression method can not be negative: " + method); @@ -235,7 +235,7 @@ public class ZipArchiveEntry extends java.util.zip.ZipEntry * Sets the internal file attributes. * @param value an <code>int</code> value */ - public void setInternalAttributes(int value) { + public void setInternalAttributes(final int value) { internalAttributes = value; } @@ -256,7 +256,7 @@ public class ZipArchiveEntry extends java.util.zip.ZipEntry * Sets the external file attributes. * @param value an <code>long</code> value */ - public void setExternalAttributes(long value) { + public void setExternalAttributes(final long value) { externalAttributes = value; } @@ -265,7 +265,7 @@ public class ZipArchiveEntry extends java.util.zip.ZipEntry * unzip command. * @param mode an <code>int</code> value */ - public void setUnixMode(int mode) { + public void setUnixMode(final int mode) { // CheckStyle:MagicNumberCheck OFF - no point setExternalAttributes((mode << SHORT_SHIFT) // MS-DOS read-only attribute @@ -312,7 +312,7 @@ public class ZipArchiveEntry extends java.util.zip.ZipEntry * Set the platform (UNIX or FAT). * @param platform an <code>int</code> value - 0 is FAT, 3 is UNIX */ - protected void setPlatform(int platform) { + protected void setPlatform(final int platform) { this.platform = platform; } @@ -320,7 +320,7 @@ public class ZipArchiveEntry extends java.util.zip.ZipEntry * Replaces all currently attached extra fields with the new array. * @param fields an array of extra fields */ - public void setExtraFields(ZipExtraField[] fields) { + public void setExtraFields(final ZipExtraField[] fields) { List<ZipExtraField> newFields = new ArrayList<ZipExtraField>(); for (ZipExtraField field : fields) { if (field instanceof UnparseableExtraFieldData) { @@ -356,7 +356,7 @@ public class ZipArchiveEntry extends java.util.zip.ZipEntry * * @since 1.1 */ - public ZipExtraField[] getExtraFields(boolean includeUnparseable) { + public ZipExtraField[] getExtraFields(final boolean includeUnparseable) { return includeUnparseable ? getAllExtraFields() : getParseableExtraFields(); @@ -385,11 +385,11 @@ public class ZipArchiveEntry extends java.util.zip.ZipEntry return unparseableExtra != null ? getMergedFields() : extraFields; } - private ZipExtraField[] copyOf(ZipExtraField[] src){ + private ZipExtraField[] copyOf(final ZipExtraField[] src){ return copyOf(src, src.length); } - private ZipExtraField[] copyOf(ZipExtraField[] src, int length) { + private ZipExtraField[] copyOf(final ZipExtraField[] src, final int length) { ZipExtraField[] cpy = new ZipExtraField[length]; System.arraycopy(src, 0, cpy, 0, Math.min(src.length, length)); return cpy; @@ -417,7 +417,7 @@ public class ZipArchiveEntry extends java.util.zip.ZipEntry * added as last field.</p> * @param ze an extra field */ - public void addExtraField(ZipExtraField ze) { + public void addExtraField(final ZipExtraField ze) { if (ze instanceof UnparseableExtraFieldData) { unparseableExtra = (UnparseableExtraFieldData) ze; } else { @@ -442,7 +442,7 @@ public class ZipArchiveEntry extends java.util.zip.ZipEntry * <p>The new extra field will be the first one.</p> * @param ze an extra field */ - public void addAsFirstExtraField(ZipExtraField ze) { + public void addAsFirstExtraField(final ZipExtraField ze) { if (ze instanceof UnparseableExtraFieldData) { unparseableExtra = (UnparseableExtraFieldData) ze; } else { @@ -464,7 +464,7 @@ public class ZipArchiveEntry extends java.util.zip.ZipEntry * Remove an extra field. * @param type the type of extra field to remove */ - public void removeExtraField(ZipShort type) { + public void removeExtraField(final ZipShort type) { if (extraFields == null) { throw new java.util.NoSuchElementException(); } @@ -501,7 +501,7 @@ public class ZipArchiveEntry extends java.util.zip.ZipEntry * @param type the header id * @return null if no such field exists. */ - public ZipExtraField getExtraField(ZipShort type) { + public ZipExtraField getExtraField(final ZipShort type) { if (extraFields != null) { for (ZipExtraField extraField : extraFields) { if (type.equals(extraField.getHeaderId())) { @@ -532,7 +532,7 @@ public class ZipArchiveEntry extends java.util.zip.ZipEntry * @throws RuntimeException on error */ @Override - public void setExtra(byte[] extra) throws RuntimeException { + public void setExtra(final byte[] extra) throws RuntimeException { try { ZipExtraField[] local = ExtraFieldUtils.parse(extra, true, @@ -559,7 +559,7 @@ public class ZipArchiveEntry extends java.util.zip.ZipEntry * Sets the central directory part of extra fields. * @param b an array of bytes to be parsed into extra fields */ - public void setCentralDirectoryExtra(byte[] b) { + public void setCentralDirectoryExtra(final byte[] b) { try { ZipExtraField[] central = ExtraFieldUtils.parse(b, false, @@ -638,7 +638,7 @@ public class ZipArchiveEntry extends java.util.zip.ZipEntry * than 0 */ @Override - public void setSize(long size) { + public void setSize(final long size) { if (size < 0) { throw new IllegalArgumentException("invalid entry size"); } @@ -654,7 +654,7 @@ public class ZipArchiveEntry extends java.util.zip.ZipEntry * archive * @since 1.2 */ - protected void setName(String name, byte[] rawName) { + protected void setName(final String name, final byte[] rawName) { setName(name); this.rawName = rawName; } @@ -706,7 +706,7 @@ public class ZipArchiveEntry extends java.util.zip.ZipEntry * @param b the general purpose bit * @since 1.1 */ - public void setGeneralPurposeBit(GeneralPurposeBit b) { + public void setGeneralPurposeBit(final GeneralPurposeBit b) { gpb = b; } @@ -718,7 +718,7 @@ public class ZipArchiveEntry extends java.util.zip.ZipEntry * @param f the extra fields to merge * @param local whether the new fields originate from local data */ - private void mergeExtraFields(ZipExtraField[] f, boolean local) + private void mergeExtraFields(final ZipExtraField[] f, final boolean local) throws ZipException { if (extraFields == null) { setExtraFields(f); @@ -763,7 +763,7 @@ public class ZipArchiveEntry extends java.util.zip.ZipEntry * @see java.lang.Object#equals(java.lang.Object) */ @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } @@ -809,7 +809,7 @@ public class ZipArchiveEntry extends java.util.zip.ZipEntry * @param versionMadeBy "version made by" field * @since 1.11 */ - public void setVersionMadeBy(int versionMadeBy) { + public void setVersionMadeBy(final int versionMadeBy) { this.versionMadeBy = versionMadeBy; } @@ -818,7 +818,7 @@ public class ZipArchiveEntry extends java.util.zip.ZipEntry * @param versionRequired "version required to expand" field * @since 1.11 */ - public void setVersionRequired(int versionRequired) { + public void setVersionRequired(final int versionRequired) { this.versionRequired = versionRequired; } @@ -854,7 +854,7 @@ public class ZipArchiveEntry extends java.util.zip.ZipEntry * @param rawFlag content of the flags field * @since 1.11 */ - public void setRawFlag(int rawFlag) { + public void setRawFlag(final int rawFlag) { this.rawFlag = rawFlag; } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryRequest.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryRequest.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryRequest.java index 06bb791..9c13f7e 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryRequest.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryRequest.java @@ -37,7 +37,7 @@ public class ZipArchiveEntryRequest { private final int method; - private ZipArchiveEntryRequest(ZipArchiveEntry zipArchiveEntry, InputStreamSupplier payloadSupplier) { + private ZipArchiveEntryRequest(final ZipArchiveEntry zipArchiveEntry, final InputStreamSupplier payloadSupplier) { // this constructor has "safe" access to all member variables on zipArchiveEntry this.zipArchiveEntry = zipArchiveEntry; this.payloadSupplier = payloadSupplier; @@ -50,7 +50,7 @@ public class ZipArchiveEntryRequest { * @param payloadSupplier The payload that will be added to the zip entry. * @return The newly created request */ - public static ZipArchiveEntryRequest createZipArchiveEntryRequest(ZipArchiveEntry zipArchiveEntry, InputStreamSupplier payloadSupplier) { + public static ZipArchiveEntryRequest createZipArchiveEntryRequest(final ZipArchiveEntry zipArchiveEntry, final InputStreamSupplier payloadSupplier) { return new ZipArchiveEntryRequest(zipArchiveEntry, payloadSupplier); } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/478bef36/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java ---------------------------------------------------------------------- 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 be036e5..d0eb5f1 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 @@ -163,7 +163,7 @@ public class ZipArchiveInputStream extends ArchiveInputStream { * Create an instance using UTF-8 encoding * @param inputStream the stream to wrap */ - public ZipArchiveInputStream(InputStream inputStream) { + public ZipArchiveInputStream(final InputStream inputStream) { this(inputStream, ZipEncodingHelper.UTF8); } @@ -174,7 +174,7 @@ public class ZipArchiveInputStream extends ArchiveInputStream { * for the platform's default encoding * @since 1.5 */ - public ZipArchiveInputStream(InputStream inputStream, String encoding) { + public ZipArchiveInputStream(final InputStream inputStream, final String encoding) { this(inputStream, encoding, true); } @@ -186,7 +186,7 @@ public class ZipArchiveInputStream extends ArchiveInputStream { * @param useUnicodeExtraFields whether to use InfoZIP Unicode * Extra Fields (if present) to set the file names. */ - public ZipArchiveInputStream(InputStream inputStream, String encoding, boolean useUnicodeExtraFields) { + public ZipArchiveInputStream(final InputStream inputStream, final String encoding, final boolean useUnicodeExtraFields) { this(inputStream, encoding, useUnicodeExtraFields, false); } @@ -201,10 +201,10 @@ public class ZipArchiveInputStream extends ArchiveInputStream { * will try to read STORED entries that use a data descriptor * @since 1.1 */ - public ZipArchiveInputStream(InputStream inputStream, - String encoding, - boolean useUnicodeExtraFields, - boolean allowStoredEntriesWithDataDescriptor) { + public ZipArchiveInputStream(final InputStream inputStream, + final String encoding, + final boolean useUnicodeExtraFields, + final boolean allowStoredEntriesWithDataDescriptor) { this.encoding = encoding; zipEncoding = ZipEncodingHelper.getZipEncoding(encoding); this.useUnicodeExtraFields = useUnicodeExtraFields; @@ -327,7 +327,7 @@ public class ZipArchiveInputStream extends ArchiveInputStream { * deals with splitting/spanning markers that may prefix the first * LFH. */ - private void readFirstLocalFileHeader(byte[] lfh) throws IOException { + private void readFirstLocalFileHeader(final byte[] lfh) throws IOException { readFully(lfh); ZipLong sig = new ZipLong(lfh); if (sig.equals(ZipLong.DD_SIG)) { @@ -349,7 +349,7 @@ public class ZipArchiveInputStream extends ArchiveInputStream { * information from it if sizes are 0xFFFFFFFF and the entry * doesn't use a data descriptor. */ - private void processZip64Extra(ZipLong size, ZipLong cSize) { + private void processZip64Extra(final ZipLong size, final ZipLong cSize) { Zip64ExtendedInformationExtraField z64 = (Zip64ExtendedInformationExtraField) current.entry.getExtraField(Zip64ExtendedInformationExtraField.HEADER_ID); @@ -379,7 +379,7 @@ public class ZipArchiveInputStream extends ArchiveInputStream { * @since 1.1 */ @Override - public boolean canReadEntryData(ArchiveEntry ae) { + public boolean canReadEntryData(final ArchiveEntry ae) { if (ae instanceof ZipArchiveEntry) { ZipArchiveEntry ze = (ZipArchiveEntry) ae; return ZipUtil.canHandleEntryData(ze) @@ -390,7 +390,7 @@ public class ZipArchiveInputStream extends ArchiveInputStream { } @Override - public int read(byte[] buffer, int offset, int length) throws IOException { + public int read(final byte[] buffer, final int offset, final int length) throws IOException { if (closed) { throw new IOException("The stream is closed"); } @@ -434,7 +434,7 @@ public class ZipArchiveInputStream extends ArchiveInputStream { /** * Implementation of read for STORED entries. */ - private int readStored(byte[] buffer, int offset, int length) throws IOException { + private int readStored(final byte[] buffer, final int offset, final int length) throws IOException { if (current.hasDataDescriptor) { if (lastStoredEntry == null) { @@ -473,7 +473,7 @@ public class ZipArchiveInputStream extends ArchiveInputStream { /** * Implementation of read for DEFLATED entries. */ - private int readDeflated(byte[] buffer, int offset, int length) throws IOException { + private int readDeflated(final byte[] buffer, final int offset, final int length) throws IOException { int read = readFromInflater(buffer, offset, length); if (read <= 0) { if (inf.finished()) { @@ -493,7 +493,7 @@ public class ZipArchiveInputStream extends ArchiveInputStream { * Potentially reads more bytes to fill the inflater's buffer and * reads from it. */ - private int readFromInflater(byte[] buffer, int offset, int length) throws IOException { + private int readFromInflater(final byte[] buffer, final int offset, final int length) throws IOException { int read = 0; do { if (inf.needsInput()) { @@ -543,7 +543,7 @@ public class ZipArchiveInputStream extends ArchiveInputStream { * @throws IllegalArgumentException - if value is negative. */ @Override - public long skip(long value) throws IOException { + public long skip(final long value) throws IOException { if (value >= 0) { long skipped = 0; while (skipped < value) { @@ -568,7 +568,7 @@ public class ZipArchiveInputStream extends ArchiveInputStream { * @param length the number of bytes to check * @return true, if this stream is a zip archive stream, false otherwise */ - public static boolean matches(byte[] signature, int length) { + public static boolean matches(final byte[] signature, final int length) { if (length < ZipArchiveOutputStream.LFH_SIG.length) { return false; } @@ -579,7 +579,7 @@ public class ZipArchiveInputStream extends ArchiveInputStream { || checksig(signature, ZipLong.SINGLE_SEGMENT_SPLIT_MARKER.getBytes()); } - private static boolean checksig(byte[] signature, byte[] expected) { + private static boolean checksig(final byte[] signature, final byte[] expected) { for (int i = 0; i < expected.length; i++) { if (signature[i] != expected[i]) { return false; @@ -698,7 +698,7 @@ public class ZipArchiveInputStream extends ArchiveInputStream { return length; } - private void readFully(byte[] b) throws IOException { + private void readFully(final byte[] b) throws IOException { int count = IOUtils.readFully(in, b); count(count); if (count < b.length) { @@ -746,7 +746,7 @@ public class ZipArchiveInputStream extends ArchiveInputStream { * the entry doesn't require any data descriptor or the method is * DEFLATED. */ - private boolean supportsDataDescriptorFor(ZipArchiveEntry entry) { + private boolean supportsDataDescriptorFor(final ZipArchiveEntry entry) { return !entry.getGeneralPurposeBit().usesDataDescriptor() || (allowStoredEntriesWithDataDescriptor && entry.getMethod() == ZipEntry.STORED) @@ -813,7 +813,7 @@ public class ZipArchiveInputStream extends ArchiveInputStream { * <p>If it contains such a signature, reads the data descriptor * and positions the stream right after the data descriptor.</p> */ - private boolean bufferContainsSignature(ByteArrayOutputStream bos, int offset, int lastRead, int expectedDDLen) + private boolean bufferContainsSignature(final ByteArrayOutputStream bos, final int offset, final int lastRead, final int expectedDDLen) throws IOException { boolean done = false; @@ -854,7 +854,7 @@ public class ZipArchiveInputStream extends ArchiveInputStream { * <p>Data descriptor plus incomplete signature (3 bytes in the * worst case) can be 20 bytes max.</p> */ - private int cacheBytesRead(ByteArrayOutputStream bos, int offset, int lastRead, int expecteDDLen) { + private int cacheBytesRead(final ByteArrayOutputStream bos, int offset, final int lastRead, final int expecteDDLen) { final int cacheable = offset + lastRead - expecteDDLen - 3; if (cacheable > 0) { bos.write(buf.array(), 0, cacheable); @@ -866,7 +866,7 @@ public class ZipArchiveInputStream extends ArchiveInputStream { return offset; } - private void pushback(byte[] buf, int offset, int length) throws IOException { + private void pushback(final byte[] buf, final int offset, final int length) throws IOException { ((PushbackInputStream) in).unread(buf, offset, length); pushedBackBytes(length); } @@ -948,7 +948,7 @@ public class ZipArchiveInputStream extends ArchiveInputStream { * * Also updates bytes-read counter. */ - private void realSkip(long value) throws IOException { + private void realSkip(final long value) throws IOException { if (value >= 0) { long skipped = 0; while (skipped < value) { @@ -979,7 +979,7 @@ public class ZipArchiveInputStream extends ArchiveInputStream { return b; } - private boolean isFirstByteOfEocdSig(int b) { + private boolean isFirstByteOfEocdSig(final int b) { return b == ZipArchiveOutputStream.EOCD_SIG[0]; }
