Refactor DaemonCommand

[signal-cli] / src / main / java / org / asamk / signal / commands / VersionCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/VersionCommand.java b/src/main/java/org/asamk/signal/commands/VersionCommand.java
index 51f805a9488681971ee1e47f614b83edc3e46078..01f1a2d7ecbc836a3a02c6bb455713b537bbfa91 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/VersionCommand.java
+++ b/src/main/java/org/asamk/signal/commands/VersionCommand.java
@@ -1,35 +1,64 @@
 package org.asamk.signal.commands;
 
 package org.asamk.signal.commands;
 

+import com.fasterxml.jackson.core.type.TypeReference;
+
+import net.sourceforge.argparse4j.inf.Namespace;
+import net.sourceforge.argparse4j.inf.Subparser;
+

 import org.asamk.signal.BaseConfig;
 import org.asamk.signal.BaseConfig;

+import org.asamk.signal.OutputType;

 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.MultiAccountManager;
 import org.asamk.signal.output.JsonWriter;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.MultiAccountManager;
 import org.asamk.signal.output.JsonWriter;

+import org.asamk.signal.output.OutputWriter;
+import org.asamk.signal.output.PlainTextWriter;

 
 

+import java.util.List;

 import java.util.Map;
 
 import java.util.Map;
 

-public class VersionCommand implements JsonRpcSingleCommand<Void>, JsonRpcMultiCommand<Void> {
+public class VersionCommand implements JsonRpcLocalCommand, JsonRpcMultiLocalCommand {

 
     @Override
     public String getName() {
         return "version";
     }
 
 
     @Override
     public String getName() {
         return "version";
     }
 

+    @Override
+    public List<OutputType> getSupportedOutputTypes() {
+        return List.of(OutputType.PLAIN_TEXT, OutputType.JSON);
+    }
+
+    @Override
+    public void attachToSubparser(final Subparser subparser) {
+    }
+

     @Override
     public void handleCommand(
     @Override
     public void handleCommand(

-            final Void request, final Manager m, final JsonWriter jsonWriter
+            final Namespace ns, final Manager m, final OutputWriter outputWriter

     ) throws CommandException {
     ) throws CommandException {

-        outputVersion(jsonWriter);
+        outputVersion(outputWriter);

     }
 
     @Override
     public void handleCommand(
     }
 
     @Override
     public void handleCommand(

-            final Void request, final MultiAccountManager c, final JsonWriter jsonWriter
+            final Namespace ns, final MultiAccountManager c, final OutputWriter outputWriter

     ) throws CommandException {
     ) throws CommandException {

-        outputVersion(jsonWriter);
+        outputVersion(outputWriter);
+    }
+
+    @Override
+    public TypeReference<Map<String, Object>> getRequestType() {
+        return new TypeReference<>() {};

     }
 
     }
 

-    private void outputVersion(final JsonWriter jsonWriter) {
-        jsonWriter.write(Map.of("version", BaseConfig.PROJECT_VERSION));
+    private void outputVersion(final OutputWriter outputWriter) {
+        final var projectName = BaseConfig.PROJECT_NAME == null ? "signal-cli" : BaseConfig.PROJECT_NAME;
+        final var version = BaseConfig.PROJECT_VERSION == null ? "unknown" : BaseConfig.PROJECT_VERSION;
+
+        switch (outputWriter) {
+            case JsonWriter jsonWriter -> jsonWriter.write(Map.of("version", version));
+            case PlainTextWriter plainTextWriter -> plainTextWriter.println("{} {}", projectName, version);
+        }

     }
 }
     }
 }