feat: add pagination support for listRoots operation #336
+770
−4
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
Jun 24, 2025
tzolov
commented
- Add nextCursor field to ListRootsResult for cursor-based pagination
- Implement automatic pagination in McpAsyncServerExchange.listRoots()
- Update tests to verify pagination functionality
- Automatically fetches and combines all pages into single result
- Add nextCursor field to ListRootsResult for cursor-based pagination - Implement automatic pagination in McpAsyncServerExchange.listRoots() - Update tests to verify pagination functionality - Automatically fetches and combines all pages into single result Signed-off-by: Christian Tzolov <christian.tzolov@broadcom.com>
chemicL
requested changes
Jun 24, 2025
| return this.listRoots(result.nextCursor()); | ||
| } | ||
| return Mono.empty(); | ||
| }).reduce(new McpSchema.ListRootsResult(new ArrayList<>(), null), (allRootssResult, result) -> { |
There was a problem hiding this comment.
Suggested change
| }).reduce(new McpSchema.ListRootsResult(new ArrayList<>(), null), (allRootssResult, result) -> { | |
| }).reduce(new McpSchema.ListRootsResult(new ArrayList<>(), null), (allRootsResult, result) -> { |
| return Mono.empty(); | ||
| }).reduce(new McpSchema.ListRootsResult(new ArrayList<>(), null), (allRootssResult, result) -> { | ||
| allRootssResult.roots().addAll(result.roots()); | ||
| return allRootssResult; |
There was a problem hiding this comment.
The backing list needs to be made unmodifiable after being accumulated.
There was a problem hiding this comment.
I made some adjustments , but not sure if this is what you've meant.
| @@ -126,7 +128,16 @@ public Mono<McpSchema.ElicitResult> createElicitation(McpSchema.ElicitRequest el | |||
| * @return A Mono that emits the list of roots result. | |||
| */ | |||
| public Mono<McpSchema.ListRootsResult> listRoots() { | |||
| return this.listRoots(null); | |||
|
|
|||
| return this.listRoots(McpSchema.FIRST_PAGE).expand(result -> { | |||
There was a problem hiding this comment.
There are no tests for this? Can we have a test for 0 pages, 1 page, 5 pages? Network error after 3rd page?
There was a problem hiding this comment.
I've added a new Test for the aync exchange.
…sive tests - Refactor McpAsyncServerExchange.listRoots() to return Collections.unmodifiableList - Fix typo in variable name (allRootssResult -> allRootsResult) - Improve code formatting and readability with ternary operator - Add comprehensive test suite for McpAsyncServerExchange covering: - listRoots() pagination scenarios and edge cases - Logging notification with level filtering - Elicitation creation with various capabilities - Message creation with sampling capabilities - Error handling and validation scenarios Signed-off-by: Christian Tzolov <christian.tzolov@broadcom.com>
|
@chemicL i've addressed the comments above |
chemicL
reviewed
Jun 25, 2025
mcp/src/test/java/io/modelcontextprotocol/server/McpAsyncServerExchangeTests.java
Show resolved
Hide resolved
chemicL
reviewed
Jun 25, 2025
mcp/src/test/java/io/modelcontextprotocol/server/McpAsyncServerExchangeTests.java
Show resolved
Hide resolved
- Verify sendNotification calls in logging notification tests - Verify sendRequest is never called when capabilities are missing - Improve test assertions to ensure correct method invocation behavior Signed-off-by: Christian Tzolov <christian.tzolov@broadcom.com>
|
@chemicL I've improved the McpAsyncServerExchangeTests to validate the correct method invocation behavior |
chemicL
approved these changes
Jun 27, 2025
tzolov
added a commit
that referenced
this pull request
Jun 27, 2025
- Add nextCursor field to ListRootsResult for cursor-based pagination - Implement automatic pagination in McpAsyncServerExchange.listRoots() - Automatically fetches and combines all pages into single result - Refactor McpAsyncServerExchange.listRoots() to return Collections.unmodifiableList - Update tests to verify pagination functionality - Add test suite for McpAsyncServerExchange covering: - listRoots() pagination scenarios and edge cases - Logging notification with level filtering - Elicitation creation with various capabilities - Message creation with sampling capabilities - Error handling and validation scenarios - Verify sendNotification calls in logging notification tests - Verify sendRequest is never called when capabilities are missing Signed-off-by: Christian Tzolov <christian.tzolov@broadcom.com>
|
rebased, squashed and merged at 1cbace3 |
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.