change to vavr.io.control.Try.

EdwinBetanc0urt · Feb 24, 2024 · a0c0639 · a0c0639
1 parent 3957fca
commit a0c0639
Showing 1 changed file with 22 additions and 20 deletions.
diff --git a/base/src/org/adempiere/pipo/CreateZipFile.java b/base/src/org/adempiere/pipo/CreateZipFile.java
@@ -17,6 +17,7 @@
 package org.adempiere.pipo;
 
 
+import io.vavr.control.Try;
 import java.io.File;
 import java.io.IOException;
 import java.util.Enumeration;
@@ -29,6 +30,7 @@
 import org.apache.tools.ant.taskdefs.GZip;
 import org.apache.tools.ant.taskdefs.Tar;
 import org.apache.tools.ant.taskdefs.Zip;
+
 /**
  * Compress package
  * 
@@ -100,28 +102,28 @@ static public void unpackFile(File zipFilepath, File destinationDir)
             Unzipper.execute();
      }
 
+
 	static public String getParentDir(File zipFilepath) throws IOException
 	{
-		String fileName = "";
-		ZipFile zipFile = null;
-		try {
-			zipFile = new ZipFile(zipFilepath);
-			Enumeration<? extends ZipEntry> entries = zipFile.entries();
-			ZipEntry entry = entries.nextElement();
-			File tempfile = new File(entry.getName());
-			while (tempfile.getParent()!=null) {
-				tempfile = tempfile.getParentFile();
-			}
-			fileName = tempfile.getName();
-		} catch (IOException ioe) {
-			System.err.println("Unhandled exception:");
-			ioe.printStackTrace();
-		} finally {
-			if (zipFile != null) {
-				zipFile.close();
-			}
-		}
-		return fileName;
+		Try<String> result = Try.withResources(() -> {
+				return new ZipFile(zipFilepath);
+			})
+			.of(zipFile -> {
+				Enumeration<? extends ZipEntry> entries = zipFile.entries();
+				ZipEntry entry = entries.nextElement();
+				File tempfile = new File(entry.getName());
+				while (tempfile.getParent()!=null) {
+					tempfile = tempfile.getParentFile();
+				}
+				return tempfile.getName();
+			})
+			.onFailure(ioError -> {
+				System.err.println("Error reading file: " + ioError.getMessage());
+				ioError.printStackTrace();
+			})
+		;
+
+		return result.get();
 	}
 
 } //	CreateZipFile