Update libsignal-service-java

[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 24b45ee83f21d68d6e5ad89ecbfeed42df31353d..d87b97cd165dc42b7a354f71d8d77a4028619d1c 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java
@@ -5,73 +5,27 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import net.sourceforge.argparse4j.inf.Namespace;
 
 import org.asamk.signal.OutputType;
 import net.sourceforge.argparse4j.inf.Namespace;
 
 import org.asamk.signal.OutputType;

-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.util.Util;
+import org.asamk.signal.output.JsonWriter;

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

-public interface JsonRpcLocalCommand extends JsonRpcCommand<Map<String, Object>>, LocalCommand {
+public interface JsonRpcLocalCommand extends JsonRpcSingleCommand<Map<String, Object>>, LocalCommand {

 
     default TypeReference<Map<String, Object>> getRequestType() {
 
     default TypeReference<Map<String, Object>> getRequestType() {

-        return new TypeReference<>() {
-        };
+        return new TypeReference<>() {};

     }
 
     default void handleCommand(
     }
 
     default void handleCommand(

-            Map<String, Object> request, Manager m, OutputWriter outputWriter
+            Map<String, Object> request, Manager m, JsonWriter jsonWriter

     ) throws CommandException {
         Namespace commandNamespace = new JsonRpcNamespace(request == null ? Map.of() : request);
     ) throws CommandException {
         Namespace commandNamespace = new JsonRpcNamespace(request == null ? Map.of() : request);

-        handleCommand(commandNamespace, m, outputWriter);
+        handleCommand(commandNamespace, m, jsonWriter);

     }
 
     default List<OutputType> getSupportedOutputTypes() {
         return List.of(OutputType.PLAIN_TEXT, OutputType.JSON);
     }
     }
 
     default List<OutputType> getSupportedOutputTypes() {
         return List.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);
-        }
-
-        @Override
-        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) {
-            try {
-                final List<E> value = super.getList(dest);
-                if (value != null) {
-                    return value;
-                }
-            } catch (ClassCastException e) {
-                return List.of(this.<E>get(dest));
-            }
-
-            return super.getList(dest + "s");
-        }
-
-        @Override
-        public Boolean getBoolean(String dest) {
-            Boolean maybeGotten = this.get(dest);
-            if (maybeGotten == null) {
-                maybeGotten = false;
-            }
-            return maybeGotten;
-        }
-    }

 }
 }