From a8ce10593b92677b2f9e427332caa4fd9e47d9ab Mon Sep 17 00:00:00 2001 From: Sizhe Fan <132420031+paoxiaomooo@users.noreply.github.com> Date: Wed, 23 Jul 2025 18:25:02 +0800 Subject: [PATCH 1/2] Update SyncMcpToolCallbackProvider.java Signed-off-by: Sizhe Fan <132420031+paoxiaomooo@users.noreply.github.com> --- .../ai/mcp/SyncMcpToolCallbackProvider.java | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/mcp/common/src/main/java/org/springframework/ai/mcp/SyncMcpToolCallbackProvider.java b/mcp/common/src/main/java/org/springframework/ai/mcp/SyncMcpToolCallbackProvider.java index 7d0aa4276a1..4e916eb023c 100644 --- a/mcp/common/src/main/java/org/springframework/ai/mcp/SyncMcpToolCallbackProvider.java +++ b/mcp/common/src/main/java/org/springframework/ai/mcp/SyncMcpToolCallbackProvider.java @@ -17,6 +17,7 @@ package org.springframework.ai.mcp; import java.util.List; +import java.util.Set; import java.util.function.BiPredicate; import io.modelcontextprotocol.client.McpSyncClient; @@ -86,7 +87,32 @@ public SyncMcpToolCallbackProvider(BiPredicate toolFilter, this.mcpClients = mcpClients; this.toolFilter = toolFilter; } - + /** + * Creates a new {@code SyncMcpToolCallbackProvider} instance that includes only clients + * from the specified allowed servers. + *

+ * This constructor: + *

    + *
  1. Filters the provided MCP clients to only those matching allowed server names
    2. + *
  2. Retains all tools from the selected clients (no additional tool filtering)
    3. + *
  3. Ensures no null parameters are passed
    4. + *
+ * + * @param mcpClients complete list of available MCP clients + * @param allowedServerNames set of server names to include (case-sensitive) + * @throws IllegalArgumentException if parameters are null or empty + * @since 1.1.0 + */ + public SyncMcpToolCallbackProvider(List mcpClients, Set allowedServerNames) { + Assert.notNull(mcpClients, "MCP clients list must not be null"); + Assert.notNull(allowedServerNames, "Allowed server names set must not be null"); + Assert.notEmpty(allowedServerNames, "Allowed server names set must not be empty"); + + this.mcpClients = mcpClients.stream() + .filter(client -> allowedServerNames.contains(client.getServerInfo().name())) + .toList(); + this.toolFilter = (client, tool) -> true; // No additional filtering + } /** * Creates a new {@code SyncMcpToolCallbackProvider} instance with a list of MCP * clients. From b5acf5fcb079416a80d10f3f9cd7605873ee4cfa Mon Sep 17 00:00:00 2001 From: Sizhe Fan <132420031+paoxiaomooo@users.noreply.github.com> Date: Wed, 23 Jul 2025 18:28:46 +0800 Subject: [PATCH 2/2] Update AsyncMcpToolCallbackProvider.java Signed-off-by: Sizhe Fan <132420031+paoxiaomooo@users.noreply.github.com> --- .../ai/mcp/AsyncMcpToolCallbackProvider.java | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/mcp/common/src/main/java/org/springframework/ai/mcp/AsyncMcpToolCallbackProvider.java b/mcp/common/src/main/java/org/springframework/ai/mcp/AsyncMcpToolCallbackProvider.java index 3525b9593e3..7de29fdb111 100644 --- a/mcp/common/src/main/java/org/springframework/ai/mcp/AsyncMcpToolCallbackProvider.java +++ b/mcp/common/src/main/java/org/springframework/ai/mcp/AsyncMcpToolCallbackProvider.java @@ -18,6 +18,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.Set; import java.util.function.BiPredicate; import io.modelcontextprotocol.client.McpAsyncClient; @@ -90,7 +91,33 @@ public AsyncMcpToolCallbackProvider(BiPredicate toolFilter this.mcpClients = mcpClients; this.toolFilter = toolFilter; } - + /** + * Creates a new {@code AsyncMcpToolCallbackProvider} instance that includes only clients + * from the specified allowed servers. + *

+ * This constructor: + *

    + *
  1. Filters the provided MCP clients to only those matching allowed server names
    2. + *
  2. Retains all tools from the selected clients (no additional tool filtering)
    3. + *
  3. Ensures no null parameters are passed
    4. + *
  4. Maintains full asynchronous operation capability
    5. + *
+ * + * @param mcpClients complete list of available MCP async clients + * @param allowedServerNames set of server names to include (case-sensitive) + * @throws IllegalArgumentException if parameters are null or empty + * @since 1.1.0 + */ + public AsyncMcpToolCallbackProvider(List mcpClients, Set allowedServerNames) { + Assert.notNull(mcpClients, "MCP clients list must not be null"); + Assert.notNull(allowedServerNames, "Allowed server names set must not be null"); + Assert.notEmpty(allowedServerNames, "Allowed server names set must not be empty"); + + this.mcpClients = mcpClients.stream() + .filter(client -> allowedServerNames.contains(client.getServerInfo().name())) + .collect(Collectors.toList()); + this.toolFilter = (client, tool) -> true; + } /** * Creates a new {@code AsyncMcpToolCallbackProvider} instance with a list of MCP * clients.