Emergency fix for Dev JsonPRC calls using JsonObject

Signed-off-by: Phillip Kruger <[email protected]>

Author: phillip-kruger

extensions/devui/runtime/src/main/java/io/quarkus/devui/runtime/jsonrpc/JsonRpcRequest.java

@@ -2,11 +2,18 @@
 
 import java.util.Map;
 
+import io.quarkus.devui.runtime.jsonrpc.json.JsonMapper;
+
 public final class JsonRpcRequest {
     private int id;
     private String jsonrpc = JsonRpcKeys.VERSION;
     private String method;
-    private Map params;
+    private Map<String, Object> params;
+    private final JsonMapper jsonMapper;
+
+    public JsonRpcRequest(JsonMapper jsonMapper) {
+        this.jsonMapper = jsonMapper;
+    }
 
     public int getId() {
         return id;
@@ -36,7 +43,7 @@ public Map getParams() {
         return params;
     }
 
-    public void setParams(Map params) {
+    public void setParams(Map<String, Object> params) {
         this.params = params;
     }
 
@@ -50,7 +57,7 @@ public boolean hasParam(String key) {
 
     public <T> T getParam(String key, Class<T> paramType) {
         if (hasParam(key)) {
-            return (T) this.params.get(key);
+            return jsonMapper.fromValue(params.get(key), paramType);
         }
         return null;
     }

extensions/devui/runtime/src/main/java/io/quarkus/devui/runtime/jsonrpc/JsonRpcRequestCreator.java

@@ -51,7 +51,7 @@ private JsonRpcRequest remap(JsonRpcRequest jsonRpcRequest) {
             String mappedName = (String) params.remove("name");
             Map mappedParams = (Map) params.remove("arguments");
 
-            JsonRpcRequest mapped = new JsonRpcRequest();
+            JsonRpcRequest mapped = new JsonRpcRequest(this.jsonMapper);
             mapped.setId(jsonRpcRequest.getId());
             mapped.setJsonrpc(jsonRpcRequest.getJsonrpc());
             mapped.setMethod(mappedName);
@@ -67,7 +67,7 @@ public String toJson(JsonRpcRequest jsonRpcRequest) {
     }
 
     private JsonRpcRequest createWithFilter(JsonObject jsonObject, String... filter) {
-        JsonRpcRequest jsonRpcRequest = new JsonRpcRequest();
+        JsonRpcRequest jsonRpcRequest = new JsonRpcRequest(this.jsonMapper);
         if (jsonObject.containsKey(ID)) {
             jsonRpcRequest.setId(jsonObject.getInteger(ID));
         }
@@ -76,7 +76,7 @@ private JsonRpcRequest createWithFilter(JsonObject jsonObject, String... filter)
         }
         jsonRpcRequest.setMethod(jsonObject.getString(METHOD));
         if (jsonObject.containsKey(PARAMS)) {
-            Map map = jsonObject.getJsonObject(PARAMS).getMap();
+            Map<String, Object> map = jsonObject.getJsonObject(PARAMS).getMap();
             if (filter != null) {
                 for (String p : filter) {
                     map.remove(p);