Change serialization to json

Author: MstrPikachu

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

@@ -29,6 +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.export.PasteBinStorage;
 import org.hydev.mcpm.client.updater.CheckForUpdatesInteractor;
 import org.hydev.mcpm.client.list.ListAllInteractor;
 import org.hydev.mcpm.client.local.LocalPluginTracker;
@@ -44,8 +45,10 @@
 import org.hydev.mcpm.client.installer.SpigotPluginDownloader;
 import org.hydev.mcpm.client.uninstall.Uninstaller;
 import org.hydev.mcpm.client.updater.UpdateInteractor;
+import org.hydev.mcpm.utils.ColorLogger;
 
 import java.util.List;
+import java.util.function.Consumer;
 import java.util.stream.Stream;
 
 /**
@@ -82,8 +85,10 @@ public static List<CommandParser> baseParsers(boolean isMinecraft) {
         var updateChecker = new CheckForUpdatesInteractor(matcher);
         var updater = new UpdateInteractor(updateChecker, installer, tracker);
 
+        var storage = new PasteBinStorage();
+
         // Controllers
-        var exportPluginsController = new ExportPluginsController(new ExportInteractor(tracker));
+        var exportPluginsController = new ExportPluginsController(new ExportInteractor(tracker, storage));
         var listController = new ListController(new ListAllInteractor(tracker));
         var searchController = new SearchPackagesController(searcher, pager);
         var mirrorController = new MirrorController(mirror);

src/main/java/org/hydev/mcpm/client/arguments/parsers/ExportPluginsParser.java

@@ -44,6 +44,6 @@ public void configure(Subparser parser)
     @Override
     public void run(Namespace details, Consumer<String> log)
     {
-        controller.export(new ExportPluginsInput(details.get("cache"), details.get("outfile")), log);
+        controller.export(new ExportPluginsInput(details.get("cache")), log);
     }
 }

src/main/java/org/hydev/mcpm/client/export/ExportInteractor.java

@@ -1,20 +1,15 @@
 package org.hydev.mcpm.client.export;
 
-import org.hydev.mcpm.client.local.LocalPluginTracker;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import org.hydev.mcpm.client.database.tracker.PluginTracker;
 
-import java.io.PrintStream;
+
+import static org.hydev.mcpm.Constants.JACKSON;
 
 /**
  * An implementation of ExportPluginsBoundary that fetches from a database.
  */
-public class ExportInteractor implements ExportPluginsBoundary {
-
-    private final LocalPluginTracker tracker;
-
-    public ExportInteractor(LocalPluginTracker tracker) {
-        this.tracker = tracker;
-    }
-
+public record ExportInteractor(PluginTracker tracker, StringStorage storage) implements ExportPluginsBoundary {
 
     /**
      * Outputs the plugins on each line as its name and version separated by a space.
@@ -26,11 +21,16 @@ public ExportInteractor(LocalPluginTracker tracker) {
     public ExportPluginsResult export(ExportPluginsInput input) {
         var plugins = tracker.listInstalled();
         if (plugins == null) {
-            return new ExportPluginsResult(ExportPluginsResult.State.FAILED_TO_FETCH_PLUGINS);
+            return new ExportPluginsResult(ExportPluginsResult.State.FAILED_TO_FETCH_PLUGINS, null);
+        }
+        var models = plugins.stream().map(p -> new ExportModel(p.name(), p.version()));
+
+        try {
+            var answer = JACKSON.writeValueAsString(models);
+            return new ExportPluginsResult(ExportPluginsResult.State.SUCCESS, answer);
+        } catch (JsonProcessingException e) {
+            // Should never happen
+            throw new RuntimeException(e);
         }
-
-        PrintStream ps = new PrintStream(input.out());
-        plugins.forEach(p -> ps.printf("%s %s\n", p.name(), p.version()));
-        return new ExportPluginsResult(ExportPluginsResult.State.SUCCESS);
     }
 }

src/main/java/org/hydev/mcpm/client/export/ExportModel.java

@@ -0,0 +1,13 @@
+package org.hydev.mcpm.client.export;
+
+/**
+ * Record storing information to export a plugin
+ *
+ * @param name Name of the plugin
+ * @param version Version of the plugin
+ */
+public record ExportModel(
+        String name,
+        String version
+) {
+}

src/main/java/org/hydev/mcpm/client/export/ExportPluginsInput.java

@@ -1,15 +1,11 @@
 package org.hydev.mcpm.client.export;
 
-import java.io.OutputStream;
-
 /**
  * Input for the ExportPluginsBoundary boundary.
  *
- * @param cache if true, will use local cache of plugins to export. Otherwise, will fetch plugins from the database.
- * @param out OutputStream to write to
+ * @param pastebin Link to the pastebin to write to
  */
 public record ExportPluginsInput(
-        boolean cache,
-        OutputStream out
+        String pastebin
 ) {
-}
+}

src/main/java/org/hydev/mcpm/client/export/ExportPluginsResult.java

@@ -1,12 +1,15 @@
 package org.hydev.mcpm.client.export;
 
+import org.jetbrains.annotations.Nullable;
+
 /**
  * Results returned from ExportPluginBoundary.
  *
  * @param state The outcome of the export. Must be SUCCESS for other values to be valid.
  */
 public record ExportPluginsResult(
-        State state
+        State state,
+        @Nullable String export
 ) {
     /**
      * Outcome of the plugin export

src/main/java/org/hydev/mcpm/client/database/export/FixedFileStorage.java renamed to src/main/java/org/hydev/mcpm/client/export/FixedFileStorage.java

@@ -1,4 +1,4 @@
-package org.hydev.mcpm.client.database.export;
+package org.hydev.mcpm.client.export;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -7,11 +7,6 @@
 
 /**
  * Fixed local file string storage. This stores the string to a specific file.
- *
- * @param path Path of the file
- * @author Peter (https://github.com/MstrPikachu)
- * @author Azalea (https://github.com/hykilpikonna)
- * @since 2022-11-23
  */
 public record FixedFileStorage(Path path) implements StringStorage
 {

src/main/java/org/hydev/mcpm/client/database/export/PasteBinStorage.java renamed to src/main/java/org/hydev/mcpm/client/export/PasteBinStorage.java

@@ -1,4 +1,4 @@
-package org.hydev.mcpm.client.database.export;
+package org.hydev.mcpm.client.export;
 
 import org.apache.hc.client5.http.fluent.Request;
 import org.apache.hc.core5.http.ContentType;
@@ -9,9 +9,6 @@
  * Store string content to a pastebin that supports raw text requests (e.g. https://github.com/w4/bin)
  *
  * @param host Pastebin host URL
- * @author Peter (https://github.com/MstrPikachu)
- * @author Azalea (https://github.com/hykilpikonna)
- * @since 2022-11-23
  */
 public record PasteBinStorage(String host) implements StringStorage
 {

src/main/java/org/hydev/mcpm/client/database/export/StringStorage.java renamed to src/main/java/org/hydev/mcpm/client/export/StringStorage.java

@@ -1,13 +1,9 @@
-package org.hydev.mcpm.client.database.export;
+package org.hydev.mcpm.client.export;
 
 import java.io.IOException;
 
 /**
  * Basic string content storage
- *
- * @author Peter (https://github.com/MstrPikachu)
- * @author Azalea (https://github.com/hykilpikonna)
- * @since 2022-11-23
  */
 public interface StringStorage
 {