review changes

Author: tvallin

docs/mcp-declarative/README.md

@@ -532,11 +532,11 @@ Below is an example of a tool that uses the Roots feature. `McpRoots` object can
 
 ```java
 @Mcp.Tool("Request MCP Roots to the connected client.")
-List<McpToolContent> rootsTool(McpRoots roots) {
-    if (!roots.enabled()) {
-        throw new McpToolErrorException(McpToolContents.textContent("Roots are not supported by the client"));
+List<McpToolContent> rootsTool(McpRoots mcpRoots) {
+    if (!mcpRoots.enabled()) {
+        throw new McpToolErrorException("Roots are not supported by the client");
     }
-    roots = request.features().roots().listRoots();
+    List<McpRoot> roots = mcpRoots.listRoots();
     McpRoot root = roots.getFirst();
     URI uri = root.uri();
     String name = root.name().orElse("Unknown");

docs/mcp/README.md

@@ -769,8 +769,6 @@ notifications whenever that list is updated.
 
 ```java
 class RootNameTool implements McpTool {
-    private List<McpRoot> roots;
-
     @Override
     public String name() {
         return "roots-name-tool";
@@ -791,9 +789,9 @@ class RootNameTool implements McpTool {
         return request -> {
             McpRoots mcpRoots = request.features().roots();
             if (!mcpRoots.enabled()) {
-                throw new McpToolErrorException(McpToolContents.textContent("Roots are not supported by the client"));
+                throw new McpToolErrorException("Roots are not supported by the client");
             }
-            roots = mcpRoots.listRoots();
+            List<McpRoot> roots = mcpRoots.listRoots();
             McpRoot root = roots.getFirst();
             URI uri = root.uri();
             String name = root.name().orElse("Unknown");

server/src/main/java/io/helidon/extensions/mcp/server/McpJsonRpc.java

@@ -674,7 +674,7 @@ static List<McpRoot> parseRoots(JsonObject response) {
                 .mapToObj(roots::getJsonObject)
                 .map(root -> McpRoot.builder()
                         .uri(URI.create(root.getString("uri")))
-                        .name(findString(root, "name"))
+                        .name(Optional.ofNullable(root.getString("name", null)))
                         .build())
                 .toList();
     }
@@ -704,13 +704,6 @@ private static Optional<JsonValue> find(JsonObject object, String key) {
         return Optional.empty();
     }
 
-    private static Optional<String> findString(JsonObject object, String key) {
-        if (object.containsKey(key)) {
-            return Optional.of(object.getString(key));
-        }
-        return Optional.empty();
-    }
-
     private static boolean isJsonObject(JsonValue value) {
         return JsonValue.ValueType.OBJECT.equals(value.getValueType());
     }

tests/declarative/src/main/java/io/helidon/extensions/mcp/tests/declarative/McpRootsServer.java

@@ -32,71 +32,71 @@
 @Mcp.Server
 @Mcp.Path("/roots")
 class McpRootsServer {
-    @Mcp.Tool("Sampling tool")
-    List<McpToolContent> tool(McpRoots sampling) {
+    @Mcp.Tool("Roots tool")
+    List<McpToolContent> tool(McpRoots roots) {
         return List.of(McpToolContents.textContent(""));
     }
 
-    @Mcp.Tool("Sampling tool")
-    List<McpToolContent> tool1(McpRoots sampling, String value) {
+    @Mcp.Tool("Roots tool")
+    List<McpToolContent> tool1(McpRoots roots, String value) {
         return List.of(McpToolContents.textContent(""));
     }
 
-    @Mcp.Tool("Sampling tool")
-    String tool2(McpRoots sampling) {
+    @Mcp.Tool("Roots tool")
+    String tool2(McpRoots roots) {
         return "";
     }
 
-    @Mcp.Tool("Sampling tool")
-    String tool3(McpRoots sampling, String value) {
+    @Mcp.Tool("Roots tool")
+    String tool3(McpRoots roots, String value) {
         return "";
     }
 
-    @Mcp.Prompt("Sampling prompt")
-    List<McpPromptContent> prompt(McpRoots sampling) {
+    @Mcp.Prompt("Roots prompt")
+    List<McpPromptContent> prompt(McpRoots roots) {
         return List.of(McpPromptContents.textContent("", McpRole.USER));
     }
 
-    @Mcp.Prompt("Sampling prompt")
-    List<McpPromptContent> prompt1(McpRoots sampling, String value) {
+    @Mcp.Prompt("Roots prompt")
+    List<McpPromptContent> prompt1(McpRoots roots, String value) {
         return List.of(McpPromptContents.textContent("", McpRole.USER));
     }
 
-    @Mcp.Prompt("Sampling prompt")
-    String prompt2(McpRoots sampling) {
+    @Mcp.Prompt("Roots prompt")
+    String prompt2(McpRoots roots) {
         return "";
     }
 
-    @Mcp.Prompt("Sampling prompt")
-    String prompt3(McpRoots sampling, String value) {
+    @Mcp.Prompt("Roots prompt")
+    String prompt3(McpRoots roots, String value) {
         return "";
     }
 
     @Mcp.Resource(uri = "https://resource",
-                  description = "Sampling resource",
+                  description = "Roots resource",
                   mediaType = MediaTypes.TEXT_PLAIN_VALUE)
-    List<McpResourceContent> resource(McpRoots sampling) {
+    List<McpResourceContent> resource(McpRoots roots) {
         return List.of(McpResourceContents.textContent(""));
     }
 
     @Mcp.Resource(uri = "https://resource1",
-                  description = "Sampling resource",
+                  description = "Roots resource",
                   mediaType = MediaTypes.TEXT_PLAIN_VALUE)
-    List<McpResourceContent> resource1(McpRoots sampling, McpRequest request) {
+    List<McpResourceContent> resource1(McpRoots roots, McpRequest request) {
         return List.of(McpResourceContents.textContent(""));
     }
 
     @Mcp.Resource(uri = "https://resource2",
-                  description = "Sampling resource",
+                  description = "Roots resource",
                   mediaType = MediaTypes.TEXT_PLAIN_VALUE)
-    String resource2(McpRoots sampling) {
+    String resource2(McpRoots roots) {
         return "";
     }
 
     @Mcp.Resource(uri = "https://resource3",
-                  description = "Sampling resource",
+                  description = "Roots resource",
                   mediaType = MediaTypes.TEXT_PLAIN_VALUE)
-    String resource3(McpRoots sampling, McpRequest request) {
+    String resource3(McpRoots roots, McpRequest request) {
         return "";
     }
 }