Refactor tool specification handling to use maps for improved lookup efficiency.

Author: amaan75

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

@@ -381,24 +381,23 @@ public Mono<Void> addTools(List<McpServerFeatures.AsyncToolSpecification> toolSp
 			return Mono.empty();
 		}
 
-		List<McpServerFeatures.AsyncToolSpecification> wrappedToolSpecifications;
+		Map<String, McpServerFeatures.AsyncToolSpecification> wrappedToolSpecificationsByName;
 		try {
-			wrappedToolSpecifications = sanitizeToolSpecifications(toolSpecifications);
+			wrappedToolSpecificationsByName = sanitizeToolSpecifications(toolSpecifications);
 		}
 		catch (IllegalArgumentException e) {
 			return Mono.error(e);
 		}
 		if (this.serverCapabilities.tools() == null) {
 			return Mono.error(new IllegalStateException("Server must be configured with tool capabilities"));
 		}
-		Set<String> toolNames = new HashSet<>(
-				wrappedToolSpecifications.stream().map(tool -> tool.tool().name()).toList());
 
 		return Mono.defer(() -> {
-			this.tools.removeIf(toolSpecification -> toolNames.contains(toolSpecification.tool().name()));
-			this.tools.addAll(wrappedToolSpecifications);
+			this.tools.removeIf(
+					toolSpecification -> wrappedToolSpecificationsByName.containsKey(toolSpecification.tool().name()));
+			this.tools.addAll(wrappedToolSpecificationsByName.values());
 
-			logger.debug("Added tool handlers: {}", toolNames);
+			logger.debug("Added tool handlers: {}", wrappedToolSpecificationsByName.keySet());
 
 			if (this.serverCapabilities.tools().listChanged()) {
 				return notifyToolsListChanged();
@@ -407,7 +406,7 @@ public Mono<Void> addTools(List<McpServerFeatures.AsyncToolSpecification> toolSp
 		});
 	}
 
-	private List<McpServerFeatures.AsyncToolSpecification> sanitizeToolSpecifications(
+	private Map<String, McpServerFeatures.AsyncToolSpecification> sanitizeToolSpecifications(
 			List<McpServerFeatures.AsyncToolSpecification> toolSpecifications) {
 		LinkedHashMap<String, McpServerFeatures.AsyncToolSpecification> toolSpecificationsByName = new LinkedHashMap<>();
 
@@ -425,7 +424,7 @@ private List<McpServerFeatures.AsyncToolSpecification> sanitizeToolSpecification
 			toolSpecificationsByName.put(wrappedToolSpecification.tool().name(), wrappedToolSpecification);
 		}
 
-		return new ArrayList<>(toolSpecificationsByName.values());
+		return toolSpecificationsByName;
 	}
 
 	private static class StructuredOutputCallToolHandler

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

@@ -370,30 +370,29 @@ public Mono<Void> addTools(List<McpStatelessServerFeatures.AsyncToolSpecificatio
 			return Mono.empty();
 		}
 
-		List<McpStatelessServerFeatures.AsyncToolSpecification> wrappedToolSpecifications;
+		Map<String, McpStatelessServerFeatures.AsyncToolSpecification> wrappedToolSpecificationsByName;
 		try {
-			wrappedToolSpecifications = sanitizeToolSpecifications(toolSpecifications);
+			wrappedToolSpecificationsByName = sanitizeToolSpecifications(toolSpecifications);
 		}
 		catch (IllegalArgumentException e) {
 			return Mono.error(e);
 		}
 		if (this.serverCapabilities.tools() == null) {
 			return Mono.error(new IllegalStateException("Server must be configured with tool capabilities"));
 		}
-		Set<String> toolNames = new HashSet<>(
-				wrappedToolSpecifications.stream().map(tool -> tool.tool().name()).toList());
 
 		return Mono.defer(() -> {
-			this.tools.removeIf(toolSpecification -> toolNames.contains(toolSpecification.tool().name()));
-			this.tools.addAll(wrappedToolSpecifications);
+			this.tools.removeIf(
+					toolSpecification -> wrappedToolSpecificationsByName.containsKey(toolSpecification.tool().name()));
+			this.tools.addAll(wrappedToolSpecificationsByName.values());
 
-			logger.debug("Added tool handlers: {}", toolNames);
+			logger.debug("Added tool handlers: {}", wrappedToolSpecificationsByName.keySet());
 
 			return Mono.empty();
 		});
 	}
 
-	private List<McpStatelessServerFeatures.AsyncToolSpecification> sanitizeToolSpecifications(
+	private Map<String, McpStatelessServerFeatures.AsyncToolSpecification> sanitizeToolSpecifications(
 			List<McpStatelessServerFeatures.AsyncToolSpecification> toolSpecifications) {
 		LinkedHashMap<String, McpStatelessServerFeatures.AsyncToolSpecification> toolSpecificationsByName = new LinkedHashMap<>();
 
@@ -411,7 +410,7 @@ private List<McpStatelessServerFeatures.AsyncToolSpecification> sanitizeToolSpec
 			toolSpecificationsByName.put(wrappedToolSpecification.tool().name(), wrappedToolSpecification);
 		}
 
-		return new ArrayList<>(toolSpecificationsByName.values());
+		return toolSpecificationsByName;
 	}
 
 	/**