Save work

Author: tvallin

docs/src/main/asciidoc/mp/guides/upgrade_3x.adoc

@@ -166,7 +166,7 @@ NOTE: See xref:{rootdir}/mp/integrations/oci.adoc#oci-compatibility[Resolving co
 
 Deprecations in the following classes:
 
-* `ResourceTemp` - old configuration approach (since 2.0)
+* `Resource` - old configuration approach (since 2.0)
 * `ThreadPoolSupplier` - Named thread pools (since 2.4.2)
 
 More information in the following link:https://github.com/oracle/helidon/issues/4363[Task].

docs/src/main/asciidoc/mp/testing/testing-common.adoc

@@ -325,7 +325,7 @@ include::{sourcedir}/mp/testing/TestingSnippets.java[tag=snippet_16, indent=0]
 ----
 <1> CDI discovery is disabled
 <2> Add JAXRS (Jersey) support
-<3> Add `MyResource` to the CDI container
+<3> Add `WeatherResource` to the CDI container
 // end::examples[]
 
 == Mock Support

docs/src/main/asciidoc/se/guides/upgrade.adoc

@@ -83,10 +83,10 @@ include::{sourcedir}/se/guides/UpgradeSnippets.java[tag=snippet_3, indent=0]
 
 == Resource Class When Loaded from Config
 
-The configuration approach to `ResourceTemp` class was using prefixes which was not aligned with our approach to configuration.
+The configuration approach to `Resource` class was using prefixes which was not aligned with our approach to configuration.
 All usages were refactored as follows:
 
-1. The `ResourceTemp` class expects a config node `resource` that will be used to read it
+1. The `Resource` class expects a config node `resource` that will be used to read it
 2. The feature set remains unchanged - we support path, classpath, url, content as plain text, and content as base64
 3. Classes using resources are changed as well, such as `KeyConfig` - see details below
 
@@ -121,14 +121,14 @@ The new JSON MediaSupport classes are:
 
 == Security: OidcConfig
 
-Configuration has been updated to use the new `ResourceTemp` approach:
+Configuration has been updated to use the new `Resource` approach:
 
 1. `oidc-metadata.resource` is the new key for loading `oidc-metadata` from local resource
 2. `sign-jwk.resource` is the new key for loading signing JWK resource
 
 == Security: JwtProvider and JwtAuthProvider
 
-Configuration has been updated to use the new `ResourceTemp` approach:
+Configuration has been updated to use the new `Resource` approach:
 
 1. `jwk.resource` is the new key for loading JWK for verifying signatures
 2. `jwt.resource` is also used for outbound as key for loading JWK for signing tokens
@@ -172,7 +172,7 @@ pem:
 
 == GrpcTlsDescriptor
 
-Configuration has been updated to use the new `ResourceTemp` approach:
+Configuration has been updated to use the new `Resource` approach:
 
 1. `tls-cert.resource` is the new key for certificate
 2. `tls-key.resource` is the new key for private key

docs/src/main/asciidoc/se/guides/upgrade_3x.adoc

@@ -144,7 +144,7 @@ NOTE: See xref:{rootdir}/se/integrations/oci.adoc#oci-compatibility[Resolving co
 
 Deprecations in the following classes:
 
-* `ResourceTemp` - old configuration approach (since 2.0)
+* `Resource` - old configuration approach (since 2.0)
 * `ThreadPoolSupplier` - Named thread pools (since 2.4.2)
 
 More information in the following link:https://github.com/oracle/helidon/issues/4363[Task].

integrations/mcp/server/pom.xml

@@ -30,11 +30,6 @@
 	<artifactId>helidon-integrations-mcp-server</artifactId>
 
 	<dependencies>
-		<dependency>
-			<groupId>io.modelcontextprotocol.sdk</groupId>
-			<artifactId>mcp</artifactId>
-			<version>0.8.1</version>
-		</dependency>
 		<dependency>
 			<groupId>io.helidon.webserver</groupId>
 			<artifactId>helidon-webserver</artifactId>
