refactor: restructure MCP server auto-configuraitons, adding streamable-http support #4179
+7,586
−490
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
tzolov
commented
Aug 18, 2025
tzolov
commented
- Extract MCP server functionality into specialized modules:
- STDIO/SSE servers (existing functionality)
- Streamable-HTTP servers with change notifications
- Stateless servers for simplified deployments
- Add new auto-configuration modules:
- spring-ai-autoconfigure-mcp-streamable-server-common
- spring-ai-autoconfigure-mcp-streamable-server-webflux/webmvc
- spring-ai-autoconfigure-mcp-stateless-server-common
- spring-ai-autoconfigure-mcp-stateless-server-webflux/webmvc
- Add server-specific property prefixes for different server types
- Extract ToolCallbackConverter into separate auto-configuration with conditional enablement via tool-callback-converter property
- Enhance transport providers with builder patterns and new features:
- Keep-alive interval support for connection health
- Add keep-alive-interval and other transport-specific options
- Add comprehensive integration tests for all server types
- Update documentation to reflect new architecture and server options
…le-http support - Extract MCP server functionality into specialized modules: * STDIO/SSE servers (existing functionality) * Streamable-HTTP servers with change notifications * Stateless servers for simplified deployments - Add new auto-configuration modules: * spring-ai-autoconfigure-mcp-streamable-server-common * spring-ai-autoconfigure-mcp-streamable-server-webflux/webmvc * spring-ai-autoconfigure-mcp-stateless-server-common * spring-ai-autoconfigure-mcp-stateless-server-webflux/webmvc * Add server-specific property prefixes for different server types - Extract ToolCallbackConverter into separate auto-configuration with conditional enablement via tool-callback-converter property - Enhance transport providers with builder patterns and new features: * Keep-alive interval support for connection health * Add keep-alive-interval and other transport-specific options - Add comprehensive integration tests for all server types - Update documentation to reflect new architecture and server options Signed-off-by: Christian Tzolov <[email protected]>
|
This looks great. I did some similar things for the IT testing in the integration tests for spring-ai-examples. i think there are some reusable patterns we can discuss. |
markpollack
reviewed
Aug 19, 2025
| // De-duplicate tools by their name, keeping the first occurrence of each tool | ||
| // name | ||
| return tools.stream() // Key: tool name | ||
| .collect(Collectors.toMap(tool -> tool.getToolDefinition().name(), tool -> tool, // Value: |
There was a problem hiding this comment.
this logic is duplicated in the sync version, can share a utility method
markpollack
reviewed
Aug 19, 2025
| .withConfiguration(AutoConfigurations.of(McpToolCallbackAutoConfiguration.class, | ||
| McpClientAutoConfiguration.class, SseWebFluxTransportAutoConfiguration.class)); | ||
|
|
||
| static AtomicReference<LoggingMessageNotification> loggingNotificationRef = new AtomicReference<>(); |
There was a problem hiding this comment.
static can introduce side effects, make them instance vars and reset state in @beforeeach.
There was a problem hiding this comment.
As those are shared between the test and the spring configuration beens we can't use the beforeeach but we can make them a special TestContext been as part for the client test configuration.
I will fix it for the Sse and the Streamable its
Signed-off-by: Christian Tzolov <[email protected]>
Signed-off-by: Christian Tzolov <[email protected]>
|
Thanks @markpollack I've addressed the above recomendations |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.