new API

Author: tvallin

integrations/mcp/server/src/main/java/io/helidon/integrations/mcp/server/BinaryResourceReader.java

@@ -1,6 +1,6 @@
 package io.helidon.integrations.mcp.server;
 
-public enum Capabilities {
+public enum Capability {
     TOOL_LIST_CHANGED,
     RESOURCE_LIST_CHANGED,
     RESOURCE_SUBSCRIBE,

integrations/mcp/server/src/main/java/io/helidon/integrations/mcp/server/Capabilities.java renamed to integrations/mcp/server/src/main/java/io/helidon/integrations/mcp/server/Capability.java

@@ -0,0 +1,5 @@
+package io.helidon.integrations.mcp.server;
+
+interface Content {
+    String type();
+}

integrations/mcp/server/src/main/java/io/helidon/integrations/mcp/server/Content.java

@@ -0,0 +1,12 @@
+package io.helidon.integrations.mcp.server;
+
+public interface EmbeddedResourceContent extends Content {
+
+    String uri();
+
+    ResourceContent content();
+
+    default String type() {
+        return "resource";
+    }
+}

integrations/mcp/server/src/main/java/io/helidon/integrations/mcp/server/EmbeddedResourceContent.java

@@ -0,0 +1,27 @@
+package io.helidon.integrations.mcp.server;
+
+interface ImageContent extends ToolContent, Content {
+
+    default String type() {
+        return "image";
+    }
+
+    String data();
+
+    String mimeType();
+
+    static ImageContent create(String data, String mimeType) {
+        return new ImageContent() {
+
+            @Override
+            public String data() {
+                return data;
+            }
+
+            @Override
+            public String mimeType() {
+                return mimeType;
+            }
+        };
+    }
+}

integrations/mcp/server/src/main/java/io/helidon/integrations/mcp/server/FileResourceReader.java

@@ -46,6 +46,14 @@ private Builder() {
             this.properties = new HashMap<>();
         }
 
+        public 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) {
             this.properties.put(key, value);
             return this;

integrations/mcp/server/src/main/java/io/helidon/integrations/mcp/server/ImageContent.java

@@ -22,34 +22,48 @@
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 /**
  * This interface contains a set of annotations for defining MCP declarative server.
  */
 public final class Mcp {
 
-	@Target(METHOD)
+	@Target(TYPE)
 	@Retention(RUNTIME)
-	public @interface Resource {
-		String uri();
-		String name();
-		String description() default "none"; 	//optional
+	public @interface Server {
+		String value() default "Helidon MCP Server";
+	}
+
+	@Target(TYPE)
+	@Retention(RUNTIME)
+	public @interface Capability {
+		io.helidon.integrations.mcp.server.Capability[] value();
+	}
+
+	@Target({TYPE, METHOD})
+	@Retention(RUNTIME)
+	public @interface Description {
+		String value();
+	}
+
+	@Target(TYPE)
+	@Retention(RUNTIME)
+	public @interface Version {
+		String value();
 	}
 
 	@Target(METHOD)
 	@Retention(RUNTIME)
 	public @interface Prompt {
-		String name();
-		String description() default "none"; //optional
+		String value() default "";
 	}
 
 	@Target(METHOD)
 	@Retention(RUNTIME)
 	public @interface Tool {
-		String name();
-		String description();
-		String annotations() default "";  //optional
+		String value() default "";
 	}
 
 	@Target(PARAMETER)
@@ -58,15 +72,15 @@ public final class Mcp {
 		String value();
 	}
 
-	@Target(ElementType.TYPE)
+	@Target(METHOD)
 	@Retention(RUNTIME)
-	public @interface Server {
-		String name() default "Helidon MCP Server";
-		String version() default "0.0.1";
-		Capabilities[] capabilities() default {};
+	public @interface Resource {
+		String value() default "";
 	}
 
-
-
-
+	@Target(METHOD)
+	@Retention(RUNTIME)
+	public @interface URI {
+		String value();
+	}
 }

integrations/mcp/server/src/main/java/io/helidon/integrations/mcp/server/InputSchema.java

@@ -42,18 +42,22 @@ public class McpHttpFeature implements HttpFeature {
     private final Map<String, McpSession> sessions = new ConcurrentHashMap<>();
 
     @Service.Inject
-    public McpHttpFeature(McpServerConfig server) {
+    public McpHttpFeature(McpServerDetails server) {
         this.server = McpServer.create(server);
     }
 
-    public McpHttpFeature(McpServerConfig... server) {
+    public McpHttpFeature(McpServerDetails... server) {
         this.server = null;
     }
 
-    public static McpHttpFeature create(McpServerConfig... servers) {
+    public static McpHttpFeature create(McpServerDetails... servers) {
         return new McpHttpFeature(servers);
     }
 
+    public static McpHttpFeature.Builder builder() {
+        return new Builder();
+    }
+
     @Override
     public void setup(HttpRouting.Builder routing) {
         routing.get("/sse", this::sse)
@@ -112,4 +116,18 @@ private McpJsonRPC.JSONRPCMessage deserializeJsonRpcMessage(String content) {
         }
     }
 
+    public static class Builder {
+        private McpServerDetails config;
+
+        public Builder server(McpServerDetails server) {
+            this.config = server;
+            return this;
+        }
+
+        public McpHttpFeature build() {
+            return new McpHttpFeature(config);
+        }
+
+    }
+
 }

integrations/mcp/server/src/main/java/io/helidon/integrations/mcp/server/Mcp.java

@@ -36,10 +36,6 @@ class McpJsonRPC {
     private McpJsonRPC() {
     }
 
-    static final String LATEST_PROTOCOL_VERSION = "2024-11-05";
-
-    static final String JSONRPC_VERSION = "2.0";
-
     // ---------------------------
     // Method Names
     // ---------------------------