From: AsamK <asamk@gmx.de>
Date: Wed, 10 Nov 2021 16:11:16 +0000 (+0100)
Subject: Rename JsonRpcCommand class
X-Git-Tag: v0.10.0~59
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/64af4914ee87067fdab16129535c530171b80766?ds=inline

Rename JsonRpcCommand class
---

diff --git a/src/main/java/org/asamk/signal/commands/JsonRpcCommand.java b/src/main/java/org/asamk/signal/commands/JsonRpcCommand.java
index 940a89da..5a7a3738 100644
--- a/src/main/java/org/asamk/signal/commands/JsonRpcCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JsonRpcCommand.java
@@ -3,9 +3,6 @@ package org.asamk.signal.commands;
 import com.fasterxml.jackson.core.type.TypeReference;
 
 import org.asamk.signal.OutputType;
-import org.asamk.signal.OutputWriter;
-import org.asamk.signal.commands.exceptions.CommandException;
-import org.asamk.signal.manager.Manager;
 
 import java.util.List;
 
@@ -15,8 +12,6 @@ public interface JsonRpcCommand<T> extends Command {
         return null;
     }
 
-    void handleCommand(T request, Manager m, OutputWriter outputWriter) throws CommandException;
-
     default List<OutputType> getSupportedOutputTypes() {
         return List.of(OutputType.JSON);
     }
diff --git a/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java b/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java
index 653747ad..d98b1585 100644
--- a/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java
@@ -12,7 +12,7 @@ import org.asamk.signal.manager.Manager;
 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() {
         return new TypeReference<>() {};
diff --git a/src/main/java/org/asamk/signal/commands/JsonRpcSingleCommand.java b/src/main/java/org/asamk/signal/commands/JsonRpcSingleCommand.java
new file mode 100644
index 00000000..14d2b864
--- /dev/null
+++ b/src/main/java/org/asamk/signal/commands/JsonRpcSingleCommand.java
@@ -0,0 +1,10 @@
+package org.asamk.signal.commands;
+
+import org.asamk.signal.OutputWriter;
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.manager.Manager;
+
+public interface JsonRpcSingleCommand<T> extends JsonRpcCommand<T> {
+
+    void handleCommand(T request, Manager m, OutputWriter outputWriter) throws CommandException;
+}
diff --git a/src/main/java/org/asamk/signal/commands/VersionCommand.java b/src/main/java/org/asamk/signal/commands/VersionCommand.java
index fd1e6fb2..134bffa0 100644
--- a/src/main/java/org/asamk/signal/commands/VersionCommand.java
+++ b/src/main/java/org/asamk/signal/commands/VersionCommand.java
@@ -8,7 +8,7 @@ import org.asamk.signal.manager.Manager;
 
 import java.util.Map;
 
-public class VersionCommand implements JsonRpcCommand<Void> {
+public class VersionCommand implements JsonRpcSingleCommand<Void> {
 
     @Override
     public String getName() {
diff --git a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
index c33cd9a5..b301f0d9 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
@@ -12,7 +12,7 @@ import org.asamk.signal.JsonWriter;
 import org.asamk.signal.OutputWriter;
 import org.asamk.signal.commands.Command;
 import org.asamk.signal.commands.Commands;
-import org.asamk.signal.commands.JsonRpcCommand;
+import org.asamk.signal.commands.JsonRpcSingleCommand;
 import org.asamk.signal.commands.SignalCreator;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
@@ -120,7 +120,7 @@ public class SignalJsonRpcDispatcherHandler {
     ) throws JsonRpcException {
         var command = getCommand(method);
         // TODO implement listAccounts, register, verify, link
-        if (command instanceof JsonRpcCommand<?> jsonRpcCommand) {
+        if (command instanceof JsonRpcSingleCommand<?> jsonRpcCommand) {
             if (m != null) {
                 return runCommand(objectMapper, params, new CommandRunnerImpl<>(m, jsonRpcCommand));
             }
@@ -152,7 +152,7 @@ public class SignalJsonRpcDispatcherHandler {
         return Commands.getCommand(method);
     }
 
-    private record CommandRunnerImpl<T>(Manager m, JsonRpcCommand<T> command) implements CommandRunner<T> {
+    private record CommandRunnerImpl<T>(Manager m, JsonRpcSingleCommand<T> command) implements CommandRunner<T> {
 
         @Override
         public void handleCommand(final T request, final OutputWriter outputWriter) throws CommandException {
@@ -227,7 +227,7 @@ public class SignalJsonRpcDispatcherHandler {
         command.handleCommand(requestParams, outputWriter);
     }
 
-    private class SubscribeReceiveCommand implements JsonRpcCommand<Void> {
+    private class SubscribeReceiveCommand implements JsonRpcSingleCommand<Void> {
 
         @Override
         public String getName() {
@@ -242,7 +242,7 @@ public class SignalJsonRpcDispatcherHandler {
         }
     }
 
-    private class UnsubscribeReceiveCommand implements JsonRpcCommand<Void> {
+    private class UnsubscribeReceiveCommand implements JsonRpcSingleCommand<Void> {
 
         @Override
         public String getName() {