Cherry pick branch 'genexuslabs:Compress' into beta

Author: tomas-sexenian

gxcompress/pom.xml

@@ -23,6 +23,11 @@
             <artifactId>xz</artifactId>
             <version>1.9</version>
         </dependency>
+        <dependency>
+            <groupId>com.github.junrar</groupId>
+            <artifactId>junrar</artifactId>
+            <version>7.5.5</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
@@ -38,6 +43,12 @@
             <artifactId>gxcommon</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.genexus</groupId>
+            <artifactId>gxclassR</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>

gxcompress/src/main/java/com/genexus/compression/Compression.java

@@ -1,25 +1,31 @@
 package com.genexus.compression;
 
+import com.genexus.GXBaseCollection;
+import com.genexus.SdtMessages_Message;
 import org.apache.logging.log4j.Logger;
 
-import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
-import java.util.List;
-import java.util.Vector;
+import java.util.stream.Stream;
 
 public class Compression {
 	private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(Compression.class);
 
 	private String path;
 	private String format;
-	private List<File> filesToCompress;
+	private GXBaseCollection<SdtMessages_Message>[] messages;
+	private ArrayList<String> filesToCompress;
 
 	public Compression() {}
 
-	public Compression(String path, String format) {
+	public Compression(String path, String format, GXBaseCollection<SdtMessages_Message>[] messages) {
 		this.path = path;
 		this.format = format;
-		this.filesToCompress = new ArrayList<>();
+		this.messages = messages;
+		filesToCompress = new ArrayList<>();
 	}
 
 	public void setPath(String path) {
@@ -31,48 +37,26 @@ public void setFormat(String format) {
 	}
 
 	public void addFile(String filePath) {
-		File file = new File(filePath);
-		if (file.exists()) {
-			filesToCompress.add(file);
-		} else {
-			log.error("File does not exist: {}", file.getAbsolutePath());
-		}
+		filesToCompress.add(filePath);
 	}
 
 	public void addFolder(String folderPath) {
-		File folder = new File(folderPath);
-		if (folder.exists() && folder.isDirectory()) {
-			File[] files = folder.listFiles();
-			if (files != null) {
-				for (File file : files) {
-					if (file.isDirectory()) {
-						addFolder(file.getAbsolutePath());
-					} else {
-						addFile(file.getAbsolutePath());
-					}
-				}
-			}
-		} else {
-			log.error("Folder does not exist or is not a directory: {}", folder.getAbsolutePath());
+		Path path = Paths.get(folderPath);
+		try (Stream<Path> stream = Files.walk(path)) {
+			stream.filter(Files::isRegularFile)
+				.forEach(p -> addFile(p.toAbsolutePath().toString()));
+		} catch (IOException e) {
+			log.error("Failed to process directory: {}", folderPath, e);
 		}
 	}
 
-	public int save() {
-		if (filesToCompress.isEmpty()) {
-			log.error("No files have been added for compression.");
-			return -4;
-		}
-		Vector<String> paths = new Vector<>();
-		for (File file : filesToCompress) {
-			paths.add(file.getPath());
-		}
-		return GXCompressor.compressFiles(paths, path, format);
+	public Boolean save() {
+		return GXCompressor.compressFiles(filesToCompress, path, format, messages);
 	}
 
-
 	public void clear() {
-		this.path = "";
-		this.format = "";
-		this.filesToCompress = new ArrayList<>();
+		path = "";
+		format = "";
+		filesToCompress = new ArrayList<>();
 	}
-}
+}

gxcompress/src/main/java/com/genexus/compression/CompressionFormat.java

@@ -1,5 +1,5 @@
 package com.genexus.compression;
 
 public enum CompressionFormat {
-	GZIP,TAR, ZIP, SEVENZ
+	GZIP,TAR, ZIP, SEVENZ, JAR
 }