address review comments

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

Author: tzolov

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

@@ -208,12 +208,6 @@ private AsyncSpecification(McpServerTransportProvider transportProvider) {
 			this.transportProvider = transportProvider;
 		}
 
-		private void AssertNotDupplicateTool(String toolName) {
-			if (this.tools.stream().anyMatch(toolSpec -> toolSpec.tool().name().equals(toolName))) {
-				throw new IllegalArgumentException("Tool with name '" + toolName + "' is already registered.");
-			}
-		}
-
 		/**
 		 * Sets the URI template manager factory to use for creating URI templates. This
 		 * allows for custom URI template parsing and variable extraction.
@@ -335,7 +329,7 @@ public AsyncSpecification tool(McpSchema.Tool tool,
 				BiFunction<McpAsyncServerExchange, Map<String, Object>, Mono<CallToolResult>> handler) {
 			Assert.notNull(tool, "Tool must not be null");
 			Assert.notNull(handler, "Handler must not be null");
-			AssertNotDupplicateTool(tool.name());
+			assertNoDuplicateTool(tool.name());
 
 			this.tools.add(new McpServerFeatures.AsyncToolSpecification(tool, handler).toToolCall());
 
@@ -360,7 +354,7 @@ public AsyncSpecification toolCall(McpSchema.Tool tool,
 
 			Assert.notNull(tool, "Tool must not be null");
 			Assert.notNull(handler, "Handler must not be null");
-			AssertNotDupplicateTool(tool.name());
+			assertNoDuplicateTool(tool.name());
 
 			this.tools.add(new McpServerFeatures.AsyncToolCallSpecification(tool, handler));
 
@@ -384,7 +378,7 @@ public AsyncSpecification tools(List<McpServerFeatures.AsyncToolSpecification> t
 			Assert.notNull(toolSpecifications, "Tool handlers list must not be null");
 
 			for (var tool : toolSpecifications) {
-				AssertNotDupplicateTool(tool.tool().name());
+				assertNoDuplicateTool(tool.tool().name());
 				this.tools.add(tool.toToolCall());
 			}
 
@@ -406,7 +400,7 @@ public AsyncSpecification toolCalls(List<McpServerFeatures.AsyncToolCallSpecific
 			Assert.notNull(toolCallSpecifications, "Tool handlers list must not be null");
 
 			for (var tool : toolCallSpecifications) {
-				AssertNotDupplicateTool(tool.tool().name());
+				assertNoDuplicateTool(tool.tool().name());
 				this.tools.add(tool);
 			}
 			return this;
@@ -435,7 +429,7 @@ public AsyncSpecification tools(McpServerFeatures.AsyncToolSpecification... tool
 			Assert.notNull(toolSpecifications, "Tool handlers list must not be null");
 
 			for (McpServerFeatures.AsyncToolSpecification tool : toolSpecifications) {
-				AssertNotDupplicateTool(tool.tool().name());
+				assertNoDuplicateTool(tool.tool().name());
 				this.tools.add(tool.toToolCall());
 			}
 			return this;
@@ -452,12 +446,18 @@ public AsyncSpecification toolCalls(McpServerFeatures.AsyncToolCallSpecification
 			Assert.notNull(toolCallSpecifications, "Tool handlers list must not be null");
 
 			for (McpServerFeatures.AsyncToolCallSpecification tool : toolCallSpecifications) {
-				AssertNotDupplicateTool(tool.tool().name());
+				assertNoDuplicateTool(tool.tool().name());
 				this.tools.add(tool);
 			}
 			return this;
 		}
 
+		private void assertNoDuplicateTool(String toolName) {
+			if (this.tools.stream().anyMatch(toolSpec -> toolSpec.tool().name().equals(toolName))) {
+				throw new IllegalArgumentException("Tool with name '" + toolName + "' is already registered.");
+			}
+		}
+
 		/**
 		 * Registers multiple resources with their handlers using a Map. This method is
 		 * useful when resources are dynamically generated or loaded from a configuration
@@ -785,12 +785,6 @@ private SyncSpecification(McpServerTransportProvider transportProvider) {
 			this.transportProvider = transportProvider;
 		}
 
-		private void AssertNotDupplicateTool(String toolName) {
-			if (this.tools.stream().anyMatch(toolSpec -> toolSpec.tool().name().equals(toolName))) {
-				throw new IllegalArgumentException("Tool with name '" + toolName + "' is already registered.");
-			}
-		}
-
 		/**
 		 * Sets the URI template manager factory to use for creating URI templates. This
 		 * allows for custom URI template parsing and variable extraction.
@@ -911,7 +905,7 @@ public SyncSpecification tool(McpSchema.Tool tool,
 				BiFunction<McpSyncServerExchange, Map<String, Object>, McpSchema.CallToolResult> handler) {
 			Assert.notNull(tool, "Tool must not be null");
 			Assert.notNull(handler, "Handler must not be null");
-			AssertNotDupplicateTool(tool.name());
+			assertNoDuplicateTool(tool.name());
 
 			this.tools.add(new McpServerFeatures.SyncToolSpecification(tool, handler).toToolCall());
 
@@ -935,7 +929,7 @@ public SyncSpecification toolCall(McpSchema.Tool tool,
 				BiFunction<McpSyncServerExchange, McpSchema.CallToolRequest, McpSchema.CallToolResult> handler) {
 			Assert.notNull(tool, "Tool must not be null");
 			Assert.notNull(handler, "Handler must not be null");
-			AssertNotDupplicateTool(tool.name());
+			assertNoDuplicateTool(tool.name());
 
 			this.tools.add(new McpServerFeatures.SyncToolCallSpecification(tool, handler));
 
@@ -960,7 +954,7 @@ public SyncSpecification tools(List<McpServerFeatures.SyncToolSpecification> too
 
 			for (var tool : toolSpecifications) {
 				String toolName = tool.tool().name();
-				AssertNotDupplicateTool(toolName); // Check against existing tools
+				assertNoDuplicateTool(toolName); // Check against existing tools
 				this.tools.add(tool.toToolCall()); // Add the tool call specification
 													// directly
 			}
@@ -981,7 +975,7 @@ public SyncSpecification toolCalls(List<McpServerFeatures.SyncToolCallSpecificat
 			Assert.notNull(toolCallSpecifications, "Tool handlers list must not be null");
 
 			for (var tool : toolCallSpecifications) {
-				AssertNotDupplicateTool(tool.tool().name());
+				assertNoDuplicateTool(tool.tool().name());
 				this.tools.add(tool);
 			}
 
@@ -1013,7 +1007,7 @@ public SyncSpecification tools(McpServerFeatures.SyncToolSpecification... toolSp
 			Assert.notNull(toolSpecifications, "Tool handlers list must not be null");
 
 			for (McpServerFeatures.SyncToolSpecification tool : toolSpecifications) {
-				AssertNotDupplicateTool(tool.tool().name());
+				assertNoDuplicateTool(tool.tool().name());
 				this.tools.add(tool.toToolCall());
 			}
 			return this;
@@ -1031,12 +1025,18 @@ public SyncSpecification toolCalls(McpServerFeatures.SyncToolCallSpecification..
 			Assert.notNull(toolCallSpecifications, "Tool handlers list must not be null");
 
 			for (McpServerFeatures.SyncToolCallSpecification tool : toolCallSpecifications) {
-				AssertNotDupplicateTool(tool.tool().name());
+				assertNoDuplicateTool(tool.tool().name());
 				this.tools.add(tool);
 			}
 			return this;
 		}
 
+		private void assertNoDuplicateTool(String toolName) {
+			if (this.tools.stream().anyMatch(toolSpec -> toolSpec.tool().name().equals(toolName))) {
+				throw new IllegalArgumentException("Tool with name '" + toolName + "' is already registered.");
+			}
+		}
+
 		/**
 		 * Registers multiple resources with their handlers using a Map. This method is
 		 * useful when resources are dynamically generated or loaded from a configuration