Improve error message when an account is already in use

[signal-cli] / src / main / java / org / asamk / signal / jsonrpc / JsonRpcReader.java

diff --git a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
index 64220a38994e57bf2078d1497a7e00d8f27d06c0..3bc7e701238811151441cc0f8f90cf546b8f999d 100644 (file)
--- a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
@@ -34,9 +34,7 @@ public class JsonRpcReader {
         this.objectMapper = Util.createJsonObjectMapper();
     }
 
-    public void readRequests(
-            final RequestHandler requestHandler, final Consumer<JsonRpcResponse> responseHandler
-    ) {
+    public void readMessages(final RequestHandler requestHandler, final Consumer<JsonRpcResponse> responseHandler) {
         while (!Thread.interrupted()) {
             JsonRpcMessage message = readMessage();
             if (message == null) break;
@@ -50,7 +48,7 @@ public class JsonRpcReader {
             } else if (message instanceof JsonRpcResponse jsonRpcResponse) {
                 responseHandler.accept(jsonRpcResponse);
             } else {
-                final var responseList = ((JsonRpcBulkMessage) message).getMessages().stream().map(jsonNode -> {
+                final var responseList = ((JsonRpcBatchMessage) message).getMessages().stream().map(jsonNode -> {
                     final JsonRpcRequest request;
                     try {
                         request = parseJsonRpcRequest(jsonNode);
@@ -61,7 +59,7 @@ public class JsonRpcReader {
                     return handleRequest(requestHandler, request);
                 }).filter(Objects::nonNull).collect(Collectors.toList());
 
-                jsonRpcSender.sendBulkResponses(responseList);
+                jsonRpcSender.sendBatchResponses(responseList);
             }
         }
     }
@@ -130,7 +128,7 @@ public class JsonRpcReader {
                         null), null));
                 return null;
             }
-            return new JsonRpcBulkMessage(StreamSupport.stream(jsonNode.spliterator(), false)
+            return new JsonRpcBatchMessage(StreamSupport.stream(jsonNode.spliterator(), false)
                     .collect(Collectors.toList()));
         } else if (jsonNode.isObject()) {
             if (jsonNode.has("result") || jsonNode.has("error")) {