From 71bf1b1e6f2860e3045eefa8b77d90a20393685f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Moriya?=
 <128506300+andre-moriya@users.noreply.github.com>
Date: Fri, 22 Mar 2024 15:52:54 +0000
Subject: [PATCH] [#39]-[Generating empty zip files]: Fixed zip generation.

---
 .../generator/ProjectGeneratorService.java    | 33 ++++++++-----------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/src/main/java/org/apache/camel/kameleon/generator/ProjectGeneratorService.java b/src/main/java/org/apache/camel/kameleon/generator/ProjectGeneratorService.java
index f006692..d991c89 100644
--- a/src/main/java/org/apache/camel/kameleon/generator/ProjectGeneratorService.java
+++ b/src/main/java/org/apache/camel/kameleon/generator/ProjectGeneratorService.java
@@ -21,9 +21,6 @@
 import org.apache.camel.kameleon.config.ConfigurationResource;
 import org.apache.camel.kameleon.model.CamelType;
 import org.apache.camel.kameleon.model.CamelVersion;
-import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
-import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
-import org.apache.commons.compress.utils.IOUtils;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.Plugin;
@@ -35,11 +32,12 @@
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 import java.io.*;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
+import java.nio.file.*;
+import java.nio.file.attribute.BasicFileAttributes;
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
 
 @ApplicationScoped
 public class ProjectGeneratorService {
@@ -187,22 +185,17 @@ private void execute(InvocationRequest request) throws MavenInvocationException,
     }
 
     private void packageProject(String folder, String filename) {
-        try (ZipArchiveOutputStream archive = new ZipArchiveOutputStream(new FileOutputStream(filename))) {
-            File folderToZip = new File(folder);
-            Files.walk(folderToZip.toPath()).forEach(p -> {
-                File file = p.toFile();
-                if (!file.isDirectory()) {
-                    ZipArchiveEntry entry_1 = new ZipArchiveEntry(file, file.toString().replace(folder, ""));
-                    try (FileInputStream fis = new FileInputStream(file)) {
-                        archive.putArchiveEntry(entry_1);
-                        IOUtils.copy(fis, archive);
-                        archive.closeArchiveEntry();
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                    }
+        var path = Paths.get(folder);
+        try (ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(filename))) {
+            Files.walkFileTree(path, new SimpleFileVisitor<>() {
+                @Override
+                public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+                    zos.putNextEntry(new ZipEntry(path.relativize(file).toString()));
+                    Files.copy(file, zos);
+                    zos.closeEntry();
+                    return FileVisitResult.CONTINUE;
                 }
             });
-            archive.finish();
         } catch (Exception e) {
             e.printStackTrace();
         }