[O] PluginLoader: Split findJar

Author: hykilpikonna

src/main/java/org/hydev/mcpm/client/arguments/CommandsFactory.java

@@ -11,6 +11,7 @@
 import org.hydev.mcpm.client.database.export.ExportInteractor;
 import org.hydev.mcpm.client.database.fetcher.LocalDatabaseFetcher;
 import org.hydev.mcpm.client.database.searchusecase.SearchInteractor;
+import org.hydev.mcpm.client.injector.LocalJarFinder;
 import org.hydev.mcpm.client.injector.PluginLoader;
 import org.hydev.mcpm.client.installer.InstallInteractor;
 import org.hydev.mcpm.client.installer.SpigotPluginDownloader;
@@ -78,7 +79,8 @@ public static List<CommandParser> baseParsers(boolean isMinecraft) {
      * @return Returns a list of argument parsers that require the Server (Minecraft Bukkit Plugin) environment.
      */
     public static List<CommandParser> serverParsers() {
-        var loader = new PluginLoader();
+        var jarFinder = new LocalJarFinder();
+        var loader = new PluginLoader(jarFinder);
 
         var loadController = new LoadController(loader);
         var reloadController = new ReloadController(loader);

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

@@ -0,0 +1,20 @@
+package org.hydev.mcpm.client.injector;
+
+import java.io.File;
+
+/**
+ * Boundary for finding local jar files
+ *
+ * @author Azalea (https://github.com/hykilpikonna)
+ * @since 2022-11-27
+ */
+public interface LocalJarBoundary
+{
+    /**
+     * Find a jar file of a plugin in file system by name
+     *
+     * @param name Plugin name in meta
+     * @return Plugin jar file
+     */
+    File findJar(String name) throws PluginNotFoundException;
+}

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

@@ -0,0 +1,40 @@
+package org.hydev.mcpm.client.injector;
+
+import org.hydev.mcpm.client.models.PluginYml;
+import org.hydev.mcpm.utils.PluginJarFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Optional;
+
+/**
+ * Implementation that finds locally installed jars by name
+ *
+ * @param dir Plugins directory (default to "./plugins")
+ * @author Azalea (https://github.com/hykilpikonna)
+ * @since 2022-11-27
+ */
+public record LocalJarFinder(File dir) implements LocalJarBoundary
+{
+    public LocalJarFinder()
+    {
+        this(new File("plugins"));
+    }
+
+    @Override
+    public File findJar(String name) throws PluginNotFoundException
+    {
+        // 1. Find plugin file by name
+        if (!dir.isDirectory()) throw new PluginNotFoundException(name);
+        return Arrays.stream(Optional.ofNullable(dir.listFiles()).orElseThrow(() -> new PluginNotFoundException(name)))
+            .filter(f -> f.getName().endsWith(".jar"))
+            .filter(f -> {
+                try (var jf = new PluginJarFile(f))
+                {
+                    return jf.readPluginYaml().name().equalsIgnoreCase(name);
+                }
+                catch (IOException | PluginYml.InvalidPluginMetaStructure ignored) { return false; }
+            }).findFirst().orElseThrow(() -> new PluginNotFoundException(name));
+    }
+}

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

@@ -10,8 +10,6 @@
 import org.bukkit.plugin.InvalidPluginException;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.RegisteredListener;
-import org.hydev.mcpm.client.models.PluginYml;
-import org.hydev.mcpm.utils.PluginJarFile;
 
 import java.io.File;
 import java.io.IOException;
@@ -30,26 +28,12 @@
  * @author Azalea (https://github.com/hykilpikonna)
  * @since 2022-09-27
  */
-public class PluginLoader implements LoadBoundary, UnloadBoundary, ReloadBoundary
+public record PluginLoader(LocalJarFinder jarFinder) implements LoadBoundary, UnloadBoundary, ReloadBoundary
 {
     @Override
     public boolean loadPlugin(String name) throws PluginNotFoundException
     {
-        // 1. Find plugin file by name
-        var dir = new File("plugins");
-        if (!dir.isDirectory()) throw new PluginNotFoundException(name);
-        var file = Arrays.stream(Optional.ofNullable(dir.listFiles())
-                .orElseThrow(() -> new PluginNotFoundException(name)))
-            .filter(f -> f.getName().endsWith(".jar"))
-            .filter(f -> {
-                try (var jf = new PluginJarFile(f))
-                {
-                    return jf.readPluginYaml().name().equalsIgnoreCase(name);
-                }
-                catch (IOException | PluginYml.InvalidPluginMetaStructure ignored) { return false; }
-            }).findFirst().orElseThrow(() -> new PluginNotFoundException(name));
-
-        return loadPlugin(file);
+        return loadPlugin(jarFinder.findJar(name));
     }
 
     @Override