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 a70d63d0c23934fa27a56e22af869ea4ebcbc261
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Jan 28 10:21:59 2023 -0500
Format nits
---
.../compress/archivers/ar/ArArchiveOutputStream.java | 8 ++++----
.../archivers/cpio/CpioArchiveOutputStream.java | 8 ++++----
.../commons/compress/archivers/sevenz/SevenZFile.java | 2 +-
.../compress/archivers/tar/TarArchiveInputStream.java | 2 +-
.../compress/archivers/zip/ZipArchiveOutputStream.java | 18 +++++++++---------
.../org/apache/commons/compress/changes/ChangeSet.java | 2 +-
.../commons/compress/harmony/pack200/BHSDCodec.java | 6 +++---
.../commons/compress/harmony/pack200/BandSet.java | 4 ++--
.../commons/compress/harmony/unpack200/BandSet.java | 4 ++--
.../commons/compress/harmony/unpack200/CpBands.java | 2 +-
.../apache/commons/compress/archivers/ZipTestCase.java | 2 +-
.../compress/archivers/sevenz/SevenZFileTest.java | 6 +++---
.../archivers/zip/ZipArchiveInputStreamTest.java | 6 +++---
.../commons/compress/archivers/zip/ZipFileTest.java | 2 +-
14 files changed, 36 insertions(+), 36 deletions(-)
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 bd5bfed3..6084a294 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
@@ -72,7 +72,7 @@ public class ArArchiveOutputStream extends
ArchiveOutputStream {
@Override
public void closeArchiveEntry() throws IOException {
- if(finished) {
+ if (finished) {
throw new IOException("Stream has already been finished");
}
if (prevEntry == null || !haveUnclosedEntry){
@@ -120,10 +120,10 @@ public class ArArchiveOutputStream extends
ArchiveOutputStream {
@Override
public void finish() throws IOException {
- if(haveUnclosedEntry) {
+ if (haveUnclosedEntry) {
throw new IOException("This archive contains unclosed entries.");
}
- if(finished) {
+ if (finished) {
throw new IOException("This archive has already been finished");
}
finished = true;
@@ -131,7 +131,7 @@ public class ArArchiveOutputStream extends
ArchiveOutputStream {
@Override
public void putArchiveEntry(final ArchiveEntry pEntry) throws IOException {
- if(finished) {
+ if (finished) {
throw new IOException("Stream has already been finished");
}
diff --git
a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
index aaa777a2..11ab70ea 100644
---
a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
+++
b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
@@ -222,7 +222,7 @@ public class CpioArchiveOutputStream extends
ArchiveOutputStream implements
*/
@Override
public void closeArchiveEntry() throws IOException {
- if(finished) {
+ if (finished) {
throw new IOException("Stream has already been finished");
}
@@ -255,7 +255,7 @@ public class CpioArchiveOutputStream extends
ArchiveOutputStream implements
@Override
public ArchiveEntry createArchiveEntry(final File inputFile, final String
entryName)
throws IOException {
- if(finished) {
+ if (finished) {
throw new IOException("Stream has already been finished");
}
return new CpioArchiveEntry(inputFile, entryName);
@@ -269,7 +269,7 @@ public class CpioArchiveOutputStream extends
ArchiveOutputStream implements
@Override
public ArchiveEntry createArchiveEntry(final Path inputPath, final String
entryName, final LinkOption... options)
throws IOException {
- if(finished) {
+ if (finished) {
throw new IOException("Stream has already been finished");
}
return new CpioArchiveEntry(inputPath, entryName, options);
@@ -357,7 +357,7 @@ public class CpioArchiveOutputStream extends
ArchiveOutputStream implements
*/
@Override
public void putArchiveEntry(final ArchiveEntry entry) throws IOException {
- if(finished) {
+ if (finished) {
throw new IOException("Stream has already been finished");
}
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 4ec6b000..f7e51b93 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
@@ -635,7 +635,7 @@ public class SevenZFile implements Closeable {
// if this is called in a random access, then the content methods
of previous entry may be null
// the content methods should be set to methods of the first entry
as it must not be null,
// and the content methods would only be set if the content
methods was not set
- if(isRandomAccess && file.getContentMethods() == null) {
+ if (isRandomAccess && file.getContentMethods() == null) {
final int folderFirstFileIndex =
archive.streamMap.folderFirstFileIndex[folderIndex];
final SevenZArchiveEntry folderFirstFile =
archive.files[folderFirstFileIndex];
file.setContentMethods(folderFirstFile.getContentMethods());
diff --git
a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
index 621a4780..889d1ea4 100644
---
a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
+++
b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
@@ -330,7 +330,7 @@ public class TarArchiveInputStream extends
ArchiveInputStream {
@Override
public void close() throws IOException {
// Close all the input streams in sparseInputStreams
- if(sparseInputStreams != null) {
+ if (sparseInputStreams != null) {
for (final InputStream inputStream : sparseInputStreams) {
inputStream.close();
}
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 b4e76795..e8fc0690 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
@@ -783,11 +783,11 @@ public class ZipArchiveOutputStream extends
ArchiveOutputStream {
private byte[] createCentralFileHeader(final ZipArchiveEntry ze, final
ByteBuffer name,
final EntryMetaData entryMetaData,
final boolean needsZip64Extra)
throws IOException {
- if(isSplitZip) {
+ if (isSplitZip) {
// calculate the disk number for every central file header,
// this will be used in writing End Of Central Directory and Zip64
End Of Central Directory
final int currentSplitSegment =
((ZipSplitOutputStream)this.outputStream).getCurrentSplitSegmentIndex();
- if(numberOfCDInDiskData.get(currentSplitSegment) == null) {
+ if (numberOfCDInDiskData.get(currentSplitSegment) == null) {
numberOfCDInDiskData.put(currentSplitSegment, 1);
} else {
final int originalNumberOfCD =
numberOfCDInDiskData.get(currentSplitSegment);
@@ -853,7 +853,7 @@ public class ZipArchiveOutputStream extends
ArchiveOutputStream {
ZipShort.putShort(commentLen, buf, CFH_COMMENT_LENGTH_OFFSET);
// disk number start
- if(isSplitZip) {
+ if (isSplitZip) {
if (ze.getDiskNumberStart() >= ZipConstants.ZIP64_MAGIC_SHORT ||
zip64Mode == Zip64Mode.Always) {
ZipShort.putShort(ZipConstants.ZIP64_MAGIC_SHORT, buf,
CFH_DISK_NUMBER_OFFSET);
} else {
@@ -1603,7 +1603,7 @@ public class ZipArchiveOutputStream extends
ArchiveOutputStream {
*/
private boolean shouldUseZip64EOCD() {
int numberOfThisDisk = 0;
- if(isSplitZip) {
+ if (isSplitZip) {
numberOfThisDisk =
((ZipSplitOutputStream)this.outputStream).getCurrentSplitSegmentIndex();
}
final int numOfEntriesOnThisDisk =
numberOfCDInDiskData.get(numberOfThisDisk) == null ? 0 :
numberOfCDInDiskData.get(numberOfThisDisk);
@@ -1740,7 +1740,7 @@ public class ZipArchiveOutputStream extends
ArchiveOutputStream {
* and {@link #setUseZip64(Zip64Mode)} is {@link Zip64Mode#Never}.
*/
protected void writeCentralDirectoryEnd() throws IOException {
- if(!hasUsedZip64 && isSplitZip) {
+ if (!hasUsedZip64 && isSplitZip) {
((ZipSplitOutputStream)this.outputStream).prepareToWriteUnsplittableContent(eocdLength);
}
@@ -1750,7 +1750,7 @@ public class ZipArchiveOutputStream extends
ArchiveOutputStream {
// number of this disk
int numberOfThisDisk = 0;
- if(isSplitZip) {
+ if (isSplitZip) {
numberOfThisDisk =
((ZipSplitOutputStream)this.outputStream).getCurrentSplitSegmentIndex();
}
writeCounted(ZipShort.getBytes(numberOfThisDisk));
@@ -1946,7 +1946,7 @@ public class ZipArchiveOutputStream extends
ArchiveOutputStream {
long offset = streamCompressor.getTotalBytesWritten();
long diskNumberStart = 0L;
- if(isSplitZip) {
+ 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;
@@ -2000,7 +2000,7 @@ public class ZipArchiveOutputStream extends
ArchiveOutputStream {
// no "zip64 extensible data sector" for now
- if(isSplitZip) {
+ if (isSplitZip) {
// based on the ZIP specification, the End Of Central Directory
record and
// the Zip64 End Of Central Directory locator record must be on
the same segment
final int zip64EOCDLOCLength = ZipConstants.WORD /* length of
ZIP64_EOCD_LOC_SIG */
@@ -2020,7 +2020,7 @@ public class ZipArchiveOutputStream extends
ArchiveOutputStream {
// relative offset of ZIP64 EOCD record
writeOut(ZipEightByteInteger.getBytes(offset));
// total number of disks
- if(isSplitZip) {
+ 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;
diff --git a/src/main/java/org/apache/commons/compress/changes/ChangeSet.java
b/src/main/java/org/apache/commons/compress/changes/ChangeSet.java
index 5cd4d4c3..515f9094 100644
--- a/src/main/java/org/apache/commons/compress/changes/ChangeSet.java
+++ b/src/main/java/org/apache/commons/compress/changes/ChangeSet.java
@@ -84,7 +84,7 @@ public final class ChangeSet {
final ArchiveEntry entry = change.getEntry();
if (entry.equals(pChange.getEntry())) {
- if(pChange.isReplaceMode()) {
+ if (pChange.isReplaceMode()) {
it.remove();
changes.add(pChange);
}
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 d7a6f239..029fae99 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
@@ -253,12 +253,12 @@ public final class BHSDCodec extends Codec {
}
// This algorithm does the same thing, but is probably slower. Leaving
// in for now for readability
- // if(isSigned()) {
+ // if (isSigned()) {
// long u = z;
// long twoPowS = (long)Math.pow(2, s);
// double twoPowSMinusOne = twoPowS-1;
- // if(u % twoPowS < twoPowSMinusOne) {
- // if(cardinality < Math.pow(2, 32)) {
+ // if (u % twoPowS < twoPowSMinusOne) {
+ // if (cardinality < Math.pow(2, 32)) {
// z = (long) (u - (Math.floor(u/ twoPowS)));
// } else {
// z = cast32((long) (u - (Math.floor(u/ twoPowS))));
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 b5901cdc..053f5812 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
@@ -354,7 +354,7 @@ public abstract class BandSet {
throws Pack200Exception {
byte[] encodedBand = null;
// Useful for debugging
-// if(ints.length > 0) {
+// if (ints.length > 0) {
// System.out.println("encoding " + name + " " + ints.length);
// }
if (effort > 1 && (ints.length >= effortThresholds[effort])) {
@@ -467,7 +467,7 @@ public abstract class BandSet {
// int specifier = 117;
// byte[] specifierEncoded = defaultCodec.encode(new int[] {specifier});
// int totalLength = firstResults.encodedBand.length +
secondResults.encodedBand.length + specifierEncoded.length + 4; // TODO actual
-// if(totalLength < results.encodedBand.length) {
+// if (totalLength < results.encodedBand.length) {
// System.out.println("using run codec");
// results.saved += results.encodedBand.length - totalLength;
// byte[] encodedBand = new byte[specifierEncoded.length +
firstResults.encodedBand.length + secondResults.encodedBand.length];
diff --git
a/src/main/java/org/apache/commons/compress/harmony/unpack200/BandSet.java
b/src/main/java/org/apache/commons/compress/harmony/unpack200/BandSet.java
index 3b1da874..b5741f48 100644
--- a/src/main/java/org/apache/commons/compress/harmony/unpack200/BandSet.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/BandSet.java
@@ -67,7 +67,7 @@ public abstract class BandSet {
throws IOException, Pack200Exception {
int[] band;
// Useful for debugging
-// if(count > 0) {
+// if (count > 0) {
// System.out.println("decoding " + name + " " + count);
// }
Codec codecUsed = codec;
@@ -92,7 +92,7 @@ public abstract class BandSet {
band = codec.decodeInts(count - 1, in, first);
}
// Useful for debugging -E options:
- // if(!codecUsed.equals(codec)) {
+ // if (!codecUsed.equals(codec)) {
// int bytes = codecUsed.lastBandLength;
// System.out.println(count + " " + name + " encoded with " +
codecUsed + " " + bytes);
// }
diff --git
a/src/main/java/org/apache/commons/compress/harmony/unpack200/CpBands.java
b/src/main/java/org/apache/commons/compress/harmony/unpack200/CpBands.java
index 6578ff64..a31e97a0 100644
--- a/src/main/java/org/apache/commons/compress/harmony/unpack200/CpBands.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/CpBands.java
@@ -515,7 +515,7 @@ public class CpBands extends BandSet {
mapSignature.put(signature.toString(), Integer.valueOf(i));
}
// for (int i = 0; i < cpSignatureInts.length; i++) {
-// if(cpSignatureInts[i] == -1) {
+// if (cpSignatureInts[i] == -1) {
// cpSignatureInts[i] = search(cpUTF8, cpSignature[i]);
// }
// }
diff --git
a/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java
b/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java
index d6e5e773..2eccf953 100644
--- a/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java
+++ b/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java
@@ -183,7 +183,7 @@ public final class ZipTestCase extends AbstractTestCase {
assertThrows(IllegalArgumentException.class, () -> new
ZipArchiveOutputStream(File.createTempFile("temp", "zip"), 64 * 1024 - 1));
}
private int countNonDirectories(final File file) {
- if(!file.isDirectory()) {
+ if (!file.isDirectory()) {
return 1;
}
diff --git
a/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZFileTest.java
b/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZFileTest.java
index 61d52fc8..da51bd0c 100644
---
a/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZFileTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZFileTest.java
@@ -131,7 +131,7 @@ public class SevenZFileTest extends AbstractTestCase {
"111111111111111111111111111000101011";
for(final SevenZArchiveEntry entry : sevenZFile.getEntries()) {
-
if(entry.getName().equals("commons-compress-1.7-src/src/test/resources/test.txt"))
{
+ if
(entry.getName().equals("commons-compress-1.7-src/src/test/resources/test.txt"))
{
final byte[] contents = new byte[(int) entry.getSize()];
int off = 0;
final InputStream inputStream =
sevenZFile.getInputStream(entry);
@@ -621,7 +621,7 @@ public class SevenZFileTest extends AbstractTestCase {
for(final SevenZArchiveEntry entry : sevenZFile.getEntries()) {
// commons-compress-1.7-src/src/test/resources/test.txt
-
if(entry.getName().equals("commons-compress-1.7-src/src/test/resources/longsymlink/files.txt"))
{
+ if
(entry.getName().equals("commons-compress-1.7-src/src/test/resources/longsymlink/files.txt"))
{
contents = new byte[(int) entry.getSize()];
off = 0;
final InputStream inputStream =
sevenZFile.getInputStream(entry);
@@ -671,7 +671,7 @@ public class SevenZFileTest extends AbstractTestCase {
SevenZArchiveEntry entry;
SevenZArchiveEntry testTxtEntry = null;
while((entry = sevenZFile.getNextEntry()) != null ) {
-
if(entry.getName().equals("commons-compress-1.7-src/src/test/resources/test.txt"))
{
+ if
(entry.getName().equals("commons-compress-1.7-src/src/test/resources/test.txt"))
{
testTxtEntry = entry;
break;
}
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 0688f202..ef8357e9 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
@@ -517,7 +517,7 @@ public class ZipArchiveInputStreamTest {
ArchiveEntry entry;
while((entry = splitInputStream.getNextEntry()) != null &&
inputStreamToCompare.getNextEntry() != null) {
- if(entry.isDirectory()) {
+ if (entry.isDirectory()) {
continue;
}
assertArrayEquals(IOUtils.toByteArray(splitInputStream),
@@ -539,7 +539,7 @@ public class ZipArchiveInputStreamTest {
ArchiveEntry entry;
while((entry = splitInputStream.getNextEntry()) != null &&
inputStreamToCompare.getNextEntry() != null) {
- if(entry.isDirectory()) {
+ if (entry.isDirectory()) {
continue;
}
assertArrayEquals(IOUtils.toByteArray(splitInputStream),
@@ -561,7 +561,7 @@ public class ZipArchiveInputStreamTest {
ArchiveEntry entry;
while((entry = splitInputStream.getNextEntry()) != null &&
inputStreamToCompare.getNextEntry() != null) {
- if(entry.isDirectory()) {
+ if (entry.isDirectory()) {
continue;
}
assertArrayEquals(IOUtils.toByteArray(splitInputStream),
diff --git
a/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java
b/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java
index 27678478..2e6d35ec 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java
@@ -130,7 +130,7 @@ public class ZipFileTest {
final List<String> linesOfFile1 =
Files.readAllLines(Paths.get(file1.getCanonicalPath()), UTF_8);
final List<String> linesOfFile2 =
Files.readAllLines(Paths.get(file2.getCanonicalPath()), UTF_8);
- if(linesOfFile1.size() != linesOfFile2.size()) {
+ if (linesOfFile1.size() != linesOfFile2.size()) {
fail("files not equal : " + file1.getName() + " , " +
file2.getName());
}
