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 2024/12/13 20:32:52 UTC

(commons-compress) branch master updated: Add ZipFile.stream()

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 286de7837 Add ZipFile.stream()
286de7837 is described below

commit 286de783740ac73096bc809affd9e9249cfb9f70
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Dec 13 15:32:46 2024 -0500

    Add ZipFile.stream()
---
 src/changes/changes.xml                            |  1 +
 .../apache/commons/compress/archivers/Lister.java  |  6 +-
 .../compress/archivers/zip/ZipArchiveEntry.java    |  6 +-
 .../commons/compress/archivers/zip/ZipFile.java    | 16 +++++
 .../apache/commons/compress/archivers/ZipTest.java | 41 ++++--------
 .../commons/compress/archivers/zip/Lister.java     | 10 ++-
 .../compress/archivers/zip/UTF8ZipFilesTest.java   |  9 +--
 .../archivers/zip/X5455_ExtendedTimestampTest.java |  4 +-
 .../compress/archivers/zip/X7875_NewUnixTest.java  | 12 +---
 .../compress/archivers/zip/Zip64SupportIT.java     | 28 ++++----
 .../zip/ZipFileIgnoringLocalFileHeaderTest.java    |  9 ++-
 .../compress/archivers/zip/ZipFileTest.java        | 76 +++++++++++++---------
 .../compressors/deflate64/Deflate64BugsTest.java   | 12 ++--
 13 files changed, 114 insertions(+), 116 deletions(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 194970f44..66d83bf49 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -63,6 +63,7 @@ The <action> type attribute can be add,update,fix,remove.
       <action type="add" dev="ggregory" issue="COMPRESS-638" due-to="vincexjl, Gary Gregory, Piotr P. Karwasz">Add GzipParameters.setFileNameCharset(Charset) and getFileNameCharset() to override the default ISO-8859-1 Charset #602.</action>
       <action type="add" dev="ggregory" due-to="ddeschenes-1, Gary Gregory">Add support for gzip extra subfields, see GzipParameters.setExtra(HeaderExtraField) #604.</action>
       <action type="add" dev="ggregory" due-to="Gary Gregory">Add CompressFilterOutputStream and refactor to use.</action>
+      <action type="add" dev="ggregory" due-to="Gary Gregory">Add ZipFile.stream().</action>
       <!-- UPDATE -->
       <action type="update" dev="ggregory" due-to="Dependabot, Gary Gregory">Bump org.apache.commons:commons-parent from 72 to 78 #563, #567, #574, #582, #587, #595.</action>
       <action type="update" dev="ggregory" due-to="Dependabot, Gary Gregory">Bump com.github.luben:zstd-jni from 1.5.6-4 to 1.5.6-8 #565, #578, #601, #616.</action>
diff --git a/src/main/java/org/apache/commons/compress/archivers/Lister.java b/src/main/java/org/apache/commons/compress/archivers/Lister.java
index f84cecada..3a3d39ca0 100644
--- a/src/main/java/org/apache/commons/compress/archivers/Lister.java
+++ b/src/main/java/org/apache/commons/compress/archivers/Lister.java
@@ -23,13 +23,11 @@ import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Enumeration;
 import java.util.Locale;
 import java.util.Objects;
 
 import org.apache.commons.compress.archivers.sevenz.SevenZFile;
 import org.apache.commons.compress.archivers.tar.TarFile;
-import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
 import org.apache.commons.compress.archivers.zip.ZipFile;
 
 /**
@@ -163,9 +161,7 @@ public final class Lister {
     private  void listZipUsingZipFile(final Path file) throws IOException {
         try (ZipFile zipFile = ZipFile.builder().setPath(file).get()) {
             println("Created " + zipFile);
-            for (final Enumeration<ZipArchiveEntry> en = zipFile.getEntries(); en.hasMoreElements();) {
-                println(en.nextElement());
-            }
+            zipFile.stream().forEach(this::println);
         }
     }
 
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
index 25c2971e7..a1e50077a 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
@@ -1030,9 +1030,9 @@ public class ZipArchiveEntry extends ZipEntry implements ArchiveEntry, EntryStre
     }
 
     /**
-     * Is this entry a directory?
+     * Tests whether this entry is a directory.
      *
-     * @return true if the entry is a directory
+     * @return true if the entry is a directory.
      */
     @Override
     public boolean isDirectory() {
@@ -1045,7 +1045,7 @@ public class ZipArchiveEntry extends ZipEntry implements ArchiveEntry, EntryStre
     }
 
     /**
-     * Returns true if this entry represents a Unix symlink, in which case the entry's content contains the target path for the symlink.
+     * Tests whether this entry represents a Unix symlink, in which case the entry's content contains the target path for the symlink.
      *
      * @since 1.5
      * @return true if the entry represents a Unix symlink, false otherwise.
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
index ec5b8268d..efb81a870 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
@@ -61,6 +61,7 @@ import org.apache.commons.io.Charsets;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.build.AbstractOrigin.ByteArrayOrigin;
 import org.apache.commons.io.build.AbstractStreamBuilder;
+import org.apache.commons.io.function.IOStream;
 import org.apache.commons.io.input.BoundedInputStream;
 
 /**
@@ -1701,4 +1702,19 @@ public class ZipFile implements Closeable {
         IOUtils.readFully(archive, wordBbuf);
         return Arrays.equals(wordBuf, ZipArchiveOutputStream.LFH_SIG);
     }
+
+    /**
+     * Returns an ordered {@code Stream} over the ZIP file entries.
+     * <p>
+     * Entries appear in the {@code Stream} in the order they appear in the central directory of the ZIP file.
+     * </p>
+     *
+     * @return an ordered {@code Stream} of entries in this ZIP file.
+     * @throws IllegalStateException if the ZIP file has been closed.
+     * @since 1.28.0
+     */
+    public IOStream<? extends ZipArchiveEntry> stream() {
+        return IOStream.adapt(entries.stream());
+    }
+
 }
