Fix errors

Author: patcher454

core/src/main/java/com/linecorp/armeria/common/jsonrpc/AbstractJsonRpcResponse.java

@@ -27,7 +27,10 @@
  */
 @UnstableApi
 public abstract class AbstractJsonRpcResponse implements JsonRpcResponse {
+    @Nullable
     private final Object result;
+
+    @Nullable
     private final JsonRpcError error;
 
     /**

core/src/main/java/com/linecorp/armeria/common/jsonrpc/DefaultJsonRpcRequest.java

@@ -36,6 +36,7 @@
  */
 @UnstableApi
 final class DefaultJsonRpcRequest implements JsonRpcRequest {
+    @Nullable
     private final Object id;
     private final String method;
     private final List<Object> params;

core/src/main/java/com/linecorp/armeria/common/jsonrpc/JsonRpcRequest.java

@@ -54,7 +54,7 @@ static JsonRpcRequest of(@Nullable Object id, String method, @Nullable Object pa
      */
     static JsonRpcRequest of(@Nullable Object id, String method, Iterable<?> params) {
         requireNonNull(params, "params");
-        return of(id, method, params);
+        return new DefaultJsonRpcRequest(id, method, params);
     }
 
     /**

core/src/main/java/com/linecorp/armeria/common/jsonrpc/JsonRpcResponse.java

@@ -33,7 +33,7 @@ static JsonRpcResponse of(Object result) {
     /**
     * Creates a new instance with error.
     */
-    static JsonRpcResponse of(JsonRpcError error) {
+    static JsonRpcResponse ofError(JsonRpcError error) {
         return new SimpleJsonResponse(error);
     }
 

core/src/main/java/com/linecorp/armeria/server/jsonrpc/DefaultJsonRpcResponse.java

@@ -29,6 +29,7 @@
 @UnstableApi
 @JsonInclude(JsonInclude.Include.NON_NULL)
 final class DefaultJsonRpcResponse extends AbstractJsonRpcResponse {
+    @Nullable
     private final Object id;
 
     DefaultJsonRpcResponse(Object id, Object result) {

core/src/main/java/com/linecorp/armeria/server/jsonrpc/JsonRpcService.java

@@ -21,6 +21,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -111,7 +112,7 @@ private HttpResponse handleBatchRequests(ServiceRequestContext ctx, JsonNode bat
         final List<CompletableFuture<DefaultJsonRpcResponse>> requests =
             StreamSupport.stream(batch.spliterator(), false)
                          .map(item -> executeRpcCall(ctx, item))
-                         .toList();
+                         .collect(Collectors.toList());
 
         if (shouldUseSse) {
             return ServerSentEvents.fromPublisher(
@@ -121,11 +122,11 @@ private HttpResponse handleBatchRequests(ServiceRequestContext ctx, JsonNode bat
                     .filter(Objects::nonNull));
         } else {
             return HttpResponse.of(
-                CompletableFuture.allOf(requests.toArray(CompletableFuture[]::new))
+                CompletableFuture.allOf(requests.stream().toArray(CompletableFuture[]::new))
                                  .thenApply(v -> requests.stream()
                                                          .map(req -> req.join())
                                                          .filter(Objects::nonNull)
-                                                         .toList())
+                                                         .collect(Collectors.toList()))
                                  .thenApply(HttpResponse::ofJson));
         }
     }
@@ -179,20 +180,20 @@ private DefaultJsonRpcResponse buildFinalResponse(JsonRpcRequest request, JsonRp
             return (DefaultJsonRpcResponse) response;
         }
 
-        if (response.result() != null && response.error() == null) {
+        if (request.id() != null && response.result() != null && response.error() == null) {
             return new DefaultJsonRpcResponse(request.id(), response.result());
         }
         if (response.error() != null && response.result() == null) {
             return new DefaultJsonRpcResponse(request.id(), response.error());
         }
-        return null;
+        return new DefaultJsonRpcResponse(request.id(), JsonRpcError.INTERNAL_ERROR);
     }
 
     private static ServerSentEvent toServerSentEvent(DefaultJsonRpcResponse response) {
         try {
             return ServerSentEvent.ofData(mapper.writeValueAsString(response));
         } catch (Exception e) {
-            return null;
+            return ServerSentEvent.empty();
         }
     }
 }