Save work

Author: tvallin

integrations/mcp/codegen/src/main/java/io/helidon/integrations/mcp/codegen/McpServiceCodegen.java renamed to integrations/mcp/codegen/src/main/java/io/helidon/integrations/mcp/codegen/McpCodegen.java

@@ -17,6 +17,7 @@
 package io.helidon.integrations.mcp.codegen;
 
 import java.util.Collection;
+import java.util.stream.Collectors;
 
 import io.helidon.codegen.CodegenContext;
 import io.helidon.codegen.CodegenException;
@@ -27,26 +28,37 @@
 
 import static io.helidon.integrations.mcp.codegen.McpTypes.MCP_SERVER;
 
-class McpServiceCodegen implements CodegenExtension {
+class McpCodegen implements CodegenExtension {
 
+	private final System.Logger LOGGER = System.getLogger(this.getClass().getName());
 	private final CodegenContext ctx;
 
-	McpServiceCodegen(CodegenContext ctx) {
+	McpCodegen(CodegenContext ctx) {
 		this.ctx = ctx;
 	}
 
 	@Override
 	public void process(RoundContext roundContext) {
+		LOGGER.log(System.Logger.Level.INFO, "Processing mcp codegen extension with context "
+				+ roundContext.types().stream().map(Object::toString).collect(Collectors.joining()));
 		Collection<TypeInfo> types = roundContext.annotatedTypes(MCP_SERVER);
 		for (TypeInfo type : types) {
 			process(roundContext, type);
 		}
 	}
 
 	private void process(RoundContext roundCtx, TypeInfo type) {
+		if (type.kind() != ElementKind.CLASS) {
+			throw new CodegenException("Type annotated with " + MCP_SERVER.fqName() + " must be a class.",
+					type.originatingElementValue());
+		}
+	}
 
+	/**
+	 * Generate JSON-RPC schema out of method signature.
+	 */
+	private static class SchemaGenerator {
 
 	}
 
-
 }

integrations/mcp/codegen/src/main/java/io/helidon/integrations/mcp/codegen/McpAiServiceCodegenProvider.java renamed to integrations/mcp/codegen/src/main/java/io/helidon/integrations/mcp/codegen/McpCodegenProvider.java

@@ -9,11 +9,11 @@
 
 import static io.helidon.integrations.mcp.codegen.McpTypes.MCP_SERVER;
 
-public class McpAiServiceCodegenProvider implements CodegenExtensionProvider {
+public class McpCodegenProvider implements CodegenExtensionProvider {
 	/**
 	 * Public no-arg constructor required by {@link java.util.ServiceLoader}.
 	 */
-	public McpAiServiceCodegenProvider() {
+	public McpCodegenProvider() {
 	}
 
 	@Override
@@ -23,7 +23,7 @@ public Set<TypeName> supportedAnnotations() {
 
 	@Override
 	public CodegenExtension create(CodegenContext ctx, TypeName generator) {
-		return new McpServiceCodegen(ctx);
+		return new McpCodegen(ctx);
 	}
 }
 

integrations/mcp/codegen/src/main/java/module-info.java

@@ -20,5 +20,5 @@
 	exports io.helidon.integrations.mcp.codegen;
 
 	provides io.helidon.codegen.spi.CodegenExtensionProvider
-			with io.helidon.integrations.mcp.codegen.McpAiServiceCodegenProvider;
+			with io.helidon.integrations.mcp.codegen.McpCodegenProvider;
 }

integrations/mcp/server/pom.xml

@@ -51,6 +51,31 @@
 			<groupId>jakarta.json</groupId>
 			<artifactId>jakarta.json-api</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>io.helidon.logging</groupId>
+			<artifactId>helidon-logging-jul</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>io.helidon.webserver.testing.junit5</groupId>
+			<artifactId>helidon-webserver-testing-junit5</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-api</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.hamcrest</groupId>
+			<artifactId>hamcrest-all</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -130,6 +155,13 @@
 					</dependency>
 				</dependencies>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<redirectTestOutputToFile>true</redirectTestOutputToFile>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 </project>

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

@@ -0,0 +1,62 @@
+package io.helidon.integrations.mcp.server;
+
+import java.io.PrintWriter;
+
+import io.helidon.integrations.mcp.server.spi.McpTransport;
+import io.helidon.integrations.mcp.server.spi.McpTransportProvider;
+
+public class HelidonTransportProvider implements McpTransportProvider {
+
+	private McpSession.Factory factory;
+
+	@Override
+	public void setSessionFactory(McpSession.Factory factory) {
+		this.factory = factory;
+	}
+
+	@Override
+	public void notifyClients(String method, Object params) {
+
+	}
+
+	@Override
+	public void closeGracefully() {
+
+	}
+
+	@Override
+	public void close() {
+
+	}
+
+	private static class HelidonTransport implements McpTransport {
+
+		private final String sessionId;
+		private final PrintWriter writer;
+
+		HelidonTransport(String sessionId, PrintWriter writer) {
+			this.sessionId = sessionId;
+			this.writer = writer;
+		}
+
+		@Override
+		public <T> T unmarshall(Object params, Class<T> initializeRequestClass) {
+			return null;
+		}
+
+		@Override
+		public void sendMessage(Object message) {
+
+		}
+
+		@Override
+		public void close() {
+
+		}
+
+		@Override
+		public void closeGracefully() {
+
+		}
+	}
+}

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

@@ -24,8 +24,10 @@
 interface ImplementationBlueprint {
 
 	@Option.Configured
+	@Option.Default("Helidon MCP Server")
 	String name();
 
 	@Option.Configured
+	@Option.Default("1.0.0")
 	String version();
 }

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

@@ -0,0 +1,13 @@
+package io.helidon.integrations.mcp.server;
+
+import io.modelcontextprotocol.spec.McpSchema;
+
+@FunctionalInterface
+public interface InitializationHandler {
+
+	McpSchema.InitializeResult handle(McpSchema.InitializeRequest request);
+
+	default McpSchema.InitializeResult empty(McpSchema.InitializeRequest request) {
+		return null;
+	}
+}

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

@@ -20,6 +20,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
+import io.helidon.integrations.mcp.server.spi.McpTransportProvider;
+
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
@@ -67,10 +69,16 @@ public final class Mcp {
 		String annotations() default "";  //optional
 	}
 
+	@Target(PARAMETER)
+	@Retention(RUNTIME)
+	public @interface ToolTParam {
+		String value();
+	}
+
 	@Target(ElementType.TYPE)
 	@Retention(RUNTIME)
 	public @interface Server {
-
+		Class<? extends McpTransportProvider> value();
 	}
 
 }

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

@@ -18,12 +18,18 @@
 
 import io.helidon.http.sse.SseEvent;
 
+import io.modelcontextprotocol.spec.McpSchema;
+
 class McpException extends RuntimeException {
 
 	McpException(String message) {
 		super(message);
 	}
 
+	static McpSchema.JSONRPCResponse.JSONRPCError toError(String message) {
+		return new McpSchema.JSONRPCResponse.JSONRPCError(500, message, null);
+	}
+
 	SseEvent.Builder sseEventBuilder() {
 		return SseEvent.builder()
 				.name("Error");

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

@@ -0,0 +1,21 @@
+package io.helidon.integrations.mcp.server;
+
+import io.helidon.integrations.mcp.server.spi.McpTransportProvider;
+
+public class McpNoopTransportProvider implements McpTransportProvider {
+	@Override
+	public void setSessionFactory(McpSession.Factory factory) {
+	}
+
+	@Override
+	public void notifyClients(String method, Object params) {
+	}
+
+	@Override
+	public void closeGracefully() {
+	}
+
+	@Override
+	public void close() {
+	}
+}