diff --git a/src/test/java/org/apache/commons/compress/archivers/ZipTest.java b/src/test/java/org/apache/commons/compress/archivers/ZipTest.java
index 31bf4ee34..9bc80d046 100644
--- a/src/test/java/org/apache/commons/compress/archivers/ZipTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/ZipTest.java
@@ -184,32 +184,17 @@ public final class ZipTest extends AbstractTest {
     private File getFilesToZip() throws IOException {
         final File originalZipFile = getFile("COMPRESS-477/split_zip_created_by_zip/zip_to_compare_created_by_zip.zip");
         try (ZipFile zipFile = newZipFile(originalZipFile)) {
-            final Enumeration<ZipArchiveEntry> zipEntries = zipFile.getEntries();
-            ZipArchiveEntry zipEntry;
-            File outputFile;
-            byte[] buffer;
-            int readLen;
-
-            while (zipEntries.hasMoreElements()) {
-                zipEntry = zipEntries.nextElement();
-                if (zipEntry.isDirectory()) {
-                    continue;
-                }
-
-                outputFile = newTempFile(zipEntry.getName());
-                if (!outputFile.getParentFile().exists()) {
-                    outputFile.getParentFile().mkdirs();
+            zipFile.stream().filter(e -> !e.isDirectory()).forEach(zipEntry -> {
+                Path outputFile = newTempPath(zipEntry.getName());
+                if (!Files.exists(outputFile.getParent())) {
+                    Files.createDirectories(outputFile.getParent());
                 }
-                outputFile = newTempFile(zipEntry.getName());
-
+                outputFile = newTempPath(zipEntry.getName());
                 try (InputStream inputStream = zipFile.getInputStream(zipEntry);
-                        OutputStream outputStream = Files.newOutputStream(outputFile.toPath())) {
-                    buffer = new byte[(int) zipEntry.getSize()];
-                    while ((readLen = inputStream.read(buffer)) > 0) {
-                        outputStream.write(buffer, 0, readLen);
-                    }
+                        OutputStream outputStream = Files.newOutputStream(outputFile)) {
+                    IOUtils.copy(inputStream, outputStream);
                 }
-            }
+            });
         }
         return getTempDirFile().listFiles()[0];
     }
@@ -564,14 +549,12 @@ public final class ZipTest extends AbstractTest {
             in.forEach(entry -> readStream(in, entry, actualStatistics));
         }
         // file access
-        try (ZipFile zf = newZipFile(input)) {
-            final Enumeration<ZipArchiveEntry> entries = zf.getEntries();
-            while (entries.hasMoreElements()) {
-                final ZipArchiveEntry zae = entries.nextElement();
-                try (InputStream in = zf.getInputStream(zae)) {
+        try (ZipFile zipFile = newZipFile(input)) {
+            zipFile.stream().forEach(zae -> {
+                try (InputStream in = zipFile.getInputStream(zae)) {
                     readStream(in, zae, actualStatistics);
                 }
-            }
+            });
         }
         // compare statistics of stream / file access
         for (final Map.Entry<String, List<List<Long>>> me : actualStatistics.entrySet()) {
diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/Lister.java b/src/test/java/org/apache/commons/compress/archivers/zip/Lister.java
index ef4f9a11b..83690328a 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/Lister.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/Lister.java
@@ -24,7 +24,6 @@ import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Enumeration;
 
 import org.apache.commons.compress.archivers.ArchiveEntry;
 
@@ -79,16 +78,15 @@ public final class Lister {
                 }
             }
         } else {
-            try (ZipFile zf = ZipFile.builder().setFile(f).setCharset(cl.encoding).get()) {
-                for (final Enumeration<ZipArchiveEntry> entries = zf.getEntries(); entries.hasMoreElements();) {
-                    final ZipArchiveEntry ze = entries.nextElement();
+            try (ZipFile zipFile = ZipFile.builder().setFile(f).setCharset(cl.encoding).get()) {
+                zipFile.stream().forEach(ze -> {
                     list(ze);
                     if (cl.dir != null) {
-                        try (InputStream is = zf.getInputStream(ze)) {
+                        try (InputStream is = zipFile.getInputStream(ze)) {
                             extract(cl.dir, ze, is);
                         }
                     }
-                }
+                });
             }
         }
     }
diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java
index 6ddfa0bc5..23bea8000 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java
@@ -30,7 +30,6 @@ import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.util.Enumeration;
 import java.util.zip.CRC32;
 
 import org.apache.commons.compress.AbstractTest;
@@ -127,10 +126,8 @@ public class UTF8ZipFilesTest extends AbstractTest {
     }
 
     private static void testFile(final File file, final String encoding) throws IOException {
-        try (ZipFile zf = ZipFile.builder().setFile(file).setCharset(encoding).setUseUnicodeExtraFields(false).get()) {
-            final Enumeration<ZipArchiveEntry> e = zf.getEntries();
-            while (e.hasMoreElements()) {
-                final ZipArchiveEntry ze = e.nextElement();
+        try (ZipFile zipFile = ZipFile.builder().setFile(file).setCharset(encoding).setUseUnicodeExtraFields(false).get()) {
+            zipFile.stream().forEach(ze -> {
                 if (ze.getName().endsWith("sser.txt")) {
                     assertUnicodeName(ze, OIL_BARREL_TXT, encoding);
                 } else if (ze.getName().endsWith("_for_Dollar.txt")) {
@@ -138,7 +135,7 @@ public class UTF8ZipFilesTest extends AbstractTest {
                 } else if (!ze.getName().equals(ASCII_TXT)) {
                     fail("Unrecognized ZIP entry with name [" + ze.getName() + "] found.");
                 }
-            }
+            });
         }
     }
 
diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestampTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestampTest.java
index f08bb9a37..d18b54bae 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestampTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestampTest.java
@@ -478,8 +478,8 @@ public class X5455_ExtendedTimestampTest {
 
         final File archive = AbstractTest.getFile("COMPRESS-210_unix_time_zip_test.zip");
 
-        try (ZipFile zf = ZipFile.builder().setFile(archive).get()) {
-            final Enumeration<ZipArchiveEntry> en = zf.getEntries();
+        try (ZipFile zipFile = ZipFile.builder().setFile(archive).get()) {
+            final Enumeration<ZipArchiveEntry> en = zipFile.getEntries();
 
             // We expect EVERY entry of this ZIP file
             // to contain extra field 0x5455.
diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/X7875_NewUnixTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/X7875_NewUnixTest.java
index 6ec397546..8503ed241 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/X7875_NewUnixTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/X7875_NewUnixTest.java
@@ -25,7 +25,6 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.util.Enumeration;
 import java.util.zip.ZipException;
 
 import org.apache.commons.compress.utils.ByteUtils;
@@ -166,17 +165,12 @@ public class X7875_NewUnixTest {
 
     @Test
     public void testSampleFile() throws Exception {
-        try (ZipFile zf = ZipFile.builder().setFile(getFile("COMPRESS-211_uid_gid_zip_test.zip")).get()) {
-            final Enumeration<ZipArchiveEntry> en = zf.getEntries();
-
+        try (ZipFile zipFile = ZipFile.builder().setFile(getFile("COMPRESS-211_uid_gid_zip_test.zip")).get()) {
             // We expect EVERY entry of this ZIP file (dir & file) to
             // contain extra field 0x7875.
-            while (en.hasMoreElements()) {
-
-                final ZipArchiveEntry zae = en.nextElement();
+            zipFile.stream().forEach(zae -> {
                 final String name = zae.getName();
                 final X7875_NewUnix xf = (X7875_NewUnix) zae.getExtraField(X7875);
-
                 // The directory entry in the test ZIP file is uid/gid 1000.
                 long expected = 1000;
                 if (name.contains("uid555_gid555")) {
@@ -196,7 +190,7 @@ public class X7875_NewUnixTest {
                 }
                 assertEquals(expected, xf.getUID());
                 assertEquals(expected, xf.getGID());
-            }
+            });
         }
     }
 
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 1560319b7..b9ef1a0c7 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
@@ -36,12 +36,16 @@ import java.io.RandomAccessFile;
 import java.nio.file.Files;
 import java.util.Enumeration;
 import java.util.Random;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.zip.ZipEntry;
 
 import org.apache.commons.compress.AbstractTest;
 import org.apache.commons.io.RandomAccessFileMode;
 import org.junit.jupiter.api.Test;
 
+/**
+ * Tests {@link ZipFile} Zip64 support.
+ */
 public class Zip64SupportIT {
 
     interface ZipOutputTest {
@@ -158,21 +162,18 @@ public class Zip64SupportIT {
         }
     }
 
-    private static void read100KFilesUsingZipFileImpl(final File f) throws IOException {
-        ZipFile zf = null;
+    private static void read100KFilesUsingZipFileImpl(final File file) throws IOException {
+        ZipFile zipFile = null;
         try {
-            zf = ZipFile.builder().setFile(f).get();
-            int files = 0;
-            for (final Enumeration<ZipArchiveEntry> e = zf.getEntries(); e.hasMoreElements();) {
-                final ZipArchiveEntry zae = e.nextElement();
-                if (!zae.isDirectory()) {
-                    files++;
-                    assertEquals(0, zae.getSize());
-                }
-            }
-            assertEquals(ONE_HUNDRED_THOUSAND, files);
+            zipFile = ZipFile.builder().setFile(file).get();
+            AtomicInteger files = new AtomicInteger();
+            zipFile.stream().filter(e -> !e.isDirectory()).forEach(e -> {
+                files.incrementAndGet();
+                assertEquals(0, e.getSize());
+            });
+            assertEquals(ONE_HUNDRED_THOUSAND, files.get());
         } finally {
-            ZipFile.closeQuietly(zf);
+            ZipFile.closeQuietly(zipFile);
         }
     }
 
@@ -1812,6 +1813,7 @@ public class Zip64SupportIT {
     private File buildZipWithZip64Mode(final String fileName, final Zip64Mode zip64Mode, final File inputFile) throws Throwable {
         final File outputFile = getTempFile(fileName);
         outputFile.createNewFile();
+
         try (ZipArchiveOutputStream outputStream = new ZipArchiveOutputStream(new BufferedOutputStream(new FileOutputStream(outputFile)))) {
             outputStream.setUseZip64(zip64Mode);
             outputStream.setCreateUnicodeExtraFields(ZipArchiveOutputStream.UnicodeExtraFieldPolicy.ALWAYS);
diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileIgnoringLocalFileHeaderTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileIgnoringLocalFileHeaderTest.java
index 2f5c3cc0c..7eb2b3157 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileIgnoringLocalFileHeaderTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileIgnoringLocalFileHeaderTest.java
@@ -102,13 +102,12 @@ public class ZipFileIgnoringLocalFileHeaderTest {
      */
     @Test
     public void testZipUnarchive() throws Exception {
-        try (ZipFile zf = openZipWithoutLocalFileHeaderDeprecated("bla.zip")) {
-            for (final Enumeration<ZipArchiveEntry> e = zf.getEntries(); e.hasMoreElements();) {
-                final ZipArchiveEntry entry = e.nextElement();
-                try (InputStream inputStream = zf.getInputStream(entry)) {
+        try (ZipFile zipFile = openZipWithoutLocalFileHeaderDeprecated("bla.zip")) {
+            zipFile.stream().forEach(entry -> {
+                try (InputStream inputStream = zipFile.getInputStream(entry)) {
                     Files.copy(inputStream, new File(dir, entry.getName()).toPath());
                 }
-            }
+            });
         }
     }
 }
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 0bbb2fa61..79b76cee1 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
@@ -42,7 +42,6 @@ import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -162,9 +161,9 @@ public class ZipFileTest extends AbstractTest {
 
     private void multiByteReadConsistentlyReturnsMinusOneAtEof(final File file) throws Exception {
         final byte[] buf = new byte[2];
-        try (ZipFile archive = ZipFile.builder().setFile(file).get()) {
-            final ZipArchiveEntry e = archive.getEntries().nextElement();
-            try (InputStream is = archive.getInputStream(e)) {
+        try (ZipFile zipFile = ZipFile.builder().setFile(file).get()) {
+            final ZipArchiveEntry e = zipFile.getEntries().nextElement();
+            try (InputStream is = zipFile.getInputStream(e)) {
                 IOUtils.toByteArray(is);
                 assertEquals(-1, is.read(buf));
                 assertEquals(-1, is.read(buf));
@@ -196,9 +195,9 @@ public class ZipFileTest extends AbstractTest {
     }
 
     private void singleByteReadConsistentlyReturnsMinusOneAtEof(final File file) throws Exception {
-        try (ZipFile archive = ZipFile.builder().setFile(file).get();) {
-            final ZipArchiveEntry e = archive.getEntries().nextElement();
-            try (InputStream is = archive.getInputStream(e)) {
+        try (ZipFile zipFile = ZipFile.builder().setFile(file).get();) {
+            final ZipArchiveEntry e = zipFile.getEntries().nextElement();
+            try (InputStream is = zipFile.getInputStream(e)) {
                 IOUtils.toByteArray(is);
                 assertEquals(-1, is.read());
                 assertEquals(-1, is.read());
@@ -264,19 +263,15 @@ public class ZipFileTest extends AbstractTest {
         // mixed.zip contains both inflated and stored files
         final File archive = getFile("mixed.zip");
         zf = new ZipFile(archive);
-
         final Map<String, byte[]> content = new HashMap<>();
-        for (final ZipArchiveEntry entry : Collections.list(zf.getEntries())) {
+        zf.stream().forEach(entry -> {
             try (InputStream inputStream = zf.getInputStream(entry)) {
                 content.put(entry.getName(), IOUtils.toByteArray(inputStream));
             }
-        }
-
+        });
         final AtomicInteger passedCount = new AtomicInteger();
         final IORunnable run = () -> {
-            for (final ZipArchiveEntry entry : Collections.list(zf.getEntries())) {
-                assertAllReadMethods(content.get(entry.getName()), zf, entry);
-            }
+            zf.stream().forEach(entry -> assertAllReadMethods(content.get(entry.getName()), zf, entry));
             passedCount.incrementAndGet();
         };
         final Thread t0 = new Thread(run.asRunnable());
@@ -297,19 +292,15 @@ public class ZipFileTest extends AbstractTest {
         }
         try (SeekableInMemoryByteChannel channel = new SeekableInMemoryByteChannel(data)) {
             zf = ZipFile.builder().setSeekableByteChannel(channel).setCharset(StandardCharsets.UTF_8).get();
-
             final Map<String, byte[]> content = new HashMap<>();
-            for (final ZipArchiveEntry entry : Collections.list(zf.getEntries())) {
+            zf.stream().forEach(entry -> {
                 try (InputStream inputStream = zf.getInputStream(entry)) {
                     content.put(entry.getName(), IOUtils.toByteArray(inputStream));
                 }
-            }
-
+            });
             final AtomicInteger passedCount = new AtomicInteger();
             final IORunnable run = () -> {
-                for (final ZipArchiveEntry entry : Collections.list(zf.getEntries())) {
-                    assertAllReadMethods(content.get(entry.getName()), zf, entry);
-                }
+                zf.stream().forEach(entry -> assertAllReadMethods(content.get(entry.getName()), zf, entry));
                 passedCount.incrementAndGet();
             };
             final Thread t0 = new Thread(run.asRunnable());
@@ -560,6 +551,38 @@ public class ZipFileTest extends AbstractTest {
         }
     }
 
+    @Test
+    public void testGetEntries() throws Exception {
+        // mixed.zip contains both inflated and stored files
+        final File archive = getFile("mixed.zip");
+        zf = new ZipFile(archive);
+        final Map<String, byte[]> content = new HashMap<>();
+        for (final ZipArchiveEntry entry : Collections.list(zf.getEntries())) {
+            try (InputStream inputStream = zf.getInputStream(entry)) {
+                content.put(entry.getName(), IOUtils.toByteArray(inputStream));
+            }
+        }
+        for (final ZipArchiveEntry entry : Collections.list(zf.getEntries())) {
+            assertAllReadMethods(content.get(entry.getName()), zf, entry);
+        }
+    }
+
+    @Test
+    public void testGetEntriesInPhysicalOrder() throws Exception {
+        // mixed.zip contains both inflated and stored files
+        final File archive = getFile("mixed.zip");
+        zf = new ZipFile(archive);
+        final Map<String, byte[]> content = new HashMap<>();
+        for (final ZipArchiveEntry entry : Collections.list(zf.getEntriesInPhysicalOrder())) {
+            try (InputStream inputStream = zf.getInputStream(entry)) {
+                content.put(entry.getName(), IOUtils.toByteArray(inputStream));
+            }
+        }
+        for (final ZipArchiveEntry entry : Collections.list(zf.getEntries())) {
+            assertAllReadMethods(content.get(entry.getName()), zf, entry);
+        }
+    }
+
     /**
      * Test non power of 2 alignment.
      */
@@ -887,7 +910,6 @@ public class ZipFileTest extends AbstractTest {
     public void testUnixSymlinkSampleFile() throws Exception {
         final String entryPrefix = "COMPRESS-214_unix_symlinks/";
         final TreeMap<String, String> expectedVals = new TreeMap<>();
-
         // I threw in some Japanese characters to keep things interesting.
         expectedVals.put(entryPrefix + "link1", "../COMPRESS-214_unix_symlinks/./a/b/c/../../../\uF999");
         expectedVals.put(entryPrefix + "link2", "../COMPRESS-214_unix_symlinks/./a/b/c/../../../g");
@@ -896,21 +918,15 @@ public class ZipFileTest extends AbstractTest {
         expectedVals.put(entryPrefix + "\uF999", "./\u82B1\u5B50/\u745B\u5B50/\u5897\u8C37/\uF999");
         expectedVals.put(entryPrefix + "g", "./a/b/c/d/e/f/g");
         expectedVals.put(entryPrefix + "\u76F4\u6A39", "./g");
-
         // Notice how a directory link might contain a trailing slash, or it might not.
         // Also note: symlinks are always stored as files, even if they link to directories.
         expectedVals.put(entryPrefix + "link5", "../COMPRESS-214_unix_symlinks/././a/b");
         expectedVals.put(entryPrefix + "link6", "../COMPRESS-214_unix_symlinks/././a/b/");
-
         // I looked into creating a test with hard links, but ZIP does not appear to
         // support hard links, so nevermind.
-
         final File archive = getFile("COMPRESS-214_unix_symlinks.zip");
-
         zf = new ZipFile(archive);
-        final Enumeration<ZipArchiveEntry> en = zf.getEntries();
-        while (en.hasMoreElements()) {
-            final ZipArchiveEntry zae = en.nextElement();
+        zf.stream().forEach(zae -> {
             final String link = zf.getUnixSymlink(zae);
             if (zae.isUnixSymlink()) {
                 final String name = zae.getName();
@@ -920,7 +936,7 @@ public class ZipFileTest extends AbstractTest {
                 // Should be null if it's not a symlink!
                 assertNull(link);
             }
-        }
+        });
     }
 
     @Test
diff --git a/src/test/java/org/apache/commons/compress/compressors/deflate64/Deflate64BugsTest.java b/src/test/java/org/apache/commons/compress/compressors/deflate64/Deflate64BugsTest.java
index bb75986a4..76c12e74c 100644
--- a/src/test/java/org/apache/commons/compress/compressors/deflate64/Deflate64BugsTest.java
+++ b/src/test/java/org/apache/commons/compress/compressors/deflate64/Deflate64BugsTest.java
@@ -19,9 +19,7 @@ package org.apache.commons.compress.compressors.deflate64;
 import static org.apache.commons.compress.AbstractTest.getFile;
 
 import java.io.InputStream;
-import java.util.Enumeration;
 
-import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
 import org.apache.commons.compress.archivers.zip.ZipFile;
 import org.junit.jupiter.api.Test;
 
@@ -29,12 +27,10 @@ public class Deflate64BugsTest {
 
     @Test
     public void testReadBeyondMemoryException() throws Exception {
-        try (ZipFile zfile = ZipFile.builder().setFile(getFile("COMPRESS-380/COMPRESS-380-readbeyondmemory.zip")).get()) {
-            final Enumeration<ZipArchiveEntry> entries = zfile.getEntries();
-            while (entries.hasMoreElements()) {
-                final ZipArchiveEntry e = entries.nextElement();
+        try (ZipFile zipFile = ZipFile.builder().setFile(getFile("COMPRESS-380/COMPRESS-380-readbeyondmemory.zip")).get()) {
+            zipFile.stream().forEach(e -> {
                 final byte[] buf = new byte[1024 * 8];
-                try (InputStream is = zfile.getInputStream(e)) {
+                try (InputStream is = zipFile.getInputStream(e)) {
                     while (true) {
                         final int read = is.read(buf);
                         if (read == -1) {
@@ -42,7 +38,7 @@ public class Deflate64BugsTest {
                         }
                     }
                 }
-            }
+            });
         }
     }
 }