fix(mcp): update tests to use callHandler instead of deprecated call method

- Replace deprecated call() method with callHandler() in ToolUtilsTests and McpToolUtils
- Fix NullPointerException in sync/async tool specification tests
- Update MCP API usage to match current implementation

Resolves test failures in spring-ai-mcp module.

Signed-off-by: yinh <[email protected]>

Author: Fottas

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

@@ -317,9 +317,9 @@ 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))
+		return new AsyncToolSpecification(syncToolSpecification.tool(), null,
+				(exchange, request) -> Mono.fromCallable(
+						() -> syncToolSpecification.callHandler().apply(new McpSyncServerExchange(exchange), request))
 					.subscribeOn(Schedulers.boundedElastic()));
 	}
 

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;
@@ -226,7 +227,10 @@ void toSyncToolSpecificationShouldConvertSingleCallback() {
 		assertThat(toolSpecification).isNotNull();
 		assertThat(toolSpecification.tool().name()).isEqualTo("test");
 
-		CallToolResult result = toolSpecification.call().apply(mock(McpSyncServerExchange.class), Map.of());
+		McpSchema.CallToolRequest mockRequest = mock(McpSchema.CallToolRequest.class);
+		when(mockRequest.arguments()).thenReturn(Map.of());
+
+		CallToolResult result = toolSpecification.callHandler().apply(mock(McpSyncServerExchange.class), mockRequest);
 		TextContent content = (TextContent) result.content().get(0);
 		assertThat(content.text()).isEqualTo("success");
 		assertThat(result.isError()).isFalse();
@@ -239,7 +243,11 @@ void toSyncToolSpecificationShouldHandleError() {
 		SyncToolSpecification toolSpecification = McpToolUtils.toSyncToolSpecification(callback);
 
 		assertThat(toolSpecification).isNotNull();
-		CallToolResult result = toolSpecification.call().apply(mock(McpSyncServerExchange.class), Map.of());
+
+		McpSchema.CallToolRequest mockRequest = mock(McpSchema.CallToolRequest.class);
+		when(mockRequest.arguments()).thenReturn(Map.of());
+
+		CallToolResult result = toolSpecification.callHandler().apply(mock(McpSyncServerExchange.class), mockRequest);
 		TextContent content = (TextContent) result.content().get(0);
 		assertThat(content.text()).isEqualTo("error");
 		assertThat(result.isError()).isTrue();
@@ -267,7 +275,10 @@ void toAsyncToolSpecificationShouldConvertSingleCallback() {
 		assertThat(toolSpecification).isNotNull();
 		assertThat(toolSpecification.tool().name()).isEqualTo("test");
 
-		StepVerifier.create(toolSpecification.call().apply(mock(McpAsyncServerExchange.class), Map.of()))
+		McpSchema.CallToolRequest mockRequest = mock(McpSchema.CallToolRequest.class);
+		when(mockRequest.arguments()).thenReturn(Map.of());
+
+		StepVerifier.create(toolSpecification.callHandler().apply(mock(McpAsyncServerExchange.class), mockRequest))
 			.assertNext(result -> {
 				TextContent content = (TextContent) result.content().get(0);
 				assertThat(content.text()).isEqualTo("success");
@@ -283,7 +294,11 @@ void toAsyncToolSpecificationShouldHandleError() {
 		AsyncToolSpecification toolSpecification = McpToolUtils.toAsyncToolSpecification(callback);
 
 		assertThat(toolSpecification).isNotNull();
-		StepVerifier.create(toolSpecification.call().apply(mock(McpAsyncServerExchange.class), Map.of()))
+
+		McpSchema.CallToolRequest mockRequest = mock(McpSchema.CallToolRequest.class);
+		when(mockRequest.arguments()).thenReturn(Map.of());
+
+		StepVerifier.create(toolSpecification.callHandler().apply(mock(McpAsyncServerExchange.class), mockRequest))
 			.assertNext(result -> {
 				TextContent content = (TextContent) result.content().get(0);
 				assertThat(content.text()).isEqualTo("error");