@@ -43,18 +38,14 @@
 			<groupId>io.helidon.webserver</groupId>
 			<artifactId>helidon-webserver-sse</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>io.helidon.webclient</groupId>
-			<artifactId>helidon-webclient</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>io.helidon.http.media</groupId>
 			<artifactId>helidon-http-media-jackson</artifactId>
 		</dependency>
+		<!--	TODO - To be removed	-->
 		<dependency>
-			<groupId>io.helidon.logging</groupId>
-			<artifactId>helidon-logging-jul</artifactId>
-			<scope>runtime</scope>
+			<groupId>io.helidon.webclient</groupId>
+			<artifactId>helidon-webclient</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>io.helidon.webserver.testing.junit5</groupId>

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

@@ -19,9 +19,7 @@
 import io.helidon.webclient.api.HttpClientResponse;
 import io.helidon.webclient.api.WebClient;
 
-import io.modelcontextprotocol.spec.McpSchema;
-
-public class BinaryResourceReader implements ResourceReader {
+class BinaryResourceReader implements ResourceReader {
 
     private final String uri;
 
@@ -30,7 +28,7 @@ public BinaryResourceReader(String uri) {
     }
 
     @Override
-    public McpSchema.ResourceContents read() {
+    public McpJsonRPC.ResourceContents read() {
         if (uri.startsWith("http")) {
             return new HttpResourceReader(uri).read();
         }
@@ -46,14 +44,14 @@ static class HttpResourceReader implements ResourceReader {
         }
 
         @Override
-        public McpSchema.ResourceContents read() {
+        public McpJsonRPC.ResourceContents read() {
             WebClient client = WebClient.builder()
                     .baseUri(uri)
                     .build();
             try (HttpClientResponse request = client.get().request()) {
                 String mimeType = request.headers().get(HeaderNames.CONTENT_TYPE).get();
                 String data = request.entity().as(String.class);
-                return new McpSchema.BlobResourceContents(uri, mimeType, data);
+                return new McpJsonRPC.BlobResourceContents(uri, mimeType, data);
             }
         }
     }

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

@@ -1,8 +1,9 @@
 package io.helidon.integrations.mcp.server;
 
-public enum CapabilitiesTemp {
+public enum Capabilities {
     TOOL_LIST_CHANGED,
     RESOURCE_LIST_CHANGED,
     RESOURCE_SUBSCRIBE,
-    PROMPT_LIST_CHANGED
+    PROMPT_LIST_CHANGED,
+    LOGGING
 }

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

@@ -29,9 +29,7 @@
 
 import io.helidon.common.media.type.MediaTypes;
 
-import io.modelcontextprotocol.spec.McpSchema;
-
-public class FileResourceReader implements ResourceReader {
+class FileResourceReader implements ResourceReader {
 
     private final Path path;
     private final String uri;
@@ -42,7 +40,7 @@ public FileResourceReader(String uri) {
     }
 
     @Override
-    public McpSchema.ResourceContents read() {
+    public McpJsonRPC.ResourceContents read() {
         try (FileInputStream fis = new FileInputStream(path.toFile())) {
             FileLock lock = null;
             try {
@@ -53,7 +51,7 @@ public McpSchema.ResourceContents read() {
             try {
                 try (BufferedReader bufferedReader = Files.newBufferedReader(path, StandardCharsets.UTF_8)) {
                     String content = bufferedReader.lines().collect(Collectors.joining("\n"));
-                    return new McpSchema.TextResourceContents(uri, MediaTypes.TEXT_PLAIN_VALUE, content);
+                    return new McpJsonRPC.TextResourceContents(uri, MediaTypes.TEXT_PLAIN_VALUE, content);
                 } catch (IOException e) {
                     throw new McpException(String.format("Cannot read from path '%s'", path), e);
                 }

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

@@ -32,10 +32,6 @@ public static Builder builder() {
         return new Builder();
     }
 
-    public String asString() {
-        return schema.toString();
-    }
-
     public static class Builder {
 
         private final String type;