Use console charset for reading/writing to stdin/out

[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 1b6d6477805bb65196f9233cf15e80beedf2a4a7..95b4159827f6dd58db5764627bb1f3c78dd3414a 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/VersionCommand.java
+++ b/src/main/java/org/asamk/signal/commands/VersionCommand.java
@@ -1,24 +1,36 @@
 package org.asamk.signal.commands;
 
 import org.asamk.signal.BaseConfig;
 package org.asamk.signal.commands;
 
 import org.asamk.signal.BaseConfig;

-import org.asamk.signal.JsonWriter;
-import org.asamk.signal.OutputWriter;

 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.manager.Manager;
 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 java.util.Map;
 
 
 import java.util.Map;
 

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

 
 

-    private final OutputWriter outputWriter;
+    @Override
+    public String getName() {
+        return "version";
+    }

 
 

-    public VersionCommand(final OutputWriter outputWriter) {
-        this.outputWriter = outputWriter;
+    @Override
+    public void handleCommand(
+            final Void request, final Manager m, final JsonWriter jsonWriter
+    ) throws CommandException {
+        outputVersion(jsonWriter);

     }
 
     @Override
     }
 
     @Override

-    public void handleCommand(final Void request, final Manager m) throws CommandException {
-        final var jsonWriter = (JsonWriter) outputWriter;
-        jsonWriter.write(Map.of("version", BaseConfig.PROJECT_VERSION));
+    public void handleCommand(
+            final Void request, final MultiAccountManager c, final JsonWriter jsonWriter
+    ) throws CommandException {
+        outputVersion(jsonWriter);
+    }
+
+    private void outputVersion(final JsonWriter jsonWriter) {
+        jsonWriter.write(Map.of("version",
+                BaseConfig.PROJECT_VERSION == null ? "unknown" : BaseConfig.PROJECT_VERSION));

     }
 }
     }
 }