make the spring.ai.mcp.client.toolcallback.enabled true by default

Signed-off-by: Christian Tzolov <[email protected]>

Author: tzolov

auto-configurations/spring-ai-mcp-client/src/main/java/org/springframework/ai/autoconfigure/mcp/client/McpToolCallbackAutoConfiguration.java

@@ -53,7 +53,7 @@ static class McpAutoConfigEnabled {
 		}
 
 		@ConditionalOnProperty(prefix = McpClientCommonProperties.CONFIG_PREFIX + ".toolcallback", name = "enabled",
-				havingValue = "true", matchIfMissing = false)
+				havingValue = "true", matchIfMissing = true)
 		static class ToolCallbackProviderEnabled {
 
 		}

auto-configurations/spring-ai-mcp-client/src/test/java/org/springframework/ai/autoconfigure/mcp/client/McpToolCallbackAutoConfigurationTests.java

@@ -29,25 +29,25 @@ public class McpToolCallbackAutoConfigurationTests {
 		.withConfiguration(AutoConfigurations.of(McpToolCallbackAutoConfiguration.class));
 
 	@Test
-	void disabledByDeafault() {
+	void byDeafault() {
 
 		this.applicationContext.run((context) -> {
-			assertThat(context).doesNotHaveBean("mcpToolCallbacks");
+			assertThat(context).hasBean("mcpToolCallbacks");
 			assertThat(context).doesNotHaveBean("mcpAsyncToolCallbacks");
 		});
 
 		this.applicationContext
 			.withPropertyValues("spring.ai.mcp.client.enabled=true", "spring.ai.mcp.client.type=SYNC")
 			.run((context) -> {
-				assertThat(context).doesNotHaveBean("mcpToolCallbacks");
+				assertThat(context).hasBean("mcpToolCallbacks");
 				assertThat(context).doesNotHaveBean("mcpAsyncToolCallbacks");
 			});
 
 		this.applicationContext
 			.withPropertyValues("spring.ai.mcp.client.enabled=true", "spring.ai.mcp.client.type=ASYNC")
 			.run((context) -> {
 				assertThat(context).doesNotHaveBean("mcpToolCallbacks");
-				assertThat(context).doesNotHaveBean("mcpAsyncToolCallbacks");
+				assertThat(context).hasBean("mcpAsyncToolCallbacks");
 			});
 	}
 

auto-configurations/spring-ai-mcp-client/src/test/java/org/springframework/ai/autoconfigure/mcp/client/McpToolCallbackAutoconfiguraitonConditionTests.java

@@ -72,19 +72,17 @@ void doesNotMatchWhenBothPropertiesAreDisabled() {
 
 	@Test
 	void doesNotMatchWhenToolCallbackPropertyIsMissing() {
-		// McpClientEnabled is true by default if missing, but ToolCallbackEnabled is
-		// false by default if missing
+		// McpClientEnabled and ToolCallbackEnabled are true by default if missing
 		this.contextRunner.withPropertyValues("spring.ai.mcp.client.enabled=true").run(context -> {
-			assertThat(context).doesNotHaveBean("testBean");
+			assertThat(context).hasBean("testBean");
 		});
 	}
 
 	@Test
 	void doesNotMatchWhenBothPropertiesAreMissing() {
-		// McpClientEnabled is true by default if missing, but ToolCallbackEnabled is
-		// false by default if missing
+		// McpClientEnabled and ToolCallbackEnabled are true by default if missing
 		this.contextRunner.run(context -> {
-			assertThat(context).doesNotHaveBean("testBean");
+			assertThat(context).hasBean("testBean");
 		});
 	}
 

spring-ai-docs/src/main/antora/modules/ROOT/pages/api/mcp/mcp-client-boot-starter-docs.adoc

@@ -5,9 +5,9 @@ The Spring AI MCP (Model Context Protocol) Client Boot Starter provides auto-con
 The MCP Client Boot Starter provides:
 
 * Management of multiple client instances
-* Automatic client initialization (if enabled)
+* Automatic client initialization (if enabled, `spring.ai.mcp.client.initialized=true`)
 * Support for multiple named transports
-* Integration with Spring AI's tool execution framework
+* Integration with Spring AI's tool execution framework (if enabled `spring.ai.mcp.client.toolcallback.enabled=true`)
 * Proper lifecycle management with automatic cleanup of resources when the application context is closed
 * Customizable client creation through customizers
 
@@ -81,7 +81,7 @@ The common properties are prefixed with `spring.ai.mcp.client`:
 
 |`toolcallback.enabled`
 |Enable/disable the MCP tool callback integration with Spring AI's tool execution framework
-|`false`
+|`true`
 |===
 
 === Stdio Transport Properties

spring-ai-docs/src/main/antora/modules/ROOT/pages/api/mcp/mcp-overview.adoc

@@ -38,7 +38,7 @@ a| The MCP Client is a key component in the Model Context Protocol (MCP) archite
 * Protocol version negotiation to ensure compatibility with servers
 * Capability negotiation to determine available features
 * Message transport and JSON-RPC communication
-* Tool discovery and execution
+* Tool discovery and execution (if enabled)
 * Resource access and management
 * Prompt system interactions
 * Optional features:
@@ -59,7 +59,7 @@ a| The MCP Client is a key component in the Model Context Protocol (MCP) archite
 a| The MCP Server is a foundational component in the Model Context Protocol (MCP) architecture that provides tools, resources, and capabilities to clients. It implements the server-side of the protocol, responsible for:
 
 * Server-side protocol operations implementation
-** Tool exposure and discovery
+** Tool exposure and discovery (if enabled)
 ** Resource management with URI-based access
 ** Prompt template provision and handling
 ** Capability negotiation with clients