work on Schema and clean up

tvallin · tvallin · commit 87f31e753b22 · 2025-05-26T14:50:11.000+02:00
diff --git a/integrations/mcp/server/pom.xml b/integrations/mcp/server/pom.xml
@@ -42,11 +42,6 @@
 			<groupId>io.helidon.http.media</groupId>
 			<artifactId>helidon-http-media-jackson</artifactId>
 		</dependency>
-		<!--	TODO - To be removed	-->
-		<dependency>
-			<groupId>io.helidon.webclient</groupId>
-			<artifactId>helidon-webclient</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>io.helidon.webserver.testing.junit5</groupId>
 			<artifactId>helidon-webserver-testing-junit5</artifactId>
diff --git a/integrations/mcp/server/src/main/java/io/helidon/integrations/mcp/server/Capability.java b/integrations/mcp/server/src/main/java/io/helidon/integrations/mcp/server/Capability.java
@@ -5,5 +5,7 @@ public enum Capability {
     RESOURCE_LIST_CHANGED,
     RESOURCE_SUBSCRIBE,
     PROMPT_LIST_CHANGED,
-    LOGGING
+    LOGGING,
+    COMPLETION,
+    PAGINATION
 }
diff --git a/integrations/mcp/server/src/main/java/io/helidon/integrations/mcp/server/InputSchema.java b/integrations/mcp/server/src/main/java/io/helidon/integrations/mcp/server/InputSchema.java
@@ -46,20 +46,51 @@ private Builder() {
             this.properties = new HashMap<>();
         }
 
