Update mcp support

Author: alexcheng1982

README.md

@@ -8,4 +8,4 @@ Reference implementation of [Agentic Workflow and Patterns](https://javaaidev.co
 Requirements:
 
 - Java 21 (for virtual threads)
-- Spring AI (Current version `1.1.0`)
+- Spring AI (Current version `1.1.1`)

core/src/main/java/com/javaaidev/agenticpatterns/core/McpClientConfiguration.java

@@ -4,14 +4,28 @@
 import java.util.HashMap;
 import java.util.Map;
 import org.jspecify.annotations.Nullable;
-import org.springframework.ai.mcp.client.autoconfigure.properties.McpSseClientProperties.SseParameters;
-import org.springframework.ai.mcp.client.autoconfigure.properties.McpStdioClientProperties.Parameters;
+import org.springframework.ai.mcp.client.common.autoconfigure.properties.McpSseClientProperties.SseParameters;
+import org.springframework.ai.mcp.client.common.autoconfigure.properties.McpStdioClientProperties.Parameters;
+import org.springframework.ai.mcp.client.common.autoconfigure.properties.McpStreamableHttpClientProperties.ConnectionParameters;
 
 public record McpClientConfiguration(
     @Nullable StdioClientProperties stdioClientProperties,
-    @Nullable SseClientProperties sseClientProperties
+    @Nullable SseClientProperties sseClientProperties,
+    @Nullable StreamableHttpClientProperties streamableHttpClientProperties
 ) {
 
+  public McpClientConfiguration(StdioClientProperties stdioClientProperties) {
+    this(stdioClientProperties, null, null);
+  }
+
+  public McpClientConfiguration(SseClientProperties sseClientProperties) {
+    this(null, sseClientProperties, null);
+  }
+
+  public McpClientConfiguration(StreamableHttpClientProperties streamableHttpClientProperties) {
+    this(null, null, streamableHttpClientProperties);
+  }
+
   public record StdioClientProperties(Map<String, Parameters> connections) {
 
     public Map<String, ServerParameters> toServerParameters() {
@@ -26,4 +40,8 @@ public Map<String, ServerParameters> toServerParameters() {
   public record SseClientProperties(Map<String, SseParameters> connections) {
 
   }
+
+  public record StreamableHttpClientProperties(Map<String, ConnectionParameters> connections) {
+
+  }
 }

examples/pom.xml

@@ -18,8 +18,8 @@
     <maven.compiler.source>21</maven.compiler.source>
     <maven.compiler.target>21</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <spring-ai.version>1.1.0</spring-ai.version>
-    <spring-boot.version>3.5.5</spring-boot.version>
+    <spring-ai.version>1.1.1</spring-ai.version>
+    <spring-boot.version>3.5.9</spring-boot.version>
   </properties>
 
   <dependencyManagement>

examples/src/main/java/com/javaaidev/agenticpatterns/examples/taskexecution/UserGenerationConfiguration.java

@@ -8,7 +8,7 @@
 import java.util.List;
 import java.util.Map;
 import org.springframework.ai.chat.client.ChatClient;
-import org.springframework.ai.mcp.client.autoconfigure.properties.McpStdioClientProperties.Parameters;
+import org.springframework.ai.mcp.client.common.autoconfigure.properties.McpStdioClientProperties.Parameters;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -45,8 +45,7 @@ public TaskExecutionAgent<UserGenerationRequest, UserGenerationResponse> userGen
                         Map.of()
                     )
                 )
-            ),
-            null
+            )
         ))
         .build();
   }

patterns/task-execution/src/main/java/com/javaaidev/agenticpatterns/taskexecution/TaskExecutionAgent.java

@@ -13,18 +13,19 @@
 import io.modelcontextprotocol.client.McpAsyncClient;
 import io.modelcontextprotocol.client.McpClient;
 import io.modelcontextprotocol.client.transport.HttpClientSseClientTransport;
