Revert "Introduce McpServerObjectMapperFactory for consistent ObjectMapper configuration"

This reverts commit 4273328.

Author: ilayaperumalg

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

@@ -91,31 +91,12 @@ public class McpServerAutoConfiguration {
 
 	private static final LogAccessor logger = new LogAccessor(McpServerAutoConfiguration.class);
 
-	/**
-	 * Creates a configured ObjectMapper for MCP server JSON serialization.
-	 * <p>
-	 * This ObjectMapper is specifically configured for MCP protocol compliance with:
-	 * <ul>
-	 * <li>Lenient deserialization that doesn't fail on unknown properties</li>
-	 * <li>Proper handling of empty beans during serialization</li>
-	 * <li>Exclusion of null values from JSON output</li>
-	 * <li>Standard Jackson modules for Java 8, JSR-310, and Kotlin support</li>
-	 * </ul>
-	 * <p>
-	 * This bean can be overridden by providing a custom ObjectMapper bean with the name
-	 * "mcpServerObjectMapper".
-	 * @return configured ObjectMapper instance for MCP server operations
-	 */
-	@Bean(name = "mcpServerObjectMapper")
-	@ConditionalOnMissingBean(name = "mcpServerObjectMapper")
-	public ObjectMapper mcpServerObjectMapper() {
-		return McpServerObjectMapperFactory.createObjectMapper();
-	}
-
 	@Bean
 	@ConditionalOnMissingBean
-	public McpServerTransportProviderBase stdioServerTransport(ObjectMapper mcpServerObjectMapper) {
-		return new StdioServerTransportProvider(new JacksonMcpJsonMapper(mcpServerObjectMapper));
+	public McpServerTransportProviderBase stdioServerTransport(ObjectProvider<ObjectMapper> objectMapperProvider) {
+		ObjectMapper objectMapper = objectMapperProvider.getIfAvailable(ObjectMapper::new);
+
+		return new StdioServerTransportProvider(new JacksonMcpJsonMapper(objectMapper));
 	}
 
 	@Bean

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

@@ -22,7 +22,6 @@
 import io.modelcontextprotocol.spec.McpServerTransportProvider;
 
 import org.springframework.ai.mcp.server.common.autoconfigure.McpServerAutoConfiguration;
-import org.springframework.ai.mcp.server.common.autoconfigure.McpServerObjectMapperFactory;
 import org.springframework.ai.mcp.server.common.autoconfigure.McpServerStdioDisabledCondition;
 import org.springframework.ai.mcp.server.common.autoconfigure.properties.McpServerSseProperties;
 import org.springframework.beans.factory.ObjectProvider;
@@ -81,7 +80,7 @@ public WebMvcSseServerTransportProvider webMvcSseServerTransportProvider(
 			@Qualifier("mcpServerObjectMapper") ObjectProvider<ObjectMapper> objectMapperProvider,
 			McpServerSseProperties serverProperties) {
 
-		ObjectMapper objectMapper = McpServerObjectMapperFactory.getOrCreateObjectMapper(objectMapperProvider);
+		ObjectMapper objectMapper = objectMapperProvider.getIfAvailable(ObjectMapper::new);
 
 		return WebMvcSseServerTransportProvider.builder()
 			.jsonMapper(new JacksonMcpJsonMapper(objectMapper))

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

@@ -21,7 +21,6 @@
 import io.modelcontextprotocol.server.transport.WebMvcStatelessServerTransport;
 import io.modelcontextprotocol.spec.McpSchema;
 
-import org.springframework.ai.mcp.server.common.autoconfigure.McpServerObjectMapperFactory;
 import org.springframework.ai.mcp.server.common.autoconfigure.McpServerStatelessAutoConfiguration;
 import org.springframework.ai.mcp.server.common.autoconfigure.McpServerStdioDisabledCondition;
 import org.springframework.ai.mcp.server.common.autoconfigure.properties.McpServerStreamableHttpProperties;
@@ -53,7 +52,7 @@ public WebMvcStatelessServerTransport webMvcStatelessServerTransport(
 			@Qualifier("mcpServerObjectMapper") ObjectProvider<ObjectMapper> objectMapperProvider,
 			McpServerStreamableHttpProperties serverProperties) {
 
-		ObjectMapper objectMapper = McpServerObjectMapperFactory.getOrCreateObjectMapper(objectMapperProvider);
+		ObjectMapper objectMapper = objectMapperProvider.getIfAvailable(ObjectMapper::new);
 
 		return WebMvcStatelessServerTransport.builder()
 			.jsonMapper(new JacksonMcpJsonMapper(objectMapper))