http://git-wip-us.apache.org/repos/asf/commons-compress/blob/3f2c760a/src/main/java/org/apache/commons/compress/compressors/bzip2/CRC.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/compressors/bzip2/CRC.java b/src/main/java/org/apache/commons/compress/compressors/bzip2/CRC.java index 6631e46..a20ea70 100644 --- a/src/main/java/org/apache/commons/compress/compressors/bzip2/CRC.java +++ b/src/main/java/org/apache/commons/compress/compressors/bzip2/CRC.java @@ -122,7 +122,7 @@ class CRC { void updateCRC(final int inCh, int repeat) { int globalCrcShadow = this.globalCrc; while (repeat-- > 0) { - int temp = (globalCrcShadow >> 24) ^ inCh; + final int temp = (globalCrcShadow >> 24) ^ inCh; globalCrcShadow = (globalCrcShadow << 8) ^ crc32Table[(temp >= 0) ? temp : (temp + 256)];
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/3f2c760a/src/main/java/org/apache/commons/compress/compressors/deflate/DeflateCompressorInputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/compressors/deflate/DeflateCompressorInputStream.java b/src/main/java/org/apache/commons/compress/compressors/deflate/DeflateCompressorInputStream.java index 76a86d8..b10bd8a 100644 --- a/src/main/java/org/apache/commons/compress/compressors/deflate/DeflateCompressorInputStream.java +++ b/src/main/java/org/apache/commons/compress/compressors/deflate/DeflateCompressorInputStream.java @@ -66,7 +66,7 @@ public class DeflateCompressorInputStream extends CompressorInputStream { /** {@inheritDoc} */ @Override public int read() throws IOException { - int ret = in.read(); + final int ret = in.read(); count(ret == -1 ? 0 : 1); return ret; } @@ -74,7 +74,7 @@ public class DeflateCompressorInputStream extends CompressorInputStream { /** {@inheritDoc} */ @Override public int read(final byte[] buf, final int off, final int len) throws IOException { - int ret = in.read(buf, off, len); + final int ret = in.read(buf, off, len); count(ret); return ret; } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/3f2c760a/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.java ---------------------------------------------------------------------- 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 99aabf9..9f28c8a 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 @@ -149,8 +149,8 @@ public class GzipCompressorInputStream extends CompressorInputStream { assert isFirstMember || decompressConcatenated; // Check the magic bytes without a possibility of EOFException. - int magic0 = in.read(); - int magic1 = in.read(); + final int magic0 = in.read(); + final int magic1 = in.read(); // If end of input was reached after decompressing at least // one .gz member, we have reached the end of the file successfully. @@ -165,14 +165,14 @@ public class GzipCompressorInputStream extends CompressorInputStream { } // Parsing the rest of the header may throw EOFException. - DataInputStream inData = new DataInputStream(in); - int method = inData.readUnsignedByte(); + final DataInputStream inData = new DataInputStream(in); + final int method = inData.readUnsignedByte(); if (method != Deflater.DEFLATED) { throw new IOException("Unsupported compression method " + method + " in the .gz header"); } - int flg = inData.readUnsignedByte(); + final int flg = inData.readUnsignedByte(); if ((flg & FRESERVED) != 0) { throw new IOException( "Reserved flags are set in the .gz header"); @@ -234,7 +234,7 @@ public class GzipCompressorInputStream extends CompressorInputStream { } private byte[] readToNull(final DataInputStream inData) throws IOException { - ByteArrayOutputStream bos = new ByteArrayOutputStream(); + final ByteArrayOutputStream bos = new ByteArrayOutputStream(); int b = 0; while ((b = inData.readUnsignedByte()) != 0x00) { // NOPMD bos.write(b); @@ -284,7 +284,7 @@ public class GzipCompressorInputStream extends CompressorInputStream { int ret; try { ret = inf.inflate(b, off, len); - } catch (DataFormatException e) { + } catch (final DataFormatException e) { throw new IOException("Gzip-compressed data is corrupt"); } @@ -302,17 +302,17 @@ public class GzipCompressorInputStream extends CompressorInputStream { // in.mark earler, it should always skip enough. in.reset(); - int skipAmount = bufUsed - inf.getRemaining(); + final int skipAmount = bufUsed - inf.getRemaining(); if (in.skip(skipAmount) != skipAmount) { throw new IOException(); } bufUsed = 0; - DataInputStream inData = new DataInputStream(in); + final DataInputStream inData = new DataInputStream(in); // CRC32 - long crcStored = readLittleEndianInt(inData); + final long crcStored = readLittleEndianInt(inData); if (crcStored != crc.getValue()) { throw new IOException("Gzip-compressed data is corrupt " @@ -320,7 +320,7 @@ public class GzipCompressorInputStream extends CompressorInputStream { } // Uncompressed size modulo 2^32 (ISIZE in the spec) - long isize = readLittleEndianInt(inData); + final long isize = readLittleEndianInt(inData); if (isize != (inf.getBytesWritten() & 0xffffffffl)) { throw new IOException("Gzip-compressed data is corrupt" http://git-wip-us.apache.org/repos/asf/commons-compress/blob/3f2c760a/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorOutputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorOutputStream.java b/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorOutputStream.java index d1afb5d..af79210 100644 --- a/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorOutputStream.java +++ b/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorOutputStream.java @@ -86,10 +86,10 @@ public class GzipCompressorOutputStream extends CompressorOutputStream { } private void writeHeader(final GzipParameters parameters) throws IOException { - String filename = parameters.getFilename(); - String comment = parameters.getComment(); + final String filename = parameters.getFilename(); + final String comment = parameters.getComment(); - ByteBuffer buffer = ByteBuffer.allocate(10); + final ByteBuffer buffer = ByteBuffer.allocate(10); buffer.order(ByteOrder.LITTLE_ENDIAN); buffer.putShort((short) GZIPInputStream.GZIP_MAGIC); buffer.put((byte) Deflater.DEFLATED); // compression method (8: deflate) @@ -97,7 +97,7 @@ public class GzipCompressorOutputStream extends CompressorOutputStream { buffer.putInt((int) (parameters.getModificationTime() / 1000)); // extra flags - int compressionLevel = parameters.getCompressionLevel(); + final int compressionLevel = parameters.getCompressionLevel(); if (compressionLevel == Deflater.BEST_COMPRESSION) { buffer.put((byte) 2); } else if (compressionLevel == Deflater.BEST_SPEED) { @@ -122,7 +122,7 @@ public class GzipCompressorOutputStream extends CompressorOutputStream { } private void writeTrailer() throws IOException { - ByteBuffer buffer = ByteBuffer.allocate(8); + final ByteBuffer buffer = ByteBuffer.allocate(8); buffer.order(ByteOrder.LITTLE_ENDIAN); buffer.putInt((int) crc.getValue()); buffer.putInt(deflater.getTotalIn()); @@ -167,7 +167,7 @@ public class GzipCompressorOutputStream extends CompressorOutputStream { } private void deflate() throws IOException { - int length = deflater.deflate(deflateBuffer, 0, deflateBuffer.length); + final int length = deflater.deflate(deflateBuffer, 0, deflateBuffer.length); if (length > 0) { out.write(deflateBuffer, 0, length); } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/3f2c760a/src/main/java/org/apache/commons/compress/compressors/gzip/GzipUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/compressors/gzip/GzipUtils.java b/src/main/java/org/apache/commons/compress/compressors/gzip/GzipUtils.java index 154f1cb..ed801cf 100644 --- a/src/main/java/org/apache/commons/compress/compressors/gzip/GzipUtils.java +++ b/src/main/java/org/apache/commons/compress/compressors/gzip/GzipUtils.java @@ -34,7 +34,7 @@ public class GzipUtils { // using LinkedHashMap so .tgz is preferred over .taz as // compressed extension of .tar as FileNameUtil will use the // first one found - Map<String, String> uncompressSuffix = + final Map<String, String> uncompressSuffix = new LinkedHashMap<String, String>(); uncompressSuffix.put(".tgz", ".tar"); uncompressSuffix.put(".taz", ".tar"); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/3f2c760a/src/main/java/org/apache/commons/compress/compressors/lzma/LZMACompressorInputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/compressors/lzma/LZMACompressorInputStream.java b/src/main/java/org/apache/commons/compress/compressors/lzma/LZMACompressorInputStream.java index ae23297..556c78c 100644 --- a/src/main/java/org/apache/commons/compress/compressors/lzma/LZMACompressorInputStream.java +++ b/src/main/java/org/apache/commons/compress/compressors/lzma/LZMACompressorInputStream.java @@ -51,7 +51,7 @@ public class LZMACompressorInputStream extends CompressorInputStream { /** {@inheritDoc} */ @Override public int read() throws IOException { - int ret = in.read(); + final int ret = in.read(); count(ret == -1 ? 0 : 1); return ret; } @@ -59,7 +59,7 @@ public class LZMACompressorInputStream extends CompressorInputStream { /** {@inheritDoc} */ @Override public int read(final byte[] buf, final int off, final int len) throws IOException { - int ret = in.read(buf, off, len); + final int ret = in.read(buf, off, len); count(ret); return ret; } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/3f2c760a/src/main/java/org/apache/commons/compress/compressors/lzma/LZMAUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/compressors/lzma/LZMAUtils.java b/src/main/java/org/apache/commons/compress/compressors/lzma/LZMAUtils.java index c1a653a..f3323ba 100644 --- a/src/main/java/org/apache/commons/compress/compressors/lzma/LZMAUtils.java +++ b/src/main/java/org/apache/commons/compress/compressors/lzma/LZMAUtils.java @@ -45,14 +45,14 @@ public class LZMAUtils { private static volatile CachedAvailability cachedLZMAAvailability; static { - Map<String, String> uncompressSuffix = new HashMap<String, String>(); + final Map<String, String> uncompressSuffix = new HashMap<String, String>(); uncompressSuffix.put(".lzma", ""); uncompressSuffix.put("-lzma", ""); fileNameUtil = new FileNameUtil(uncompressSuffix, ".lzma"); cachedLZMAAvailability = CachedAvailability.DONT_CACHE; try { Class.forName("org.osgi.framework.BundleEvent"); - } catch (Exception ex) { + } catch (final Exception ex) { setCacheLZMAAvailablity(true); } } @@ -99,7 +99,7 @@ public class LZMAUtils { try { LZMACompressorInputStream.matches(null, 0); return true; - } catch (NoClassDefFoundError error) { + } catch (final NoClassDefFoundError error) { return false; } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/3f2c760a/src/main/java/org/apache/commons/compress/compressors/lzw/LZWInputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/compressors/lzw/LZWInputStream.java b/src/main/java/org/apache/commons/compress/compressors/lzw/LZWInputStream.java index a102695..5967f66 100644 --- a/src/main/java/org/apache/commons/compress/compressors/lzw/LZWInputStream.java +++ b/src/main/java/org/apache/commons/compress/compressors/lzw/LZWInputStream.java @@ -61,7 +61,7 @@ public abstract class LZWInputStream extends CompressorInputStream { @Override public int read() throws IOException { - int ret = read(oneByte); + final int ret = read(oneByte); if (ret < 0) { return ret; } @@ -72,7 +72,7 @@ public abstract class LZWInputStream extends CompressorInputStream { public int read(final byte[] b, final int off, final int len) throws IOException { int bytesRead = readFromStack(b, off, len); while (len - bytesRead > 0) { - int result = decompressNextSymbol(); + final int result = decompressNextSymbol(); if (result < 0) { if (bytesRead > 0) { count(bytesRead); @@ -192,9 +192,9 @@ public abstract class LZWInputStream extends CompressorInputStream { } private int readFromStack(final byte[] b, final int off, final int len) { - int remainingInStack = outputStack.length - outputStackLocation; + final int remainingInStack = outputStack.length - outputStackLocation; if (remainingInStack > 0) { - int maxLength = Math.min(remainingInStack, len); + final int maxLength = Math.min(remainingInStack, len); System.arraycopy(outputStack, outputStackLocation, b, off, maxLength); outputStackLocation += maxLength; return maxLength; http://git-wip-us.apache.org/repos/asf/commons-compress/blob/3f2c760a/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200CompressorInputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200CompressorInputStream.java b/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200CompressorInputStream.java index 3e28465..93bc8c3 100644 --- a/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200CompressorInputStream.java +++ b/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200CompressorInputStream.java @@ -171,8 +171,8 @@ public class Pack200CompressorInputStream extends CompressorInputStream { throws IOException { originalInput = in; streamBridge = mode.newStreamBridge(); - JarOutputStream jarOut = new JarOutputStream(streamBridge); - Pack200.Unpacker u = Pack200.newUnpacker(); + final JarOutputStream jarOut = new JarOutputStream(streamBridge); + final Pack200.Unpacker u = Pack200.newUnpacker(); if (props != null) { u.properties().putAll(props); } @@ -215,7 +215,7 @@ public class Pack200CompressorInputStream extends CompressorInputStream { public boolean markSupported() { try { return streamBridge.getInput().markSupported(); - } catch (IOException ex) { + } catch (final IOException ex) { return false; } } @@ -224,7 +224,7 @@ public class Pack200CompressorInputStream extends CompressorInputStream { public void mark(final int limit) { try { streamBridge.getInput().mark(limit); - } catch (IOException ex) { + } catch (final IOException ex) { throw new RuntimeException(ex); } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/3f2c760a/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200CompressorOutputStream.java ---------------------------------------------------------------------- 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 87a1d87..ca27100 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 @@ -126,7 +126,7 @@ public class Pack200CompressorOutputStream extends CompressorOutputStream { public void finish() throws IOException { if (!finished) { finished = true; - Pack200.Packer p = Pack200.newPacker(); + final Pack200.Packer p = Pack200.newPacker(); if (properties != null) { p.properties().putAll(properties); } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/3f2c760a/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200Utils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200Utils.java b/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200Utils.java index 4659f42..164fa2f 100644 --- a/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200Utils.java +++ b/src/main/java/org/apache/commons/compress/compressors/pack200/Pack200Utils.java @@ -131,20 +131,20 @@ public class Pack200Utils { props = new HashMap<String, String>(); } props.put(Pack200.Packer.SEGMENT_LIMIT, "-1"); - File f = File.createTempFile("commons-compress", "pack200normalize"); + final File f = File.createTempFile("commons-compress", "pack200normalize"); f.deleteOnExit(); try { OutputStream os = new FileOutputStream(f); JarFile j = null; try { - Pack200.Packer p = Pack200.newPacker(); + final Pack200.Packer p = Pack200.newPacker(); p.properties().putAll(props); p.pack(j = new JarFile(from), os); j = null; os.close(); os = null; - Pack200.Unpacker u = Pack200.newUnpacker(); + final Pack200.Unpacker u = Pack200.newUnpacker(); os = new JarOutputStream(new FileOutputStream(to)); u.unpack(f, (JarOutputStream) os); } finally { http://git-wip-us.apache.org/repos/asf/commons-compress/blob/3f2c760a/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java b/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java index 3d51c9c..5a79387 100644 --- a/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java +++ b/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java @@ -132,7 +132,7 @@ public class FramedSnappyCompressorInputStream extends CompressorInputStream { private int readOnce(final byte[] b, final int off, final int len) throws IOException { int read = -1; if (inUncompressedChunk) { - int amount = Math.min(uncompressedBytesRemaining, len); + final int amount = Math.min(uncompressedBytesRemaining, len); if (amount == 0) { return -1; } @@ -142,7 +142,7 @@ public class FramedSnappyCompressorInputStream extends CompressorInputStream { count(read); } } else if (currentCompressedChunk != null) { - long before = currentCompressedChunk.getBytesRead(); + final long before = currentCompressedChunk.getBytesRead(); read = currentCompressedChunk.read(b, off, len); if (read == -1) { currentCompressedChunk.close(); @@ -160,7 +160,7 @@ public class FramedSnappyCompressorInputStream extends CompressorInputStream { private void readNextBlock() throws IOException { verifyLastChecksumAndReset(); inUncompressedChunk = false; - int type = readOneByte(); + final int type = readOneByte(); if (type == -1) { endReached = true; } else if (type == STREAM_IDENTIFIER_TYPE) { @@ -181,7 +181,7 @@ public class FramedSnappyCompressorInputStream extends CompressorInputStream { uncompressedBytesRemaining = readSize() - 4 /* CRC */; expectedChecksum = unmask(readCrc()); } else if (type == COMPRESSED_CHUNK_TYPE) { - long size = readSize() - 4 /* CRC */; + final long size = readSize() - 4 /* CRC */; expectedChecksum = unmask(readCrc()); currentCompressedChunk = new SnappyCompressorInputStream(new BoundedInputStream(in, size)); @@ -195,8 +195,8 @@ public class FramedSnappyCompressorInputStream extends CompressorInputStream { } private long readCrc() throws IOException { - byte[] b = new byte[4]; - int read = IOUtils.readFully(in, b); + final byte[] b = new byte[4]; + final int read = IOUtils.readFully(in, b); count(read); if (read != 4) { throw new IOException("premature end of stream"); @@ -230,8 +230,8 @@ public class FramedSnappyCompressorInputStream extends CompressorInputStream { } private void skipBlock() throws IOException { - int size = readSize(); - long read = IOUtils.skip(in, size); + final int size = readSize(); + final long read = IOUtils.skip(in, size); count(read); if (read != size) { throw new IOException("premature end of stream"); @@ -239,8 +239,8 @@ public class FramedSnappyCompressorInputStream extends CompressorInputStream { } private void readStreamIdentifier() throws IOException { - byte[] b = new byte[10]; - int read = IOUtils.readFully(in, b); + final byte[] b = new byte[10]; + final int read = IOUtils.readFully(in, b); count(read); if (10 != read || !matches(b, 10)) { throw new IOException("Not a framed Snappy stream"); @@ -248,7 +248,7 @@ public class FramedSnappyCompressorInputStream extends CompressorInputStream { } private int readOneByte() throws IOException { - int b = in.read(); + final int b = in.read(); if (b != -1) { count(1); return b & 0xFF; http://git-wip-us.apache.org/repos/asf/commons-compress/blob/3f2c760a/src/main/java/org/apache/commons/compress/compressors/snappy/PureJavaCrc32C.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/compressors/snappy/PureJavaCrc32C.java b/src/main/java/org/apache/commons/compress/compressors/snappy/PureJavaCrc32C.java index d01353c..53e5c55 100644 --- a/src/main/java/org/apache/commons/compress/compressors/snappy/PureJavaCrc32C.java +++ b/src/main/java/org/apache/commons/compress/compressors/snappy/PureJavaCrc32C.java @@ -44,7 +44,7 @@ class PureJavaCrc32C implements Checksum { @Override public long getValue() { - long ret = crc; + final long ret = crc; return (~ret) & 0xffffffffL; } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/3f2c760a/src/main/java/org/apache/commons/compress/compressors/snappy/SnappyCompressorInputStream.java ---------------------------------------------------------------------- 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 fae3a42..db19bc8 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 @@ -134,7 +134,7 @@ public class SnappyCompressorInputStream extends CompressorInputStream { fill(len - avail); } - int readable = Math.min(len, available()); + final int readable = Math.min(len, available()); if (readable == 0 && len > 0) { return -1; } @@ -307,7 +307,7 @@ public class SnappyCompressorInputStream extends CompressorInputStream { * @return True if the decompressed data should be flushed */ private boolean expandLiteral(final int length) throws IOException { - int bytesRead = IOUtils.readFully(in, decompressBuf, writeIndex, length); + final int bytesRead = IOUtils.readFully(in, decompressBuf, writeIndex, length); count(bytesRead); if (length != bytesRead) { throw new IOException("Premature end of stream"); @@ -340,10 +340,10 @@ public class SnappyCompressorInputStream extends CompressorInputStream { if (off > blockSize) { throw new IOException("Offset is larger than block size"); } - int offset = (int) off; + final int offset = (int) off; if (offset == 1) { - byte lastChar = decompressBuf[writeIndex - 1]; + final byte lastChar = decompressBuf[writeIndex - 1]; for (int i = 0; i < length; i++) { decompressBuf[writeIndex++] = lastChar; } @@ -353,7 +353,7 @@ public class SnappyCompressorInputStream extends CompressorInputStream { writeIndex += length; } else { int fullRotations = length / offset; - int pad = length - (offset * fullRotations); + final int pad = length - (offset * fullRotations); while (fullRotations-- != 0) { System.arraycopy(decompressBuf, writeIndex - offset, @@ -382,7 +382,7 @@ public class SnappyCompressorInputStream extends CompressorInputStream { * EOF is reached or error reading the stream */ private int readOneByte() throws IOException { - int b = in.read(); + final int b = in.read(); if (b == -1) { throw new IOException("Premature end of stream"); } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/3f2c760a/src/main/java/org/apache/commons/compress/compressors/xz/XZCompressorInputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/compressors/xz/XZCompressorInputStream.java b/src/main/java/org/apache/commons/compress/compressors/xz/XZCompressorInputStream.java index 24fee7b..27d70d2 100644 --- a/src/main/java/org/apache/commons/compress/compressors/xz/XZCompressorInputStream.java +++ b/src/main/java/org/apache/commons/compress/compressors/xz/XZCompressorInputStream.java @@ -101,14 +101,14 @@ public class XZCompressorInputStream extends CompressorInputStream { @Override public int read() throws IOException { - int ret = in.read(); + final int ret = in.read(); count(ret == -1 ? -1 : 1); return ret; } @Override public int read(final byte[] buf, final int off, final int len) throws IOException { - int ret = in.read(buf, off, len); + final int ret = in.read(buf, off, len); count(ret); return ret; } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/3f2c760a/src/main/java/org/apache/commons/compress/compressors/xz/XZUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/compressors/xz/XZUtils.java b/src/main/java/org/apache/commons/compress/compressors/xz/XZUtils.java index db71b17..4da6425 100644 --- a/src/main/java/org/apache/commons/compress/compressors/xz/XZUtils.java +++ b/src/main/java/org/apache/commons/compress/compressors/xz/XZUtils.java @@ -48,7 +48,7 @@ public class XZUtils { private static volatile CachedAvailability cachedXZAvailability; static { - Map<String, String> uncompressSuffix = new HashMap<String, String>(); + final Map<String, String> uncompressSuffix = new HashMap<String, String>(); uncompressSuffix.put(".txz", ".tar"); uncompressSuffix.put(".xz", ""); uncompressSuffix.put("-xz", ""); @@ -56,7 +56,7 @@ public class XZUtils { cachedXZAvailability = CachedAvailability.DONT_CACHE; try { Class.forName("org.osgi.framework.BundleEvent"); - } catch (Exception ex) { + } catch (final Exception ex) { setCacheXZAvailablity(true); } } @@ -108,7 +108,7 @@ public class XZUtils { try { XZCompressorInputStream.matches(null, 0); return true; - } catch (NoClassDefFoundError error) { + } catch (final NoClassDefFoundError error) { return false; } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/3f2c760a/src/main/java/org/apache/commons/compress/compressors/z/ZCompressorInputStream.java ---------------------------------------------------------------------- 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 a7b028e..799e58d 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 @@ -40,9 +40,9 @@ public class ZCompressorInputStream extends LZWInputStream { public ZCompressorInputStream(final InputStream inputStream) throws IOException { super(inputStream, ByteOrder.LITTLE_ENDIAN); - int firstByte = (int) in.readBits(8); - int secondByte = (int) in.readBits(8); - int thirdByte = (int) in.readBits(8); + final int firstByte = (int) in.readBits(8); + final int secondByte = (int) in.readBits(8); + final int thirdByte = (int) in.readBits(8); if (firstByte != MAGIC_1 || secondByte != MAGIC_2 || thirdByte < 0) { throw new IOException("Input is not in .Z format"); } @@ -67,7 +67,7 @@ public class ZCompressorInputStream extends LZWInputStream { */ @Override protected int readNextCode() throws IOException { - int code = super.readNextCode(); + final int code = super.readNextCode(); if (code >= 0) { ++totalCodesRead; } @@ -98,7 +98,7 @@ public class ZCompressorInputStream extends LZWInputStream { @Override protected int addEntry(final int previousCode, final byte character) throws IOException { final int maxTableSize = 1 << getCodeSize(); - int r = addEntry(previousCode, character, maxTableSize); + final int r = addEntry(previousCode, character, maxTableSize); if (getTableSize() == maxTableSize && getCodeSize() < maxCodeSize) { reAlignReading(); incrementCodeSize(); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/3f2c760a/src/main/java/org/apache/commons/compress/utils/ArchiveUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/utils/ArchiveUtils.java b/src/main/java/org/apache/commons/compress/utils/ArchiveUtils.java index 8798274..e39e4f3 100644 --- a/src/main/java/org/apache/commons/compress/utils/ArchiveUtils.java +++ b/src/main/java/org/apache/commons/compress/utils/ArchiveUtils.java @@ -44,9 +44,9 @@ public class ArchiveUtils { * @return the representation of the entry */ public static String toString(final ArchiveEntry entry){ - StringBuilder sb = new StringBuilder(); + final StringBuilder sb = new StringBuilder(); sb.append(entry.isDirectory()? 'd' : '-');// c.f. "ls -l" output - String size = Long.toString(entry.getSize()); + final String size = Long.toString(entry.getSize()); sb.append(' '); // Pad output to 7 places, leading spaces for(int i=7; i > size.length(); i--){ @@ -71,7 +71,7 @@ public class ArchiveUtils { byte[] buffer1; try { buffer1 = expected.getBytes(CharsetNames.US_ASCII); - } catch (UnsupportedEncodingException e) { + } catch (final UnsupportedEncodingException e) { throw new RuntimeException(e); // Should not happen } return isEqual(buffer1, 0, buffer1.length, buffer, offset, length, false); @@ -98,7 +98,7 @@ public class ArchiveUtils { public static byte[] toAsciiBytes(final String inputString){ try { return inputString.getBytes(CharsetNames.US_ASCII); - } catch (UnsupportedEncodingException e) { + } catch (final UnsupportedEncodingException e) { throw new RuntimeException(e); // Should never happen } } @@ -112,7 +112,7 @@ public class ArchiveUtils { public static String toAsciiString(final byte[] inputBytes){ try { return new String(inputBytes, CharsetNames.US_ASCII); - } catch (UnsupportedEncodingException e) { + } catch (final UnsupportedEncodingException e) { throw new RuntimeException(e); // Should never happen } } @@ -128,7 +128,7 @@ public class ArchiveUtils { public static String toAsciiString(final byte[] inputBytes, final int offset, final int length){ try { return new String(inputBytes, offset, length, CharsetNames.US_ASCII); - } catch (UnsupportedEncodingException e) { + } catch (final UnsupportedEncodingException e) { throw new RuntimeException(e); // Should never happen } } @@ -149,7 +149,7 @@ public class ArchiveUtils { final byte[] buffer1, final int offset1, final int length1, final byte[] buffer2, final int offset2, final int length2, final boolean ignoreTrailingNulls){ - int minLen=length1 < length2 ? length1 : length2; + final int minLen=length1 < length2 ? length1 : length2; for (int i=0; i < minLen; i++){ if (buffer1[offset1+i] != buffer2[offset2+i]){ return false; http://git-wip-us.apache.org/repos/asf/commons-compress/blob/3f2c760a/src/main/java/org/apache/commons/compress/utils/ChecksumVerifyingInputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/utils/ChecksumVerifyingInputStream.java b/src/main/java/org/apache/commons/compress/utils/ChecksumVerifyingInputStream.java index eb8619f..de2bef4 100644 --- a/src/main/java/org/apache/commons/compress/utils/ChecksumVerifyingInputStream.java +++ b/src/main/java/org/apache/commons/compress/utils/ChecksumVerifyingInputStream.java @@ -52,7 +52,7 @@ public class ChecksumVerifyingInputStream extends InputStream { if (bytesRemaining <= 0) { return -1; } - int ret = in.read(); + final int ret = in.read(); if (ret >= 0) { checksum.update(ret); --bytesRemaining; @@ -82,7 +82,7 @@ public class ChecksumVerifyingInputStream extends InputStream { */ @Override public int read(final byte[] b, final int off, final int len) throws IOException { - int ret = in.read(b, off, len); + final int ret = in.read(b, off, len); if (ret >= 0) { checksum.update(b, off, ret); bytesRemaining -= ret; http://git-wip-us.apache.org/repos/asf/commons-compress/blob/3f2c760a/src/main/java/org/apache/commons/compress/utils/CountingInputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/utils/CountingInputStream.java b/src/main/java/org/apache/commons/compress/utils/CountingInputStream.java index c4905fa..f79b95b 100644 --- a/src/main/java/org/apache/commons/compress/utils/CountingInputStream.java +++ b/src/main/java/org/apache/commons/compress/utils/CountingInputStream.java @@ -36,7 +36,7 @@ public class CountingInputStream extends FilterInputStream { @Override public int read() throws IOException { - int r = in.read(); + final int r = in.read(); if (r >= 0) { count(1); } @@ -48,7 +48,7 @@ public class CountingInputStream extends FilterInputStream { } @Override public int read(final byte[] b, final int off, final int len) throws IOException { - int r = in.read(b, off, len); + final int r = in.read(b, off, len); if (r >= 0) { count(r); } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/3f2c760a/src/main/java/org/apache/commons/compress/utils/IOUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/utils/IOUtils.java b/src/main/java/org/apache/commons/compress/utils/IOUtils.java index ee9989b..d7979f1 100644 --- a/src/main/java/org/apache/commons/compress/utils/IOUtils.java +++ b/src/main/java/org/apache/commons/compress/utils/IOUtils.java @@ -98,9 +98,9 @@ public final class IOUtils { * @throws IOException on error */ public static long skip(final InputStream input, long numToSkip) throws IOException { - long available = numToSkip; + final long available = numToSkip; while (numToSkip > 0) { - long skipped = input.skip(numToSkip); + final long skipped = input.skip(numToSkip); if (skipped == 0) { break; } @@ -108,7 +108,7 @@ public final class IOUtils { } while (numToSkip > 0) { - int read = readFully(input, SKIP_BUF, 0, + final int read = readFully(input, SKIP_BUF, 0, (int) Math.min(numToSkip, SKIP_BUF_SIZE)); if (read < 1) { break; @@ -199,7 +199,7 @@ public final class IOUtils { if (c != null) { try { c.close(); - } catch (IOException ignored) { // NOPMD + } catch (final IOException ignored) { // NOPMD } } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/3f2c760a/src/test/java/org/apache/commons/compress/AbstractTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/AbstractTestCase.java b/src/test/java/org/apache/commons/compress/AbstractTestCase.java index 31d0ab2..a151a26 100644 --- a/src/test/java/org/apache/commons/compress/AbstractTestCase.java +++ b/src/test/java/org/apache/commons/compress/AbstractTestCase.java @@ -61,21 +61,21 @@ public abstract class AbstractTestCase { } public static File mkdir(final String name) throws IOException { - File f = File.createTempFile(name, ""); + final File f = File.createTempFile(name, ""); f.delete(); f.mkdir(); return f; } public static File getFile(final String path) throws IOException { - URL url = AbstractTestCase.class.getClassLoader().getResource(path); + final URL url = AbstractTestCase.class.getClassLoader().getResource(path); if (url == null) { throw new FileNotFoundException("couldn't find " + path); } URI uri = null; try { uri = url.toURI(); - } catch (java.net.URISyntaxException ex) { + } catch (final java.net.URISyntaxException ex) { throw new IOException(ex); } return new File(uri); @@ -93,14 +93,14 @@ public abstract class AbstractTestCase { } public static void rmdir(final File f) { - String[] s = f.list(); + final String[] s = f.list(); if (s != null) { - for (String element : s) { + for (final String element : s) { final File file = new File(f, element); if (file.isDirectory()){ rmdir(file); } - boolean ok = tryHardToDelete(file); + final boolean ok = tryHardToDelete(file); if (!ok && file.exists()){ System.out.println("Failed to delete "+element+" in "+f.getPath()); } @@ -130,7 +130,7 @@ public abstract class AbstractTestCase { } try { Thread.sleep(10); - } catch (InterruptedException ex) { + } catch (final InterruptedException ex) { // Ignore Exception } return f.delete(); @@ -211,7 +211,7 @@ public abstract class AbstractTestCase { */ private void addArchiveEntry(final ArchiveOutputStream out, final String filename, final File infile) throws IOException, FileNotFoundException { - ArchiveEntry entry = out.createArchiveEntry(infile, filename); + final ArchiveEntry entry = out.createArchiveEntry(infile, filename); out.putArchiveEntry(entry); IOUtils.copy(new FileInputStream(infile), out); out.closeArchiveEntry(); @@ -317,20 +317,20 @@ public abstract class AbstractTestCase { */ protected File checkArchiveContent(final ArchiveInputStream in, final List<String> expected, final boolean cleanUp) throws Exception { - File result = mkdir("dir-result"); + final File result = mkdir("dir-result"); result.deleteOnExit(); try { ArchiveEntry entry = null; while ((entry = in.getNextEntry()) != null) { - File outfile = new File(result.getCanonicalPath() + "/result/" + final File outfile = new File(result.getCanonicalPath() + "/result/" + entry.getName()); long copied=0; if (entry.isDirectory()){ outfile.mkdirs(); } else { outfile.getParentFile().mkdirs(); - OutputStream out = new FileOutputStream(outfile); + final OutputStream out = new FileOutputStream(outfile); try { copied=IOUtils.copy(in, out); } finally { @@ -381,10 +381,10 @@ public abstract class AbstractTestCase { * element of the two element array). */ protected File[] createTempDirAndFile() throws IOException { - File tmpDir = createTempDir(); - File tmpFile = File.createTempFile("testfile", "", tmpDir); + final File tmpDir = createTempDir(); + final File tmpFile = File.createTempFile("testfile", "", tmpDir); tmpFile.deleteOnExit(); - FileOutputStream fos = new FileOutputStream(tmpFile); + final FileOutputStream fos = new FileOutputStream(tmpFile); try { fos.write(new byte[] {'f', 'o', 'o'}); return new File[] {tmpDir, tmpFile}; @@ -394,7 +394,7 @@ public abstract class AbstractTestCase { } protected File createTempDir() throws IOException { - File tmpDir = mkdir("testdir"); + final File tmpDir = mkdir("testdir"); tmpDir.deleteOnExit(); return tmpDir; } @@ -403,7 +403,7 @@ public abstract class AbstractTestCase { if (closeable != null) { try { closeable.close(); - } catch (IOException ignored) { + } catch (final IOException ignored) { // ignored } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/3f2c760a/src/test/java/org/apache/commons/compress/ArchiveReadTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/ArchiveReadTest.java b/src/test/java/org/apache/commons/compress/ArchiveReadTest.java index f9c3ce2..30d9896 100644 --- a/src/test/java/org/apache/commons/compress/ArchiveReadTest.java +++ b/src/test/java/org/apache/commons/compress/ArchiveReadTest.java @@ -60,9 +60,9 @@ public class ArchiveReadTest extends AbstractTestCase { @BeforeClass public static void setUpFileList() throws Exception { assertTrue(ARCDIR.exists()); - File listing= new File(ARCDIR,"files.txt"); + final File listing= new File(ARCDIR,"files.txt"); assertTrue("files.txt is readable",listing.canRead()); - BufferedReader br = new BufferedReader(new FileReader(listing)); + final BufferedReader br = new BufferedReader(new FileReader(listing)); String line; while ((line=br.readLine())!=null){ if (!line.startsWith("#")){ @@ -75,8 +75,8 @@ public class ArchiveReadTest extends AbstractTestCase { @Parameters(name = "file={0}") public static Collection<Object[]> data() { assertTrue(ARCDIR.exists()); - Collection<Object[]> params = new ArrayList<Object[]>(); - for (String f : ARCDIR.list(new FilenameFilter() { + final Collection<Object[]> params = new ArrayList<Object[]>(); + for (final String f : ARCDIR.list(new FilenameFilter() { @Override public boolean accept(final File dir, final String name) { return !name.endsWith(".txt"); @@ -97,12 +97,13 @@ public class ArchiveReadTest extends AbstractTestCase { @Test public void testArchive() throws Exception{ @SuppressWarnings("unchecked") // fileList is correct type already + final ArrayList<String> expected= (ArrayList<String>) FILELIST.clone(); try { checkArchiveContent(file, expected); - } catch (ArchiveException e) { + } catch (final ArchiveException e) { fail("Problem checking "+file); - } catch (AssertionError e) { // show error in context + } catch (final AssertionError e) { // show error in context fail("Problem checking " + file + " " +e); } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/3f2c760a/src/test/java/org/apache/commons/compress/ArchiveUtilsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/ArchiveUtilsTest.java b/src/test/java/org/apache/commons/compress/ArchiveUtilsTest.java index 7eb3318..413b52b 100644 --- a/src/test/java/org/apache/commons/compress/ArchiveUtilsTest.java +++ b/src/test/java/org/apache/commons/compress/ArchiveUtilsTest.java @@ -37,9 +37,9 @@ public class ArchiveUtilsTest extends AbstractTestCase { @Test public void testCompareBA(){ - byte[] buffer1 = {1,2,3}; - byte[] buffer2 = {1,2,3,0}; - byte[] buffer3 = {1,2,3}; + final byte[] buffer1 = {1,2,3}; + final byte[] buffer2 = {1,2,3,0}; + final byte[] buffer3 = {1,2,3}; assertTrue(ArchiveUtils.isEqual(buffer1, buffer2, true)); assertFalse(ArchiveUtils.isEqual(buffer1, buffer2, false)); assertFalse(ArchiveUtils.isEqual(buffer1, buffer2)); @@ -52,8 +52,8 @@ public class ArchiveUtilsTest extends AbstractTestCase { @Test public void testCompareAscii(){ - byte[] buffer1 = {'a','b','c'}; - byte[] buffer2 = {'d','e','f',0}; + final byte[] buffer1 = {'a','b','c'}; + final byte[] buffer2 = {'d','e','f',0}; assertTrue(ArchiveUtils.matchAsciiBuffer("abc", buffer1)); assertFalse(ArchiveUtils.matchAsciiBuffer("abc\0", buffer1)); assertTrue(ArchiveUtils.matchAsciiBuffer("def\0", buffer2)); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/3f2c760a/src/test/java/org/apache/commons/compress/ChainingTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/ChainingTestCase.java b/src/test/java/org/apache/commons/compress/ChainingTestCase.java index cc82d9f..69e67fa 100644 --- a/src/test/java/org/apache/commons/compress/ChainingTestCase.java +++ b/src/test/java/org/apache/commons/compress/ChainingTestCase.java @@ -34,7 +34,7 @@ public class ChainingTestCase extends AbstractTestCase { @Test public void testTarGzip() throws Exception { - File file = getFile("bla.tgz"); + final File file = getFile("bla.tgz"); final TarArchiveInputStream is = new TarArchiveInputStream(new GzipCompressorInputStream(new FileInputStream(file))); final TarArchiveEntry entry = (TarArchiveEntry)is.getNextEntry(); assertNotNull(entry); @@ -44,7 +44,7 @@ public class ChainingTestCase extends AbstractTestCase { @Test public void testTarBzip2() throws Exception { - File file = getFile("bla.tar.bz2"); + final File file = getFile("bla.tar.bz2"); final TarArchiveInputStream is = new TarArchiveInputStream(new BZip2CompressorInputStream(new FileInputStream(file))); final TarArchiveEntry entry = (TarArchiveEntry)is.getNextEntry(); assertNotNull(entry); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/3f2c760a/src/test/java/org/apache/commons/compress/DetectArchiverTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/DetectArchiverTestCase.java b/src/test/java/org/apache/commons/compress/DetectArchiverTestCase.java index 68d12b6..767b2e9 100644 --- a/src/test/java/org/apache/commons/compress/DetectArchiverTestCase.java +++ b/src/test/java/org/apache/commons/compress/DetectArchiverTestCase.java @@ -43,7 +43,7 @@ public final class DetectArchiverTestCase extends AbstractTestCase { try { getStreamFor("test.txt"); fail("Expected ArchiveException"); - } catch (ArchiveException e) { + } catch (final ArchiveException e) { // expected } } @@ -130,14 +130,14 @@ public final class DetectArchiverTestCase extends AbstractTestCase { } private void checkEmptyArchive(final String type) throws Exception{ - File ar = createEmptyArchive(type); // will be deleted by tearDown() + final File ar = createEmptyArchive(type); // will be deleted by tearDown() ar.deleteOnExit(); // Just in case file cannot be deleted ArchiveInputStream ais = null; BufferedInputStream in = null; try { in = new BufferedInputStream(new FileInputStream(ar)); ais = factory.createArchiveInputStream(in); - } catch (ArchiveException ae) { + } catch (final ArchiveException ae) { fail("Should have recognised empty archive for "+type); } finally { if (ais != null) { http://git-wip-us.apache.org/repos/asf/commons-compress/blob/3f2c760a/src/test/java/org/apache/commons/compress/IOMethodsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/IOMethodsTest.java b/src/test/java/org/apache/commons/compress/IOMethodsTest.java index b962392..cb2c260 100644 --- a/src/test/java/org/apache/commons/compress/IOMethodsTest.java +++ b/src/test/java/org/apache/commons/compress/IOMethodsTest.java @@ -54,32 +54,32 @@ public class IOMethodsTest extends AbstractTestCase { @Test public void testWriteAr() throws Exception { - ArchiveEntry entry = new ArArchiveEntry("dummy", bytesToTest); + final ArchiveEntry entry = new ArArchiveEntry("dummy", bytesToTest); compareWrites("ar", entry); } @Test public void testWriteCpio() throws Exception { - ArchiveEntry entry = new CpioArchiveEntry("dummy", bytesToTest); + final ArchiveEntry entry = new CpioArchiveEntry("dummy", bytesToTest); compareWrites("cpio", entry); } @Test public void testWriteJar() throws Exception { - ArchiveEntry entry = new JarArchiveEntry("dummy"); + final ArchiveEntry entry = new JarArchiveEntry("dummy"); compareWrites("jar", entry); } @Test public void testWriteTar() throws Exception { - TarArchiveEntry entry = new TarArchiveEntry("dummy"); + final TarArchiveEntry entry = new TarArchiveEntry("dummy"); entry.setSize(bytesToTest); compareWrites("tar", entry); } @Test public void testWriteZip() throws Exception { - ArchiveEntry entry = new ZipArchiveEntry("dummy"); + final ArchiveEntry entry = new ZipArchiveEntry("dummy"); compareWrites("zip", entry); } @@ -109,16 +109,16 @@ public class IOMethodsTest extends AbstractTestCase { } private void compareWrites(final String archiverName, final ArchiveEntry entry) throws Exception { - OutputStream out1 = new ByteArrayOutputStream(); - OutputStream out2 = new ByteArrayOutputStream(); - OutputStream out3 = new ByteArrayOutputStream(); - ArchiveOutputStream aos1 = factory.createArchiveOutputStream(archiverName, out1); + final OutputStream out1 = new ByteArrayOutputStream(); + final OutputStream out2 = new ByteArrayOutputStream(); + final OutputStream out3 = new ByteArrayOutputStream(); + final ArchiveOutputStream aos1 = factory.createArchiveOutputStream(archiverName, out1); aos1.putArchiveEntry(entry); - ArchiveOutputStream aos2 = factory.createArchiveOutputStream(archiverName, out2); + final ArchiveOutputStream aos2 = factory.createArchiveOutputStream(archiverName, out2); aos2.putArchiveEntry(entry); - ArchiveOutputStream aos3 = factory.createArchiveOutputStream(archiverName, out3); + final ArchiveOutputStream aos3 = factory.createArchiveOutputStream(archiverName, out3); aos3.putArchiveEntry(entry); - for (byte element : byteTest) { + for (final byte element : byteTest) { aos1.write(element); } aos1.closeArchiveEntry(); @@ -140,31 +140,31 @@ public class IOMethodsTest extends AbstractTestCase { } private void compareReads(final String archiverName) throws Exception { - OutputStream out1 = new ByteArrayOutputStream(); - OutputStream out2 = new ByteArrayOutputStream(); - OutputStream out3 = new ByteArrayOutputStream(); - File file = createSingleEntryArchive(archiverName); + final OutputStream out1 = new ByteArrayOutputStream(); + final OutputStream out2 = new ByteArrayOutputStream(); + final OutputStream out3 = new ByteArrayOutputStream(); + final File file = createSingleEntryArchive(archiverName); file.deleteOnExit(); - InputStream is1 = new FileInputStream(file); - ArchiveInputStream ais1 = factory.createArchiveInputStream(archiverName, is1); + final InputStream is1 = new FileInputStream(file); + final ArchiveInputStream ais1 = factory.createArchiveInputStream(archiverName, is1); final ArchiveEntry nextEntry = ais1.getNextEntry(); assertNotNull(nextEntry); - byte [] buff = new byte[10]; // small so multiple reads are needed; - long size = nextEntry.getSize(); + final byte [] buff = new byte[10]; // small so multiple reads are needed; + final long size = nextEntry.getSize(); if (size != ArchiveEntry.SIZE_UNKNOWN) { assertTrue("Size should be > 0, found: "+size, size > 0); } - InputStream is2 = new FileInputStream(file); - ArchiveInputStream ais2 = factory.createArchiveInputStream(archiverName, is2); + final InputStream is2 = new FileInputStream(file); + final ArchiveInputStream ais2 = factory.createArchiveInputStream(archiverName, is2); final ArchiveEntry nextEntry2 = ais2.getNextEntry(); assertNotNull(nextEntry2); assertEquals("Expected same entry size", size, nextEntry2.getSize()); - InputStream is3 = new FileInputStream(file); - ArchiveInputStream ais3 = factory.createArchiveInputStream(archiverName, is3); + final InputStream is3 = new FileInputStream(file); + final ArchiveInputStream ais3 = factory.createArchiveInputStream(archiverName, is3); final ArchiveEntry nextEntry3 = ais3.getNextEntry(); assertNotNull(nextEntry3); assertEquals("Expected same entry size", size, nextEntry3.getSize()); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/3f2c760a/src/test/java/org/apache/commons/compress/archivers/ArTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/archivers/ArTestCase.java b/src/test/java/org/apache/commons/compress/archivers/ArTestCase.java index 8eac9bb..62674d4 100644 --- a/src/test/java/org/apache/commons/compress/archivers/ArTestCase.java +++ b/src/test/java/org/apache/commons/compress/archivers/ArTestCase.java @@ -84,7 +84,7 @@ public final class ArTestCase extends AbstractTestCase { final ArchiveInputStream in = new ArchiveStreamFactory().createArchiveInputStream(new BufferedInputStream(is)); final ArArchiveEntry entry = (ArArchiveEntry)in.getNextEntry(); - File target = new File(dir, entry.getName()); + final File target = new File(dir, entry.getName()); final OutputStream out = new FileOutputStream(target); IOUtils.copy(in, out); @@ -192,7 +192,7 @@ public final class ArTestCase extends AbstractTestCase { @Ignore @Test public void XtestDirectoryEntryFromFile() throws Exception { - File[] tmp = createTempDirAndFile(); + final File[] tmp = createTempDirAndFile(); File archive = null; ArArchiveOutputStream aos = null; ArArchiveInputStream ais = null; @@ -200,14 +200,14 @@ public final class ArTestCase extends AbstractTestCase { archive = File.createTempFile("test.", ".ar", tmp[0]); archive.deleteOnExit(); aos = new ArArchiveOutputStream(new FileOutputStream(archive)); - long beforeArchiveWrite = tmp[0].lastModified(); - ArArchiveEntry in = new ArArchiveEntry(tmp[0], "foo"); + final long beforeArchiveWrite = tmp[0].lastModified(); + final ArArchiveEntry in = new ArArchiveEntry(tmp[0], "foo"); aos.putArchiveEntry(in); aos.closeArchiveEntry(); aos.close(); aos = null; ais = new ArArchiveInputStream(new FileInputStream(archive)); - ArArchiveEntry out = ais.getNextArEntry(); + final ArArchiveEntry out = ais.getNextArEntry(); ais.close(); ais = null; assertNotNull(out); @@ -234,7 +234,7 @@ public final class ArTestCase extends AbstractTestCase { @Ignore @Test public void XtestExplicitDirectoryEntry() throws Exception { - File[] tmp = createTempDirAndFile(); + final File[] tmp = createTempDirAndFile(); File archive = null; ArArchiveOutputStream aos = null; ArArchiveInputStream ais = null; @@ -242,15 +242,15 @@ public final class ArTestCase extends AbstractTestCase { archive = File.createTempFile("test.", ".ar", tmp[0]); archive.deleteOnExit(); aos = new ArArchiveOutputStream(new FileOutputStream(archive)); - long beforeArchiveWrite = tmp[0].lastModified(); - ArArchiveEntry in = new ArArchiveEntry("foo", 0, 0, 0, 0, + final long beforeArchiveWrite = tmp[0].lastModified(); + final ArArchiveEntry in = new ArArchiveEntry("foo", 0, 0, 0, 0, tmp[1].lastModified() / 1000); aos.putArchiveEntry(in); aos.closeArchiveEntry(); aos.close(); aos = null; ais = new ArArchiveInputStream(new FileInputStream(archive)); - ArArchiveEntry out = ais.getNextArEntry(); + final ArArchiveEntry out = ais.getNextArEntry(); ais.close(); ais = null; assertNotNull(out); @@ -274,7 +274,7 @@ public final class ArTestCase extends AbstractTestCase { @Test public void testFileEntryFromFile() throws Exception { - File[] tmp = createTempDirAndFile(); + final File[] tmp = createTempDirAndFile(); File archive = null; ArArchiveOutputStream aos = null; ArArchiveInputStream ais = null; @@ -283,9 +283,9 @@ public final class ArTestCase extends AbstractTestCase { archive = File.createTempFile("test.", ".ar", tmp[0]); archive.deleteOnExit(); aos = new ArArchiveOutputStream(new FileOutputStream(archive)); - ArArchiveEntry in = new ArArchiveEntry(tmp[1], "foo"); + final ArArchiveEntry in = new ArArchiveEntry(tmp[1], "foo"); aos.putArchiveEntry(in); - byte[] b = new byte[(int) tmp[1].length()]; + final byte[] b = new byte[(int) tmp[1].length()]; fis = new FileInputStream(tmp[1]); while (fis.read(b) > 0) { aos.write(b); @@ -296,7 +296,7 @@ public final class ArTestCase extends AbstractTestCase { aos.close(); aos = null; ais = new ArArchiveInputStream(new FileInputStream(archive)); - ArArchiveEntry out = ais.getNextArEntry(); + final ArArchiveEntry out = ais.getNextArEntry(); ais.close(); ais = null; assertNotNull(out); @@ -324,7 +324,7 @@ public final class ArTestCase extends AbstractTestCase { @Test public void testExplicitFileEntry() throws Exception { - File[] tmp = createTempDirAndFile(); + final File[] tmp = createTempDirAndFile(); File archive = null; ArArchiveOutputStream aos = null; ArArchiveInputStream ais = null; @@ -333,11 +333,11 @@ public final class ArTestCase extends AbstractTestCase { archive = File.createTempFile("test.", ".ar", tmp[0]); archive.deleteOnExit(); aos = new ArArchiveOutputStream(new FileOutputStream(archive)); - ArArchiveEntry in = new ArArchiveEntry("foo", tmp[1].length(), + final ArArchiveEntry in = new ArArchiveEntry("foo", tmp[1].length(), 0, 0, 0, tmp[1].lastModified() / 1000); aos.putArchiveEntry(in); - byte[] b = new byte[(int) tmp[1].length()]; + final byte[] b = new byte[(int) tmp[1].length()]; fis = new FileInputStream(tmp[1]); while (fis.read(b) > 0) { aos.write(b); @@ -348,7 +348,7 @@ public final class ArTestCase extends AbstractTestCase { aos.close(); aos = null; ais = new ArArchiveInputStream(new FileInputStream(archive)); - ArArchiveEntry out = ais.getNextArEntry(); + final ArArchiveEntry out = ais.getNextArEntry(); ais.close(); ais = null; assertNotNull(out); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/3f2c760a/src/test/java/org/apache/commons/compress/archivers/ArchiveOutputStreamTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/archivers/ArchiveOutputStreamTest.java b/src/test/java/org/apache/commons/compress/archivers/ArchiveOutputStreamTest.java index a1c0243..37606bd 100644 --- a/src/test/java/org/apache/commons/compress/archivers/ArchiveOutputStreamTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/ArchiveOutputStreamTest.java @@ -40,14 +40,14 @@ public class ArchiveOutputStreamTest extends AbstractTestCase { @Test public void testFinish() throws Exception { - OutputStream out1 = new ByteArrayOutputStream(); + final OutputStream out1 = new ByteArrayOutputStream(); ArchiveOutputStream aos1 = factory.createArchiveOutputStream("zip", out1); aos1.putArchiveEntry(new ZipArchiveEntry("dummy")); try { aos1.finish(); fail("After putArchive should follow closeArchive"); - } catch (IOException io) { + } catch (final IOException io) { // Exception expected } @@ -56,7 +56,7 @@ public class ArchiveOutputStreamTest extends AbstractTestCase { try { aos1.finish(); fail("After putArchive should follow closeArchive"); - } catch (IOException io) { + } catch (final IOException io) { // Exception expected } @@ -65,7 +65,7 @@ public class ArchiveOutputStreamTest extends AbstractTestCase { try { aos1.finish(); fail("After putArchive should follow closeArchive"); - } catch (IOException io) { + } catch (final IOException io) { // Exception expected } @@ -74,7 +74,7 @@ public class ArchiveOutputStreamTest extends AbstractTestCase { try { aos1.finish(); fail("After putArchive should follow closeArchive"); - } catch (IOException io) { + } catch (final IOException io) { // Exception expected } @@ -83,14 +83,14 @@ public class ArchiveOutputStreamTest extends AbstractTestCase { try { aos1.finish(); fail("After putArchive should follow closeArchive"); - } catch (IOException io) { + } catch (final IOException io) { // Exception expected } } @Test public void testOptionalFinish() throws Exception { - OutputStream out1 = new ByteArrayOutputStream(); + final OutputStream out1 = new ByteArrayOutputStream(); ArchiveOutputStream aos1 = factory.createArchiveOutputStream("zip", out1); aos1.putArchiveEntry(new ZipArchiveEntry("dummy")); @@ -104,7 +104,7 @@ public class ArchiveOutputStreamTest extends AbstractTestCase { try { aos1.finish(); fail("finish() cannot follow close()"); - } catch (IOException io) { + } catch (final IOException io) { // Exception expected } } @@ -135,8 +135,8 @@ public class ArchiveOutputStreamTest extends AbstractTestCase { } private void doCallSequence(final String archiveType) throws Exception { - OutputStream out1 = new ByteArrayOutputStream(); - File dummy = getFile("test1.xml"); // need a real file + final OutputStream out1 = new ByteArrayOutputStream(); + final File dummy = getFile("test1.xml"); // need a real file ArchiveOutputStream aos1; aos1 = factory.createArchiveOutputStream(archiveType, out1); @@ -153,7 +153,7 @@ public class ArchiveOutputStreamTest extends AbstractTestCase { try { aos1.closeArchiveEntry(); fail("Should have raised IOException - closeArchiveEntry() called before putArchiveEntry()"); - } catch (IOException expected) { + } catch (final IOException expected) { } aos1.putArchiveEntry(aos1.createArchiveEntry(dummy, "dummy")); @@ -166,25 +166,25 @@ public class ArchiveOutputStreamTest extends AbstractTestCase { try { aos1.finish(); fail("Should have raised IOException - finish() called before closeArchiveEntry()"); - } catch (IOException expected) { + } catch (final IOException expected) { } try { aos1.close(); fail("Should have raised IOException - close() called before closeArchiveEntry()"); - } catch (IOException expected) { + } catch (final IOException expected) { } aos1.closeArchiveEntry(); try { aos1.closeArchiveEntry(); fail("Should have raised IOException - closeArchiveEntry() called with no open entry"); - } catch (IOException expected) { + } catch (final IOException expected) { } aos1.finish(); aos1.close(); try { aos1.finish(); fail("Should have raised IOException - finish() called after close()"); - } catch (IOException expected) { + } catch (final IOException expected) { } } } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/3f2c760a/src/test/java/org/apache/commons/compress/archivers/ArchiveStreamFactoryTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/archivers/ArchiveStreamFactoryTest.java b/src/test/java/org/apache/commons/compress/archivers/ArchiveStreamFactoryTest.java index ec1ead4..4c78f93 100644 --- a/src/test/java/org/apache/commons/compress/archivers/ArchiveStreamFactoryTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/ArchiveStreamFactoryTest.java @@ -53,7 +53,7 @@ public class ArchiveStreamFactoryTest { new ArchiveStreamFactory() .createArchiveInputStream(new ByteArrayInputStream("This certainly is not a tar archive, really, no kidding".getBytes())); fail("created an input stream for a non-archive"); - } catch (ArchiveException ae) { + } catch (final ArchiveException ae) { assertTrue(ae.getMessage().startsWith("No Archiver found")); } } @@ -63,13 +63,13 @@ public class ArchiveStreamFactoryTest { */ @Test public void aiffFilesAreNoTARs() throws Exception { - FileInputStream fis = new FileInputStream("src/test/resources/testAIFF.aif"); + final FileInputStream fis = new FileInputStream("src/test/resources/testAIFF.aif"); try { - InputStream is = new BufferedInputStream(fis); + final InputStream is = new BufferedInputStream(fis); try { new ArchiveStreamFactory().createArchiveInputStream(is); fail("created an input stream for a non-archive"); - } catch (ArchiveException ae) { + } catch (final ArchiveException ae) { assertTrue(ae.getMessage().startsWith("No Archiver found")); } finally { is.close(); @@ -81,13 +81,13 @@ public class ArchiveStreamFactoryTest { @Test public void testCOMPRESS209() throws Exception { - FileInputStream fis = new FileInputStream("src/test/resources/testCompress209.doc"); + final FileInputStream fis = new FileInputStream("src/test/resources/testCompress209.doc"); try { - InputStream bis = new BufferedInputStream(fis); + final InputStream bis = new BufferedInputStream(fis); try { new ArchiveStreamFactory().createArchiveInputStream(bis); fail("created an input stream for a non-archive"); - } catch (ArchiveException ae) { + } catch (final ArchiveException ae) { assertTrue(ae.getMessage().startsWith("No Archiver found")); } finally { bis.close(); @@ -118,13 +118,13 @@ public class ArchiveStreamFactoryTest { */ @Test public void detectsAndThrowsFor7z() throws Exception { - FileInputStream fis = new FileInputStream("src/test/resources/bla.7z"); + final FileInputStream fis = new FileInputStream("src/test/resources/bla.7z"); try { - InputStream bis = new BufferedInputStream(fis); + final InputStream bis = new BufferedInputStream(fis); try { new ArchiveStreamFactory().createArchiveInputStream(bis); fail("Expected a StreamingNotSupportedException"); - } catch (StreamingNotSupportedException ex) { + } catch (final StreamingNotSupportedException ex) { assertEquals(ArchiveStreamFactory.SEVEN_Z, ex.getFormat()); } finally { bis.close(); @@ -141,11 +141,11 @@ public class ArchiveStreamFactoryTest { */ @Test public void skipsPK00Prefix() throws Exception { - FileInputStream fis = new FileInputStream("src/test/resources/COMPRESS-208.zip"); + final FileInputStream fis = new FileInputStream("src/test/resources/COMPRESS-208.zip"); try { - InputStream bis = new BufferedInputStream(fis); + final InputStream bis = new BufferedInputStream(fis); try { - ArchiveInputStream ais = new ArchiveStreamFactory().createArchiveInputStream(bis); + final ArchiveInputStream ais = new ArchiveStreamFactory().createArchiveInputStream(bis); try { assertTrue(ais instanceof ZipArchiveInputStream); } finally { @@ -183,7 +183,7 @@ public class ArchiveStreamFactoryTest { try { fac.setEntryEncoding("US_ASCII"); fail("Expected IllegalStateException"); - } catch (IllegalStateException ise) { + } catch (final IllegalStateException ise) { // expected } } @@ -207,7 +207,7 @@ public class ArchiveStreamFactoryTest { @SuppressWarnings("deprecation") // test of deprecated method static ArchiveStreamFactory getFactory(final String entryEncoding) { - ArchiveStreamFactory fac = new ArchiveStreamFactory(); + final ArchiveStreamFactory fac = new ArchiveStreamFactory(); fac.setEntryEncoding(entryEncoding); return fac; } @@ -233,18 +233,18 @@ public class ArchiveStreamFactoryTest { dflt = UNKNOWN; try { dflt = getField(new ArjArchiveInputStream(new FileInputStream(getFile("bla.arj"))), "charsetName"); - } catch (ArchiveException e) { + } catch (final ArchiveException e) { e.printStackTrace(); - } catch (Exception e) { + } catch (final Exception e) { e.printStackTrace(); } ARJ_DEFAULT = dflt; dflt = UNKNOWN; try { dflt = getField(new DumpArchiveInputStream(new FileInputStream(getFile("bla.dump"))), "encoding"); - } catch (ArchiveException e) { + } catch (final ArchiveException e) { e.printStackTrace(); - } catch (Exception e) { + } catch (final Exception e) { e.printStackTrace(); } DUMP_DEFAULT = dflt; @@ -292,8 +292,8 @@ public class ArchiveStreamFactoryTest { public void testEncodingInputStreamAutodetect() throws Exception { int failed = 0; for(int i = 1; i <= TESTS.length; i++) { - TestData test = TESTS[i-1]; - ArchiveInputStream ais = getInputStreamFor(test.testFile, test.fac); + final TestData test = TESTS[i-1]; + final ArchiveInputStream ais = getInputStreamFor(test.testFile, test.fac); final String field = getField(ais,test.fieldName); if (!eq(test.expectedEncoding,field)) { System.out.println("Failed test " + i + ". expected: " + test.expectedEncoding + " actual: " + field + " type: " + test.type); @@ -309,8 +309,8 @@ public class ArchiveStreamFactoryTest { public void testEncodingInputStream() throws Exception { int failed = 0; for(int i = 1; i <= TESTS.length; i++) { - TestData test = TESTS[i-1]; - ArchiveInputStream ais = getInputStreamFor(test.type, test.testFile, test.fac); + final TestData test = TESTS[i-1]; + final ArchiveInputStream ais = getInputStreamFor(test.type, test.testFile, test.fac); final String field = getField(ais,test.fieldName); if (!eq(test.expectedEncoding,field)) { System.out.println("Failed test " + i + ". expected: " + test.expectedEncoding + " actual: " + field + " type: " + test.type); @@ -326,9 +326,9 @@ public class ArchiveStreamFactoryTest { public void testEncodingOutputStream() throws Exception { int failed = 0; for(int i = 1; i <= TESTS.length; i++) { - TestData test = TESTS[i-1]; + final TestData test = TESTS[i-1]; if (test.hasOutputStream) { - ArchiveOutputStream ais = getOutputStreamFor(test.type, test.fac); + final ArchiveOutputStream ais = getOutputStreamFor(test.type, test.fac); final String field = getField(ais, test.fieldName); if (!eq(test.expectedEncoding, field)) { System.out.println("Failed test " + i + ". expected: " + test.expectedEncoding + " actual: " + field + " type: " + test.type); @@ -350,19 +350,19 @@ public class ArchiveStreamFactoryTest { } private static String getField(final Object instance, final String name) { - Class<?> cls = instance.getClass(); + final Class<?> cls = instance.getClass(); Field fld; try { fld = cls.getDeclaredField(name); - } catch (NoSuchFieldException nsfe) { + } catch (final NoSuchFieldException nsfe) { try { fld = cls.getSuperclass().getDeclaredField(name); - } catch (NoSuchFieldException e) { + } catch (final NoSuchFieldException e) { System.out.println("Cannot find " + name + " in class " + instance.getClass().getSimpleName()); return UNKNOWN; } } - boolean isAccessible = fld.isAccessible(); + final boolean isAccessible = fld.isAccessible(); try { if (!isAccessible) { fld.setAccessible(true); @@ -373,7 +373,7 @@ public class ArchiveStreamFactoryTest { } System.out.println("Wrong type: " + object.getClass().getCanonicalName() + " for " + name + " in class " + instance.getClass().getSimpleName()); return UNKNOWN; - } catch (Exception e) { + } catch (final Exception e) { e.printStackTrace(); return UNKNOWN; } finally { http://git-wip-us.apache.org/repos/asf/commons-compress/blob/3f2c760a/src/test/java/org/apache/commons/compress/archivers/CpioTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/archivers/CpioTestCase.java b/src/test/java/org/apache/commons/compress/archivers/CpioTestCase.java index 248a52f..5f623ca 100644 --- a/src/test/java/org/apache/commons/compress/archivers/CpioTestCase.java +++ b/src/test/java/org/apache/commons/compress/archivers/CpioTestCase.java @@ -92,10 +92,10 @@ public final class CpioTestCase extends AbstractTestCase { final ArchiveInputStream in = new ArchiveStreamFactory().createArchiveInputStream("cpio", is); - Map<String, File> result = new HashMap<String, File>(); + final Map<String, File> result = new HashMap<String, File>(); ArchiveEntry entry = null; while ((entry = in.getNextEntry()) != null) { - File cpioget = new File(dir, entry.getName()); + final File cpioget = new File(dir, entry.getName()); final OutputStream out = new FileOutputStream(cpioget); IOUtils.copy(in, out); out.close(); @@ -115,7 +115,7 @@ public final class CpioTestCase extends AbstractTestCase { @Test public void testDirectoryEntryFromFile() throws Exception { - File[] tmp = createTempDirAndFile(); + final File[] tmp = createTempDirAndFile(); File archive = null; CpioArchiveOutputStream tos = null; CpioArchiveInputStream tis = null; @@ -123,14 +123,14 @@ public final class CpioTestCase extends AbstractTestCase { archive = File.createTempFile("test.", ".cpio", tmp[0]); archive.deleteOnExit(); tos = new CpioArchiveOutputStream(new FileOutputStream(archive)); - long beforeArchiveWrite = tmp[0].lastModified(); - CpioArchiveEntry in = new CpioArchiveEntry(tmp[0], "foo"); + final long beforeArchiveWrite = tmp[0].lastModified(); + final CpioArchiveEntry in = new CpioArchiveEntry(tmp[0], "foo"); tos.putArchiveEntry(in); tos.closeArchiveEntry(); tos.close(); tos = null; tis = new CpioArchiveInputStream(new FileInputStream(archive)); - CpioArchiveEntry out = tis.getNextCPIOEntry(); + final CpioArchiveEntry out = tis.getNextCPIOEntry(); tis.close(); tis = null; assertNotNull(out); @@ -155,7 +155,7 @@ public final class CpioTestCase extends AbstractTestCase { @Test public void testExplicitDirectoryEntry() throws Exception { - File[] tmp = createTempDirAndFile(); + final File[] tmp = createTempDirAndFile(); File archive = null; CpioArchiveOutputStream tos = null; CpioArchiveInputStream tis = null; @@ -163,8 +163,8 @@ public final class CpioTestCase extends AbstractTestCase { archive = File.createTempFile("test.", ".cpio", tmp[0]); archive.deleteOnExit(); tos = new CpioArchiveOutputStream(new FileOutputStream(archive)); - long beforeArchiveWrite = tmp[0].lastModified(); - CpioArchiveEntry in = new CpioArchiveEntry("foo/"); + final long beforeArchiveWrite = tmp[0].lastModified(); + final CpioArchiveEntry in = new CpioArchiveEntry("foo/"); in.setTime(beforeArchiveWrite / 1000); in.setMode(CpioConstants.C_ISDIR); tos.putArchiveEntry(in); @@ -172,7 +172,7 @@ public final class CpioTestCase extends AbstractTestCase { tos.close(); tos = null; tis = new CpioArchiveInputStream(new FileInputStream(archive)); - CpioArchiveEntry out = tis.getNextCPIOEntry(); + final CpioArchiveEntry out = tis.getNextCPIOEntry(); tis.close(); tis = null; assertNotNull(out); @@ -196,7 +196,7 @@ public final class CpioTestCase extends AbstractTestCase { @Test public void testFileEntryFromFile() throws Exception { - File[] tmp = createTempDirAndFile(); + final File[] tmp = createTempDirAndFile(); File archive = null; CpioArchiveOutputStream tos = null; CpioArchiveInputStream tis = null; @@ -205,9 +205,9 @@ public final class CpioTestCase extends AbstractTestCase { archive = File.createTempFile("test.", ".cpio", tmp[0]); archive.deleteOnExit(); tos = new CpioArchiveOutputStream(new FileOutputStream(archive)); - CpioArchiveEntry in = new CpioArchiveEntry(tmp[1], "foo"); + final CpioArchiveEntry in = new CpioArchiveEntry(tmp[1], "foo"); tos.putArchiveEntry(in); - byte[] b = new byte[(int) tmp[1].length()]; + final byte[] b = new byte[(int) tmp[1].length()]; fis = new FileInputStream(tmp[1]); while (fis.read(b) > 0) { tos.write(b); @@ -218,7 +218,7 @@ public final class CpioTestCase extends AbstractTestCase { tos.close(); tos = null; tis = new CpioArchiveInputStream(new FileInputStream(archive)); - CpioArchiveEntry out = tis.getNextCPIOEntry(); + final CpioArchiveEntry out = tis.getNextCPIOEntry(); tis.close(); tis = null; assertNotNull(out); @@ -245,7 +245,7 @@ public final class CpioTestCase extends AbstractTestCase { @Test public void testExplicitFileEntry() throws Exception { - File[] tmp = createTempDirAndFile(); + final File[] tmp = createTempDirAndFile(); File archive = null; CpioArchiveOutputStream tos = null; CpioArchiveInputStream tis = null; @@ -254,12 +254,12 @@ public final class CpioTestCase extends AbstractTestCase { archive = File.createTempFile("test.", ".cpio", tmp[0]); archive.deleteOnExit(); tos = new CpioArchiveOutputStream(new FileOutputStream(archive)); - CpioArchiveEntry in = new CpioArchiveEntry("foo"); + final CpioArchiveEntry in = new CpioArchiveEntry("foo"); in.setTime(tmp[1].lastModified() / 1000); in.setSize(tmp[1].length()); in.setMode(CpioConstants.C_ISREG); tos.putArchiveEntry(in); - byte[] b = new byte[(int) tmp[1].length()]; + final byte[] b = new byte[(int) tmp[1].length()]; fis = new FileInputStream(tmp[1]); while (fis.read(b) > 0) { tos.write(b); @@ -270,7 +270,7 @@ public final class CpioTestCase extends AbstractTestCase { tos.close(); tos = null; tis = new CpioArchiveInputStream(new FileInputStream(archive)); - CpioArchiveEntry out = tis.getNextCPIOEntry(); + final CpioArchiveEntry out = tis.getNextCPIOEntry(); tis.close(); tis = null; assertNotNull(out); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/3f2c760a/src/test/java/org/apache/commons/compress/archivers/DumpTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/archivers/DumpTestCase.java b/src/test/java/org/apache/commons/compress/archivers/DumpTestCase.java index f8155f0..899fdcd 100644 --- a/src/test/java/org/apache/commons/compress/archivers/DumpTestCase.java +++ b/src/test/java/org/apache/commons/compress/archivers/DumpTestCase.java @@ -55,7 +55,7 @@ public final class DumpTestCase extends AbstractTestCase { ArchiveEntry entry = in.getNextEntry(); while (entry != null) { - File archiveEntry = new File(dir, entry.getName()); + final File archiveEntry = new File(dir, entry.getName()); archiveEntry.getParentFile().mkdirs(); if (entry.isDirectory()) { archiveEntry.mkdir(); @@ -112,7 +112,7 @@ public final class DumpTestCase extends AbstractTestCase { } private void checkDumpArchive(final File f) throws Exception { - ArrayList<String> expected = new ArrayList<String>(); + final ArrayList<String> expected = new ArrayList<String>(); expected.add(""); expected.add("lost+found/"); expected.add("test1.xml");
