Make ToolInputValidationIntegrationTests not dependend on abstract class

Signed-off-by: Daniel Garnier-Moiroux <git@garnier.wf>

Author: Kehrlann

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

@@ -424,10 +424,9 @@ public AsyncSpecification<S> strictToolNameValidation(boolean strict) {
 		}
 
 		/**
-		 * Sets whether to validate tool inputs against the tool's input schema. When set,
-		 * this takes priority over the system property
-		 * {@code io.modelcontextprotocol.validateToolInputs}.
-		 * @param validate true to validate inputs and return error on validation failure
+		 * Sets whether to validate tool inputs against the tool's input schema.
+		 * @param validate true to validate inputs and return error on validation failure,
+		 * false to skip validation. Defaults to true.
 		 * @return This builder instance for method chaining
 		 */
 		public AsyncSpecification<S> validateToolInputs(boolean validate) {
@@ -1022,10 +1021,9 @@ public SyncSpecification<S> strictToolNameValidation(boolean strict) {
 		}
 
 		/**
-		 * Sets whether to validate tool inputs against the tool's input schema. When set,
-		 * this takes priority over the system property
-		 * {@code io.modelcontextprotocol.validateToolInputs}.
-		 * @param validate true to validate inputs and return error on validation failure
+		 * Sets whether to validate tool inputs against the tool's input schema.
+		 * @param validate true to validate inputs and return error on validation failure,
+		 * false to skip validation. Defaults to true.
 		 * @return This builder instance for method chaining
 		 */
 		public SyncSpecification<S> validateToolInputs(boolean validate) {
@@ -1562,10 +1560,9 @@ public StatelessAsyncSpecification strictToolNameValidation(boolean strict) {
 		}
 
 		/**
-		 * Sets whether to validate tool inputs against the tool's input schema. When set,
-		 * this takes priority over the system property
-		 * {@code io.modelcontextprotocol.validateToolInputs}.
-		 * @param validate true to validate inputs and return error on validation failure
+		 * Sets whether to validate tool inputs against the tool's input schema.
+		 * @param validate true to validate inputs and return error on validation failure,
+		 * false to skip validation. Defaults to true.
 		 * @return This builder instance for method chaining
 		 */
 		public StatelessAsyncSpecification validateToolInputs(boolean validate) {
@@ -2060,10 +2057,9 @@ public StatelessSyncSpecification strictToolNameValidation(boolean strict) {
 		}
 
 		/**
-		 * Sets whether to validate tool inputs against the tool's input schema. When set,
-		 * this takes priority over the system property
-		 * {@code io.modelcontextprotocol.validateToolInputs}.
-		 * @param validate true to validate inputs and return error on validation failure
+		 * Sets whether to validate tool inputs against the tool's input schema.
+		 * @param validate true to validate inputs and return error on validation failure,
+		 * false to skip validation. Defaults to true.
 		 * @return This builder instance for method chaining
 		 */
 		public StatelessSyncSpecification validateToolInputs(boolean validate) {

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

@@ -9,7 +9,6 @@
 import java.util.Map;
 import java.util.stream.Stream;
 
-import io.modelcontextprotocol.AbstractMcpClientServerIntegrationTests;
 import io.modelcontextprotocol.client.McpClient;
 import io.modelcontextprotocol.client.transport.HttpClientStreamableHttpTransport;
 import io.modelcontextprotocol.common.McpTransportContext;
@@ -42,7 +41,7 @@
  * @author Andrei Shakirin
  */
 @Timeout(15)
-class ToolInputValidationIntegrationTests extends AbstractMcpClientServerIntegrationTests {
+class ToolInputValidationIntegrationTests {
 
 	private static final int PORT = TomcatTestUtil.findAvailablePort();
 
@@ -61,10 +60,6 @@ class ToolInputValidationIntegrationTests extends AbstractMcpClientServerIntegra
 
 	private Tomcat tomcat;
 
-	static Stream<Arguments> clientsForTesting() {
-		return Stream.of(Arguments.of("httpclient"));
-	}
-
 	static Stream<Arguments> validInputTestCases() {
 		return Stream.of(
 				// serverType, validationEnabled, inputArgs, expectedOutput
@@ -82,6 +77,10 @@ static Stream<Arguments> invalidInputTestCases() {
 																						// value
 	}
 
+	private final McpClient.SyncSpec clientBuilder = McpClient
+		.sync(HttpClientStreamableHttpTransport.builder("http://localhost:" + PORT).endpoint(MESSAGE_ENDPOINT).build())
+		.requestTimeout(Duration.ofSeconds(10));
+
 	@BeforeEach
 	public void before() {
 		mcpServerTransportProvider = HttpServletStreamableServerTransportProvider.builder()
@@ -97,20 +96,12 @@ public void before() {
 		catch (Exception e) {
 			throw new RuntimeException("Failed to start Tomcat", e);
 		}
-
-		clientBuilders
-			.put("httpclient",
-					McpClient.sync(HttpClientStreamableHttpTransport.builder("http://localhost:" + PORT)
-						.endpoint(MESSAGE_ENDPOINT)
-						.build()).requestTimeout(Duration.ofSeconds(10)));
 	}
 
-	@Override
 	protected McpServer.AsyncSpecification<?> prepareAsyncServerBuilder() {
 		return McpServer.async(this.mcpServerTransportProvider);
 	}
 
-	@Override
 	protected McpServer.SyncSpecification<?> prepareSyncServerBuilder() {
 		return McpServer.sync(this.mcpServerTransportProvider);
 	}
@@ -131,10 +122,6 @@ public void after() {
 		}
 	}
 
-	@Override
-	protected void prepareClients(int port, String mcpEndpoint) {
-	}
-
 	private McpServerFeatures.SyncToolSpecification createSyncTool() {
 		Tool tool = Tool.builder()
 			.name(TOOL_NAME)
@@ -173,7 +160,6 @@ private McpServerFeatures.AsyncToolSpecification createAsyncTool() {
 	@MethodSource("validInputTestCases")
 	void validInput_shouldSucceed(String serverType, boolean validationEnabled, Map<String, Object> input,
 			String expectedOutput) {
-		var clientBuilder = clientBuilders.get("httpclient");
 		Object server = createServer(serverType, validationEnabled);
 
 		try (var client = clientBuilder.clientInfo(new McpSchema.Implementation("test-client", "1.0.0")).build()) {
@@ -192,7 +178,6 @@ void validInput_shouldSucceed(String serverType, boolean validationEnabled, Map<
 	@MethodSource("invalidInputTestCases")
 	void invalidInput_withDefaultValidation_shouldReturnToolError(String serverType, Map<String, Object> input,
 			String expectedErrorSubstring) {
-		var clientBuilder = clientBuilders.get("httpclient");
 		Object server = createServerWithDefaultValidation(serverType);
 
 		try (var client = clientBuilder.clientInfo(new McpSchema.Implementation("test-client", "1.0.0")).build()) {
@@ -212,7 +197,6 @@ void invalidInput_withDefaultValidation_shouldReturnToolError(String serverType,
 	@MethodSource("invalidInputTestCases")
 	void invalidInput_withValidationDisabled_shouldSucceed(String serverType, Map<String, Object> input,
 			String ignored) {
-		var clientBuilder = clientBuilders.get("httpclient");
 		Object server = createServer(serverType, false);
 
 		try (var client = clientBuilder.clientInfo(new McpSchema.Implementation("test-client", "1.0.0")).build()) {