Implement more methods for DbusManagerImpl

[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 3bc7e701238811151441cc0f8f90cf546b8f999d..6e58b23c5f102eee049c98ca02b7cf1f5cca26b4 100644 (file)
--- a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
@@ -15,7 +15,6 @@ import java.io.IOException;
 import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.function.Supplier;

-import java.util.stream.Collectors;

 import java.util.stream.StreamSupport;
 
 public class JsonRpcReader {
 import java.util.stream.StreamSupport;
 
 public class JsonRpcReader {


@@ -57,7 +56,7 @@ public class JsonRpcReader {
                     }
 
                     return handleRequest(requestHandler, request);
                     }
 
                     return handleRequest(requestHandler, request);

-                }).filter(Objects::nonNull).collect(Collectors.toList());
+                }).filter(Objects::nonNull).toList();

 
                 jsonRpcSender.sendBatchResponses(responseList);
             }
 
                 jsonRpcSender.sendBatchResponses(responseList);
             }


@@ -128,8 +127,7 @@ public class JsonRpcReader {
                         null), null));
                 return null;
             }
                         null), null));
                 return null;
             }

-            return new JsonRpcBatchMessage(StreamSupport.stream(jsonNode.spliterator(), false)
-                    .collect(Collectors.toList()));
+            return new JsonRpcBatchMessage(StreamSupport.stream(jsonNode.spliterator(), false).toList());

         } else if (jsonNode.isObject()) {
             if (jsonNode.has("result") || jsonNode.has("error")) {
                 return parseJsonRpcResponse(jsonNode);
         } else if (jsonNode.isObject()) {
             if (jsonNode.has("result") || jsonNode.has("error")) {
                 return parseJsonRpcResponse(jsonNode);