Update to Spring AI 1.1

Author: alexcheng1982

pom.xml

@@ -7,21 +7,21 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.4.6</version>
+    <version>3.5.7</version>
     <relativePath/>
   </parent>
 
   <groupId>com.javaaidev.easymcpclient</groupId>
   <artifactId>easy-mcp-client</artifactId>
   <name>Easy MCP Client</name>
   <description>An easy-to-use MCP client for testing</description>
-  <version>0.2.0</version>
+  <version>0.3.0</version>
 
   <properties>
     <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.0.0</spring-ai.version>
+    <spring-ai.version>1.1.0</spring-ai.version>
     <chat-agent-ui.version>0.11.0</chat-agent-ui.version>
     <llm-agent-spec.version>0.2.0</llm-agent-spec.version>
   </properties>
@@ -73,7 +73,7 @@
       <dependency>
         <groupId>io.modelcontextprotocol.sdk</groupId>
         <artifactId>mcp-bom</artifactId>
-        <version>0.10.0</version>
+        <version>0.16.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

sample-config/.gitignore

@@ -0,0 +1 @@
+!sample-config.json

src/main/java/com/javaaidev/easymcpclient/AppConfiguration.java

@@ -11,6 +11,7 @@
 import com.javaaidev.easymcpclient.client.SamplingService;
 import com.javaaidev.easymcpclient.config.McpClientConfig;
 import com.javaaidev.easymcpclient.config.mcp.NamedMcpServer;
+import io.modelcontextprotocol.json.McpJsonMapper;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.List;
@@ -41,6 +42,12 @@ public ObjectMapper objectMapper() {
         .build();
   }
 
+  @Bean
+  public McpJsonMapper mcpJsonMapper() {
+    return McpJsonMapper.createDefault();
+  }
+
+
   @Bean
   public McpClientConfig mcpClientConfig(ApplicationArguments arguments,
       ObjectMapper objectMapper) {
@@ -69,8 +76,9 @@ public SamplingService samplingService(ChatModel chatModel) {
 
   @Bean
   public McpClientService mcpClientService(@Lazy SamplingService samplingService,
+      McpJsonMapper mcpJsonMapper,
       ApplicationEventPublisher applicationEventPublisher) {
-    return new McpClientService(samplingService, applicationEventPublisher);
+    return new McpClientService(samplingService, mcpJsonMapper, applicationEventPublisher);
   }
 
   @Bean

src/main/java/com/javaaidev/easymcpclient/client/McpClientService.java

@@ -7,6 +7,7 @@
 import io.modelcontextprotocol.client.transport.HttpClientSseClientTransport;
 import io.modelcontextprotocol.client.transport.ServerParameters;
 import io.modelcontextprotocol.client.transport.StdioClientTransport;
+import io.modelcontextprotocol.json.McpJsonMapper;
 import io.modelcontextprotocol.spec.McpClientTransport;
 import io.modelcontextprotocol.spec.McpSchema.ClientCapabilities;
 import io.modelcontextprotocol.spec.McpSchema.Implementation;
@@ -23,11 +24,13 @@ public class McpClientService {
   private static final Logger LOGGER = LoggerFactory.getLogger(McpClientService.class);
 
   private final SamplingService samplingService;
+  private final McpJsonMapper mcpJsonMapper;
   private final ApplicationEventPublisher applicationEventPublisher;
 
-  public McpClientService(SamplingService samplingService,
+  public McpClientService(SamplingService samplingService, McpJsonMapper mcpJsonMapper,
       ApplicationEventPublisher applicationEventPublisher) {
     this.samplingService = samplingService;
+    this.mcpJsonMapper = mcpJsonMapper;
     this.applicationEventPublisher = applicationEventPublisher;
   }
 
@@ -53,7 +56,7 @@ private Optional<NamedMcpSyncClient> connect(String name, StdioServer server) {
         ServerParameters.builder(server.command())
             .args(server.args())
             .env(server.env())
-            .build()));
+            .build(), mcpJsonMapper));
   }
 
   private Optional<NamedMcpSyncClient> doConnect(String name, McpClientTransport clientTransport) {

src/main/java/com/javaaidev/easymcpclient/client/SamplingService.java

@@ -11,7 +11,6 @@
 import io.modelcontextprotocol.spec.McpSchema.TextContent;
 import io.modelcontextprotocol.spec.McpSchema.TextResourceContents;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Function;
@@ -99,11 +98,9 @@ private Message fromSamplingMessage(SamplingMessage message) {
       }
       case ASSISTANT -> {
         var mediaList = media != null ? List.of(media) : List.<Media>of();
-        yield new AssistantMessage(
-            Objects.requireNonNullElse(text, ""),
-            Map.of(),
-            List.of(),
-            mediaList);
+        yield AssistantMessage.builder()
+            .content(Objects.requireNonNullElse(text, ""))
+            .media(mediaList).build();
       }
     };
   }