Make mcp methods more robust

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

Author: phillip-kruger

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

@@ -50,12 +50,13 @@ private JsonRpcRequest remap(JsonRpcRequest jsonRpcRequest) {
             Map params = jsonRpcRequest.getParams();
             String mappedName = (String) params.remove("name");
             Map mappedParams = (Map) params.remove("arguments");
-            
+
             JsonRpcRequest mapped = new JsonRpcRequest(this.jsonMapper);
             mapped.setId(jsonRpcRequest.getId());
             mapped.setJsonrpc(jsonRpcRequest.getJsonrpc());
             mapped.setMethod(mappedName);
-            if(mappedParams!=null && !mappedParams.isEmpty())mapped.setParams(mappedParams);
+            if (mappedParams != null && !mappedParams.isEmpty())
+                mapped.setParams(mappedParams);
 
             return mapped;
         }

extensions/devui/runtime/src/main/java/io/quarkus/devui/runtime/mcp/McpHttpHandler.java

@@ -110,9 +110,17 @@ private void handleMCPJsonRPCRequest(RoutingContext ctx) {
                 // This is a MCP notification
                 this.routeToMCPNotification(jsonRpcRequest, codec, writer);
             } else if (methodName.equalsIgnoreCase(McpBuiltinMethods.TOOLS_LIST) ||
-                    methodName.equalsIgnoreCase(McpBuiltinMethods.RESOURCES_LIST) ||
-                    methodName.equalsIgnoreCase(McpBuiltinMethods.RESOURCES_READ)) {
+                    methodName.equalsIgnoreCase(McpBuiltinMethods.RESOURCES_LIST)) {
                 jsonRpcRequest.setMethod(methodName.replace(SLASH, UNDERSCORE));
+                // Make sure that parameters is empty as expected.
+                jsonRpcRequest.setParams(null);
+                jsonRpcRouter.route(jsonRpcRequest, writer);
+            } else if (methodName.equalsIgnoreCase(McpBuiltinMethods.RESOURCES_READ)) {
+                jsonRpcRequest.setMethod(methodName.replace(SLASH, UNDERSCORE));
+                // Make sure that the only parameter is uri (as expected).
+                String uri = jsonRpcRequest.getParam("uri", String.class);
+                jsonRpcRequest.getParams().clear();
+                jsonRpcRequest.setParams(Map.of("uri", uri));
                 jsonRpcRouter.route(jsonRpcRequest, writer);
             } else {
                 // This is a normal extension method