-import io.modelcontextprotocol.client.transport.ServerParameters;
+import io.modelcontextprotocol.client.transport.HttpClientStreamableHttpTransport;
 import io.modelcontextprotocol.client.transport.StdioClientTransport;
+import io.modelcontextprotocol.json.jackson.JacksonMcpJsonMapper;
 import io.modelcontextprotocol.spec.McpSchema;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
-import java.net.http.HttpClient;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.Function;
@@ -35,8 +36,7 @@
 import org.springframework.ai.chat.client.ChatClient;
 import org.springframework.ai.chat.client.ChatClient.ChatClientRequestSpec;
 import org.springframework.ai.mcp.AsyncMcpToolCallbackProvider;
-import org.springframework.ai.mcp.client.autoconfigure.NamedClientMcpTransport;
-import org.springframework.ai.mcp.client.autoconfigure.properties.McpSseClientProperties.SseParameters;
+import org.springframework.ai.mcp.client.common.autoconfigure.NamedClientMcpTransport;
 import org.springframework.ai.tool.StaticToolCallbackProvider;
 import org.springframework.ai.tool.ToolCallbackProvider;
 import org.springframework.core.ParameterizedTypeReference;
@@ -234,24 +234,40 @@ protected ToolCallbackProvider getToolCallbackProvider() {
     List<NamedClientMcpTransport> transports = new ArrayList<>();
     var stdioProperties = mcpClientConfiguration.stdioClientProperties();
     if (stdioProperties != null) {
-      for (Map.Entry<String, ServerParameters> serverParameters : stdioProperties.toServerParameters()
+      for (var serverParameters : stdioProperties.toServerParameters()
           .entrySet()) {
-        var transport = new StdioClientTransport(serverParameters.getValue());
+        var transport = new StdioClientTransport(serverParameters.getValue(),
+            new JacksonMcpJsonMapper(objectMapper));
         transports.add(new NamedClientMcpTransport(serverParameters.getKey(),
             transport));
       }
     }
+
     var sseProperties = mcpClientConfiguration.sseClientProperties();
     if (sseProperties != null) {
-      for (Map.Entry<String, SseParameters> serverParameters : sseProperties.connections()
+      for (var serverParameters : sseProperties.connections()
           .entrySet()) {
         String baseUrl = serverParameters.getValue().url();
-        String sseEndpoint = serverParameters.getValue().sseEndpoint() != null
-            ? serverParameters.getValue().sseEndpoint() : "/sse";
+        String sseEndpoint = Objects.requireNonNullElse(serverParameters.getValue().sseEndpoint(),
+            "/sse");
         var transport = HttpClientSseClientTransport.builder(baseUrl)
             .sseEndpoint(sseEndpoint)
-            .clientBuilder(HttpClient.newBuilder())
-            .objectMapper(objectMapper)
+            .jsonMapper(new JacksonMcpJsonMapper(objectMapper))
+            .build();
+        transports.add(new NamedClientMcpTransport(serverParameters.getKey(), transport));
+      }
+    }
+
+    var streamableHttpProperties = mcpClientConfiguration.streamableHttpClientProperties();
+    if (streamableHttpProperties != null) {
+      for (var serverParameters : streamableHttpProperties.connections()
+          .entrySet()) {
+        String baseUrl = serverParameters.getValue().url();
+        String endpoint = Objects.requireNonNullElse(serverParameters.getValue().endpoint(),
+            "/mcp");
+        var transport = HttpClientStreamableHttpTransport.builder(baseUrl)
+            .endpoint(endpoint)
+            .jsonMapper(new JacksonMcpJsonMapper(objectMapper))
             .build();
         transports.add(new NamedClientMcpTransport(serverParameters.getKey(), transport));
       }

pom.xml

@@ -52,7 +52,7 @@
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <spring-ai.version>1.1.0</spring-ai.version>
+    <spring-ai.version>1.1.1</spring-ai.version>
     <micrometer.version>1.14.4</micrometer.version>
   </properties>