refactor: use java paths for zip backups management

tglman · tglman · commit 7c7df79b9b44 · 2025-08-26T10:20:55.000+01:00
diff --git a/core/src/main/java/com/orientechnologies/orient/core/compression/impl/OZIPCompressionUtil.java b/core/src/main/java/com/orientechnologies/orient/core/compression/impl/OZIPCompressionUtil.java
@@ -63,8 +63,7 @@ public static List<String> compressDirectory(
   public static void uncompressDirectory(
       final InputStream in, final String out, final OCommandOutputListener iListener)
       throws IOException {
-    final File outdir = new File(out);
-    final String targetDirPath = outdir.getCanonicalPath() + File.separator;
+    final Path outdir = Path.of(out).toAbsolutePath();
 
     try (ZipInputStream zin = new ZipInputStream(in)) {
       ZipEntry entry;
@@ -73,8 +72,8 @@ public static void uncompressDirectory(
       while ((entry = zin.getNextEntry()) != null) {
         name = entry.getName();
 
-        final File file = new File(outdir, name);
-        if (!file.getCanonicalPath().startsWith(targetDirPath))
+        Path targetPath = outdir.resolve(name);
+        if (!targetPath.startsWith(outdir))
           throw new IOException(
               "Expanding '"
                   + entry.getName()
@@ -100,20 +99,20 @@ public static void uncompressDirectory(
 
   private static void extractFile(
       final ZipInputStream in,
-      final File outdir,
+      final Path outdir,
       final String name,
       final OCommandOutputListener iListener)
       throws IOException {
     if (iListener != null) iListener.onMessage("\n- Uncompressing file " + name + "...");
 
     try (BufferedOutputStream out =
-        new BufferedOutputStream(new FileOutputStream(new File(outdir, name)))) {
+        new BufferedOutputStream(new FileOutputStream(outdir.resolve(name).toFile()))) {
       OIOUtils.copyStream(in, out);
     }
   }
 
-  private static void mkdirs(final File outdir, final String path) {
-    final File d = new File(outdir, path);
+  private static void mkdirs(final Path outdir, final String path) {
+    final File d = outdir.resolve(path).toFile();
     if (!d.exists()) d.mkdirs();
   }
 
