address review comments

Signed-off-by: Christian Tzolov <christian.tzolov@broadcom.com>

Author: tzolov

mcp-core/src/main/java/io/modelcontextprotocol/server/McpAsyncServer.java

@@ -26,7 +26,6 @@
 import io.modelcontextprotocol.spec.McpSchema.CallToolResult;
 import io.modelcontextprotocol.spec.McpSchema.CompleteResult.CompleteCompletion;
 import io.modelcontextprotocol.spec.McpSchema.ErrorCodes;
-import io.modelcontextprotocol.spec.McpSchema.LoggingLevel;
 import io.modelcontextprotocol.spec.McpSchema.PromptReference;
 import io.modelcontextprotocol.spec.McpSchema.ResourceReference;
 import io.modelcontextprotocol.spec.McpSchema.SetLevelRequest;
@@ -433,7 +432,8 @@ public Mono<CallToolResult> apply(McpAsyncServerExchange exchange, McpSchema.Cal
 				var validation = this.jsonSchemaValidator.validate(outputSchema, result.structuredContent());
 
 				if (!validation.valid()) {
-					String message = "Tool output validation failed: " + validation.errorMessage();
+					String message = "Tool (" + request.name() + ") output validation failed: "
+							+ validation.errorMessage();
 					logger.warn(message);
 					return CallToolResult.builder()
 						.content(List.of(McpSchema.TextContent.builder(message).build()))

mcp-core/src/main/java/io/modelcontextprotocol/server/McpStatelessAsyncServer.java

@@ -4,9 +4,19 @@
 
 package io.modelcontextprotocol.server;
 
-import io.modelcontextprotocol.json.TypeRef;
-import io.modelcontextprotocol.json.McpJsonMapper;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.function.BiFunction;
+
 import io.modelcontextprotocol.common.McpTransportContext;
+import io.modelcontextprotocol.json.McpJsonMapper;
+import io.modelcontextprotocol.json.TypeRef;
 import io.modelcontextprotocol.json.schema.JsonSchemaValidator;
 import io.modelcontextprotocol.server.McpStatelessServerFeatures.AsyncResourceTemplateSpecification;
 import io.modelcontextprotocol.spec.McpError;
@@ -28,16 +38,6 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.function.BiFunction;
-
 import static io.modelcontextprotocol.spec.McpError.RESOURCE_NOT_FOUND;
 
 /**
@@ -293,7 +293,8 @@ public Mono<CallToolResult> apply(McpTransportContext transportContext, McpSchem
 				var validation = this.jsonSchemaValidator.validate(outputSchema, result.structuredContent());
 
 				if (!validation.valid()) {
-					String message = "Tool output validation failed: " + validation.errorMessage();
+					String message = "Tool (" + request.name() + ") output validation failed: "
+							+ validation.errorMessage();
 					logger.warn(message);
 					return CallToolResult.builder()
 						.content(List.of(McpSchema.TextContent.builder(message).build()))

mcp-core/src/main/java/io/modelcontextprotocol/util/ToolInputValidator.java

@@ -42,8 +42,8 @@ public static CallToolResult validate(McpSchema.Tool tool, Map<String, Object> a
 		Map<String, Object> args = arguments != null ? arguments : Map.of();
 		var validation = validator.validate(tool.inputSchema(), args);
 		if (!validation.valid()) {
-			String message = "Tool input validation failed: " + validation.errorMessage();
-			logger.warn("Tool '{}' {}", tool.name(), message);
+			String message = "Tool (" + tool.name() + ") input validation failed: " + validation.errorMessage();
+			logger.warn("'{}' {}", tool.name(), message);
 			return CallToolResult.builder()
 				.content(List.of(McpSchema.TextContent.builder(message).build()))
 				.isError(true)

mcp-test/src/test/java/io/modelcontextprotocol/server/ToolInputValidationIntegrationTests.java

@@ -182,7 +182,7 @@ void invalidInput_withDefaultValidation_shouldReturnToolError(String serverType,
 
 			assertThat(result.isError()).isTrue();
 			String errorMessage = ((TextContent) result.content().get(0)).text();
-			assertThat(errorMessage).startsWith("Tool input validation failed:");
+			assertThat(errorMessage).startsWith("Tool (test-tool) input validation failed:");
 			assertThat(errorMessage).containsIgnoringCase("Validation failed");
 			assertThat(errorMessage).containsIgnoringCase("JSON schema validation errors");
 			assertThat(errorMessage).containsIgnoringCase(expectedErrorSubstring);