Skip to content

chore: Use stream flatmap when build toolcallbacks. #2802

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 29, 2025
Merged

chore: Use stream flatmap when build toolcallbacks. #2802

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions mcp/common/src/main/java/org/springframework/ai/mcp/SyncMcpToolCallbackProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
* // Get all available tools
* ToolCallback[] tools = provider.getToolCallbacks();
* }</pre>
*
* <p>
* Example usage with multiple clients:
*
* <pre>{@code
Expand All @@ -63,10 +63,10 @@
* }</pre>
*
* @author Christian Tzolov
* @since 1.0.0
* @see ToolCallbackProvider
* @see SyncMcpToolCallback
* @see McpSyncClient
* @since 1.0.0
*/

public class SyncMcpToolCallbackProvider implements ToolCallbackProvider {
Expand Down Expand Up @@ -130,17 +130,13 @@ public SyncMcpToolCallbackProvider(McpSyncClient... mcpClients) {
*/
@Override
public ToolCallback[] getToolCallbacks() {

var toolCallbacks = new ArrayList<>();

this.mcpClients.stream()
.forEach(mcpClient -> toolCallbacks.addAll(mcpClient.listTools()
var array = this.mcpClients.stream()
.flatMap(mcpClient -> mcpClient.listTools()
.tools()
.stream()
.filter(tool -> this.toolFilter.test(mcpClient, tool))
.map(tool -> new SyncMcpToolCallback(mcpClient, tool))
.toList()));
var array = toolCallbacks.toArray(new ToolCallback[0]);
.map(tool -> new SyncMcpToolCallback(mcpClient, tool)))
.toArray(ToolCallback[]::new);
validateToolCallbacks(array);
return array;
}
Expand Down