-        public Builder properties(String key, String value, boolean required) {
+        public Builder asBoolean(String name, boolean bool, boolean required) {
+            return this;
+        }
+        public Builder asBoolean(String name, boolean bool) {
+            return this;
+        }
+
+        public <T> Builder array(String name, List<T> list, boolean required) {
+            return this;
+        }
+
+        public <T> Builder array(String name, List<T> list) {
+            return this;
+        }
+
+        public Builder number(String name, boolean required) {
+            return this;
+        }
+
+        public Builder number(String name) {
+            return this;
+        }
+
+        public Builder object(String name, Class<?> type, boolean required) {
+            return this;
+        }
+
+        public Builder object(String name, Class<?> type) {
+            return this;
+        }
+
+        Builder properties(String key, String value, boolean required) {
             this.properties.put(key, value);
             if (required) {
                 this.required.add(key);
             }
             return this;
         }
 
-        public Builder properties(String key, String value) {
+        Builder properties(String key, String value) {
             this.properties.put(key, value);
             return this;
         }
 
-        public Builder required(String value) {
+        Builder required(String value) {
             this.required.add(value);
             return this;
         }
diff --git a/integrations/mcp/server/src/main/java/io/helidon/integrations/mcp/server/McpServerInfo.java b/integrations/mcp/server/src/main/java/io/helidon/integrations/mcp/server/McpServerInfo.java
@@ -43,6 +43,10 @@ public interface McpServerInfo {
      */
     Set<Capability> capabilities();
 
+    static Builder builder() {
+        return new Builder();
+    }
+
     static McpServerInfo create(String name, String version, Capability... capabilities) {
         return new McpServerInfo() {
             @Override
@@ -61,4 +65,44 @@ public Set<Capability> capabilities() {
             }
         };
     }
+
+    class Builder {
+        private String name;
+        private String version;
+        private Set<Capability> capabilities;
+
+        public Builder name(String name) {
+            this.name = name;
+            return this;
+        }
+
+        public Builder version(String version) {
+            this.version = version;
+            return this;
+        }
+
+        public Builder capability(Capability... capabilities) {
+            this.capabilities = Set.of(capabilities);
+            return this;
+        }
+
+        public McpServerInfo build() {
+            return new McpServerInfo() {
+                @Override
+                public String name() {
+                    return name;
+                }
+
+                @Override
+                public String version() {
+                    return version;
+                }
+
+                @Override
+                public Set<Capability> capabilities() {
+                    return capabilities;
+                }
+            };
+        }
+    }
 }
diff --git a/integrations/mcp/server/src/main/java/io/helidon/integrations/mcp/server/Parameters.java b/integrations/mcp/server/src/main/java/io/helidon/integrations/mcp/server/Parameters.java
@@ -0,0 +1,60 @@
+package io.helidon.integrations.mcp.server;
+
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Optional;
+import java.util.Set;
+
+import io.helidon.common.mapper.OptionalValue;
+import io.helidon.common.mapper.Value;
+
+public class Parameters implements io.helidon.common.parameters.Parameters {
+
+    io.helidon.common.parameters.Parameters delegate =
+            io.helidon.common.parameters.Parameters.create("mcp", Map.of());
+
+    public <T> Optional<T> object(String name, Class<T> clazz) {
+        return Optional.empty();
+    }
+
+    @Override
+    public List<String> all(String name) throws NoSuchElementException {
+        return delegate.all(name);
+    }
+
+    @Override
+    public List<Value<String>> allValues(String name) throws NoSuchElementException {
+        return delegate.allValues(name);
+    }
+
+    @Override
+    public String get(String name) throws NoSuchElementException {
+        return delegate.get(name);
+    }
+
+    @Override
+    public OptionalValue<String> first(String name) {
+        return delegate.first(name);
+    }
+
+    @Override
+    public boolean contains(String name) {
+        return delegate.contains(name);
+    }
+
+    @Override
+    public int size() {
+        return delegate.size();
+    }
+
+    @Override
+    public Set<String> names() {
+        return delegate.names();
+    }
+
+    @Override
+    public String component() {
+        return delegate.component();
+    }
+}
diff --git a/integrations/mcp/server/src/main/java/io/helidon/integrations/mcp/server/Prompt.java b/integrations/mcp/server/src/main/java/io/helidon/integrations/mcp/server/Prompt.java
@@ -16,8 +16,6 @@
 
 package io.helidon.integrations.mcp.server;
 
-import io.helidon.common.parameters.Parameters;
-
 /**
  * MCP Prompt definition.
  */
diff --git a/integrations/mcp/server/src/main/java/io/helidon/integrations/mcp/server/Tool.java b/integrations/mcp/server/src/main/java/io/helidon/integrations/mcp/server/Tool.java
@@ -16,8 +16,6 @@
 
 package io.helidon.integrations.mcp.server;
 
-import io.helidon.common.parameters.Parameters;
-
 /**
  * MCP tool definition.
  */
diff --git a/integrations/mcp/tests/declarative/src/main/java/io/helidon/integrations/mcp/McpWeatherServerDeclarative.java b/integrations/mcp/tests/declarative/src/main/java/io/helidon/integrations/mcp/McpWeatherServerDeclarative.java
@@ -27,7 +27,7 @@
 
 @Mcp.Server("mcp-weather-server")
 @Mcp.Version("0.0.1")
-@Mcp.Capability({TOOL_LIST_CHANGED, RESOURCE_LIST_CHANGED})
+@Mcp.Capability({ TOOL_LIST_CHANGED, RESOURCE_LIST_CHANGED })
 class McpWeatherServerDeclarative {
 
     @Mcp.Tool
diff --git a/integrations/mcp/tests/se/src/main/java/io/helidon/integrations/mcp/tests/se/McpWeatherServerSe.java b/integrations/mcp/tests/se/src/main/java/io/helidon/integrations/mcp/tests/se/McpWeatherServerSe.java
@@ -16,13 +16,15 @@
 
 package io.helidon.integrations.mcp.tests.se;
 
+import java.util.Optional;
+
 import io.helidon.common.config.Config;
-import io.helidon.common.parameters.Parameters;
 import io.helidon.integrations.mcp.server.Capability;
 import io.helidon.integrations.mcp.server.McpHttpFeature;
 import io.helidon.integrations.mcp.server.McpRouting;
 import io.helidon.integrations.mcp.server.McpServerDetails;
 import io.helidon.integrations.mcp.server.McpServerInfo;
+import io.helidon.integrations.mcp.server.Parameters;
 import io.helidon.integrations.mcp.server.Prompt;
 import io.helidon.integrations.mcp.server.PromptArgument;
 import io.helidon.integrations.mcp.server.PromptContent;
@@ -70,7 +72,11 @@ static class McpWeatherDetails implements McpServerDetails {
 
         @Override
         public McpServerInfo info() {
-            return McpServerInfo.create("mcp-server", "0.0.1", Capability.TOOL_LIST_CHANGED);
+            return McpServerInfo.builder()
+                    .name("weather-mcp-server")
+                    .version("0.0.1")
+                    .capability(Capability.TOOL_LIST_CHANGED)
+                    .build();
         }
 
         @Override
@@ -88,20 +94,32 @@ public ToolInfo info() {
             return ToolInfo.builder()
                     .name("tool-weater")
                     .description("Get the weather in a specific town")
-                    .schema(schema -> schema.properties("town", "string", true))
+                    .schema(schema -> schema
+                            .object("town", Town.class, false))
                     .build();
         }
 
         @Override
         public ToolContent process(Parameters parameters) {
-//            Optional<Town> value = parameters.object("town", Town.class);
-//            Optional<String> value = parameters.objectString("town");
-//            OptionalValue<String> value = parameters.first("town");
+
+            Optional<Town> town = parameters.object("town", Town.class);
 
             ToolContent resource = ToolContent.resourceContent("uri");
             ToolContent image = ToolContent.imageContent("data", "text/plain");
             return ToolContent.textContent("data");
         }
+
+        static class Town {
+            String name;
+            double latitude;
+            double longitude;
+
+            Town() {
+                name = "Prague";
+                latitude = 50.09;
+                longitude = 14.40;
+            }
+        }
     }
 
     static class WeatherPrompt implements Prompt {

Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,7 @@ public enum Capability {`
`5`	`5`	`RESOURCE_LIST_CHANGED,`
`6`	`6`	`RESOURCE_SUBSCRIBE,`
`7`	`7`	`PROMPT_LIST_CHANGED,`
`8`		`- LOGGING`
	`8`	`+ LOGGING,`
	`9`	`+ COMPLETION,`
	`10`	`+ PAGINATION`
`9`	`11`	`}`