Skip to content

Commit fcdc0d4

Browse files
KehrlannKehrlann
committed
Polish gh-906 
1 parent eaa0c69 commit fcdc0d4

File tree

4 files changed

+116
-588
lines changed

4 files changed

+116
-588
lines changed

‎mcp-core/src/main/java/io/modelcontextprotocol/client/McpAsyncClient.java‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -654,12 +654,12 @@ public Mono<McpSchema.ListToolsResult> listTools(String cursor) {
654654
* @param meta Optional metadata to include in the request (_meta field)
655655
* @return A Mono that emits the list of tools result
656656
*/
657-
public Mono<McpSchema.ListToolsResult> listTools(String cursor, java.util.Map<String, Object> meta) {
657+
public Mono<McpSchema.ListToolsResult> listTools(String cursor, Map<String, Object> meta) {
658658
return this.initializer.withInitialization("listing tools", init -> this.listToolsInternal(init, cursor, meta));
659659
}
660660

661661
private Mono<McpSchema.ListToolsResult> listToolsInternal(Initialization init, String cursor,
662-
java.util.Map<String, Object> meta) {
662+
Map<String, Object> meta) {
663663

664664
if (init.initializeResult().capabilities().tools() == null) {
665665
return Mono.error(new IllegalStateException("Server does not provide tools capability"));
@@ -749,12 +749,11 @@ public Mono<McpSchema.ListResourcesResult> listResources(String cursor) {
749749
* @see McpSchema.ListResourcesResult
750750
* @see #readResource(McpSchema.Resource)
751751
*/
752-
public Mono<McpSchema.ListResourcesResult> listResources(String cursor, java.util.Map<String, Object> meta) {
752+
public Mono<McpSchema.ListResourcesResult> listResources(String cursor, Map<String, Object> meta) {
753753
return this.listResourcesInternal(cursor, meta);
754754
}
755755

756-
private Mono<McpSchema.ListResourcesResult> listResourcesInternal(String cursor,
757-
java.util.Map<String, Object> meta) {
756+
private Mono<McpSchema.ListResourcesResult> listResourcesInternal(String cursor, Map<String, Object> meta) {
758757
return this.initializer.withInitialization("listing resources", init -> {
759758
if (init.initializeResult().capabilities().resources() == null) {
760759
return Mono.error(new IllegalStateException("Server does not provide the resources capability"));
@@ -837,13 +836,12 @@ public Mono<McpSchema.ListResourceTemplatesResult> listResourceTemplates(String
837836
* @return A Mono that completes with the list of resource templates result.
838837
* @see McpSchema.ListResourceTemplatesResult
839838
*/
840-
public Mono<McpSchema.ListResourceTemplatesResult> listResourceTemplates(String cursor,
841-
java.util.Map<String, Object> meta) {
839+
public Mono<McpSchema.ListResourceTemplatesResult> listResourceTemplates(String cursor, Map<String, Object> meta) {
842840
return this.listResourceTemplatesInternal(cursor, meta);
843841
}
844842

845843
private Mono<McpSchema.ListResourceTemplatesResult> listResourceTemplatesInternal(String cursor,
846-
java.util.Map<String, Object> meta) {
844+
Map<String, Object> meta) {
847845
return this.initializer.withInitialization("listing resource templates", init -> {
848846
if (init.initializeResult().capabilities().resources() == null) {
849847
return Mono.error(new IllegalStateException("Server does not provide the resources capability"));
@@ -955,11 +953,11 @@ public Mono<ListPromptsResult> listPrompts(String cursor) {
955953
* @see McpSchema.ListPromptsResult
956954
* @see #getPrompt(GetPromptRequest)
957955
*/
958-
public Mono<ListPromptsResult> listPrompts(String cursor, java.util.Map<String, Object> meta) {
956+
public Mono<ListPromptsResult> listPrompts(String cursor, Map<String, Object> meta) {
959957
return this.listPromptsInternal(cursor, meta);
960958
}
961959

962-
private Mono<ListPromptsResult> listPromptsInternal(String cursor, java.util.Map<String, Object> meta) {
960+
private Mono<ListPromptsResult> listPromptsInternal(String cursor, Map<String, Object> meta) {
963961
return this.initializer.withInitialization("listing prompts",
964962
init -> init.mcpSession()
965963
.sendRequest(McpSchema.METHOD_PROMPT_LIST, new PaginatedRequest(cursor, meta),

‎mcp-core/src/main/java/io/modelcontextprotocol/client/McpSyncClient.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package io.modelcontextprotocol.client;
66

77
import java.time.Duration;
8+
import java.util.Map;
89
import java.util.function.Supplier;
910

1011
import org.slf4j.Logger;
@@ -267,7 +268,7 @@ public McpSchema.ListToolsResult listTools(String cursor) {
267268
* with a name, description, and input schema - nextCursor: Optional cursor for
268269
* pagination if more tools are available
269270
*/
270-
public McpSchema.ListToolsResult listTools(String cursor, java.util.Map<String, Object> meta) {
271+
public McpSchema.ListToolsResult listTools(String cursor, Map<String, Object> meta) {
271272
return withProvidedContext(this.delegate.listTools(cursor, meta)).block();
272273
}
273274

@@ -300,7 +301,7 @@ public McpSchema.ListResourcesResult listResources(String cursor) {
300301
* @param meta Optional metadata to include in the request (_meta field)
301302
* @return The list of resources result
302303
*/
303-
public McpSchema.ListResourcesResult listResources(String cursor, java.util.Map<String, Object> meta) {
304+
public McpSchema.ListResourcesResult listResources(String cursor, Map<String, Object> meta) {
304305
return withProvidedContext(this.delegate.listResources(cursor, meta)).block();
305306

306307
}
@@ -356,8 +357,7 @@ public McpSchema.ListResourceTemplatesResult listResourceTemplates(String cursor
356357
* @param meta Optional metadata to include in the request (_meta field)
357358
* @return The list of resource templates result.
358359
*/
359-
public McpSchema.ListResourceTemplatesResult listResourceTemplates(String cursor,
360-
java.util.Map<String, Object> meta) {
360+
public McpSchema.ListResourceTemplatesResult listResourceTemplates(String cursor, Map<String, Object> meta) {
361361
return withProvidedContext(this.delegate.listResourceTemplates(cursor, meta)).block();
362362

363363
}
@@ -414,7 +414,7 @@ public ListPromptsResult listPrompts(String cursor) {
414414
* @param meta Optional metadata to include in the request (_meta field)
415415
* @return The list of prompts result.
416416
*/
417-
public ListPromptsResult listPrompts(String cursor, java.util.Map<String, Object> meta) {
417+
public ListPromptsResult listPrompts(String cursor, Map<String, Object> meta) {
418418
return withProvidedContext(this.delegate.listPrompts(cursor, meta)).block();
419419

420420
}

‎mcp-test/src/main/java/io/modelcontextprotocol/client/AbstractMcpSyncClientTests.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ void testListTools() {
158158
void testListToolsWithMeta() {
159159
withClient(createMcpTransport(), mcpSyncClient -> {
160160
mcpSyncClient.initialize();
161-
java.util.Map<String, Object> meta = java.util.Map.of("requestId", "test-123");
161+
Map<String, Object> meta = java.util.Map.of("requestId", "test-123");
162162
ListToolsResult tools = mcpSyncClient.listTools(McpSchema.FIRST_PAGE, meta);
163163

164164
assertThat(tools).isNotNull().satisfies(result -> {
@@ -695,7 +695,7 @@ void testProgressConsumer() {
695695
void testListResourcesWithMeta() {
696696
withClient(createMcpTransport(), mcpSyncClient -> {
697697
mcpSyncClient.initialize();
698-
java.util.Map<String, Object> meta = java.util.Map.of("requestId", "test-123");
698+
Map<String, Object> meta = java.util.Map.of("requestId", "test-123");
699699
ListResourcesResult resources = mcpSyncClient.listResources(McpSchema.FIRST_PAGE, meta);
700700

701701
assertThat(resources).isNotNull().satisfies(result -> {
@@ -708,7 +708,7 @@ void testListResourcesWithMeta() {
708708
void testListResourceTemplatesWithMeta() {
709709
withClient(createMcpTransport(), mcpSyncClient -> {
710710
mcpSyncClient.initialize();
711-
java.util.Map<String, Object> meta = java.util.Map.of("requestId", "test-123");
711+
Map<String, Object> meta = java.util.Map.of("requestId", "test-123");
712712
ListResourceTemplatesResult result = mcpSyncClient.listResourceTemplates(McpSchema.FIRST_PAGE, meta);
713713

714714
assertThat(result).isNotNull().satisfies(r -> {
@@ -721,7 +721,7 @@ void testListResourceTemplatesWithMeta() {
721721
void testListPromptsWithMeta() {
722722
withClient(createMcpTransport(), mcpSyncClient -> {
723723
mcpSyncClient.initialize();
724-
java.util.Map<String, Object> meta = java.util.Map.of("requestId", "test-123");
724+
Map<String, Object> meta = java.util.Map.of("requestId", "test-123");
725725
McpSchema.ListPromptsResult result = mcpSyncClient.listPrompts(McpSchema.FIRST_PAGE, meta);
726726

727727
assertThat(result).isNotNull().satisfies(r -> {

0 commit comments

Comments
 (0)