Commit attempt 7 - Adding FileRemove interface and RemoveFile class for removing file in Uninstall use case.

Author: aanushkasharma

src/main/java/org/hydev/mcpm/client/injector/UnloadBoundary.java

@@ -11,8 +11,7 @@ public interface UnloadBoundary
      * Dynamically unload a local plugin through JVM reflections and classloader hacks
      *
      * @param name Loaded plugin name
-     * @return Jar file
      * @throws PluginNotFoundException If a loaded plugin of the name isn't found
      */
-    File unloadPlugin(String name) throws PluginNotFoundException;
+    void unloadPlugin(String name) throws PluginNotFoundException;
 }

src/main/java/org/hydev/mcpm/client/uninstall/FileRemove.java

@@ -0,0 +1,23 @@
+package org.hydev.mcpm.client.uninstall;
+
+import org.hydev.mcpm.client.injector.LocalJarBoundary;
+import org.hydev.mcpm.client.injector.PluginNotFoundException;
+
+import java.io.File;
+
+import static org.hydev.mcpm.client.uninstall.UninstallResult.State.FAILED_TO_DELETE;
+import static org.hydev.mcpm.client.uninstall.UninstallResult.State.NOT_FOUND;
+
+/**
+ * Interface for removing a file
+ */
+
+public interface FileRemove {
+    /**
+     * Remove file for given plugin (step 2 and 3 of Uninstaller use case)
+     * @param pluginName
+     * @return int 0 - true, 1 - NOT_FOUND, 2 - FAILED_TO_DELETE
+     */
+    int removeFile(String pluginName);
+
+}

src/main/java/org/hydev/mcpm/client/uninstall/RemoveFile.java

@@ -0,0 +1,36 @@
+package org.hydev.mcpm.client.uninstall;
+
+import org.hydev.mcpm.client.injector.LocalJarBoundary;
+import org.hydev.mcpm.client.injector.PluginNotFoundException;
+import org.hydev.mcpm.client.uninstall.FileRemove;
+
+import java.io.File;
+
+/**
+ * Removes file for FileRemove.java
+ */
+public class RemoveFile implements FileRemove{
+    private final LocalJarBoundary jarFinder;
+
+    public RemoveFile(LocalJarBoundary jarFinder) {
+        this.jarFinder = jarFinder;
+    }
+
+    public int removeFile(String pluginName) {
+        // 2. If it isn't loaded, find the plugin jar file in local file system
+        // (This will throw PluginNotFoundException when a plugin of the name in the file system
+        // could not be found).
+        File jar = null;
+        try {
+            jar = jarFinder.findJar(pluginName);
+        } catch (PluginNotFoundException e) {
+            return 1;
+        }
+
+        // 3. Delete plugin jar
+        if (!jar.delete()) {
+            return 2;
+        }
+        return 0;
+    }
+}

src/main/java/org/hydev/mcpm/client/uninstall/Uninstaller.java

@@ -4,6 +4,7 @@
 import org.hydev.mcpm.client.injector.LocalJarBoundary;
 import org.hydev.mcpm.client.injector.PluginNotFoundException;
 import org.hydev.mcpm.client.injector.UnloadBoundary;
+import org.hydev.mcpm.client.uninstall.FileRemove;
 
 import java.io.File;
 
@@ -29,40 +30,33 @@ public Uninstaller(PluginTracker tracker, UnloadBoundary unloader, LocalJarBound
         this.tracker = tracker;
         this.unloader = unloader;
         this.jarFinder = jarFinder;
+
     }
 
     @Override
-    public UninstallResult uninstall(UninstallInput input) {
+    public UninstallResult uninstall(UninstallInput input)  {
         // 1. Unload plugin
         // This will throw PluginNotFoundException if the plugin isn't loaded. If it is loaded,
         // this will return the jar of the currently loaded plugin, which is the most precise.
         // Since people may still uninstall a plugin when it's not loaded, we ignore the not
         // found error here.
-        File jar = null;
         if (unloader != null) {
             try {
-                jar = unloader.unloadPlugin(input.name());
+                unloader.unloadPlugin(input.name());
             }
             catch (PluginNotFoundException ignored) { }
         }
 
-        // 2. If it isn't loaded, find the plugin jar file in local file system
-        if (jar == null) {
-            // This will throw PluginNotFoundException when a plugin of the name in the file system
-            // could not be found.
-            try {
-                jar = jarFinder.findJar(input.name());
-            }
-            catch (PluginNotFoundException e) {
-                return new UninstallResult(NOT_FOUND);
-            }
-        }
+        // Steps 2. + 3.
+        RemoveFile fileRemover = new RemoveFile(jarFinder);
 
-        // 3. Delete plugin jar
-        if (!jar.delete()) {
+        if (fileRemover.removeFile(input.name())==1) {
+            return new UninstallResult(NOT_FOUND);
+        } else if (fileRemover.removeFile(input.name())==2) {
             return new UninstallResult(FAILED_TO_DELETE);
         }
 
+
         // 4. Remove manually installed flag from the tracker
         tracker.removeEntry(input.name());
         var result = new UninstallResult(SUCCESS);
@@ -85,4 +79,5 @@ public UninstallResult uninstall(UninstallInput input) {
 
         return result;
     }
+
 }