Delete a lot of stuff and remove all warnings

Author: 1whatleytay

src/main/java/org/hydev/mcpm/Constants.java

@@ -19,6 +19,7 @@ public class Constants
     // This is technically not a constant, but it should only be changed by SpigotEntry to true.
     // It cannot be put inside SpigotEntry because accessing SpigotEntry would try to initialize the class, then it
     // will try to import Spigot packages which doesn't exist outside of Spigot.
+    @SuppressWarnings("unused")
     public static boolean IS_MINECRAFT = false;
 
     public static final ObjectMapper JACKSON = new ObjectMapper()

src/main/java/org/hydev/mcpm/SpigotEntry.java

@@ -24,6 +24,7 @@ public class SpigotEntry extends JavaPlugin implements CommandExecutor
 {
     private static SpigotEntry instance;
 
+    @SuppressWarnings("unused")
     public SpigotEntry()
     {
         // Let the other parts of our program know that we're in minecraft

src/main/java/org/hydev/mcpm/client/Downloader.java

@@ -51,6 +51,8 @@ public void downloadFile(String url, String to)
 
                 try (var stream = entity.getContent())
                 {
+                    // We use the size of 8096 here since it's typically the internal buffer size of an OS stream.
+                    // This allows us to grab the entire buffer in one go and allow the OS to continue reading.
                     var buffer = new byte[8096];
 
                     var count = stream.read(buffer);
@@ -117,50 +119,10 @@ public void downloadFiles(Map<String, String> urls)
      * @param threads Number of simultaneous downloads
      * @return this (for fluent access)
      */
+    @SuppressWarnings("unused")
     public Downloader threads(int threads)
     {
         this.threads = threads;
         return this;
     }
-
-    /**
-     * Displays a demo for downloader.
-     *
-     * @param args Not used
-     */
-    @SuppressWarnings("ResultOfMethodCallIgnored")
-    public static void main(String[] args)
-    {
-        // Remember to chang link to test
-        String link = "https://sd.blackball.lv/library/Introduction_to_Algorithms_Third_Edition_(2009).pdf";
-        String out = "./Introduction_to_Algorithms_Third_Edition.pdf";
-        String link1 = "https://www.iusb.edu/students/academic-success-programs/academic-centers-for-excellence/docs/Basic%20Math%20Review%20Card.pdf";
-        String out1 = "./Math.pdf";
-        String link2 = "https://ouopentextbooks.org/mathematics/files/2015/07/1503.pdf";
-        String out2 = "./1503";
-        String link3 = "https://faculty.math.illinois.edu/~aydin/math220/lecturenotes/m220_Sec1_4.pdf";
-        String out3 = "./m220_Sec1_4";
-        String link4 = "https://ocw.mit.edu/ans7870/9/9.00SC/MIT9_00SCF11_text.pdf";
-        String out4 = "./MIT9_00SCF11_text";
-
-        final var downloader = new Downloader();
-
-        Map<String, String> urls = new HashMap<>();
-        urls.put(link, out);
-        urls.put(link1, out1);
-        urls.put(link2, out2);
-        urls.put(link3, out3);
-        urls.put(link4, out4);
-        downloader.downloadFiles(urls);
-        File outFile = new File(out);
-        outFile.delete();
-        File outFile1 = new File(out1);
-        outFile1.delete();
-        File outFile2 = new File(out2);
-        outFile2.delete();
-        File outFile3 = new File(out3);
-        outFile3.delete();
-        File outFile4 = new File(out4);
-        outFile4.delete();
-    }
 }

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

@@ -29,6 +29,8 @@
 import org.hydev.mcpm.client.matcher.MatchPluginsInteractor;
 import org.hydev.mcpm.client.search.SearchInteractor;
 import org.hydev.mcpm.client.search.SearchPackagesBoundary;
+import org.hydev.mcpm.client.uninstall.FileRemove;
+import org.hydev.mcpm.client.uninstall.PluginRemover;
 import org.hydev.mcpm.client.uninstall.UninstallBoundary;
 import org.hydev.mcpm.client.uninstall.Uninstaller;
 import org.hydev.mcpm.client.updater.CheckForUpdatesBoundary;
@@ -94,7 +96,6 @@ public PluginTracker pluginTracker() {
         return cache(LocalPluginTracker.class, () -> new LocalPluginTracker(lockPath, pluginsDirectory));
     }
 
-    @Override
     public LocalJarBoundary jarBoundary() {
         return cache(LocalJarFinder.class, LocalJarFinder::new);
     }
@@ -137,7 +138,6 @@ public SearchPackagesBoundary searchBoundary() {
         return cache(SearchInteractor.class, () -> new SearchInteractor(fetcher, listener));
     }
 
-    @Override
     public PluginDownloader pluginDownloader() {
         var mirror = mirrorSelector();
 
@@ -157,15 +157,13 @@ public InstallBoundary installBoundary() {
         return cache(InstallInteractor.class, () -> new InstallInteractor(downloader, loader, searcher, tracker));
     }
 
-    @Override
     public MatchPluginsBoundary matchBoundary() {
         var fetcher = databaseFetcher();
         var listener = fetcherListener();
 
         return cache(MatchPluginsInteractor.class, () -> new MatchPluginsInteractor(fetcher, listener));
     }
 
-    @Override
     public CheckForUpdatesBoundary checkForUpdatesBoundary() {
         var matcher = matchBoundary();
 
@@ -203,12 +201,18 @@ public ListAllBoundary listBoundary() {
         return cache(ListAllInteractor.class, () -> new ListAllInteractor(tracker, checkForUpdates));
     }
 
+    public FileRemove fileRemover() {
+        var boundary = jarBoundary();
+
+        return cache(PluginRemover.class, () -> new PluginRemover(boundary));
+    }
+
     @Override
     public UninstallBoundary uninstallBoundary() {
         var tracker = pluginTracker();
         var unload = unloadBoundary(); // ...er
-        var boundary = jarBoundary();
+        var remover = fileRemover();
 
-        return cache(Uninstaller.class, () -> new Uninstaller(tracker, unload, boundary));
+        return cache(Uninstaller.class, () -> new Uninstaller(tracker, unload, remover));
     }
 }

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

@@ -7,16 +7,12 @@
 import org.hydev.mcpm.client.export.ExportPluginsBoundary;
 import org.hydev.mcpm.client.export.ImportPluginsBoundary;
 import org.hydev.mcpm.client.installer.InstallBoundary;
-import org.hydev.mcpm.client.installer.PluginDownloader;
 import org.hydev.mcpm.client.list.ListAllBoundary;
 import org.hydev.mcpm.client.loader.LoadBoundary;
-import org.hydev.mcpm.client.loader.LocalJarBoundary;
 import org.hydev.mcpm.client.loader.ReloadBoundary;
 import org.hydev.mcpm.client.loader.UnloadBoundary;
-import org.hydev.mcpm.client.matcher.MatchPluginsBoundary;
 import org.hydev.mcpm.client.search.SearchPackagesBoundary;
 import org.hydev.mcpm.client.uninstall.UninstallBoundary;
-import org.hydev.mcpm.client.updater.CheckForUpdatesBoundary;
 import org.hydev.mcpm.client.updater.UpdateBoundary;
 
 /**
@@ -72,13 +68,6 @@ public interface InteractorFactoryBoundary {
      */
     UnloadBoundary unloadBoundary();
 
-    /**
-     * Creates a jar boundary object for looking up plugins by name.
-     *
-     * @return A LocalJarBoundary object.
-     */
-    LocalJarBoundary jarBoundary();
-
     /**
      * Creates a fetcher listener object for sending database fetching updates to the user.
      *
@@ -93,34 +82,13 @@ public interface InteractorFactoryBoundary {
      */
     SearchPackagesBoundary searchBoundary();
 
-    /**
-     * Creates a plugin downloader object for downloading plugins to the filesystem.
-     *
-     * @return A PluginDownloader object.
-     */
-    PluginDownloader pluginDownloader();
-
     /**
      * Creates an `install` boundary object for installing new plugins.
      *
      * @return A InstallBoundary object.
      */
     InstallBoundary installBoundary();
 
-    /**
-     * Creates an `match` boundary object for finding plugins by id.
-     *
-     * @return A MatchPluginsBoundary object.
-     */
-    MatchPluginsBoundary matchBoundary();
-
-    /**
-     * Creates an `check for updates` boundary object for checking if plugins have available updates.
-     *
-     * @return A CheckForUpdatesBoundary object.
-     */
-    CheckForUpdatesBoundary checkForUpdatesBoundary();
-
     /**
      * Creates an `update` boundary object for updating installed plugins.
      *

src/main/java/org/hydev/mcpm/client/commands/controllers/ListController.java

@@ -1,5 +1,6 @@
 package org.hydev.mcpm.client.commands.controllers;
 
+import org.hydev.mcpm.client.commands.presenters.ListResultPresenter;
 import org.hydev.mcpm.client.display.presenters.ListPresenter;
 import org.hydev.mcpm.client.list.ListAllBoundary;
 import org.hydev.mcpm.client.list.ListType;
@@ -31,7 +32,7 @@ public ListController(ListAllBoundary listAllBoundary) {
      * @param parameter The parameter for the ListAll use case.
      */
     public void listAll(String parameter, Consumer<String> log) {
-        ListPresenter listPresenter = new ListPresenter(log);
+        ListResultPresenter listPresenter = new ListPresenter(log);
         ListType listType;
         switch (parameter.toLowerCase()) {
             case "all" -> listType = ListType.ALL;

src/main/java/org/hydev/mcpm/client/commands/controllers/PageBoundary.java

@@ -9,13 +9,6 @@
  */
 public interface PageBoundary
 {
-    /**
-     * Getter for page size
-     *
-     * @return Lines per page
-     */
-    int pageSize();
-
     /**
      * Get a printable formatted page
      *

src/main/java/org/hydev/mcpm/client/commands/controllers/SearchPackagesController.java

@@ -1,16 +1,11 @@
 package org.hydev.mcpm.client.commands.controllers;
 
-import org.hydev.mcpm.client.display.presenters.Table;
-import org.hydev.mcpm.client.models.PluginModel;
 import org.hydev.mcpm.client.search.SearchPackagesBoundary;
 import org.hydev.mcpm.client.search.SearchPackagesInput;
 import org.hydev.mcpm.client.search.SearchPackagesResult;
 import org.hydev.mcpm.client.search.SearchPackagesType;
 
-import javax.annotation.Nullable;
 import java.util.List;
-import java.util.Optional;
-import java.util.function.Consumer;
 
 /**
  * Handles the user input for a search.

src/main/java/org/hydev/mcpm/client/commands/presenters/PagedPresenter.java

@@ -4,9 +4,6 @@
 
 /**
  * Presenter for paginated content
- *
- * @author Azalea (https://github.com/hykilpikonna)
- * @since 2022-11-24
  */
 @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property = "type")
 public interface PagedPresenter<T>

src/main/java/org/hydev/mcpm/client/database/tracker/MockPluginTracker.java

@@ -11,7 +11,7 @@
  * A MockPluginTracker that only stores the yml.
  */
 public class MockPluginTracker extends LocalPluginTracker {
-    List<PluginYml> ymls;
+    private final List<PluginYml> ymls;
 
     /**
      * Creates a MockPluginTracker with the given plugins.
@@ -21,7 +21,9 @@ public class MockPluginTracker extends LocalPluginTracker {
     public MockPluginTracker(List<PluginModel> plugins) {
         ymls = new ArrayList<>();
         for (var plugin : plugins) {
-            ymls.add(plugin.getLatestPluginVersion().get().meta());
+            var version = plugin.getLatestPluginVersion();
+
+            version.ifPresent(pluginVersion -> ymls.add(pluginVersion.meta()));
         }
     }