Update McpWebFluxServerAutoConfiguration.java

refactor: Clean up McpWebFluxServerAutoConfiguration and add tests

- Reorganize imports and improve code formatting for better readability.
- Update `webFluxTransport` method to accept a custom `ObjectMapper`.
- Introduce `McpWebFluxServerAutoConfigurationTests` to validate configuration and ensure proper handling of unknown JSON properties.

Signed-off-by: Hari Ohm Prasath <[email protected]>
Signed-off-by: Hari Ohm Prasth Rajagopal <[email protected]>

Author: bullet-dev-team

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

@@ -72,8 +72,8 @@ public class McpWebFluxServerAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	public WebFluxSseServerTransport webFluxTransport(McpServerProperties serverProperties) {
-		return new WebFluxSseServerTransport(new ObjectMapper(), serverProperties.getSseMessageEndpoint());
+	public WebFluxSseServerTransport webFluxTransport(McpServerProperties serverProperties, ObjectMapper objectMapper) {
+		return new WebFluxSseServerTransport(objectMapper, serverProperties.getSseMessageEndpoint());
 	}
 
 	// Router function for SSE transport used by Spring WebFlux to start an HTTP server.

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

@@ -0,0 +1,73 @@
+package org.springframework.ai.autoconfigure.mcp.server;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.reactive.function.server.RouterFunction;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.modelcontextprotocol.server.transport.WebFluxSseServerTransport;
+
+class McpWebFluxServerAutoConfigurationTests {
+
+    private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
+            .withConfiguration(AutoConfigurations.of(
+                    McpWebFluxServerAutoConfiguration.class,
+                    JacksonAutoConfiguration.class,
+                    TestConfiguration.class)); // Add test configuration
+
+    @Test
+    void shouldConfigureWebFluxTransportWithCustomObjectMapper() {
+        this.contextRunner.run((context) -> {
+            assertThat(context).hasSingleBean(WebFluxSseServerTransport.class);
+            assertThat(context).hasSingleBean(RouterFunction.class);
+            assertThat(context).hasSingleBean(McpServerProperties.class);
+
+            WebFluxSseServerTransport transport = context.getBean(WebFluxSseServerTransport.class);
+            ObjectMapper objectMapper = context.getBean(ObjectMapper.class);
+
+            // Verify that the ObjectMapper is configured to ignore unknown properties
+            assertThat(objectMapper.getDeserializationConfig().isEnabled(
+                    com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES))
+                    .isFalse();
+
+            // Test with a JSON payload containing unknown fields
+            String jsonWithUnknownField = """
+                    {
+                        "tools": ["tool1", "tool2"],
+                        "name": "test",
+                        "unknownField": "value"
+                    }
+                    """;
+
+            // This should not throw an exception
+            TestMessage message = objectMapper.readValue(jsonWithUnknownField, TestMessage.class);
+            assertThat(message.getName()).isEqualTo("test");
+        });
+    }
+
+    // Test configuration to enable McpServerProperties
+    @Configuration
+    @EnableConfigurationProperties(McpServerProperties.class)
+    static class TestConfiguration {
+    }
+
+    // Test class to simulate the actual message structure
+    static class TestMessage {
+        private String name;
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+    }
+}