merge: Merged the main branch code and resolved the conflicts.

Signed-off-by: Sun Yuhan <[email protected]>

Author: sunyuhan1998

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

@@ -231,8 +231,8 @@ public static McpStatelessServerFeatures.SyncToolSpecification toStatelessSyncTo
 	private static SharedSyncToolSpecification toSharedSyncToolSpecification(ToolCallback toolCallback,
 			MimeType mimeType) {
 		boolean returnDirect = Optional.ofNullable(toolCallback.getToolMetadata())
-				.map(ToolMetadata::returnDirect)
-				.orElse(false);
+			.map(ToolMetadata::returnDirect)
+			.orElse(false);
 		McpSchema.ToolAnnotations toolAnnotations = new McpSchema.ToolAnnotations(null, null, null, null, null,
 				returnDirect);
 

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

@@ -48,27 +48,6 @@ class AsyncMcpToolCallbackTest {
 	@Mock
 	private McpSchema.Tool tool;
 
-	@Test
-	void getToolDefinitionShouldReturnCorrectDefinition() {
-
-		var clientInfo = new McpSchema.Implementation("testClient", "1.0.0");
-		var toolAnnotations = new McpSchema.ToolAnnotations(null, false, false, false, false, true);
-
-		when(this.mcpClient.getClientInfo()).thenReturn(clientInfo);
-		when(this.tool.name()).thenReturn("testTool");
-		when(this.tool.description()).thenReturn("Test tool description");
-		when(this.tool.annotations()).thenReturn(toolAnnotations);
-
-		AsyncMcpToolCallback callback = new AsyncMcpToolCallback(this.mcpClient, this.tool);
-
-		var toolDefinition = callback.getToolDefinition();
-		var toolMetadata = callback.getToolMetadata();
-
-		assertThat(toolDefinition.name()).isEqualTo(clientInfo.name() + "_testTool");
-		assertThat(toolDefinition.description()).isEqualTo("Test tool description");
-		assertThat(toolMetadata.returnDirect()).isEqualTo(true);
-	}
-
 	@Test
 	void callShouldThrowOnError() {
 		when(this.tool.name()).thenReturn("testTool");
@@ -225,6 +204,8 @@ void getToolDefinitionShouldReturnCorrectDefinition() {
 		when(this.tool.description()).thenReturn("Test tool description");
 		var jsonSchema = mock(McpSchema.JsonSchema.class);
 		when(this.tool.inputSchema()).thenReturn(jsonSchema);
+		var toolAnnotations = new McpSchema.ToolAnnotations(null, false, false, false, false, true);
+		when(this.tool.annotations()).thenReturn(toolAnnotations);
 
 		// Act
 		var callback = AsyncMcpToolCallback.builder()
@@ -234,11 +215,13 @@ void getToolDefinitionShouldReturnCorrectDefinition() {
 			.build();
 
 		ToolDefinition definition = callback.getToolDefinition();
+		var toolMetadata = callback.getToolMetadata();
 
 		// Assert
 		assertThat(definition.name()).isEqualTo("prefix_testTool");
 		assertThat(definition.description()).isEqualTo("Test tool description");
 		assertThat(definition.inputSchema()).isNotNull();
+		assertThat(toolMetadata.returnDirect()).isEqualTo(true);
 	}
 
 	@Test

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

@@ -58,7 +58,6 @@ void getToolDefinitionShouldReturnCorrectDefinition() {
 		when(this.tool.description()).thenReturn("Test tool description");
 		when(this.tool.annotations()).thenReturn(toolAnnotations);
 
-
 		SyncMcpToolCallback callback = SyncMcpToolCallback.builder()
 			.mcpClient(this.mcpClient)
 			.tool(this.tool)