refactor(McpToolUtils): Use builder pattern instead of deprecated constructors

- Update SyncToolSpecification creation to use builder pattern
- Update AsyncToolSpecification creation to use builder pattern
- Improve code readability and maintainability

Signed-off-by: codeboyzhou <imzhouchen@gmail.com>
Co-authored-by: Ilayaperumal Gopinathan <ilayaperumal.gopinathan@broadcom.com>

Author: codeboyzhou

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

@@ -28,7 +28,6 @@
 import io.modelcontextprotocol.client.McpAsyncClient;
 import io.modelcontextprotocol.client.McpSyncClient;
 import io.modelcontextprotocol.server.McpServerFeatures;
-import io.modelcontextprotocol.server.McpServerFeatures.AsyncToolSpecification;
 import io.modelcontextprotocol.server.McpStatelessServerFeatures;
 import io.modelcontextprotocol.server.McpSyncServerExchange;
 import io.modelcontextprotocol.spec.McpSchema;
@@ -222,8 +221,10 @@ public static McpStatelessServerFeatures.SyncToolSpecification toStatelessSyncTo
 
 		var sharedSpec = toSharedSyncToolSpecification(toolCallback, mimeType);
 
-		return new McpStatelessServerFeatures.SyncToolSpecification(sharedSpec.tool(),
-				(exchange, request) -> sharedSpec.sharedHandler().apply(exchange, request));
+		return McpStatelessServerFeatures.SyncToolSpecification.builder()
+			.tool(sharedSpec.tool())
+			.callHandler((exchange, request) -> sharedSpec.sharedHandler().apply(exchange, request))
+			.build();
 	}
 
 	private static SharedSyncToolSpecification toSharedSyncToolSpecification(ToolCallback toolCallback,
@@ -241,9 +242,9 @@ private static SharedSyncToolSpecification toSharedSyncToolSpecification(ToolCal
 				String callResult = toolCallback.call(ModelOptionsUtils.toJsonString(request.arguments()),
 						new ToolContext(Map.of(TOOL_CONTEXT_MCP_EXCHANGE_KEY, exchangeOrContext)));
 				if (mimeType != null && mimeType.toString().startsWith("image")) {
-					return new McpSchema.CallToolResult(List
-						.of(new McpSchema.ImageContent(List.of(Role.ASSISTANT), null, callResult, mimeType.toString())),
-							false);
+					McpSchema.Annotations annotations = new McpSchema.Annotations(List.of(Role.ASSISTANT), null);
+					return new McpSchema.CallToolResult(
+							List.of(new McpSchema.ImageContent(annotations, callResult, mimeType.toString())), false);
 				}
 				return new McpSchema.CallToolResult(List.of(new McpSchema.TextContent(callResult)), false);
 			}
@@ -353,10 +354,13 @@ public static McpServerFeatures.AsyncToolSpecification toAsyncToolSpecification(
 
 		McpServerFeatures.SyncToolSpecification syncToolSpecification = toSyncToolSpecification(toolCallback, mimeType);
 
-		return new AsyncToolSpecification(syncToolSpecification.tool(),
-				(exchange, map) -> Mono
-					.fromCallable(() -> syncToolSpecification.call().apply(new McpSyncServerExchange(exchange), map))
-					.subscribeOn(Schedulers.boundedElastic()));
+		return McpServerFeatures.AsyncToolSpecification.builder()
+			.tool(syncToolSpecification.tool())
+			.callHandler((exchange, request) -> Mono
+				.fromCallable(
+						() -> syncToolSpecification.callHandler().apply(new McpSyncServerExchange(exchange), request))
+				.subscribeOn(Schedulers.boundedElastic()))
+			.build();
 	}
 
 	public static McpStatelessServerFeatures.AsyncToolSpecification toStatelessAsyncToolSpecification(

mcp/common/src/test/java/org/springframework/ai/mcp/ToolUtilsTests.java

@@ -26,6 +26,7 @@
 import io.modelcontextprotocol.server.McpServerFeatures.AsyncToolSpecification;
 import io.modelcontextprotocol.server.McpServerFeatures.SyncToolSpecification;
 import io.modelcontextprotocol.server.McpSyncServerExchange;
+import io.modelcontextprotocol.spec.McpSchema;
 import io.modelcontextprotocol.spec.McpSchema.CallToolResult;
 import io.modelcontextprotocol.spec.McpSchema.Implementation;
 import io.modelcontextprotocol.spec.McpSchema.ListToolsResult;
@@ -267,7 +268,9 @@ void toAsyncToolSpecificationShouldConvertSingleCallback() {
 		assertThat(toolSpecification).isNotNull();
 		assertThat(toolSpecification.tool().name()).isEqualTo("test");
 
-		StepVerifier.create(toolSpecification.call().apply(mock(McpAsyncServerExchange.class), Map.of()))
+		StepVerifier
+			.create(toolSpecification.callHandler()
+				.apply(mock(McpAsyncServerExchange.class), mock(McpSchema.CallToolRequest.class)))
 			.assertNext(result -> {
 				TextContent content = (TextContent) result.content().get(0);
 				assertThat(content.text()).isEqualTo("success");
@@ -283,7 +286,9 @@ void toAsyncToolSpecificationShouldHandleError() {
 		AsyncToolSpecification toolSpecification = McpToolUtils.toAsyncToolSpecification(callback);
 
 		assertThat(toolSpecification).isNotNull();
-		StepVerifier.create(toolSpecification.call().apply(mock(McpAsyncServerExchange.class), Map.of()))
+		StepVerifier
+			.create(toolSpecification.callHandler()
+				.apply(mock(McpAsyncServerExchange.class), mock(McpSchema.CallToolRequest.class)))
 			.assertNext(result -> {
 				TextContent content = (TextContent) result.content().get(0);
 				assertThat(content.text()).isEqualTo("error");