Author: nick
Date: Tue Mar 15 12:03:30 2016
New Revision: 1735064
URL: http://svn.apache.org/viewvc?rev=1735064&view=rev
Log:
Push all the zip opening logic into ZipHelper
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipHelper.java
Modified: poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java?rev=1735064&r1=1735063&r2=1735064&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java Tue
Mar 15 12:03:30 2016
@@ -24,7 +24,6 @@ import java.io.OutputStream;
import java.util.Enumeration;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
-import java.util.zip.ZipInputStream;
import java.util.zip.ZipOutputStream;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
@@ -42,7 +41,6 @@ import org.apache.poi.openxml4j.opc.inte
import org.apache.poi.openxml4j.util.ZipEntrySource;
import org.apache.poi.openxml4j.util.ZipFileZipEntrySource;
import org.apache.poi.openxml4j.util.ZipInputStreamZipEntrySource;
-import org.apache.poi.openxml4j.util.ZipSecureFile;
import org.apache.poi.openxml4j.util.ZipSecureFile.ThresholdInputStream;
import org.apache.poi.util.POILogFactory;
import org.apache.poi.util.POILogger;
@@ -89,9 +87,8 @@ public final class ZipPackage extends Pa
*/
ZipPackage(InputStream in, PackageAccess access) throws IOException {
super(access);
- InputStream zis = new ZipInputStream(in);
- ThresholdInputStream tis = ZipSecureFile.addThreshold(zis);
- this.zipArchive = new ZipInputStreamZipEntrySource(tis);
+ ThresholdInputStream zis = ZipHelper.openZipStream(in);
+ this.zipArchive = new ZipInputStreamZipEntrySource(zis);
}
/**
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipHelper.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipHelper.java?rev=1735064&r1=1735063&r2=1735064&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipHelper.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipHelper.java
Tue Mar 15 12:03:30 2016
@@ -19,17 +19,20 @@ package org.apache.poi.openxml4j.opc.int
import java.io.File;
import java.io.IOException;
+import java.io.InputStream;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Enumeration;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
+import java.util.zip.ZipInputStream;
import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.openxml4j.opc.PackageRelationshipTypes;
import org.apache.poi.openxml4j.opc.ZipPackage;
import org.apache.poi.openxml4j.util.ZipSecureFile;
+import org.apache.poi.openxml4j.util.ZipSecureFile.ThresholdInputStream;
public final class ZipHelper {
/**
@@ -143,7 +146,21 @@ public final class ZipHelper {
}
/**
- * Opens the specified file as a zip, or returns null if no such file
exists
+ * Opens the specified stream as a secure zip
+ *
+ * @param stream
+ * The stream to open.
+ * @return The zip stream freshly open.
+ */
+ public static ThresholdInputStream openZipStream(InputStream stream)
throws IOException {
+ InputStream zis = new ZipInputStream(stream);
+ ThresholdInputStream tis = ZipSecureFile.addThreshold(zis);
+ return tis;
+ }
+
+ /**
+ * Opens the specified file as a secure zip, or returns null if no
+ * such file exists
*
* @param file
* The file to open.
@@ -158,7 +175,7 @@ public final class ZipHelper {
}
/**
- * Retrieve and open a zip file with the specified path.
+ * Retrieve and open as a secure zip file with the specified path.
*
* @param path
* The file path.
@@ -166,11 +183,7 @@ public final class ZipHelper {
*/
public static ZipFile openZipFile(String path) throws IOException {
File f = new File(path);
-
- if (!f.exists()) {
- return null;
- }
-
- return new ZipSecureFile(f);
+
+ return openZipFile(f);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
