Update ToolCallback providers to use client.getCurrentInitializationResult()

Signed-off-by: Ilayaperumal Gopinathan <[email protected]>

Author: ilayaperumalg

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

@@ -26,10 +26,10 @@
 import reactor.core.publisher.Mono;
 
 import org.springframework.ai.mcp.AsyncMcpToolCallbackProvider;
-import org.springframework.ai.mcp.McpToolFilter;
 import org.springframework.ai.mcp.McpClientMetadata;
 import org.springframework.ai.mcp.McpMetadata;
 import org.springframework.ai.mcp.McpServerMetadata;
+import org.springframework.ai.mcp.McpToolFilter;
 import org.springframework.ai.mcp.SyncMcpToolCallbackProvider;
 import org.springframework.ai.mcp.client.common.autoconfigure.McpToolCallbackAutoConfiguration.McpToolCallbackAutoConfigurationCondition;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;

mcp/common/src/main/java/org/springframework/ai/mcp/AsyncMcpToolCallbackProvider.java

@@ -147,7 +147,7 @@ public ToolCallback[] getToolCallbacks() {
 					.stream()
 					.filter(tool -> this.toolFilter.test(new McpMetadata(
 							new McpClientMetadata(mcpClient.getClientCapabilities(), mcpClient.getClientInfo()),
-							new McpServerMetadata(mcpClient.initialize().block())), tool))
+							new McpServerMetadata(mcpClient.getCurrentInitializationResult())), tool))
 					.map(tool -> new AsyncMcpToolCallback(mcpClient, tool))
 					.toArray(ToolCallback[]::new))
 				.block();

mcp/common/src/main/java/org/springframework/ai/mcp/SyncMcpToolCallbackProvider.java

@@ -133,7 +133,7 @@ public ToolCallback[] getToolCallbacks() {
 				.stream()
 				.filter(tool -> this.toolFilter.test(new McpMetadata(
 						new McpClientMetadata(mcpClient.getClientCapabilities(), mcpClient.getClientInfo()),
-						new McpServerMetadata(mcpClient.initialize())), tool))
+						new McpServerMetadata(mcpClient.getCurrentInitializationResult())), tool))
 				.map(tool -> new SyncMcpToolCallback(mcpClient, tool)))
 			.toArray(ToolCallback[]::new);
 		validateToolCallbacks(array);