[O] Rename SuperPluginTracker > PluginTracker

hykilpikonna · hykilpikonna · commit 6c4743f2359f · 2022-12-05T15:27:44.000-05:00
diff --git a/src/main/java/org/hydev/mcpm/client/DatabaseManager.java b/src/main/java/org/hydev/mcpm/client/DatabaseManager.java
@@ -1,6 +1,6 @@
 package org.hydev.mcpm.client;
 
-import org.hydev.mcpm.client.database.tracker.SuperPluginTracker;
+import org.hydev.mcpm.client.database.tracker.PluginTracker;
 import org.hydev.mcpm.client.search.SearchPackagesBoundary;
 import org.hydev.mcpm.client.search.SearchPackagesInput;
 import org.hydev.mcpm.client.search.SearchPackagesResult;
@@ -15,10 +15,10 @@
  * (Goal: avoid the dependency and cluster of parameters to connect to database).
  */
 public class DatabaseManager {
-    private final SuperPluginTracker localPluginTracker;
+    private final PluginTracker localPluginTracker;
     private final SearchPackagesBoundary searchInteractor;
 
-    public DatabaseManager(SuperPluginTracker tracker, SearchPackagesBoundary searcher) {
+    public DatabaseManager(PluginTracker tracker, SearchPackagesBoundary searcher) {
         this.localPluginTracker = tracker;
         this.searchInteractor = searcher;
     }
diff --git a/src/main/java/org/hydev/mcpm/client/arguments/CommandsFactory.java b/src/main/java/org/hydev/mcpm/client/arguments/CommandsFactory.java
@@ -29,7 +29,7 @@
 import org.hydev.mcpm.client.commands.controllers.UninstallController;
 import org.hydev.mcpm.client.commands.controllers.UnloadController;
 import org.hydev.mcpm.client.commands.controllers.UpdateController;
-import org.hydev.mcpm.client.local.SuperLocalPluginTracker;
+import org.hydev.mcpm.client.local.LocalPluginTracker;
 import org.hydev.mcpm.client.updater.CheckForUpdatesInteractor;
 import org.hydev.mcpm.client.list.ListAllInteractor;
 import org.hydev.mcpm.client.matcher.MatchPluginsInteractor;
@@ -68,7 +68,7 @@ public static List<CommandParser> baseParsers(boolean isMinecraft) {
         var mirror = new MirrorSelector();
         var fetcher = new LocalDatabaseFetcher(mirror.selectedMirrorSupplier());
         // TODO: Change all implementation to SuperLocalPluginTracker
-        var superTracker = new SuperLocalPluginTracker();
+        var superTracker = new LocalPluginTracker();
         var jarFinder = new LocalJarFinder();
 
         var loader = isMinecraft ? new PluginLoader(jarFinder) : null;
diff --git a/src/main/java/org/hydev/mcpm/client/commands/controllers/InfoController.java b/src/main/java/org/hydev/mcpm/client/commands/controllers/InfoController.java
@@ -2,7 +2,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.text.WordUtils;
-import org.hydev.mcpm.client.database.tracker.SuperPluginTracker;
+import org.hydev.mcpm.client.database.tracker.PluginTracker;
 import org.hydev.mcpm.utils.ColorLogger;
 
 import javax.annotation.Nullable;
@@ -14,7 +14,7 @@
 /**
  * Controller for the info use case
  */
-public record InfoController(SuperPluginTracker tracker)
+public record InfoController(PluginTracker tracker)
 {
     private static final int LEN_LEFT = 12;
     private static final int LEN_RIGHT = 60;
diff --git a/src/main/java/org/hydev/mcpm/client/database/tracker/PluginTracker.java b/src/main/java/org/hydev/mcpm/client/database/tracker/PluginTracker.java
@@ -1,36 +1,33 @@
 package org.hydev.mcpm.client.database.tracker;
 
-import org.hydev.mcpm.client.search.SearchPackagesBoundary;
-import org.hydev.mcpm.client.models.PluginModel;
+import org.hydev.mcpm.client.models.PluginTrackerModel;
 import org.hydev.mcpm.client.models.PluginYml;
 
-import java.io.File;
 import java.util.List;
 
 /**
- * Plugin tracker interface
+ * Extended plugin tracker interface (with methods for specific
+ * versionId/pluginId).
  */
-
-public interface PluginTracker {
-    void addEntry(String name, boolean status);
+public interface PluginTracker
+{
+    void addEntry(String name, boolean status, long versionId, long pluginId);
 
     void removeEntry(String name);
 
+    List<PluginTrackerModel> listEntries();
+
     List<PluginYml> listInstalled();
 
     void setManuallyInstalled(String name);
 
     void removeManuallyInstalled(String name);
 
-    List<String> listManuallyInstalled();
-
-    List<String> listOrphanPlugins(boolean considerSoftDependencies);
-
-    String getVersion(String name);
+    Boolean findIfInLockById(String id);
 
-    List<PluginYml> listOutdatedPluginYml(SearchPackagesBoundary searchPackagesBoundary);
+    Boolean findIfInLockByName(String name);
 
-    Boolean compareVersion(String name, SearchPackagesBoundary searchPackagesBoundary);
+    List<String> listManuallyInstalled();
 
-    Boolean compareVersionNew(File local, PluginModel remote);
+    List<PluginYml> listOrphanPlugins(boolean considerSoftDependencies);
 }
diff --git a/src/main/java/org/hydev/mcpm/client/database/tracker/SuperPluginTracker.java b/src/main/java/org/hydev/mcpm/client/database/tracker/SuperPluginTracker.java
diff --git a/src/main/java/org/hydev/mcpm/client/export/ExportInteractor.java b/src/main/java/org/hydev/mcpm/client/export/ExportInteractor.java
@@ -1,6 +1,6 @@
 package org.hydev.mcpm.client.export;
 
-import org.hydev.mcpm.client.database.tracker.SuperPluginTracker;
+import org.hydev.mcpm.client.database.tracker.PluginTracker;
 
 import java.io.PrintStream;
 
@@ -9,9 +9,9 @@
  */
 public class ExportInteractor implements ExportPluginsBoundary {
 
-    private final SuperPluginTracker tracker;
+    private final PluginTracker tracker;
 
-    public ExportInteractor(SuperPluginTracker tracker) {
+    public ExportInteractor(PluginTracker tracker) {
         this.tracker = tracker;
     }
 
diff --git a/src/main/java/org/hydev/mcpm/client/installer/InstallInteractor.java b/src/main/java/org/hydev/mcpm/client/installer/InstallInteractor.java
@@ -3,7 +3,7 @@
 import org.hydev.mcpm.client.DatabaseManager;
 import org.hydev.mcpm.client.Downloader;
 import org.hydev.mcpm.client.local.LocalDatabaseFetcher;
-import org.hydev.mcpm.client.local.SuperLocalPluginTracker;
+import org.hydev.mcpm.client.local.LocalPluginTracker;
 import org.hydev.mcpm.client.search.SearchPackagesType;
 import org.hydev.mcpm.client.search.SearchPackagesResult;
 import org.hydev.mcpm.client.search.SearchInteractor;
@@ -165,7 +165,7 @@ public static void main(String[] args) {
         var searcher = new SearchInteractor(fetcher);
         Downloader downloader = new Downloader();
         SpigotPluginDownloader spigotPluginDownloader = new SpigotPluginDownloader(downloader, () -> host);
-        DatabaseManager databaseManager = new DatabaseManager(new SuperLocalPluginTracker(), searcher);
+        DatabaseManager databaseManager = new DatabaseManager(new LocalPluginTracker(), searcher);
         InstallInteractor installInteractor = new InstallInteractor(spigotPluginDownloader, databaseManager, null);
         InstallInput installInput = new InstallInput(
             "JedCore",
diff --git a/src/main/java/org/hydev/mcpm/client/list/ListAllInteractor.java b/src/main/java/org/hydev/mcpm/client/list/ListAllInteractor.java
@@ -2,7 +2,7 @@
 
 import org.hydev.mcpm.client.models.PluginYml;
 import org.hydev.mcpm.client.updater.CheckForUpdatesBoundary;
-import org.hydev.mcpm.client.database.tracker.SuperPluginTracker;
+import org.hydev.mcpm.client.database.tracker.PluginTracker;
 
 import java.util.List;
 
@@ -12,7 +12,7 @@
  * @author Kevin (https://github.com/kchprog)
  * @since 2022-11-20
  */
-public record ListAllInteractor(SuperPluginTracker pluginTracker) implements ListAllBoundary {
+public record ListAllInteractor(PluginTracker pluginTracker) implements ListAllBoundary {
     /**
      * listAllInteractor interacts with the LocalPluginTracker to get the list of
      * plugins, according to a specified
diff --git a/src/main/java/org/hydev/mcpm/client/list/ListUpdateableBoundary.java b/src/main/java/org/hydev/mcpm/client/list/ListUpdateableBoundary.java
@@ -2,12 +2,12 @@
 
 import java.util.ArrayList;
 import org.hydev.mcpm.client.updater.CheckForUpdatesBoundary;
-import org.hydev.mcpm.client.database.tracker.SuperPluginTracker;
+import org.hydev.mcpm.client.database.tracker.PluginTracker;
 
 /**
  * Defines an interface for obtaining a list of plugin names that may be updated
  */
 public interface ListUpdateableBoundary {
-    ArrayList<String> listUpdateable(SuperPluginTracker superPluginTracker,
-            CheckForUpdatesBoundary checkForUpdatesBoundary);
+    ArrayList<String> listUpdateable(PluginTracker superPluginTracker,
+                                     CheckForUpdatesBoundary checkForUpdatesBoundary);
 }
diff --git a/src/main/java/org/hydev/mcpm/client/list/ListUpdateableHelper.java b/src/main/java/org/hydev/mcpm/client/list/ListUpdateableHelper.java
@@ -4,7 +4,7 @@
 import org.hydev.mcpm.client.models.PluginTrackerModel;
 import org.hydev.mcpm.client.models.PluginModel;
 import org.hydev.mcpm.client.updater.CheckForUpdatesBoundary;
-import org.hydev.mcpm.client.database.tracker.SuperPluginTracker;
+import org.hydev.mcpm.client.database.tracker.PluginTracker;
 import org.hydev.mcpm.client.matcher.PluginVersionState;
 import org.hydev.mcpm.client.matcher.PluginModelId;
 import org.hydev.mcpm.client.matcher.PluginVersionId;
@@ -30,7 +30,7 @@ public class ListUpdateableHelper implements ListUpdateableBoundary {
      * @return A list of plugins that are outdated.
      */
     public ArrayList<String> listUpdateable(
-            SuperPluginTracker localPluginTracker, CheckForUpdatesBoundary checkForUpdatesBoundary) {
+        PluginTracker localPluginTracker, CheckForUpdatesBoundary checkForUpdatesBoundary) {
 
         ArrayList<PluginVersionState> temp = new ArrayList<>();
         List<PluginTrackerModel> installedModels = localPluginTracker.listEntries();
diff --git a/src/main/java/org/hydev/mcpm/client/local/LocalPluginTracker.java b/src/main/java/org/hydev/mcpm/client/local/LocalPluginTracker.java
@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.hydev.mcpm.client.database.tracker.SuperPluginTracker;
+import org.hydev.mcpm.client.database.tracker.PluginTracker;
 import org.hydev.mcpm.client.models.*;
 import org.hydev.mcpm.client.models.PluginYml.InvalidPluginMetaStructure;
 import org.hydev.mcpm.utils.Pair;
@@ -19,7 +19,8 @@
 /**
  * This class keeps track of locally installed packages
  */
-public class SuperLocalPluginTracker implements SuperPluginTracker {
+public class LocalPluginTracker implements PluginTracker
+{
     /** Lock file containing installed plugin information */
     private final String mainLockFile;
 
@@ -32,7 +33,7 @@ public class SuperLocalPluginTracker implements SuperPluginTracker {
     /**
      * Instantiates a LocalPluginTracker with default parameters for general use
      */
-    public SuperLocalPluginTracker() {
+    public LocalPluginTracker() {
         this("plugins/mcpm.lock.json", "plugins");
     }
 
@@ -43,7 +44,7 @@ public SuperLocalPluginTracker() {
      * @param mainLockFile    The path to the main lock file
      * @param pluginDirectory The path to the plugin directory
      */
-    public SuperLocalPluginTracker(String mainLockFile, String pluginDirectory) {
+    public LocalPluginTracker(String mainLockFile, String pluginDirectory) {
         this.mainLockFile = mainLockFile;
         this.pluginDirectory = pluginDirectory;
     }
@@ -187,7 +188,7 @@ public List<PluginYml> listInstalled() {
 
         // Filter only java files, return all metadata that's not null
         return Arrays.stream(list).filter(f -> f.isFile() && f.getName().endsWith(".jar"))
-            .parallel().map(SuperLocalPluginTracker::readMeta).filter(Objects::nonNull).toList();
+            .parallel().map(LocalPluginTracker::readMeta).filter(Objects::nonNull).toList();
     }
 
     /**
diff --git a/src/main/java/org/hydev/mcpm/client/uninstall/Uninstaller.java b/src/main/java/org/hydev/mcpm/client/uninstall/Uninstaller.java
@@ -1,6 +1,6 @@
 package org.hydev.mcpm.client.uninstall;
 
-import org.hydev.mcpm.client.database.tracker.SuperPluginTracker;
+import org.hydev.mcpm.client.database.tracker.PluginTracker;
 import org.hydev.mcpm.client.injector.LocalJarBoundary;
 import org.hydev.mcpm.client.injector.PluginNotFoundException;
 import org.hydev.mcpm.client.injector.UnloadBoundary;
@@ -14,7 +14,7 @@
  * Uninstall use case interactor
  */
 public class Uninstaller implements UninstallBoundary {
-    private final SuperPluginTracker tracker;
+    private final PluginTracker tracker;
     private final UnloadBoundary unloader;
     private final LocalJarBoundary jarFinder;
 
@@ -25,7 +25,7 @@ public class Uninstaller implements UninstallBoundary {
      * @param unloader Unload implementation
      * @param jarFinder Local jar finder
      */
-    public Uninstaller(SuperPluginTracker tracker, UnloadBoundary unloader, LocalJarBoundary jarFinder) {
+    public Uninstaller(PluginTracker tracker, UnloadBoundary unloader, LocalJarBoundary jarFinder) {
         this.tracker = tracker;
         this.unloader = unloader;
         this.jarFinder = jarFinder;
diff --git a/src/main/java/org/hydev/mcpm/client/updater/UpdateInteractor.java b/src/main/java/org/hydev/mcpm/client/updater/UpdateInteractor.java
@@ -3,6 +3,7 @@
 import org.hydev.mcpm.client.commands.presenters.InstallResultPresenter;
 import org.hydev.mcpm.client.installer.InstallBoundary;
 import org.hydev.mcpm.client.installer.input.InstallInput;
+import org.hydev.mcpm.client.local.LocalPluginTracker;
 import org.hydev.mcpm.client.matcher.PluginModelId;
 import org.hydev.mcpm.client.matcher.PluginVersionId;
 import org.hydev.mcpm.client.matcher.PluginVersionState;
@@ -29,7 +30,7 @@
 public record UpdateInteractor(
         CheckForUpdatesBoundary checkBoundary,
         InstallBoundary installer,
-        org.hydev.mcpm.client.local.SuperLocalPluginTracker pluginTracker
+        LocalPluginTracker pluginTracker
 ) implements UpdateBoundary {
     @Nullable
     private PluginVersionState stateByName(Map<String, PluginYml> installed, String name) {
@@ -46,7 +47,7 @@ private PluginVersionState stateByName(Map<String, PluginYml> installed, String
 
     // This is hacky. It would be nice if we could look up states by name in update() so we return a map.
     private Map<String, PluginVersionState> stateMapByNames(List<String> names) {
-        // 
+        //
         var installed = pluginTracker.listInstalled().stream().map(it -> new Pair<>(it.name(), it))
             .collect(Pair.toMap());
 
diff --git a/src/test/java/org/hydev/mcpm/client/local/SuperLocalPluginTrackerTest.java b/src/test/java/org/hydev/mcpm/client/local/SuperLocalPluginTrackerTest.java
@@ -21,15 +21,15 @@ class SuperLocalPluginTrackerTest
     private static String TESTING_PLUGIN = "TestingPlugin";
     
     static TemporaryDir tmp;
-    static SuperLocalPluginTracker tracker;
+    static LocalPluginTracker tracker;
 
     @BeforeAll
     static void init()
     {
         tmp = new TemporaryDir();
         var lock = new File(tmp.path, "lock.json");
         var f = Objects.requireNonNull(GeneralUtils.getResourceFile("test-plugin-activelist.jar"));
-        tracker = new SuperLocalPluginTracker(lock.getAbsolutePath(), f.getParentFile().getAbsolutePath());
+        tracker = new LocalPluginTracker(lock.getAbsolutePath(), f.getParentFile().getAbsolutePath());
     }
 
     @AfterAll
