This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-compress.git
commit ba5c0de867dff7623c58ec2da1072d864dbb3a4a Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Sun Oct 29 09:21:59 2023 -0400 Whitespace after close paren --- .../compress/archivers/ArchiveStreamFactory.java | 2 +- .../archivers/ar/ArArchiveOutputStream.java | 2 +- .../compress/archivers/dump/DumpArchiveEntry.java | 8 ++++---- .../archivers/jar/JarArchiveOutputStream.java | 2 +- .../compress/archivers/sevenz/SevenZFile.java | 18 +++++++++--------- .../compress/archivers/sevenz/SevenZMethod.java | 14 +++++++------- .../archivers/zip/ZipArchiveOutputStream.java | 20 ++++++++++---------- .../commons/compress/archivers/zip/ZipLong.java | 2 +- .../compress/harmony/pack200/BHSDCodec.java | 2 +- .../commons/compress/harmony/pack200/BandSet.java | 2 +- .../archivers/tar/TarArchiveOutputStreamTest.java | 2 +- .../compress/archivers/zip/AsiExtraFieldTest.java | 22 +++++++++++----------- .../archivers/zip/ZipArchiveInputStreamTest.java | 2 +- .../archivers/zip/ZipEightByteIntegerTest.java | 2 +- .../compress/archivers/zip/ZipShortTest.java | 2 +- .../compressors/DetectCompressorTestCase.java | 2 +- .../unpack200/tests/AttributeLayoutTest.java | 16 ++++++++-------- .../utils/FixedLengthBlockOutputStreamTest.java | 2 +- .../apache/commons/compress/utils/IOUtilsTest.java | 2 +- 19 files changed, 62 insertions(+), 62 deletions(-) diff --git a/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java b/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java index 556f62e4..7cc14186 100644 --- a/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java +++ b/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java @@ -74,7 +74,7 @@ import org.apache.commons.compress.utils.Sets; * <pre> * final InputStream is = Files.newInputStream(input.toPath()); * ArchiveInputStream in = new ArchiveStreamFactory().createArchiveInputStream(ArchiveStreamFactory.ZIP, is); - * ZipArchiveEntry entry = (ZipArchiveEntry)in.getNextEntry(); + * ZipArchiveEntry entry = (ZipArchiveEntry) in.getNextEntry(); * OutputStream out = Files.newOutputStream(dir.toPath().resolve(entry.getName())); * IOUtils.copy(in, out); * out.close(); diff --git a/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java index 6084a294..ebfbacfc 100644 --- a/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java +++ b/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java @@ -135,7 +135,7 @@ public class ArArchiveOutputStream extends ArchiveOutputStream { throw new IOException("Stream has already been finished"); } - final ArArchiveEntry pArEntry = (ArArchiveEntry)pEntry; + final ArArchiveEntry pArEntry = (ArArchiveEntry) pEntry; if (prevEntry == null) { writeArchiveHeader(); } else { diff --git a/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveEntry.java b/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveEntry.java index 1ddca6f7..651c4f74 100644 --- a/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveEntry.java +++ b/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveEntry.java @@ -55,10 +55,10 @@ import org.apache.commons.compress.archivers.ArchiveEntry; * #define LBLSIZE 16 * #define NAMELEN 64 * - * #define OFS_MAGIC (int)60011 // old format magic value - * #define NFS_MAGIC (int)60012 // new format magic value - * #define FS_UFS2_MAGIC (int)0x19540119 - * #define CHECKSUM (int)84446 // constant used in checksum algorithm + * #define OFS_MAGIC (int) 60011 // old format magic value + * #define NFS_MAGIC (int) 60012 // new format magic value + * #define FS_UFS2_MAGIC (int) 0x19540119 + * #define CHECKSUM (int) 84446 // constant used in checksum algorithm * * struct s_spcl { * int32_t c_type; // record type (see below) diff --git a/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveOutputStream.java index 4e47c535..68550593 100644 --- a/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveOutputStream.java +++ b/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveOutputStream.java @@ -57,7 +57,7 @@ public class JarArchiveOutputStream extends ZipArchiveOutputStream { @Override public void putArchiveEntry(final ArchiveEntry ze) throws IOException { if (!jarMarkerAdded) { - ((ZipArchiveEntry)ze).addAsFirstExtraField(JarMarker.getInstance()); + ((ZipArchiveEntry) ze).addAsFirstExtraField(JarMarker.getInstance()); jarMarkerAdded = true; } super.putArchiveEntry(ze); diff --git a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java index 47fcb5fb..2cf5c521 100644 --- a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java +++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java @@ -1012,7 +1012,7 @@ public class SevenZFile implements Closeable { int nid = getUnsignedByte(input); while (nid != NID.kEnd) { final long propertySize = readUint64(input); - final byte[] property = new byte[(int)propertySize]; + final byte[] property = new byte[(int) propertySize]; get(input, property); nid = getUnsignedByte(input); } @@ -1228,7 +1228,7 @@ public class SevenZFile implements Closeable { final Folder folder = new Folder(); final long numCoders = readUint64(header); - final Coder[] coders = new Coder[(int)numCoders]; + final Coder[] coders = new Coder[(int) numCoders]; long totalInStreams = 0; long totalOutStreams = 0; for (int i = 0; i < coders.length; i++) { @@ -1252,7 +1252,7 @@ public class SevenZFile implements Closeable { totalOutStreams += coders[i].numOutStreams; if (hasAttributes) { final long propertiesSize = readUint64(header); - coders[i].properties = new byte[(int)propertiesSize]; + coders[i].properties = new byte[(int) propertiesSize]; get(header, coders[i].properties); } // would need to keep looping as above: @@ -1266,7 +1266,7 @@ public class SevenZFile implements Closeable { folder.totalOutputStreams = totalOutStreams; final long numBindPairs = totalOutStreams - 1; - final BindPair[] bindPairs = new BindPair[(int)numBindPairs]; + final BindPair[] bindPairs = new BindPair[(int) numBindPairs]; for (int i = 0; i < bindPairs.length; i++) { bindPairs[i] = new BindPair(); bindPairs[i].inIndex = readUint64(header); @@ -1275,17 +1275,17 @@ public class SevenZFile implements Closeable { folder.bindPairs = bindPairs; final long numPackedStreams = totalInStreams - numBindPairs; - final long[] packedStreams = new long[(int)numPackedStreams]; + final long[] packedStreams = new long[(int) numPackedStreams]; if (numPackedStreams == 1) { int i; - for (i = 0; i < (int)totalInStreams; i++) { + for (i = 0; i < (int) totalInStreams; i++) { if (folder.findBindPairForInStream(i) < 0) { break; } } packedStreams[0] = i; } else { - for (int i = 0; i < (int)numPackedStreams; i++) { + for (int i = 0; i < (int) numPackedStreams; i++) { packedStreams[i] = readUint64(header); } } @@ -1460,7 +1460,7 @@ public class SevenZFile implements Closeable { unpackStreamsCount = 0; for (final Folder folder : archive.folders) { final long numStreams = readUint64(header); - folder.numUnpackSubStreams = (int)numStreams; + folder.numUnpackSubStreams = (int) numStreams; unpackStreamsCount += numStreams; } nid = getUnsignedByte(header); @@ -1545,7 +1545,7 @@ public class SevenZFile implements Closeable { nid = getUnsignedByte(header); for (final Folder folder : folders) { assertFitsIntoNonNegativeInt("totalOutputStreams", folder.totalOutputStreams); - folder.unpackSizes = new long[(int)folder.totalOutputStreams]; + folder.unpackSizes = new long[(int) folder.totalOutputStreams]; for (int i = 0; i < folder.totalOutputStreams; i++) { folder.unpackSizes[i] = readUint64(header); } diff --git a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZMethod.java b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZMethod.java index da3f8c57..3f04a9a7 100644 --- a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZMethod.java +++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZMethod.java @@ -34,25 +34,25 @@ import java.util.Arrays; */ public enum SevenZMethod { /** no compression at all */ - COPY(new byte[] { (byte)0x00 }), + COPY(new byte[] { (byte) 0x00 }), /** LZMA - only supported when reading */ - LZMA(new byte[] { (byte)0x03, (byte)0x01, (byte)0x01 }), + LZMA(new byte[] { (byte) 0x03, (byte) 0x01, (byte) 0x01 }), /** LZMA2 */ - LZMA2(new byte[] { (byte)0x21 }), + LZMA2(new byte[] { (byte) 0x21 }), /** Deflate */ - DEFLATE(new byte[] { (byte)0x04, (byte)0x01, (byte)0x08 }), + DEFLATE(new byte[] { (byte) 0x04, (byte) 0x01, (byte) 0x08 }), /** * Deflate64 * @since 1.16 */ - DEFLATE64(new byte[] { (byte)0x04, (byte)0x01, (byte)0x09 }), + DEFLATE64(new byte[] { (byte) 0x04, (byte) 0x01, (byte) 0x09 }), /** BZIP2 */ - BZIP2(new byte[] { (byte)0x04, (byte)0x02, (byte)0x02 }), + BZIP2(new byte[] { (byte) 0x04, (byte) 0x02, (byte) 0x02 }), /** * AES encryption with a key length of 256 bit using SHA256 for * hashes - only supported when reading */ - AES256SHA256(new byte[] { (byte)0x06, (byte)0xf1, (byte)0x07, (byte)0x01 }), + AES256SHA256(new byte[] { (byte) 0x06, (byte) 0xf1, (byte) 0x07, (byte) 0x01 }), /** * BCJ x86 platform version 1. * @since 1.8 diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java index 7739efb8..fc3c4ba7 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java @@ -1023,7 +1023,7 @@ public class ZipArchiveOutputStream extends ArchiveOutputStream { if (isSplitZip) { // when creating a split zip, the offset should be // the offset to the corresponding segment disk - final ZipSplitOutputStream zipSplitOutputStream = (ZipSplitOutputStream)this.outputStream; + final ZipSplitOutputStream zipSplitOutputStream = (ZipSplitOutputStream) this.outputStream; cdOffset = zipSplitOutputStream.getCurrentSplitSegmentBytesWritten(); cdDiskNumberStart = zipSplitOutputStream.getCurrentSplitSegmentIndex(); } @@ -1632,7 +1632,7 @@ public class ZipArchiveOutputStream extends ArchiveOutputStream { int numberOfThisDisk = 0; if (isSplitZip) { - numberOfThisDisk = ((ZipSplitOutputStream)this.outputStream).getCurrentSplitSegmentIndex(); + numberOfThisDisk = ((ZipSplitOutputStream) this.outputStream).getCurrentSplitSegmentIndex(); } if (numberOfThisDisk >= ZipConstants.ZIP64_MAGIC_SHORT) { throw new Zip64RequiredException(Zip64RequiredException @@ -1739,7 +1739,7 @@ public class ZipArchiveOutputStream extends ArchiveOutputStream { */ protected void writeCentralDirectoryEnd() throws IOException { if (!hasUsedZip64 && isSplitZip) { - ((ZipSplitOutputStream)this.outputStream).prepareToWriteUnsplittableContent(eocdLength); + ((ZipSplitOutputStream) this.outputStream).prepareToWriteUnsplittableContent(eocdLength); } validateIfZip64IsNeededInEOCD(); @@ -1749,12 +1749,12 @@ public class ZipArchiveOutputStream extends ArchiveOutputStream { // number of this disk int numberOfThisDisk = 0; if (isSplitZip) { - numberOfThisDisk = ((ZipSplitOutputStream)this.outputStream).getCurrentSplitSegmentIndex(); + numberOfThisDisk = ((ZipSplitOutputStream) this.outputStream).getCurrentSplitSegmentIndex(); } writeCounted(ZipShort.getBytes(numberOfThisDisk)); // disk number of the start of central directory - writeCounted(ZipShort.getBytes((int)cdDiskNumberStart)); + writeCounted(ZipShort.getBytes((int) cdDiskNumberStart)); // number of entries final int numberOfEntries = entries.size(); @@ -1860,7 +1860,7 @@ public class ZipArchiveOutputStream extends ArchiveOutputStream { if (isSplitZip) { // when creating a split zip, the offset should be // the offset to the corresponding segment disk - final ZipSplitOutputStream splitOutputStream = (ZipSplitOutputStream)this.outputStream; + final ZipSplitOutputStream splitOutputStream = (ZipSplitOutputStream) this.outputStream; ze.setDiskNumberStart(splitOutputStream.getCurrentSplitSegmentIndex()); localHeaderStart = splitOutputStream.getCurrentSplitSegmentBytesWritten(); } @@ -1947,7 +1947,7 @@ public class ZipArchiveOutputStream extends ArchiveOutputStream { if (isSplitZip) { // when creating a split zip, the offset of should be // the offset to the corresponding segment disk - final ZipSplitOutputStream zipSplitOutputStream = (ZipSplitOutputStream)this.outputStream; + final ZipSplitOutputStream zipSplitOutputStream = (ZipSplitOutputStream) this.outputStream; offset = zipSplitOutputStream.getCurrentSplitSegmentBytesWritten(); diskNumberStart = zipSplitOutputStream.getCurrentSplitSegmentIndex(); } @@ -1974,7 +1974,7 @@ public class ZipArchiveOutputStream extends ArchiveOutputStream { // number of this disk int numberOfThisDisk = 0; if (isSplitZip) { - numberOfThisDisk = ((ZipSplitOutputStream)this.outputStream).getCurrentSplitSegmentIndex(); + numberOfThisDisk = ((ZipSplitOutputStream) this.outputStream).getCurrentSplitSegmentIndex(); } writeOut(ZipLong.getBytes(numberOfThisDisk)); @@ -2007,7 +2007,7 @@ public class ZipArchiveOutputStream extends ArchiveOutputStream { + ZipConstants.WORD /* total number of disks */; final long unsplittableContentSize = zip64EOCDLOCLength + eocdLength; - ((ZipSplitOutputStream)this.outputStream).prepareToWriteUnsplittableContent(unsplittableContentSize); + ((ZipSplitOutputStream) this.outputStream).prepareToWriteUnsplittableContent(unsplittableContentSize); } // and now the "ZIP64 end of central directory locator" @@ -2021,7 +2021,7 @@ public class ZipArchiveOutputStream extends ArchiveOutputStream { if (isSplitZip) { // the Zip64 End Of Central Directory Locator and the End Of Central Directory must be // in the same split disk, it means they must be located in the last disk - final int totalNumberOfDisks = ((ZipSplitOutputStream)this.outputStream).getCurrentSplitSegmentIndex() + 1; + final int totalNumberOfDisks = ((ZipSplitOutputStream) this.outputStream).getCurrentSplitSegmentIndex() + 1; writeOut(ZipLong.getBytes(totalNumberOfDisks)); } else { writeOut(ONE); diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipLong.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipLong.java index 877d6688..7e74936b 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipLong.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipLong.java @@ -185,7 +185,7 @@ public final class ZipLong implements Cloneable, Serializable { * @return value as int * @since 1.15 */ - public int getIntValue() { return (int)value;} + public int getIntValue() { return (int) value;} /** * Get value as Java long. diff --git a/src/main/java/org/apache/commons/compress/harmony/pack200/BHSDCodec.java b/src/main/java/org/apache/commons/compress/harmony/pack200/BHSDCodec.java index be14706b..4f31a78f 100644 --- a/src/main/java/org/apache/commons/compress/harmony/pack200/BHSDCodec.java +++ b/src/main/java/org/apache/commons/compress/harmony/pack200/BHSDCodec.java @@ -254,7 +254,7 @@ public final class BHSDCodec extends Codec { // in for now for readability // if (isSigned()) { // long u = z; - // long twoPowS = (long)Math.pow(2, s); + // long twoPowS = (long) Math.pow(2, s); // double twoPowSMinusOne = twoPowS-1; // if (u % twoPowS < twoPowSMinusOne) { // if (cardinality < Math.pow(2, 32)) { diff --git a/src/main/java/org/apache/commons/compress/harmony/pack200/BandSet.java b/src/main/java/org/apache/commons/compress/harmony/pack200/BandSet.java index 9d1ba67d..c900a1ca 100644 --- a/src/main/java/org/apache/commons/compress/harmony/pack200/BandSet.java +++ b/src/main/java/org/apache/commons/compress/harmony/pack200/BandSet.java @@ -719,7 +719,7 @@ public abstract class BandSet { } return results.numCodecsTried >= effort; // May want to also check how much we've saved if performance needs improving, e.g. saved more than effort*2 % - // || (float)results.saved/(float)results.encodedBand.length > (float)effort * 2/100; + // || (float) results.saved/(float) results.encodedBand.length > (float) effort * 2/100; } private void tryCodecs(final String name, final int[] band, final BHSDCodec defaultCodec, final BandData bandData, diff --git a/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java b/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java index 3382baee..5a2bb61c 100644 --- a/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java @@ -326,7 +326,7 @@ public class TarArchiveOutputStreamTest extends AbstractTestCase { final int headerSize = 512; final int endOfArchiveSize = 1024; final int unpaddedSize = headerSize + fileRecordsSize + endOfArchiveSize; - final int paddedSize = (int) Math.ceil((double)unpaddedSize/blockSize)*blockSize; + final int paddedSize = (int) Math.ceil((double) unpaddedSize/blockSize)*blockSize; assertEquals(paddedSize, f.length()); } diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/AsiExtraFieldTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/AsiExtraFieldTest.java index 58a28e8b..035b1935 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/AsiExtraFieldTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/AsiExtraFieldTest.java @@ -59,8 +59,8 @@ public class AsiExtraFieldTest implements UnixStat { byte[] b = a.getLocalFileDataData(); // CRC manually calculated, sorry - byte[] expect = {(byte)0xC6, 0x02, 0x78, (byte)0xB6, // CRC - 0123, (byte)0x80, // mode + byte[] expect = {(byte) 0xC6, 0x02, 0x78, (byte) 0xB6, // CRC + 0123, (byte) 0x80, // mode 0, 0, 0, 0, // link length 5, 0, 6, 0}; // uid, gid assertEquals(expect.length, b.length, "no link"); @@ -69,8 +69,8 @@ public class AsiExtraFieldTest implements UnixStat { } a.setLinkedFile("test"); - expect = new byte[] {0x75, (byte)0x8E, 0x41, (byte)0xFD, // CRC - 0123, (byte)0xA0, // mode + expect = new byte[] {0x75, (byte) 0x8E, 0x41, (byte) 0xFD, // CRC + 0123, (byte) 0xA0, // mode 4, 0, 0, 0, // link length 5, 0, 6, 0, // uid, gid (byte)'t', (byte)'e', (byte)'s', (byte)'t'}; @@ -102,8 +102,8 @@ public class AsiExtraFieldTest implements UnixStat { @Test public void testReparse() throws Exception { // CRC manually calculated, sorry - final byte[] data1 = {(byte)0xC6, 0x02, 0x78, (byte)0xB6, // CRC - 0123, (byte)0x80, // mode + final byte[] data1 = {(byte) 0xC6, 0x02, 0x78, (byte) 0xB6, // CRC + 0123, (byte) 0x80, // mode 0, 0, 0, 0, // link length 5, 0, 6, 0}; // uid, gid final AsiExtraField a1 = new AsiExtraField(); @@ -115,8 +115,8 @@ public class AsiExtraFieldTest implements UnixStat { assertEquals(5, a1.getUserId(), "uid plain file"); assertEquals(6, a1.getGroupId(), "gid plain file"); - final byte[] data2 = {0x75, (byte)0x8E, 0x41, (byte)0xFD, // CRC - 0123, (byte)0xA0, // mode + final byte[] data2 = {0x75, (byte) 0x8E, 0x41, (byte) 0xFD, // CRC + 0123, (byte) 0xA0, // mode 4, 0, 0, 0, // link length 5, 0, 6, 0, // uid, gid (byte)'t', (byte)'e', (byte)'s', (byte)'t'}; @@ -130,8 +130,8 @@ public class AsiExtraFieldTest implements UnixStat { assertEquals(6, a2.getGroupId(), "gid link"); assertEquals("test", a2.getLinkedFile()); - final byte[] data3 = {(byte)0x8E, 0x01, (byte)0xBF, (byte)0x0E, // CRC - 0123, (byte)0x40, // mode + final byte[] data3 = {(byte) 0x8E, 0x01, (byte) 0xBF, (byte) 0x0E, // CRC + 0123, (byte) 0x40, // mode 0, 0, 0, 0, // link 5, 0, 6, 0}; // uid, gid final AsiExtraField a3 = new AsiExtraField(); @@ -144,7 +144,7 @@ public class AsiExtraFieldTest implements UnixStat { assertEquals(6, a3.getGroupId(), "gid dir"); final byte[] data4 = {0, 0, 0, 0, // bad CRC - 0123, (byte)0x40, // mode + 0123, (byte) 0x40, // mode 0, 0, 0, 0, // link 5, 0, 6, 0}; // uid, gid final AsiExtraField a4 = new AsiExtraField(); diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStreamTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStreamTest.java index 54d51f01..0a69f739 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStreamTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStreamTest.java @@ -67,7 +67,7 @@ public class ZipArchiveInputStreamTest extends AbstractTestCase { } private static byte[] readEntry(final ZipArchiveInputStream zip, final ZipArchiveEntry zae) throws IOException { - final int len = (int)zae.getSize(); + final int len = (int) zae.getSize(); final byte[] buff = new byte[len]; zip.read(buff, 0, len); diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ZipEightByteIntegerTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ZipEightByteIntegerTest.java index 84eb7fb9..f14d65e3 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/ZipEightByteIntegerTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/ZipEightByteIntegerTest.java @@ -114,7 +114,7 @@ public class ZipEightByteIntegerTest { */ @Test public void testSign() { - final ZipEightByteInteger zl = new ZipEightByteInteger(new byte[] {(byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF}); + final ZipEightByteInteger zl = new ZipEightByteInteger(new byte[] {(byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF}); assertEquals(BigInteger.valueOf(Long.MAX_VALUE).shiftLeft(1).setBit(0), zl.getValue()); } diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ZipShortTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ZipShortTest.java index 389b43da..2fe9a9ab 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/ZipShortTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/ZipShortTest.java @@ -85,7 +85,7 @@ public class ZipShortTest { */ @Test public void testSign() { - final ZipShort zs = new ZipShort(new byte[] {(byte)0xFF, (byte)0xFF}); + final ZipShort zs = new ZipShort(new byte[] {(byte) 0xFF, (byte) 0xFF}); assertEquals(0x0000FFFF, zs.getValue()); } diff --git a/src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCase.java b/src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCase.java index 0e098a51..83c26131 100644 --- a/src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCase.java +++ b/src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCase.java @@ -121,7 +121,7 @@ public final class DetectCompressorTestCase { } catch (final CompressorException e) { if (e.getCause() != null && e.getCause() instanceof Exception) { //unwrap cause to reveal MemoryLimitException - throw (Exception)e.getCause(); + throw (Exception) e.getCause(); } throw e; } diff --git a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/AttributeLayoutTest.java b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/AttributeLayoutTest.java index 72a66512..37e5d5cc 100644 --- a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/AttributeLayoutTest.java +++ b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/AttributeLayoutTest.java @@ -123,8 +123,8 @@ public class AttributeLayoutTest { AttributeLayout.CONTEXT_CLASS, "RS", 1); final Segment segment = new TestSegment(); assertNull(layout.getValue(-1, segment.getConstantPool())); - assertEquals("Eins", ((CPUTF8)layout.getValue(0, segment.getConstantPool())).underlyingString()); - assertEquals("Zwei", ((CPUTF8)layout.getValue(1, segment.getConstantPool())).underlyingString()); + assertEquals("Eins", ((CPUTF8) layout.getValue(0, segment.getConstantPool())).underlyingString()); + assertEquals("Zwei", ((CPUTF8) layout.getValue(1, segment.getConstantPool())).underlyingString()); } @Test @@ -133,8 +133,8 @@ public class AttributeLayoutTest { AttributeLayout.CONTEXT_CLASS, "RSN", 1); final Segment segment = new TestSegment(); assertNull(layout.getValue(0, segment.getConstantPool())); - assertEquals("Eins", ((CPUTF8)layout.getValue(1, segment.getConstantPool())).underlyingString()); - assertEquals("Zwei", ((CPUTF8)layout.getValue(2, segment.getConstantPool())).underlyingString()); + assertEquals("Eins", ((CPUTF8) layout.getValue(1, segment.getConstantPool())).underlyingString()); + assertEquals("Zwei", ((CPUTF8) layout.getValue(2, segment.getConstantPool())).underlyingString()); } @Test @@ -143,8 +143,8 @@ public class AttributeLayoutTest { AttributeLayout.CONTEXT_CLASS, "RU", 1); final Segment segment = new TestSegment(); assertNull(layout.getValue(-1, segment.getConstantPool())); - assertEquals("Zero", ((CPUTF8)layout.getValue(0, segment.getConstantPool())).underlyingString()); - assertEquals("One", ((CPUTF8)layout.getValue(1, segment.getConstantPool())).underlyingString()); + assertEquals("Zero", ((CPUTF8) layout.getValue(0, segment.getConstantPool())).underlyingString()); + assertEquals("One", ((CPUTF8) layout.getValue(1, segment.getConstantPool())).underlyingString()); } @Test @@ -153,8 +153,8 @@ public class AttributeLayoutTest { AttributeLayout.CONTEXT_CLASS, "RUN", 1); final Segment segment = new TestSegment(); assertNull(layout.getValue(0, segment.getConstantPool())); - assertEquals("Zero", ((CPUTF8)layout.getValue(1, segment.getConstantPool())).underlyingString()); - assertEquals("One", ((CPUTF8)layout.getValue(2, segment.getConstantPool())).underlyingString()); + assertEquals("Zero", ((CPUTF8) layout.getValue(1, segment.getConstantPool())).underlyingString()); + assertEquals("One", ((CPUTF8) layout.getValue(2, segment.getConstantPool())).underlyingString()); } @ParameterizedTest diff --git a/src/test/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStreamTest.java b/src/test/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStreamTest.java index c018e54e..1c6a3f86 100644 --- a/src/test/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStreamTest.java +++ b/src/test/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStreamTest.java @@ -246,7 +246,7 @@ public class FixedLengthBlockOutputStreamTest { } } final long expectedDataSize = reps * 4L; - final long expectedFileSize = (long)Math.ceil(expectedDataSize/(double)blockSize)*blockSize; + final long expectedFileSize = (long) Math.ceil(expectedDataSize/(double) blockSize)*blockSize; assertEquals(expectedFileSize, Files.size(tempFile), "file size"); final DataInputStream din = new DataInputStream(Files.newInputStream(tempFile)); for (int i = 0; i < reps; i++) { diff --git a/src/test/java/org/apache/commons/compress/utils/IOUtilsTest.java b/src/test/java/org/apache/commons/compress/utils/IOUtilsTest.java index f9dfb92d..27cbfbf6 100644 --- a/src/test/java/org/apache/commons/compress/utils/IOUtilsTest.java +++ b/src/test/java/org/apache/commons/compress/utils/IOUtilsTest.java @@ -157,7 +157,7 @@ public class IOUtilsTest { public void readRangeMoreThanCopyBufferSize() throws Exception { final Field COPY_BUF_SIZE = IOUtils.class.getDeclaredField("COPY_BUF_SIZE"); COPY_BUF_SIZE.setAccessible(true); - final int copyBufSize = (int)COPY_BUF_SIZE.get(null); + final int copyBufSize = (int) COPY_BUF_SIZE.get(null); // Make an input that requires two read loops to trigger COMPRESS-585 final byte[] input = new byte[copyBufSize + 10];