Clean up base package

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

diff --git a/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java b/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java
index abe4e74db4dbc57194e90af11eadc69810825053..d87b97cd165dc42b7a354f71d8d77a4028619d1c 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java
@@ -7,64 +7,25 @@ import net.sourceforge.argparse4j.inf.Namespace;
 import org.asamk.signal.OutputType;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.manager.Manager;
-import org.asamk.signal.util.Util;
+import org.asamk.signal.output.JsonWriter;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
-public interface JsonRpcLocalCommand extends JsonRpcCommand<Map<String, Object>>, LocalCommand {
+public interface JsonRpcLocalCommand extends JsonRpcSingleCommand<Map<String, Object>>, LocalCommand {
 
     default TypeReference<Map<String, Object>> getRequestType() {
-        return new TypeReference<>() {
-        };
+        return new TypeReference<>() {};
     }
 
-    default void handleCommand(Map<String, Object> request, Manager m) throws CommandException {
+    default void handleCommand(
+            Map<String, Object> request, Manager m, JsonWriter jsonWriter
+    ) throws CommandException {
         Namespace commandNamespace = new JsonRpcNamespace(request == null ? Map.of() : request);
-        handleCommand(commandNamespace, m);
+        handleCommand(commandNamespace, m, jsonWriter);
     }
 
-    default Set<OutputType> getSupportedOutputTypes() {
-        return Set.of(OutputType.PLAIN_TEXT, OutputType.JSON);
-    }
-
-    /**
-     * Namepace implementation, that defaults booleans to false and converts camel case keys to dashed strings
-     */
-    final class JsonRpcNamespace extends Namespace {
-
-        public JsonRpcNamespace(final Map<String, Object> attrs) {
-            super(attrs);
-        }
-
-        public <T> T get(String dest) {
-            final T value = super.get(dest);
-            if (value != null) {
-                return value;
-            }
-
-            final var camelCaseString = Util.dashSeparatedToCamelCaseString(dest);
-            return super.get(camelCaseString);
-        }
-
-        @Override
-        public <E> List<E> getList(final String dest) {
-            final List<E> value = super.getList(dest);
-            if (value != null) {
-                return value;
-            }
-
-            return super.getList(dest + "s");
-        }
-
-        @Override
-        public Boolean getBoolean(String dest) {
-            Boolean maybeGotten = this.get(dest);
-            if (maybeGotten == null) {
-                maybeGotten = false;
-            }
-            return maybeGotten;
-        }
+    default List<OutputType> getSupportedOutputTypes() {
+        return List.of(OutputType.PLAIN_TEXT, OutputType.JSON);
     }
 }