You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2024/01/28 17:22:32 UTC

(causeway) branch master updated: CAUSEWAY-3404: Blob unzip to support ZipOptions

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/causeway.git


The following commit(s) were added to refs/heads/master by this push:
     new 34b19dc70d CAUSEWAY-3404: Blob unzip to support ZipOptions
34b19dc70d is described below

commit 34b19dc70d4da768960284246caff8cde9dc4dc2
Author: andi-huber <ah...@apache.org>
AuthorDate: Sun Jan 28 18:22:26 2024 +0100

    CAUSEWAY-3404: Blob unzip to support ZipOptions
---
 .../src/main/java/org/apache/causeway/applib/value/Blob.java       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/api/applib/src/main/java/org/apache/causeway/applib/value/Blob.java b/api/applib/src/main/java/org/apache/causeway/applib/value/Blob.java
index 1740c52390..971a1b436a 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/value/Blob.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/value/Blob.java
@@ -50,6 +50,7 @@ import org.apache.causeway.commons.io.DataSource;
 import org.apache.causeway.commons.io.HashUtils;
 import org.apache.causeway.commons.io.HashUtils.HashAlgorithm;
 import org.apache.causeway.commons.io.ZipUtils;
+import org.apache.causeway.commons.io.ZipUtils.ZipOptions;
 
 import lombok.NonNull;
 import lombok.SneakyThrows;
@@ -254,7 +255,11 @@ public final class Blob implements NamedWithMimeType {
     }
 
     public Blob unZip(final @NonNull CommonMimeType resultingMimeType) {
-        return ZipUtils.firstZipEntry(asDataSource()) // assuming first entry is the one we want
+        return unZip(resultingMimeType, ZipOptions.builder().build());
+    }
+
+    public Blob unZip(final @NonNull CommonMimeType resultingMimeType, final @NonNull ZipOptions zipOptions) {
+        return ZipUtils.firstZipEntry(asDataSource(), zipOptions) // assuming first entry is the one we want
                 .map(zipEntryDataSource->Blob.of(
                         zipEntryDataSource.zipEntry().getName(),
                         resultingMimeType,