You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/07/08 13:18:09 UTC
[commons-compress] branch master updated: Fix formatting
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
The following commit(s) were added to refs/heads/master by this push:
new b25785e7 Fix formatting
b25785e7 is described below
commit b25785e79c35a60b664fce9bf7fdad67fff9f880
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 8 09:18:04 2023 -0400
Fix formatting
---
.../compress/archivers/tar/TarArchiveEntry.java | 6 ++---
.../zip/X0017_StrongEncryptionHeader.java | 2 +-
.../commons/compress/java/util/jar/Pack200.java | 2 +-
.../commons/compress/archivers/SevenZTestCase.java | 2 +-
.../archivers/tar/TarArchiveInputStreamTest.java | 4 ++--
.../compress/archivers/tar/TarUtilsTest.java | 28 +++++++++++-----------
.../archivers/zip/ExtraFieldUtilsTest.java | 2 +-
.../archivers/zip/PkWareExtraHeaderTest.java | 10 ++++----
.../compress/archivers/zip/ZipEncodingTest.java | 2 +-
.../compress/archivers/zip/ZipLongTest.java | 4 ++--
.../compress/archivers/zip/ZipUtilTest.java | 4 ++--
.../utils/FixedLengthBlockOutputStreamTest.java | 2 +-
12 files changed, 35 insertions(+), 33 deletions(-)
diff --git a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
index 774bf9b7..1598b87d 100644
--- a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
+++ b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
@@ -551,7 +551,7 @@ public class TarArchiveEntry implements ArchiveEntry, TarConstants, EntryStreamO
*/
public TarArchiveEntry(final Map<String, String> globalPaxHeaders, final byte[] headerBuf,
final ZipEncoding encoding, final boolean lenient, final long dataOffset) throws IOException {
- this(globalPaxHeaders,headerBuf, encoding, lenient);
+ this(globalPaxHeaders, headerBuf, encoding, lenient);
setDataOffset(dataOffset);
}
@@ -692,7 +692,7 @@ public class TarArchiveEntry implements ArchiveEntry, TarConstants, EntryStreamO
*/
public void addPaxHeader(final String name, final String value) {
try {
- processPaxHeader(name,value);
+ processPaxHeader(name, value);
} catch (final IOException ex) {
throw new IllegalArgumentException("Invalid input", ex);
}
@@ -1725,7 +1725,7 @@ public class TarArchiveEntry implements ArchiveEntry, TarConstants, EntryStreamO
}
break;
default:
- extraPaxHeaders.put(key,val);
+ extraPaxHeaders.put(key, val);
}
}
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/X0017_StrongEncryptionHeader.java b/src/main/java/org/apache/commons/compress/archivers/zip/X0017_StrongEncryptionHeader.java
index 64c36999..875ba9a7 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/X0017_StrongEncryptionHeader.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/X0017_StrongEncryptionHeader.java
@@ -120,7 +120,7 @@ import java.util.zip.ZipException;
* The IVData can be completely random data. If the size of
* the randomly generated data does not match the block size
* it should be complemented with zero's or truncated as
- * necessary. If IVSize is 0,then IV = CRC32 + Uncompressed
+ * necessary. If IVSize is 0, then IV = CRC32 + Uncompressed
* File Size (as a 64 bit little-endian, unsigned integer value).
*
* Format - the data format identifier for this record. The only
diff --git a/src/main/java/org/apache/commons/compress/java/util/jar/Pack200.java b/src/main/java/org/apache/commons/compress/java/util/jar/Pack200.java
index 429f6c07..4c4d1b6c 100644
--- a/src/main/java/org/apache/commons/compress/java/util/jar/Pack200.java
+++ b/src/main/java/org/apache/commons/compress/java/util/jar/Pack200.java
@@ -194,7 +194,7 @@ public abstract class Pack200 {
/**
* The String indicating if the unpacker should ignore all transmitted
- * values,can be replaced by either {@code true} or {@code false}.
+ * values, can be replaced by either {@code true} or {@code false}.
*/
String DEFLATE_HINT = "unpack.deflate.hint";//$NON-NLS-1$
diff --git a/src/test/java/org/apache/commons/compress/archivers/SevenZTestCase.java b/src/test/java/org/apache/commons/compress/archivers/SevenZTestCase.java
index 8241b6c9..98d6dde5 100644
--- a/src/test/java/org/apache/commons/compress/archivers/SevenZTestCase.java
+++ b/src/test/java/org/apache/commons/compress/archivers/SevenZTestCase.java
@@ -197,7 +197,7 @@ public class SevenZTestCase extends AbstractTestCase {
entry = archive.getNextEntry();
assertNotNull(entry);
- assertEquals(file1.getName(),entry.getName());
+ assertEquals(file1.getName(), entry.getName());
BasicFileAttributes attributes = Files.readAttributes(file1.toPath(), BasicFileAttributes.class);
assertEquals(TimeUtils.truncateToHundredNanos(attributes.lastModifiedTime()), entry.getLastModifiedTime());
assertEquals(TimeUtils.truncateToHundredNanos(attributes.creationTime()), entry.getCreationTime());
diff --git a/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStreamTest.java b/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStreamTest.java
index 0f4ca61b..09c6a433 100644
--- a/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStreamTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStreamTest.java
@@ -363,11 +363,11 @@ public class TarArchiveInputStreamTest extends AbstractTestCase {
final TarArchiveEntry entry = is.getNextTarEntry();
assertEquals("package/package.json", entry.getName());
assertEquals(TarConstants.LF_NORMAL, entry.getLinkFlag());
- assertEquals(is.getCurrentEntry(),entry);
+ assertEquals(is.getCurrentEntry(), entry);
final TarArchiveEntry weaselEntry = new TarArchiveEntry(entry.getName());
weaselEntry.setSize(entry.getSize());
is.setCurrentEntry(weaselEntry);
- assertEquals(entry,is.getCurrentEntry());
+ assertEquals(entry, is.getCurrentEntry());
assertNotSame(entry, is.getCurrentEntry());
assertSame(weaselEntry, is.getCurrentEntry());
assertThrows(IllegalStateException.class, () -> {
diff --git a/src/test/java/org/apache/commons/compress/archivers/tar/TarUtilsTest.java b/src/test/java/org/apache/commons/compress/archivers/tar/TarUtilsTest.java
index caa64167..72ff3370 100644
--- a/src/test/java/org/apache/commons/compress/archivers/tar/TarUtilsTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/tar/TarUtilsTest.java
@@ -53,19 +53,19 @@ public class TarUtilsTest extends AbstractTestCase {
}
private void checkRoundTripOctal(final long value, final int bufsize) {
- final byte [] buffer = new byte[bufsize];
+ final byte[] buffer = new byte[bufsize];
long parseValue;
TarUtils.formatLongOctalBytes(value, buffer, 0, buffer.length);
- parseValue = TarUtils.parseOctal(buffer,0, buffer.length);
- assertEquals(value,parseValue);
+ parseValue = TarUtils.parseOctal(buffer, 0, buffer.length);
+ assertEquals(value, parseValue);
}
private void checkRoundTripOctalOrBinary(final long value, final int bufsize) {
- final byte [] buffer = new byte[bufsize];
+ final byte[] buffer = new byte[bufsize];
long parseValue;
TarUtils.formatLongOctalOrBinaryBytes(value, buffer, 0, buffer.length);
- parseValue = TarUtils.parseOctalOrBinary(buffer,0, buffer.length);
- assertEquals(value,parseValue);
+ parseValue = TarUtils.parseOctalOrBinary(buffer, 0, buffer.length);
+ assertEquals(value, parseValue);
}
@Test
@@ -386,21 +386,21 @@ public class TarUtilsTest extends AbstractTestCase {
}
@Test
- public void testName(){
- byte [] buff = new byte[20];
+ public void testName() {
+ byte[] buff = new byte[20];
final String sb1 = "abcdefghijklmnopqrstuvwxyz";
- int off = TarUtils.formatNameBytes(sb1, buff, 1, buff.length-1);
+ int off = TarUtils.formatNameBytes(sb1, buff, 1, buff.length - 1);
assertEquals(off, 20);
String sb2 = TarUtils.parseName(buff, 1, 10);
- assertEquals(sb2,sb1.substring(0,10));
+ assertEquals(sb2, sb1.substring(0, 10));
sb2 = TarUtils.parseName(buff, 1, 19);
- assertEquals(sb2,sb1.substring(0,19));
+ assertEquals(sb2, sb1.substring(0, 19));
buff = new byte[30];
- off = TarUtils.formatNameBytes(sb1, buff, 1, buff.length-1);
+ off = TarUtils.formatNameBytes(sb1, buff, 1, buff.length - 1);
assertEquals(off, 30);
- sb2 = TarUtils.parseName(buff, 1, buff.length-1);
+ sb2 = TarUtils.parseName(buff, 1, buff.length - 1);
assertEquals(sb1, sb2);
- buff = new byte[]{0, 1, 0};
+ buff = new byte[] { 0, 1, 0 };
sb2 = TarUtils.parseName(buff, 0, 3);
assertEquals("", sb2);
}
diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtilsTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtilsTest.java
index 856054fc..02d430d1 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtilsTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtilsTest.java
@@ -203,7 +203,7 @@ public class ExtraFieldUtilsTest implements UnixStat {
@Test
public void testParseCentral() throws Exception {
- final ZipExtraField[] ze = ExtraFieldUtils.parse(data,false);
+ final ZipExtraField[] ze = ExtraFieldUtils.parse(data, false);
assertEquals(2, ze.length, "number of fields");
assertTrue(ze[0] instanceof AsiExtraField, "type field 1");
assertEquals(040755, ((AsiExtraField) ze[0]).getMode(), "mode field 1");
diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/PkWareExtraHeaderTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/PkWareExtraHeaderTest.java
index 3ccc0251..32ff5ea6 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/PkWareExtraHeaderTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/PkWareExtraHeaderTest.java
@@ -27,19 +27,21 @@ import org.junit.jupiter.api.Test;
public class PkWareExtraHeaderTest {
- @Test public void testEncryptionAlgorithm() {
+ @Test
+ public void testEncryptionAlgorithm() {
final String name = "AES256";
final int code = EncryptionAlgorithm.AES256.getCode();
final EncryptionAlgorithm e = EncryptionAlgorithm.valueOf(name);
- assertEquals(code,e.getCode());
+ assertEquals(code, e.getCode());
assertNotNull(e);
}
- @Test public void testHashAlgorithm() {
+ @Test
+ public void testHashAlgorithm() {
final String name = "SHA256";
final int code = HashAlgorithm.SHA256.getCode();
final HashAlgorithm e = HashAlgorithm.valueOf(name);
- assertEquals(code,e.getCode());
+ assertEquals(code, e.getCode());
assertNotNull(e);
}
diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ZipEncodingTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ZipEncodingTest.java
index 6f477a9d..d8f5bea0 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/ZipEncodingTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/ZipEncodingTest.java
@@ -172,7 +172,7 @@ public class ZipEncodingTest {
(byte) 0xF9, (byte) 0xFA, (byte) 0xFB, (byte) 0xFC,
(byte) 0xFD, (byte) 0xFE, (byte) 0xFF };
- doSimpleEncodingTest("Cp1252",b);
+ doSimpleEncodingTest("Cp1252", b);
}
@Test
diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ZipLongTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ZipLongTest.java
index 766ba3c3..04c61e69 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/ZipLongTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/ZipLongTest.java
@@ -85,9 +85,9 @@ public class ZipLongTest {
*/
@Test
public void testSign() {
- ZipLong zl = new ZipLong(new byte[] {(byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF});
+ ZipLong zl = new ZipLong(new byte[] { (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF });
assertEquals(0x00000000FFFFFFFFL, zl.getValue());
- assertEquals(-1,zl.getIntValue());
+ assertEquals(-1, zl.getIntValue());
zl = new ZipLong(0xFFFF_FFFFL);
assertEquals(0x00000000FFFFFFFFL, zl.getValue());
diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ZipUtilTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ZipUtilTest.java
index 4b668791..447f041f 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/ZipUtilTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/ZipUtilTest.java
@@ -197,12 +197,12 @@ public class ZipUtilTest {
}
@Test
- public void testMinTime(){
+ public void testMinTime() {
final byte[] b1 = ZipUtil.toDosTime(0);
final byte b10 = b1[0]; // Save the first byte
b1[0]++; // change it
final byte[] b2 = ZipUtil.toDosTime(0); // get the same time
- assertEquals(b10,b2[0]); // first byte should still be the same
+ assertEquals(b10, b2[0]); // first byte should still be the same
}
@Test
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 960f0fcc..bb24992f 100644
--- a/src/test/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStreamTest.java
+++ b/src/test/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStreamTest.java
@@ -254,7 +254,7 @@ public class FixedLengthBlockOutputStreamTest {
for (int i = 0; i < expectedFileSize - expectedDataSize; i++) {
assertEquals(0, din.read());
}
- assertEquals(-1,din.read());
+ assertEquals(-1, din.read());
}
private void testWriteAndPad(final int blockSize, final String text, final boolean doPartialWrite)