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 09d558d3207b3ab021b9e4b3d757f99f2fdca972
Author: Gary D. Gregory <garydgreg...@gmail.com>
AuthorDate: Tue Sep 16 17:53:12 2025 -0400
Javadoc
Some formatting tweaks
---
.../archivers/ar/ArArchiveInputStream.java | 3 +-
.../archivers/arj/ArjArchiveInputStream.java | 3 +-
.../archivers/cpio/CpioArchiveInputStream.java | 3 +-
.../archivers/dump/DumpArchiveInputStream.java | 3 +-
.../archivers/jar/JarArchiveInputStream.java | 3 +-
.../archivers/tar/TarArchiveInputStream.java | 21 ++++++--------
.../archivers/zip/ZipArchiveInputStream.java | 33 +++++++++++-----------
.../commons/compress/archivers/tar/BigFilesIT.java | 11 ++++----
.../compress/archivers/tar/SparseFilesTest.java | 3 +-
.../commons/compress/archivers/tar/TarLister.java | 3 +-
.../archivers/tar/TarMemoryFileSystemTest.java | 9 +-----
.../compress/archivers/zip/Zip64SupportIT.java | 8 ++----
.../archivers/zip/ZipArchiveInputStreamTest.java | 25 ++++------------
.../compressors/pack200/Pack200UtilsTest.java | 3 +-
14 files changed, 51 insertions(+), 80 deletions(-)
diff --git
a/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
b/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
index d9d3ad899..d5b956053 100644
---
a/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
+++
b/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
@@ -49,6 +49,7 @@ public class ArArchiveInputStream extends
ArchiveInputStream<ArArchiveEntry> {
* .setPath(inputPath)
* .get();
* }</pre>
+ *
* @since 1.29.0
*/
public static final class Builder extends
AbstractBuilder<ArArchiveInputStream, Builder> {
@@ -85,7 +86,7 @@ public ArArchiveInputStream get() throws IOException {
/**
* Creates a new builder.
*
- * @return A new builder
+ * @return A new builder.
* @since 1.29.0
*/
public static Builder builder() {
diff --git
a/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveInputStream.java
b/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveInputStream.java
index 34dedaa06..f30345c9a 100644
---
a/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveInputStream.java
+++
b/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveInputStream.java
@@ -57,6 +57,7 @@ public class ArjArchiveInputStream extends
ArchiveInputStream<ArjArchiveEntry> {
* .setCharset(StandardCharsets.UTF_8)
* .get();
* }</pre>
+ *
* @since 1.29.0
*/
public static final class Builder extends
AbstractBuilder<ArjArchiveInputStream, Builder> {
@@ -78,7 +79,7 @@ public ArjArchiveInputStream get() throws IOException {
/**
* Creates a new builder.
*
- * @return A new builder
+ * @return A new builder.
* @since 1.29.0
*/
public static Builder builder() {
diff --git
a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java
b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java
index 5aa93b54a..a7a3b1f78 100644
---
a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java
+++
b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java
@@ -76,6 +76,7 @@ public class CpioArchiveInputStream extends
ArchiveInputStream<CpioArchiveEntry>
* .setCharset(StandardCharsets.UTF_8)
* .get();
* }</pre>
+ *
* @since 1.29.0
*/
public static final class Builder extends
AbstractBuilder<CpioArchiveInputStream, Builder> {
@@ -109,7 +110,7 @@ public Builder setBlockSize(final int blockSize) {
/**
* Creates a new builder.
*
- * @return A new builder
+ * @return A new builder.
* @since 1.29.0
*/
public static Builder builder() {
diff --git
a/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStream.java
b/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStream.java
index 258c191bc..bc377291a 100644
---
a/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStream.java
+++
b/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStream.java
@@ -57,6 +57,7 @@ public class DumpArchiveInputStream extends
ArchiveInputStream<DumpArchiveEntry>
* .setPath(inputPath)
* .get();
* }</pre>
+ *
* @since 1.29.0
*/
public static final class Builder extends
AbstractBuilder<DumpArchiveInputStream, Builder> {
@@ -76,7 +77,7 @@ public DumpArchiveInputStream get() throws IOException {
/**
* Creates a new builder.
*
- * @return A new builder
+ * @return A new builder.
* @since 1.29.0
*/
public static Builder builder() {
diff --git
a/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveInputStream.java
b/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveInputStream.java
index 4e4c4a584..ee3e1be58 100644
---
a/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveInputStream.java
+++
b/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveInputStream.java
@@ -43,6 +43,7 @@ public class JarArchiveInputStream extends
ZipArchiveInputStream {
* .setUseUnicodeExtraFields(false)
* .get();
* }</pre>
+ *
* @since 1.29.0
*/
public static class Builder extends
ZipArchiveInputStream.AbstractBuilder<JarArchiveInputStream, Builder> {
@@ -55,7 +56,7 @@ public JarArchiveInputStream get() throws IOException {
/**
* Creates a new builder.
*
- * @return A new builder
+ * @return A new builder.
* @since 1.29.0
*/
public static Builder jarInputStreamBuilder() {
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 9be91c189..0103cd4c5 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
@@ -305,19 +305,14 @@ public TarArchiveInputStream(
* @deprecated Use {@link #builder()} to configure and {@link
Builder#get() get()} a {@link Builder}.
*/
@Deprecated
- public TarArchiveInputStream(
- final InputStream inputStream,
- final int blockSize,
- final int recordSize,
- final String encoding,
- final boolean lenient) {
- this(
- inputStream,
- builder()
- .setBlockSize(blockSize)
- .setRecordSize(recordSize)
- .setCharset(encoding)
- .setLenient(lenient));
+ public TarArchiveInputStream(final InputStream inputStream, final int
blockSize, final int recordSize, final String encoding, final boolean lenient) {
+ // @formatter:off
+ this(inputStream, builder()
+ .setBlockSize(blockSize)
+ .setRecordSize(recordSize)
+ .setCharset(encoding)
+ .setLenient(lenient));
+ // @formatter:on
}
/**
diff --git
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
index 46f89b6f9..6f525955f 100644
---
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
+++
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
@@ -86,6 +86,7 @@ public class ZipArchiveInputStream extends
ArchiveInputStream<ZipArchiveEntry> i
*/
public abstract static class AbstractBuilder<T extends
ZipArchiveInputStream, B extends AbstractBuilder<T, B>>
extends ArchiveInputStream.AbstractBuilder<T, B> {
+
private boolean useUnicodeExtraFields = true;
private boolean supportStoredEntryDataDescriptor;
private boolean skipSplitSignature;
@@ -240,6 +241,7 @@ private int readCount(final int bytesRead) {
* .setUseUnicodeExtraFields(false)
* .get();
* }</pre>
+ *
* @since 1.29.0
*/
public static final class Builder extends
AbstractBuilder<ZipArchiveInputStream, Builder> {
@@ -330,7 +332,7 @@ private <T extends InputStream> T checkInputStream() throws
ZipException {
/**
* Creates a new builder.
*
- * @return A new builder
+ * @return A new builder.
* @since 1.29.0
*/
public static Builder builder() {
@@ -447,8 +449,7 @@ public ZipArchiveInputStream(final InputStream inputStream,
final String encodin
* @param encoding the encoding to use for file names, use
null for the platform's default encoding.
* @param useUnicodeExtraFields whether to use InfoZIP Unicode Extra
Fields (if present) to set the file names.
*/
- public ZipArchiveInputStream(
- final InputStream inputStream, final String encoding, final
boolean useUnicodeExtraFields) {
+ public ZipArchiveInputStream(final InputStream inputStream, final String
encoding, final boolean useUnicodeExtraFields) {
this(inputStream,
builder().setCharset(encoding).setUseUnicodeExtraFields(useUnicodeExtraFields));
}
@@ -466,12 +467,12 @@ public ZipArchiveInputStream(
final String encoding,
final boolean useUnicodeExtraFields,
final boolean supportStoredEntryDataDescriptor) {
- this(
- inputStream,
- builder()
- .setCharset(encoding)
- .setUseUnicodeExtraFields(useUnicodeExtraFields)
-
.setSupportStoredEntryDataDescriptor(supportStoredEntryDataDescriptor));
+ // @formatter:off
+ this(inputStream, builder()
+ .setCharset(encoding)
+ .setUseUnicodeExtraFields(useUnicodeExtraFields)
+
.setSupportStoredEntryDataDescriptor(supportStoredEntryDataDescriptor));
+ // @formatter:on
}
/**
@@ -491,13 +492,13 @@ public ZipArchiveInputStream(
final boolean useUnicodeExtraFields,
final boolean supportStoredEntryDataDescriptor,
final boolean skipSplitSignature) {
- this(
- inputStream,
- builder()
- .setCharset(encoding)
- .setUseUnicodeExtraFields(useUnicodeExtraFields)
-
.setSupportStoredEntryDataDescriptor(supportStoredEntryDataDescriptor)
- .setSkipSplitSignature(skipSplitSignature));
+ // @formatter:off
+ this(inputStream, builder()
+ .setCharset(encoding)
+ .setUseUnicodeExtraFields(useUnicodeExtraFields)
+
.setSupportStoredEntryDataDescriptor(supportStoredEntryDataDescriptor)
+ .setSkipSplitSignature(skipSplitSignature));
+ // @formatter:on
}
/**
diff --git
a/src/test/java/org/apache/commons/compress/archivers/tar/BigFilesIT.java
b/src/test/java/org/apache/commons/compress/archivers/tar/BigFilesIT.java
index a647c2ed0..a941dbe0e 100644
--- a/src/test/java/org/apache/commons/compress/archivers/tar/BigFilesIT.java
+++ b/src/test/java/org/apache/commons/compress/archivers/tar/BigFilesIT.java
@@ -35,17 +35,18 @@
import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
import org.junit.jupiter.api.Test;
+/**
+ * An integration test for big files.
+ */
public class BigFilesIT extends AbstractTest {
private void readFileBiggerThan8GByte(final String name) throws Exception {
try (InputStream in = new
BufferedInputStream(Files.newInputStream(getPath(name)));
GzipCompressorInputStream gzin = new
GzipCompressorInputStream(in);
- TarArchiveInputStream tin =
-
TarArchiveInputStream.builder().setInputStream(gzin).get()) {
+ TarArchiveInputStream tin =
TarArchiveInputStream.builder().setInputStream(gzin).get()) {
final TarArchiveEntry e = tin.getNextTarEntry();
assertNotNull(e);
assertEquals(8200L * 1024 * 1024, e.getSize());
-
long read = 0;
final Random r = new Random(System.currentTimeMillis());
int readNow;
@@ -78,8 +79,7 @@ void testReadFileBiggerThan8GByteStar() throws Exception {
void testReadFileHeadersOfArchiveBiggerThan8GByte() throws Exception {
try (InputStream in = new
BufferedInputStream(Files.newInputStream(getPath("8.posix.tar.gz")));
GzipCompressorInputStream gzin = new
GzipCompressorInputStream(in);
- TarArchiveInputStream tin =
-
TarArchiveInputStream.builder().setInputStream(gzin).get()) {
+ TarArchiveInputStream tin =
TarArchiveInputStream.builder().setInputStream(gzin).get()) {
final TarArchiveEntry e = tin.getNextTarEntry();
assertNotNull(e);
assertNull(tin.getNextTarEntry());
@@ -94,7 +94,6 @@ void testTarFileReadFileHeadersOfArchiveBiggerThan8GByte()
throws Exception {
GzipCompressorInputStream gzin = new
GzipCompressorInputStream(in)) {
Files.copy(gzin, output, StandardCopyOption.REPLACE_EXISTING);
}
-
try (TarFile tarFile = new TarFile(output)) {
final List<TarArchiveEntry> entries = tarFile.getEntries();
assertEquals(1, entries.size());
diff --git
a/src/test/java/org/apache/commons/compress/archivers/tar/SparseFilesTest.java
b/src/test/java/org/apache/commons/compress/archivers/tar/SparseFilesTest.java
index 779521617..4d09fddca 100644
---
a/src/test/java/org/apache/commons/compress/archivers/tar/SparseFilesTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/tar/SparseFilesTest.java
@@ -115,8 +115,7 @@ private String getTarBinaryHelp() throws IOException {
@Test
void testCompareTarArchiveInputStreamWithTarFile() throws IOException {
final Path file = getPath("oldgnu_sparse.tar");
- try (TarArchiveInputStream tarIn =
- TarArchiveInputStream.builder().setPath(file).get();
+ try (TarArchiveInputStream tarIn =
TarArchiveInputStream.builder().setPath(file).get();
TarFile tarFile = new TarFile(file)) {
assertNotNull(tarIn.getNextTarEntry());
try (InputStream inputStream =
tarFile.getInputStream(tarFile.getEntries().get(0))) {
diff --git
a/src/test/java/org/apache/commons/compress/archivers/tar/TarLister.java
b/src/test/java/org/apache/commons/compress/archivers/tar/TarLister.java
index a049a5f21..6fc9deaf3 100644
--- a/src/test/java/org/apache/commons/compress/archivers/tar/TarLister.java
+++ b/src/test/java/org/apache/commons/compress/archivers/tar/TarLister.java
@@ -84,8 +84,7 @@ public static void main(final String[] args) throws Exception
{
if (!f.isFile()) {
System.err.println(f + " doesn't exist or is a directory");
}
- TarArchiveInputStream.Builder tarBuilder =
- TarArchiveInputStream.builder().setFile(f);
+ TarArchiveInputStream.Builder tarBuilder =
TarArchiveInputStream.builder().setFile(f);
if (args.length > 1) {
tarBuilder = tarBuilder.setCharset(args[1]);
}
diff --git
a/src/test/java/org/apache/commons/compress/archivers/tar/TarMemoryFileSystemTest.java
b/src/test/java/org/apache/commons/compress/archivers/tar/TarMemoryFileSystemTest.java
index 1763fc493..f8859a0f9 100644
---
a/src/test/java/org/apache/commons/compress/archivers/tar/TarMemoryFileSystemTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/tar/TarMemoryFileSystemTest.java
@@ -52,7 +52,6 @@ void testCheckUserInformationInTarEntry() throws IOException,
ArchiveException {
Files.write(pathSource, "Test".getBytes(UTF_8));
Files.setAttribute(pathSource, "posix:owner", (UserPrincipal) ()
-> user);
Files.setAttribute(pathSource, "posix:group", (GroupPrincipal) ()
-> group);
-
final Path target = fileSystem.getPath("original-file.tar");
try (OutputStream out = Files.newOutputStream(target);
ArchiveOutputStream<ArchiveEntry> tarOut =
ArchiveStreamFactory.DEFAULT.createArchiveOutputStream(ArchiveStreamFactory.TAR,
out)) {
@@ -61,11 +60,8 @@ void testCheckUserInformationInTarEntry() throws
IOException, ArchiveException {
tarOut.write(pathSource);
tarOut.closeArchiveEntry();
}
-
- try (TarArchiveInputStream tarIn =
- TarArchiveInputStream.builder().setPath(target).get()) {
+ try (TarArchiveInputStream tarIn =
TarArchiveInputStream.builder().setPath(target).get()) {
final TarArchiveEntry nextTarEntry = tarIn.getNextTarEntry();
-
assertEquals(user, nextTarEntry.getUserName());
assertEquals(group, nextTarEntry.getGroupName());
}
@@ -95,17 +91,14 @@ void testTarFromMemoryFileSystem() throws IOException,
ArchiveException {
void testTarToMemoryFileSystem() throws IOException, ArchiveException {
try (FileSystem fileSystem =
MemoryFileSystemBuilder.newLinux().build()) {
final Path p = fileSystem.getPath("target.tar");
-
try (OutputStream out = Files.newOutputStream(p);
ArchiveOutputStream<ArchiveEntry> tarOut =
ArchiveStreamFactory.DEFAULT.createArchiveOutputStream(ArchiveStreamFactory.TAR,
out)) {
final String content = "Test";
final TarArchiveEntry entry = new TarArchiveEntry("test.txt");
entry.setSize(content.length());
tarOut.putArchiveEntry(entry);
-
tarOut.writeUtf8("Test");
tarOut.closeArchiveEntry();
-
assertTrue(Files.exists(p));
assertEquals(Files.size(p), tarOut.getBytesWritten());
}
diff --git
a/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportIT.java
b/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportIT.java
index 7e070fba3..6804f76a0 100644
---
a/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportIT.java
+++
b/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportIT.java
@@ -152,8 +152,7 @@ private static File getTempFile(final String testName)
throws Throwable {
}
private static void read100KFilesImpl(final File f) throws IOException {
- try (ZipArchiveInputStream zin =
- ZipArchiveInputStream.builder().setFile(f).get()) {
+ try (ZipArchiveInputStream zin =
ZipArchiveInputStream.builder().setFile(f).get()) {
int files = 0;
ZipArchiveEntry zae;
while ((zae = zin.getNextZipEntry()) != null) {
@@ -182,8 +181,7 @@ private static void read100KFilesUsingZipFileImpl(final
File file) throws IOExce
}
private static void read5GBOfZerosImpl(final File f, final String
expectedName) throws IOException {
- try (ZipArchiveInputStream zin =
- ZipArchiveInputStream.builder().setFile(f).get()) {
+ try (ZipArchiveInputStream zin =
ZipArchiveInputStream.builder().setFile(f).get()) {
ZipArchiveEntry zae = zin.getNextZipEntry();
while (zae.isDirectory()) {
zae = zin.getNextZipEntry();
@@ -253,7 +251,6 @@ private static void withTemporaryArchive(final String
testName, final ZipOutputT
if (splitSize != null) {
dir = Files.createTempDirectory("commons-compress-" +
testName).toFile();
dir.deleteOnExit();
-
f = new File(dir, "commons-compress-" + testName + ".zip");
}
BufferedOutputStream os = null;
@@ -262,7 +259,6 @@ private static void withTemporaryArchive(final String
testName, final ZipOutputT
if (splitSize != null) {
zos = new ZipArchiveOutputStream(f, splitSize);
}
-
try {
test.test(f, zos);
} catch (final IOException ex) {
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 04ef3219d..0b97084ed 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
@@ -181,8 +181,7 @@ private void getAllZipEntries(final ZipArchiveInputStream
zipInputStream) throws
private void multiByteReadConsistentlyReturnsMinusOneAtEof(final File
file) throws Exception {
final byte[] buf = new byte[2];
- try (ZipArchiveInputStream archive =
- ZipArchiveInputStream.builder().setFile(file).get()) {
+ try (ZipArchiveInputStream archive =
ZipArchiveInputStream.builder().setFile(file).get()) {
assertEquals(-1, archive.getCompressedCount());
assertNotNull(archive.getNextEntry());
IOUtils.toByteArray(archive);
@@ -192,8 +191,7 @@ private void
multiByteReadConsistentlyReturnsMinusOneAtEof(final File file) thro
}
private void singleByteReadConsistentlyReturnsMinusOneAtEof(final File
file) throws Exception {
- try (ZipArchiveInputStream archive =
- ZipArchiveInputStream.builder().setFile(file).get()) {
+ try (ZipArchiveInputStream archive =
ZipArchiveInputStream.builder().setFile(file).get()) {
assertNotNull(archive.getNextEntry());
IOUtils.toByteArray(archive);
assertEquals(-1, archive.read());
@@ -323,8 +321,7 @@ void testNameSourceIsSetToUnicodeExtraField() throws
Exception {
@Test
void testOffsets() throws Exception {
// mixed.zip contains both inflated and stored files
- try (ZipArchiveInputStream zipStream =
-
ZipArchiveInputStream.builder().setURI(getURI("mixed.zip")).get()) {
+ try (ZipArchiveInputStream zipStream =
ZipArchiveInputStream.builder().setURI(getURI("mixed.zip")).get()) {
final ZipArchiveEntry inflatedEntry = zipStream.getNextZipEntry();
assertEquals("inflated.txt", inflatedEntry.getName());
assertEquals(0x0000, inflatedEntry.getLocalHeaderOffset());
@@ -355,8 +352,7 @@ void
testProperlyMarksEntriesAsUnreadableIfUncompressedSizeIsUnknown() throws Ex
@Test
void testProperlyReadsStoredEntries() throws IOException {
- try (ZipArchiveInputStream archive =
-
ZipArchiveInputStream.builder().setURI(getURI("bla-stored.zip")).get()) {
+ try (ZipArchiveInputStream archive =
ZipArchiveInputStream.builder().setURI(getURI("bla-stored.zip")).get()) {
ZipArchiveEntry e = archive.getNextZipEntry();
assertNotNull(e);
assertEquals("test1.xml", e.getName());
@@ -467,7 +463,6 @@ void testReadDeflate64CompressedStreamWithDataDescriptor()
throws Exception {
*/
@Test
void testReadingOfFirstStoredEntry() throws Exception {
-
try (ZipArchiveInputStream in =
ZipArchiveInputStream.builder().setURI(getURI("COMPRESS-264.zip")).get()) {
final ZipArchiveEntry ze = in.getNextZipEntry();
assertEquals(5, ze.getSize());
@@ -492,8 +487,7 @@ void testRejectsStoredEntriesWithDataDescriptorByDefault()
throws IOException {
@Test
void testShouldConsumeArchiveCompletely() throws Exception {
try (InputStream is =
ZipArchiveInputStreamTest.class.getResourceAsStream("/archive_with_trailer.zip");
- ZipArchiveInputStream zip =
-
ZipArchiveInputStream.builder().setInputStream(is).get()) {
+ ZipArchiveInputStream zip =
ZipArchiveInputStream.builder().setInputStream(is).get()) {
getAllZipEntries(zip);
final byte[] expected = { 'H', 'e', 'l', 'l', 'o', ',', ' ', 'w',
'o', 'r', 'l', 'd', '!', '\n' };
final byte[] actual = new byte[expected.length];
@@ -645,7 +639,6 @@ void testSplitZipCreatedByZipThrowsException() throws
IOException {
.setURI(getURI("COMPRESS-477/split_zip_created_by_zip/split_zip_created_by_zip.z01"))
.setSkipSplitSignature(true)
.get()) {
-
assertThrows(EOFException.class, () -> {
ArchiveEntry entry = inputStream.getNextEntry();
while (entry != null) {
@@ -733,26 +726,22 @@ void testUnshrinkEntry() throws Exception {
ZipArchiveEntry entry = in.getNextZipEntry();
assertEquals(ZipMethod.UNSHRINKING.getCode(), entry.getMethod(),
"method");
assertTrue(in.canReadEntryData(entry));
-
try (InputStream original = newInputStream("test1.xml")) {
try {
assertArrayEquals(IOUtils.toByteArray(original),
IOUtils.toByteArray(in));
} finally {
original.close();
}
-
entry = in.getNextZipEntry();
assertEquals(ZipMethod.UNSHRINKING.getCode(),
entry.getMethod(), "method");
assertTrue(in.canReadEntryData(entry));
}
-
assertArrayEquals(readAllBytes("test2.xml"),
IOUtils.toByteArray(in));
}
}
@Test
void testUnzipBZip2CompressedEntry() throws Exception {
-
try (ZipArchiveInputStream in =
ZipArchiveInputStream.builder().setURI(getURI("bzip2-zip.zip")).get()) {
final ZipArchiveEntry ze = in.getNextZipEntry();
assertEquals(42, ze.getSize());
@@ -902,7 +891,6 @@ void testZipWithBadExtraFields() throws IOException {
@Test
void testZipWithLongerBeginningGarbage() throws IOException {
final Path path = createTempPath("preamble", ".zip");
-
try (OutputStream fos = Files.newOutputStream(path)) {
fos.write("#!/usr/bin/env some-program with quite a few arguments
to make it longer than the local header\n".getBytes(StandardCharsets.UTF_8));
try (ZipArchiveOutputStream zos = new ZipArchiveOutputStream(fos))
{
@@ -913,7 +901,6 @@ void testZipWithLongerBeginningGarbage() throws IOException
{
zos.closeArchiveEntry();
}
}
-
try (ZipArchiveInputStream zis =
ZipArchiveInputStream.builder().setPath(path).get()) {
final ZipArchiveEntry entry = zis.getNextEntry();
@@ -926,7 +913,6 @@ void testZipWithLongerBeginningGarbage() throws IOException
{
@Test
void testZipWithShortBeginningGarbage() throws IOException {
final Path path = createTempPath("preamble", ".zip");
-
try (OutputStream fos = Files.newOutputStream(path)) {
fos.write("#!/usr/bin/unzip\n".getBytes(StandardCharsets.UTF_8));
try (ZipArchiveOutputStream zos = new ZipArchiveOutputStream(fos))
{
@@ -937,7 +923,6 @@ void testZipWithShortBeginningGarbage() throws IOException {
zos.closeArchiveEntry();
}
}
-
try (ZipArchiveInputStream zis =
ZipArchiveInputStream.builder().setPath(path).get()) {
final ZipArchiveEntry entry = zis.getNextEntry();
diff --git
a/src/test/java/org/apache/commons/compress/compressors/pack200/Pack200UtilsTest.java
b/src/test/java/org/apache/commons/compress/compressors/pack200/Pack200UtilsTest.java
index a08842234..bf2de5d48 100644
---
a/src/test/java/org/apache/commons/compress/compressors/pack200/Pack200UtilsTest.java
+++
b/src/test/java/org/apache/commons/compress/compressors/pack200/Pack200UtilsTest.java
@@ -90,8 +90,7 @@ void testCompress675() throws Exception {
//
// If you use a zip archive instead of a tar archive you
// get a different number of bytes read, but still not the expected
- try (TarArchiveInputStream in =
- TarArchiveInputStream.builder().setFile(archiveFile).get()) {
+ try (TarArchiveInputStream in =
TarArchiveInputStream.builder().setFile(archiveFile).get()) {
ArchiveEntry entry = in.getNextEntry();
int entries = 0;
long count = 0;
