simpler zipfile creation for patches

bubble-server/pom.xml

@@ -246,12 +246,6 @@
             <version>16.2.0</version>
         </dependency>
 
-        <dependency>
-            <groupId>net.lingala.zip4j</groupId>
-            <artifactId>zip4j</artifactId>
-            <version>2.5.1</version>
-        </dependency>
-
         <dependency>
             <groupId>org.cobbzilla</groupId>
             <artifactId>restex</artifactId>

bubble-server/src/main/java/bubble/resources/cloud/NodeManagerResource.java

@@ -9,8 +9,7 @@ import bubble.service.boot.SelfNodeService;
 import bubble.service.notify.NotificationService;
 import edu.emory.mathcs.backport.java.util.Arrays;
 import lombok.extern.slf4j.Slf4j;
-import net.lingala.zip4j.ZipFile;
-import net.lingala.zip4j.exception.ZipException;
+import org.apache.commons.io.IOUtils;
 import org.cobbzilla.util.http.*;
 import org.cobbzilla.util.io.ByteLimitedInputStream;
 import org.cobbzilla.util.io.FileUtil;
@@ -26,11 +25,11 @@ import javax.ws.rs.*;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.Response;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
 
 import static bubble.model.cloud.notify.NotificationType.hello_to_sage;
 import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
@@ -170,7 +169,8 @@ public class NodeManagerResource {
                                @PathParam("path") String path,
                                @FormDataParam("file") InputStream in,
                                @FormDataParam("name") String name) {
-        if (PATCH_COMPONENTS.contains(component)) return notFound(component);
+        log.info("patchFile: component="+component+", path="+path+", name="+name);
+        if (!PATCH_COMPONENTS.contains(component)) return notFound(component);
         final HttpRequestBean request = validateNodeManagerRequest(ctx, "patch/"+component)
                 .setMethod(HttpMethods.POST);
 
@@ -197,10 +197,14 @@ public class NodeManagerResource {
         log.info("buildPatchZip: wrote temp file: "+abs(dest));
         final File zipFile = FileUtil.temp(".zip");
         log.info("buildPatchZip: zipping into zipFile: "+abs(zipFile));
-        try {
-            new ZipFile(zipFile).addFolder(tempDir);
-        } catch (ZipException e) {
-            return die("buildPatchZip: "+shortError(e));
+        try (OutputStream o = new FileOutputStream(zipFile)){
+            final ZipOutputStream out = new ZipOutputStream(o);
+            final ZipEntry e = new ZipEntry(path);
+            out.putNextEntry(e);
+            IOUtils.copyLarge(in, out);
+            out.closeEntry();
+        } catch (Exception e) {
+            return die("buildPatchZip: "+shortError(e), e);
         }
         log.info("buildPatchZip: created patch file: "+abs(zipFile));
         return zipFile;

utils/cobbzilla-utils

@@ -1 +1 @@
-Subproject commit a168473a8855ea2b05e4afffdce84ae7f54f7dbe
+Subproject commit 825ce0905f5fc562a796eeca3ce91cd250016999