Implement uncompressing of BZip2 compressed entries in ZipFile

Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/ca55bc4c
Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/ca55bc4c
Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/ca55bc4c

Branch: refs/heads/master
Commit: ca55bc4cfaead7376599c281abfff94a936f5bf5
Parents: c226da2
Author: Sören Glimm <[email protected]>
Authored: Tue Nov 10 20:00:08 2015 +0100
Committer: Stefan Bodewig <[email protected]>
Committed: Wed Nov 11 06:11:33 2015 +0100

----------------------------------------------------------------------
 .../commons/compress/archivers/zip/ZipFile.java      |   3 +++
 .../commons/compress/archivers/zip/ZipUtil.java      |   3 ++-
 .../commons/compress/archivers/zip/ZipFileTest.java  |  12 ++++++++++++
 src/test/resources/bzip2-zip.zip                     | Bin 0 -> 209 bytes
 4 files changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ca55bc4c/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
----------------------------------------------------------------------
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 e8bcc03..0406433 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
@@ -36,6 +36,7 @@ import java.util.zip.Inflater;
 import java.util.zip.InflaterInputStream;
 import java.util.zip.ZipException;
 
+import 
org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
 import org.apache.commons.compress.utils.IOUtils;
 
 import static org.apache.commons.compress.archivers.zip.ZipConstants.DWORD;
@@ -423,6 +424,8 @@ public class ZipFile implements Closeable {
                         inflater.end();
                     }
                 };
+            case BZIP2:
+                return new BZip2CompressorInputStream(bis);
             default:
                 throw new ZipException("Found unsupported compression method "
                                        + ze.getMethod());

http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ca55bc4c/src/main/java/org/apache/commons/compress/archivers/zip/ZipUtil.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipUtil.java 
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipUtil.java
index b12b19f..7c21e29 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipUtil.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipUtil.java
@@ -333,7 +333,8 @@ public abstract class ZipUtil {
         return entry.getMethod() == ZipEntry.STORED
             || entry.getMethod() == ZipMethod.UNSHRINKING.getCode()
             || entry.getMethod() == ZipMethod.IMPLODING.getCode()
-            || entry.getMethod() == ZipEntry.DEFLATED;
+            || entry.getMethod() == ZipEntry.DEFLATED
+            || entry.getMethod() == ZipMethod.BZIP2.getCode();
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ca55bc4c/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java
----------------------------------------------------------------------
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 5fceaeb..c9e512a 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
@@ -27,6 +27,7 @@ import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.TreeMap;
@@ -284,6 +285,17 @@ public class ZipFileTest {
                           IOUtils.toByteArray(zf.getInputStream(ze)));
     }
 
+    @Test
+    public void testUnzipBZip2CompressedEntry() throws Exception {
+        File archive = getFile("bzip2-zip.zip");
+        zf = new ZipFile(archive);
+        ZipArchiveEntry ze = zf.getEntry("lots-of-as");
+        assertEquals(42, ze.getSize());
+        byte[] expected = new byte[42];
+        Arrays.fill(expected , (byte)'a');
+        assertArrayEquals(expected, 
IOUtils.toByteArray(zf.getInputStream(ze)));
+    }
+
     /*
      * ordertest.zip has been handcrafted.
      *

http://git-wip-us.apache.org/repos/asf/commons-compress/blob/ca55bc4c/src/test/resources/bzip2-zip.zip
----------------------------------------------------------------------
diff --git a/src/test/resources/bzip2-zip.zip b/src/test/resources/bzip2-zip.zip
new file mode 100644
index 0000000..e1a85c7
Binary files /dev/null and b/src/test/resources/bzip2-zip.zip differ

Reply via email to