From 9c86baf0ea310341e588eb7d41856c270ebb2c0d Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 9 Nov 2021 14:22:35 +0100
Subject: [PATCH] Rename jsonrpc bulk to batch message

---
 graalvm-config-dir/reflect-config.json                      | 2 +-
 .../{JsonRpcBulkMessage.java => JsonRpcBatchMessage.java}   | 4 ++--
 src/main/java/org/asamk/signal/jsonrpc/JsonRpcMessage.java  | 4 ++--
 src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java   | 6 +++---
 src/main/java/org/asamk/signal/jsonrpc/JsonRpcSender.java   | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)
 rename src/main/java/org/asamk/signal/jsonrpc/{JsonRpcBulkMessage.java => JsonRpcBatchMessage.java} (66%)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 32274e8d..1ba9c82f 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -623,7 +623,7 @@
   "allDeclaredConstructors":true}
 ,
 {
-  "name":"org.asamk.signal.jsonrpc.JsonRpcBulkMessage",
+  "name":"org.asamk.signal.jsonrpc.JsonRpcBatchMessage",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true}
diff --git a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcBulkMessage.java b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcBatchMessage.java
similarity index 66%
rename from src/main/java/org/asamk/signal/jsonrpc/JsonRpcBulkMessage.java
rename to src/main/java/org/asamk/signal/jsonrpc/JsonRpcBatchMessage.java
index 1ffdb016..09a87a6e 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcBulkMessage.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcBatchMessage.java
@@ -4,11 +4,11 @@ import com.fasterxml.jackson.databind.JsonNode;
 
 import java.util.List;
 
-public final class JsonRpcBulkMessage extends JsonRpcMessage {
+public final class JsonRpcBatchMessage extends JsonRpcMessage {
 
     List<JsonNode> messages;
 
-    public JsonRpcBulkMessage(final List<JsonNode> messages) {
+    public JsonRpcBatchMessage(final List<JsonNode> messages) {
         this.messages = messages;
     }
 
diff --git a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcMessage.java b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcMessage.java
index 9cc7c87d..8d1fcbf7 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcMessage.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcMessage.java
@@ -1,9 +1,9 @@
 package org.asamk.signal.jsonrpc;
 
 /**
- * Represents a JSON-RPC (bulk) request or (bulk) response.
+ * Represents a JSON-RPC (batch) request or (batch) response.
  * https://www.jsonrpc.org/specification
  */
-public sealed abstract class JsonRpcMessage permits JsonRpcBulkMessage, JsonRpcRequest, JsonRpcResponse {
+public sealed abstract class JsonRpcMessage permits JsonRpcBatchMessage, JsonRpcRequest, JsonRpcResponse {
 
 }
diff --git a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
index 64220a38..c2727d28 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
@@ -50,7 +50,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 +61,7 @@ public class JsonRpcReader {
                     return handleRequest(requestHandler, request);
                 }).filter(Objects::nonNull).collect(Collectors.toList());
 
-                jsonRpcSender.sendBulkResponses(responseList);
+                jsonRpcSender.sendBatchResponses(responseList);
             }
         }
     }
@@ -130,7 +130,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")) {
diff --git a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcSender.java b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcSender.java
index cdacdf28..11dc1698 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcSender.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcSender.java
@@ -16,7 +16,7 @@ public class JsonRpcSender {
         jsonWriter.write(request);
     }
 
-    public void sendBulkRequests(List<JsonRpcRequest> requests) {
+    public void sendBatchRequests(List<JsonRpcRequest> requests) {
         jsonWriter.write(requests);
     }
 
@@ -24,7 +24,7 @@ public class JsonRpcSender {
         jsonWriter.write(response);
     }
 
-    public void sendBulkResponses(List<JsonRpcResponse> responses) {
+    public void sendBatchResponses(List<JsonRpcResponse> responses) {
         jsonWriter.write(responses);
     }
 }
-- 
2.50.1