Make request context available in JSON-RPC request (helidon-io#10712)

Author: tvallin

webserver/jsonrpc/src/main/java/io/helidon/webserver/jsonrpc/JsonRpcRequest.java

@@ -18,15 +18,15 @@
 import java.util.Optional;
 
 import io.helidon.jsonrpc.core.JsonRpcParams;
-import io.helidon.webserver.http.HttpRequest;
+import io.helidon.webserver.http.ServerRequest;
 
 import jakarta.json.JsonObject;
 import jakarta.json.JsonValue;
 
 /**
  * A representation of a JSON-RPC request.
  */
-public interface JsonRpcRequest extends HttpRequest {
+public interface JsonRpcRequest extends ServerRequest {
 
     /**
      * The request version. Always "2.0".

webserver/jsonrpc/src/main/java/io/helidon/webserver/jsonrpc/JsonRpcRequestImpl.java

@@ -15,17 +15,24 @@
  */
 package io.helidon.webserver.jsonrpc;
 
+import java.io.InputStream;
 import java.util.Optional;
+import java.util.function.UnaryOperator;
 
+import io.helidon.common.context.Context;
 import io.helidon.common.socket.PeerInfo;
 import io.helidon.common.uri.UriInfo;
-import io.helidon.common.uri.UriPath;
 import io.helidon.common.uri.UriQuery;
 import io.helidon.http.Header;
 import io.helidon.http.HttpPrologue;
+import io.helidon.http.RoutedPath;
 import io.helidon.http.ServerRequestHeaders;
+import io.helidon.http.media.ReadableEntity;
 import io.helidon.jsonrpc.core.JsonRpcParams;
-import io.helidon.webserver.http.HttpRequest;
+import io.helidon.webserver.ListenerContext;
+import io.helidon.webserver.ProxyProtocolData;
+import io.helidon.webserver.http.HttpSecurity;
+import io.helidon.webserver.http.ServerRequest;
 
 import jakarta.json.JsonObject;
 import jakarta.json.JsonStructure;
@@ -36,10 +43,10 @@
  */
 class JsonRpcRequestImpl implements JsonRpcRequest {
 
-    private final HttpRequest delegate;
+    private final ServerRequest delegate;
     private final JsonObject request;
 
-    JsonRpcRequestImpl(HttpRequest delegate, JsonObject request) {
+    JsonRpcRequestImpl(ServerRequest delegate, JsonObject request) {
         this.delegate = delegate;
         this.request = request;
     }
@@ -73,6 +80,36 @@ public JsonObject asJsonObject() {
         return request;
     }
 
+    @Override
+    public Context context() {
+        return delegate.context();
+    }
+
+    @Override
+    public ListenerContext listenerContext() {
+        return delegate.listenerContext();
+    }
+
+    @Override
+    public HttpSecurity security() {
+        return delegate.security();
+    }
+
+    @Override
+    public boolean continueSent() {
+        return delegate.continueSent();
+    }
+
+    @Override
+    public void streamFilter(UnaryOperator<InputStream> filterFunction) {
+        delegate.streamFilter(filterFunction);
+    }
+
+    @Override
+    public Optional<ProxyProtocolData> proxyProtocolData() {
+        return delegate.proxyProtocolData();
+    }
+
     @Override
     public HttpPrologue prologue() {
         return delegate.prologue();
@@ -84,10 +121,35 @@ public ServerRequestHeaders headers() {
     }
 
     @Override
-    public UriPath path() {
+    public void reset() {
+        delegate.reset();
+    }
+
+    @Override
+    public boolean isSecure() {
+        return delegate.isSecure();
+    }
+
+    @Override
+    public RoutedPath path() {
         return delegate.path();
     }
 
+    @Override
+    public ReadableEntity content() {
+        return delegate.content();
+    }
+
+    @Override
+    public String socketId() {
+        return delegate.socketId();
+    }
+
+    @Override
+    public String serverSocketId() {
+        return delegate.serverSocketId();
+    }
+
     @Override
     public UriQuery query() {
         return delegate.query();