Add jar support

Author: tomas-sexenian

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
 }

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

@@ -18,6 +18,9 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Vector;
+import java.util.jar.JarEntry;
+import java.util.jar.JarInputStream;
+import java.util.jar.JarOutputStream;
 import java.util.zip.*;
 
 import static org.apache.commons.io.FilenameUtils.getExtension;
@@ -51,6 +54,9 @@ public static int compressFiles(Vector<String> files, String path, String format
 				case GZIP:
 					compressToGzip(toCompress, path);
 					return 0;
+				case JAR:
+					compressToJar(toCompress, path);
+					return 0;
 			}
 		} catch (IllegalArgumentException iae) {
 			log.error("Unsupported compression format for compression: {}", format);
@@ -103,6 +109,9 @@ public static int decompress(String file, String path) {
 				case "gz":
 					decompressGzip(toCompress, path);
 					return 0;
+				case "jar":
+					decompressJar(toCompress, path);
+					return 0;
 				default:
 					log.error("Unsupported compression format for decompression: {}", extension);
 					return -3;
@@ -329,12 +338,8 @@ private static void decompressTar(File file, String outputPath) throws IOExcepti
 				if (!outputFile.toPath().startsWith(targetDir)) {
 					throw new IOException("Entry is outside of the target directory: " + entry.getName());
 				}
-				if (entry.isDirectory()) {
-					if (!outputFile.exists()) {
-						if (!outputFile.mkdirs()) {
-							throw new IOException("Failed to create directory: " + outputFile);
-						}
-					}
+				if (entry.isDirectory() && !outputFile.exists() && !outputFile.mkdirs()) {
+					throw new IOException("Failed to create directory: " + outputFile);
 				} else {
 					File parent = outputFile.getParentFile();
 					if (!parent.exists() && !parent.mkdirs()) {
@@ -370,6 +375,52 @@ private static void decompressGzip(File inputFile, String outputPath) throws IOE
 		}
 	}
 
+	private static void compressToJar(File[] files, String outputPath) throws IOException {
+		JarOutputStream jos = new JarOutputStream(Files.newOutputStream(Paths.get(outputPath)));
+		byte[] buffer = new byte[1024];
+		for (File file : files) {
+			FileInputStream fis = new FileInputStream(file);
+			jos.putNextEntry(new JarEntry(file.getName()));
+			int length;
+			while ((length = fis.read(buffer)) > 0) {
+				jos.write(buffer, 0, length);
+			}
+			fis.close();
+			jos.closeEntry();
+		}
+		jos.close();
+	}
+
+	public static void decompressJar(File jarFile, String outputPath) throws IOException {
+		if (!jarFile.exists()) {
+			throw new IOException("The jar file does not exist.");
+		}
+		File outputDir = new File(outputPath);
+		if (!outputDir.exists() && !outputDir.mkdirs()) {
+			throw new IOException("Failed to create output directory.");
+		}
+		try (JarInputStream jis = new JarInputStream(Files.newInputStream(jarFile.toPath()))) {
+			JarEntry entry;
+			byte[] buffer = new byte[1024];
+			while ((entry = jis.getNextJarEntry()) != null) {
+				File outputFile = new File(outputDir, entry.getName());
+				if (entry.isDirectory()) {
+					if (!outputFile.exists() && !outputFile.mkdirs()) {
+						throw new IOException("Failed to create directory " + outputFile.getAbsolutePath());
+					}
+				} else {
+					try (FileOutputStream fos = new FileOutputStream(outputFile)) {
+						int len;
+						while ((len = jis.read(buffer)) > 0) {
+							fos.write(buffer, 0, len);
+						}
+					}
+				}
+				jis.closeEntry();
+			}
+		}
+	}
+
 	private static CompressionFormat getCompressionFormat(String format) {
 		try {
 			return CompressionFormat.valueOf(format.toUpperCase());

gxcompress/src/test/java/com/genexus/compression/TestCompression.java

@@ -74,6 +74,14 @@ public void testCompressToGzip() {
 		assertTrue(new File(outputPath).exists());
 	}
 
+	@Test
+	public void testCompressToJar() {
+		String outputPath = new File(testDirectory, "output.jar").getAbsolutePath();
+		int result = GXCompressor.compressFiles(files, outputPath, "JAR");
+		assertEquals(0, result);
+		assertTrue(new File(outputPath).exists());
+	}
+
 	@Test
 	public void testUnsupportedFormat() {
 		String outputPath = new File(testDirectory, "output.unknown").getAbsolutePath();