From e55a7e005dcc26b0d8f714e78ab88b9b5862620d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dariusz=20J=C4=99drzejczyk?= Date: Mon, 6 Oct 2025 11:18:31 +0200 Subject: [PATCH] Ensure MCP Tools Autoconfiguration happens before ChatClient Autoconfiguration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Dariusz Jędrzejczyk --- .../common/autoconfigure/McpToolCallbackAutoConfiguration.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/auto-configurations/mcp/spring-ai-autoconfigure-mcp-client-common/src/main/java/org/springframework/ai/mcp/client/common/autoconfigure/McpToolCallbackAutoConfiguration.java b/auto-configurations/mcp/spring-ai-autoconfigure-mcp-client-common/src/main/java/org/springframework/ai/mcp/client/common/autoconfigure/McpToolCallbackAutoConfiguration.java index 51227b5534e..89143c324c0 100644 --- a/auto-configurations/mcp/spring-ai-autoconfigure-mcp-client-common/src/main/java/org/springframework/ai/mcp/client/common/autoconfigure/McpToolCallbackAutoConfiguration.java +++ b/auto-configurations/mcp/spring-ai-autoconfigure-mcp-client-common/src/main/java/org/springframework/ai/mcp/client/common/autoconfigure/McpToolCallbackAutoConfiguration.java @@ -42,7 +42,8 @@ * ToolCallbacksProviders. These providers are used by Spring AI to discover and execute * tools. */ -@AutoConfiguration(after = { McpClientAutoConfiguration.class }) +@AutoConfiguration(after = { McpClientAutoConfiguration.class }, + beforeName = { "org.springframework.ai.model.chat.client.autoconfigure.ChatClientAutoConfiguration" }) @EnableConfigurationProperties(McpClientCommonProperties.class) @Conditional(McpToolCallbackAutoConfiguration.McpToolCallbackAutoConfigurationCondition.class) public class McpToolCallbackAutoConfiguration {