Removed NioZipObject

FlowArg · Sep 1, 2021 · ca257c8 · ca257c8
1 parent 79cc9da
commit ca257c8
Showing 1 changed file with 8 additions and 31 deletions.
diff --git a/CurseForgePlugin/src/main/java/fr/flowarg/flowupdater/curseforgeplugin/CurseForgePlugin.java b/CurseForgePlugin/src/main/java/fr/flowarg/flowupdater/curseforgeplugin/CurseForgePlugin.java
@@ -150,48 +150,25 @@ private void extractModPack(@NotNull Path out, boolean installExtFiles) throws E
                     if (flPath.getFileName().toString().endsWith(flPath.getFileSystem().getSeparator())) Files.createDirectories(flPath);
                     if (entry.isDirectory()) continue;
 
-                    final NioZipObject nioZipObject = new NioZipObject(flPath, zipFile.getInputStream(entry));
-                    nioZipObject.transfer();
-                    nioZipObject.close();
+                    this.transferAndClose(flPath, zipFile, entry);
                 }
             }
-            else if(entry.getName().equals("manifest.json"))
-            {
-                final NioZipObject nioZipObject = new NioZipObject(flPath, zipFile.getInputStream(entry));
-                nioZipObject.transfer();
-                nioZipObject.close();
-            }
+            else if(entry.getName().equals("manifest.json")) this.transferAndClose(flPath, zipFile, entry);
         }
         zipFile.close();
     }
 
-    private static class NioZipObject
+    private void transferAndClose(Path flPath, ZipFile zipFile, ZipEntry entry) throws Exception
     {
-        private final OutputStream pathStream;
-        private final BufferedOutputStream fo;
-        private final InputStream is;
-
-        public NioZipObject(Path path, InputStream is) throws Exception
-        {
-            this.pathStream = Files.newOutputStream(path);
-            this.fo = new BufferedOutputStream(this.pathStream);
-            this.is = is;
-        }
-
-        public void transfer() throws Exception
+        try(OutputStream pathStream = Files.newOutputStream(flPath);
+            BufferedOutputStream fo = new BufferedOutputStream(pathStream);
+            InputStream is = zipFile.getInputStream(entry)
+        )
         {
-            while (this.is.available() > 0) this.fo.write(this.is.read());
-        }
-
-        public void close() throws Exception
-        {
-            this.fo.close();
-            this.pathStream.close();
-            this.is.close();
+            while (is.available() > 0) fo.write(is.read());
         }
     }
 
-
     private @NotNull CurseModPack parseMods() throws Exception
     {
         this.getLogger().info("Fetching mods...");