samples: remove hacks around client eager initialization

Signed-off-by: Daniel Garnier-Moiroux <[email protected]>

Author: Kehrlann

README.md

@@ -370,6 +370,8 @@ Depending on the flow you chose (see above), you may need one or both client reg
 ```properties
 # Ensure MCP clients are sync
 spring.ai.mcp.client.type=SYNC
+# Ensure that you do not initialize the clients on startup
+spring.ai.mcp.client.initialized=false
 #
 #
 # For obtaining tokens for calling the tool
@@ -619,41 +621,9 @@ class McpConfiguration {
 }
 ```
 
-### Work around Spring AI autoconfiguration
+### Programmatically configure MCP clients
 
-Spring AI integrates MCP tools as if they were regular "tools" (e.g. `@Tool` methods).
-As such, they are discovered when application starts up.
-This means that any MCP client that is configured through configuration properties, such
-as `spring.ai.mcp.client.streamable-http.connections.<SERVER-NAME>.url=...` will be initialized.
-In practice, there will be multiple calls issued to the MCP Server (`initialize` followed by `tools/list`).
-The server will require a token for these calls, and, without a user present, this is an issue in the general case.
-
-To avoid this, you first need to ensure that the clients are not initialized on startup.
-You can do so by setting the property `spring.ai.mcp.client.initialized=false`.
-Then, you need to ensure tools are not listed. There are a few ways to avoid this:
-
-**Disable the @Tool auto-configuration**
-
-You can turn off Spring AI's `@Tool` autoconfiguration altogether.
-This will disable all method and function-based tool calling, and only MCP tools will be available.
-The easiest way to do so is to publish an empty `ToolCallbackResolver` bean:
-
-```java
-
-@Configuration
-public class McpConfiguration {
-
-    @Bean
-    ToolCallbackResolver resolver() {
-        return new StaticToolCallbackResolver(List.of());
-    }
-
-}
-```
-
-**Programmatically configure MCP clients**
-
-You may also forego Spring AI's autoconfiguration altogether, and create the MCP clients programmatically.
+If you'd like to use Spring AI's autoconfiguration altogether, you can create the MCP clients programmatically.
 The easiest way is to draw some inspiration on the transport
 auto-configurations ([HttpClient](https://github.com/spring-projects/spring-ai/blob/main/auto-configurations/mcp/spring-ai-autoconfigure-mcp-client-httpclient/src/main/java/org/springframework/ai/mcp/client/httpclient/autoconfigure/StreamableHttpHttpClientTransportAutoConfiguration.java), [WebClient](https://github.com/spring-projects/spring-ai/blob/main/auto-configurations/mcp/spring-ai-autoconfigure-mcp-client-webflux/src/main/java/org/springframework/ai/mcp/client/webflux/autoconfigure/StreamableHttpWebFluxTransportAutoConfiguration.java))
 as well as
@@ -723,7 +693,7 @@ var chatResponse = chatClient.prompt("Prompt the LLM to _do the thing_")
 - Spring WebFlux servers are not supported.
 - Spring AI autoconfiguration initializes the MCP client app start.
   Most MCP servers want calls to be authenticated with a token, so you
-  need to work around the Spring AI auto-config ([see the workaround above](#work-around-spring-ai-autoconfiguration))
+  need to turn initialization off with `spring.ai.mcp.client.initialized=false`.
 
 Note:
 

samples/sample-mcp-client-webflux/src/main/java/org/springaicommunity/mcp/security/sample/client/McpConfiguration.java

@@ -16,16 +16,10 @@
 
 package org.springaicommunity.mcp.security.sample.client;
 
-import java.util.List;
-
 import org.springaicommunity.mcp.security.client.sync.AuthenticationMcpTransportContextProvider;
 import org.springaicommunity.mcp.security.client.sync.oauth2.webclient.McpOAuth2AuthorizationCodeExchangeFilterFunction;
 
 import org.springframework.ai.mcp.customizer.McpSyncClientCustomizer;
-import org.springframework.ai.model.anthropic.autoconfigure.AnthropicChatAutoConfiguration;
-import org.springframework.ai.model.tool.autoconfigure.ToolCallingAutoConfiguration;
-import org.springframework.ai.tool.resolution.StaticToolCallbackResolver;
-import org.springframework.ai.tool.resolution.ToolCallbackResolver;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.oauth2.client.OAuth2AuthorizedClientManager;
@@ -39,26 +33,6 @@
 @Configuration
 class McpConfiguration {
 
-	/**
-	 * If the default {@link ToolCallbackResolver} from
-	 * {@link ToolCallingAutoConfiguration} is imported, then all MCP-based tools are
-	 * added to the resolver. In order to do so, the {@link ToolCallbackResolver} bean
-	 * lists all MCP tools, therefore initializing MCP clients and listing the tools.
-	 * <p>
-	 * This is an issue when the MCP server is secured with OAuth2, because to obtain a
-	 * token, a user must be involved in the flow, and there is no user present on app
-	 * startup.
-	 * <p>
-	 * To avoid this issue, we must exclude the default {@link ToolCallbackResolver}. We
-	 * can't easily disable the entire {@link ToolCallingAutoConfiguration} class, because
-	 * it is imported directly by the chat model configurations, such as
-	 * {@link AnthropicChatAutoConfiguration}. Instead, we provide a default, no-op bean.
-	 */
-	@Bean
-	ToolCallbackResolver resolver() {
-		return new StaticToolCallbackResolver(List.of());
-	}
-
 	@Bean
 	McpSyncClientCustomizer syncClientCustomizer() {
 		return (name, syncSpec) -> syncSpec.transportContextProvider(new AuthenticationMcpTransportContextProvider());

samples/sample-mcp-client/src/main/java/org/springaicommunity/mcp/security/sample/client/McpConfiguration.java

@@ -16,17 +16,11 @@
 
 package org.springaicommunity.mcp.security.sample.client;
 
-import java.util.List;
-
 import io.modelcontextprotocol.client.transport.customizer.McpSyncHttpClientRequestCustomizer;
 import org.springaicommunity.mcp.security.client.sync.AuthenticationMcpTransportContextProvider;
 import org.springaicommunity.mcp.security.client.sync.oauth2.http.client.OAuth2AuthorizationCodeSyncHttpRequestCustomizer;
 
 import org.springframework.ai.mcp.customizer.McpSyncClientCustomizer;
-import org.springframework.ai.model.anthropic.autoconfigure.AnthropicChatAutoConfiguration;
-import org.springframework.ai.model.tool.autoconfigure.ToolCallingAutoConfiguration;
-import org.springframework.ai.tool.resolution.StaticToolCallbackResolver;
-import org.springframework.ai.tool.resolution.ToolCallbackResolver;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.oauth2.client.OAuth2AuthorizedClientManager;
@@ -39,26 +33,6 @@
 @Configuration
 class McpConfiguration {
 
-	/**
-	 * If the default {@link ToolCallbackResolver} from
-	 * {@link ToolCallingAutoConfiguration} is imported, then all MCP-based tools are
-	 * added to the resolver. In order to do so, the {@link ToolCallbackResolver} bean
-	 * lists all MCP tools, therefore initializing MCP clients and listing the tools.
-	 * <p>
-	 * This is an issue when the MCP server is secured with OAuth2, because to obtain a
-	 * token, a user must be involved in the flow, and there is no user present on app
-	 * startup.
-	 * <p>
-	 * To avoid this issue, we must exclude the default {@link ToolCallbackResolver}. We
-	 * can't easily disable the entire {@link ToolCallingAutoConfiguration} class, because
-	 * it is imported directly by the chat model configurations, such as
-	 * {@link AnthropicChatAutoConfiguration}. Instead, we provide a default, no-op bean.
-	 */
-	@Bean
-	ToolCallbackResolver resolver() {
-		return new StaticToolCallbackResolver(List.of());
-	}
-
 	@Bean
 	McpSyncHttpClientRequestCustomizer requestCustomizer(OAuth2AuthorizedClientManager oAuth2AuthorizedClientManager,
 			ClientRegistrationRepository clientRegistrationRepository) {

samples/sample-mcp-client/src/main/resources/application.properties

@@ -5,8 +5,8 @@ spring.ai.anthropic.api-key=${ANTHROPIC_API_KEY}
 
 spring.ai.mcp.client.streamable-http.connections.current-weather.url=http://localhost:8091
 spring.ai.mcp.client.streamable-http.connections.historical-weather.url=http://localhost:8090
-spring.ai.mcp.client.initialized=false
 spring.ai.mcp.client.type=SYNC
+spring.ai.mcp.client.initialized=false
 
 # For obtaining tokens for calling the tool
 spring.security.oauth2.client.registration.authserver.client-id=default-client