Merge the main branch and resolve conflicts

Signed-off-by: Ahoo Wang <[email protected]>

Author: Ahoo-Wang

auto-configurations/mcp/spring-ai-autoconfigure-mcp-server/src/main/java/org/springframework/ai/mcp/server/autoconfigure/McpWebFluxServerAutoConfiguration.java

@@ -20,6 +20,7 @@
 import io.modelcontextprotocol.server.transport.WebFluxSseServerTransportProvider;
 import io.modelcontextprotocol.spec.McpServerTransportProvider;
 
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -60,9 +61,9 @@
  * }</pre>
  *
  * @author Christian Tzolov
- * @since 1.0.0
  * @see McpServerProperties
  * @see WebFluxSseServerTransportProvider
+ * @since 1.0.0
  */
 @AutoConfiguration
 @ConditionalOnClass({ WebFluxSseServerTransportProvider.class })
@@ -73,8 +74,10 @@ public class McpWebFluxServerAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	public WebFluxSseServerTransportProvider webFluxTransport(McpServerProperties serverProperties) {
-		return new WebFluxSseServerTransportProvider(new ObjectMapper(), serverProperties.getSseMessageEndpoint());
+	public WebFluxSseServerTransportProvider webFluxTransport(ObjectProvider<ObjectMapper> objectMapperProvider,
+			McpServerProperties serverProperties) {
+		ObjectMapper objectMapper = objectMapperProvider.getIfAvailable(ObjectMapper::new);
+		return new WebFluxSseServerTransportProvider(objectMapper, serverProperties.getSseMessageEndpoint());
 	}
 
 	// Router function for SSE transport used by Spring WebFlux to start an HTTP server.

auto-configurations/mcp/spring-ai-autoconfigure-mcp-server/src/main/java/org/springframework/ai/mcp/server/autoconfigure/McpWebMvcServerAutoConfiguration.java

@@ -20,6 +20,7 @@
 import io.modelcontextprotocol.server.transport.WebMvcSseServerTransportProvider;
 import io.modelcontextprotocol.spec.McpServerTransportProvider;
 
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -68,8 +69,9 @@ public class McpWebMvcServerAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	public WebMvcSseServerTransportProvider webMvcSseServerTransportProvider(ObjectMapper objectMapper,
-			McpServerProperties serverProperties) {
+	public WebMvcSseServerTransportProvider webMvcSseServerTransportProvider(
+			ObjectProvider<ObjectMapper> objectMapperProvider, McpServerProperties serverProperties) {
+		ObjectMapper objectMapper = objectMapperProvider.getIfAvailable(ObjectMapper::new);
 		return new WebMvcSseServerTransportProvider(objectMapper, serverProperties.getSseMessageEndpoint());
 	}
 

auto-configurations/mcp/spring-ai-autoconfigure-mcp-server/src/test/java/org/springframework/ai/mcp/server/autoconfigure/McpWebFluxServerAutoConfigurationIT.java

@@ -1,7 +1,8 @@
-package org.springframework.ai.autoconfigure.mcp.server;
+package org.springframework.ai.mcp.server.autoconfigure;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.modelcontextprotocol.server.transport.WebFluxSseServerTransport;
+import io.modelcontextprotocol.server.transport.WebFluxSseServerTransportProvider;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
@@ -17,23 +18,23 @@ class McpWebFluxServerAutoConfigurationIT {
 	@Test
 	void defaultConfiguration() {
 		this.contextRunner.run(context -> {
-			assertThat(context).hasSingleBean(WebFluxSseServerTransport.class);
+			assertThat(context).hasSingleBean(WebFluxSseServerTransportProvider.class);
 			assertThat(context).hasSingleBean(RouterFunction.class);
 		});
 	}
 
 	@Test
 	void objectMapperConfiguration() {
 		this.contextRunner.withBean(ObjectMapper.class, ObjectMapper::new).run(context -> {
-			assertThat(context).hasSingleBean(WebFluxSseServerTransport.class);
+			assertThat(context).hasSingleBean(WebFluxSseServerTransportProvider.class);
 			assertThat(context).hasSingleBean(RouterFunction.class);
 		});
 	}
 
 	@Test
 	void stdioEnabledConfiguration() {
 		this.contextRunner.withPropertyValues("spring.ai.mcp.server.stdio=true").run(context -> {
-			assertThat(context).doesNotHaveBean(WebFluxSseServerTransport.class);
+			assertThat(context).doesNotHaveBean(WebFluxSseServerTransportProvider.class);
 		});
 	}
 

auto-configurations/mcp/spring-ai-autoconfigure-mcp-server/src/test/java/org/springframework/ai/mcp/server/autoconfigure/McpWebMvcServerAutoConfigurationTest.java renamed to auto-configurations/mcp/spring-ai-autoconfigure-mcp-server/src/test/java/org/springframework/ai/mcp/server/autoconfigure/McpWebMvcServerAutoConfigurationIT.java

@@ -1,38 +1,38 @@
-package org.springframework.ai.autoconfigure.mcp.server;
+package org.springframework.ai.mcp.server.autoconfigure;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import io.modelcontextprotocol.server.transport.WebMvcSseServerTransport;
+import io.modelcontextprotocol.server.transport.WebMvcSseServerTransportProvider;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.web.servlet.function.RouterFunction;
 import static org.assertj.core.api.Assertions.assertThat;
 
-class McpWebMvcServerAutoConfigurationTest {
+class McpWebMvcServerAutoConfigurationIT {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner().withConfiguration(
 			AutoConfigurations.of(McpWebMvcServerAutoConfiguration.class, McpServerAutoConfiguration.class));
 
 	@Test
 	void defaultConfiguration() {
 		this.contextRunner.run(context -> {
-			assertThat(context).hasSingleBean(WebMvcSseServerTransport.class);
+			assertThat(context).hasSingleBean(WebMvcSseServerTransportProvider.class);
 			assertThat(context).hasSingleBean(RouterFunction.class);
 		});
 	}
 
 	@Test
 	void objectMapperConfiguration() {
 		this.contextRunner.withBean(ObjectMapper.class, ObjectMapper::new).run(context -> {
-			assertThat(context).hasSingleBean(WebMvcSseServerTransport.class);
+			assertThat(context).hasSingleBean(WebMvcSseServerTransportProvider.class);
 			assertThat(context).hasSingleBean(RouterFunction.class);
 		});
 	}
 
 	@Test
 	void stdioEnabledConfiguration() {
 		this.contextRunner.withPropertyValues("spring.ai.mcp.server.stdio=true").run(context -> {
-			assertThat(context).doesNotHaveBean(WebMvcSseServerTransport.class);
+			assertThat(context).doesNotHaveBean(WebMvcSseServerTransportProvider.class);
 		});
 	}