Skip to content

Commit d076654

Browse files
He-PinHe-Pin
committed
.
Signed-off-by: He-Pin <hepin1989@gmail.com>
1 parent 9afc044 commit d076654

6 files changed

Lines changed: 653 additions & 501 deletions

File tree

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

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ public class DefaultMcpAsyncClient implements McpAsyncClient {
178178
* @param features the MCP Client supported features. responses against output
179179
* schemas.
180180
*/
181-
DefaultMcpAsyncClient(McpClientTransport transport, Duration requestTimeout, Duration initializationTimeout,
181+
DefaultMcpAsyncClient(McpClientTransport transport, Duration requestTimeout, Duration initializationTimeout,
182182
JsonSchemaValidator jsonSchemaValidator, McpClientFeatures.Async features) {
183183

184184
Assert.notNull(transport, "Transport must not be null");
@@ -321,52 +321,52 @@ public class DefaultMcpAsyncClient implements McpAsyncClient {
321321
this.transport.setExceptionHandler(this.initializer::handleException);
322322
}
323323

324-
@Override
324+
@Override
325325
public McpSchema.InitializeResult getCurrentInitializationResult() {
326326
return this.initializer.currentInitializationResult();
327327
}
328328

329-
@Override
329+
@Override
330330
public McpSchema.ServerCapabilities getServerCapabilities() {
331331
McpSchema.InitializeResult initializeResult = this.initializer.currentInitializationResult();
332332
return initializeResult != null ? initializeResult.capabilities() : null;
333333
}
334334

335-
@Override
335+
@Override
336336
public String getServerInstructions() {
337337
McpSchema.InitializeResult initializeResult = this.initializer.currentInitializationResult();
338338
return initializeResult != null ? initializeResult.instructions() : null;
339339
}
340340

341-
@Override
341+
@Override
342342
public McpSchema.Implementation getServerInfo() {
343343
McpSchema.InitializeResult initializeResult = this.initializer.currentInitializationResult();
344344
return initializeResult != null ? initializeResult.serverInfo() : null;
345345
}
346346

347-
@Override
347+
@Override
348348
public boolean isInitialized() {
349349
return this.initializer.isInitialized();
350350
}
351351

352-
@Override
352+
@Override
353353
public ClientCapabilities getClientCapabilities() {
354354
return this.clientCapabilities;
355355
}
356356

357-
@Override
357+
@Override
358358
public McpSchema.Implementation getClientInfo() {
359359
return this.clientInfo;
360360
}
361361

362-
@Override
362+
@Override
363363
public void close() {
364364
this.initializer.close();
365365
this.transport.close();
366366
}
367367

368-
@Override
369-
public Mono<Void> closeGracefully() {
368+
@Override
369+
public Mono<Void> closeGracefully() {
370370
return Mono.defer(() -> {
371371
return this.initializer.closeGracefully().then(transport.closeGracefully());
372372
});
@@ -376,16 +376,16 @@ public Mono<Void> closeGracefully() {
376376
// Initialization
377377
// --------------------------
378378

379-
@Override
380-
public Mono<McpSchema.InitializeResult> initialize() {
379+
@Override
380+
public Mono<McpSchema.InitializeResult> initialize() {
381381
return this.initializer.withInitialization("by explicit API call", init -> Mono.just(init.initializeResult()));
382382
}
383383

384384
// --------------------------
385385
// Basic Utilities
386386
// --------------------------
387387

388-
@Override
388+
@Override
389389
public Mono<Object> ping() {
390390
return this.initializer.withInitialization("pinging the server",
391391
init -> init.mcpSession().sendRequest(McpSchema.METHOD_PING, null, OBJECT_TYPE_REF));
@@ -395,7 +395,7 @@ public Mono<Object> ping() {
395395
// Roots
396396
// --------------------------
397397

398-
@Override
398+
@Override
399399
public Mono<Void> addRoot(Root root) {
400400

401401
if (root == null) {
@@ -425,7 +425,7 @@ public Mono<Void> addRoot(Root root) {
425425
return Mono.empty();
426426
}
427427

428-
@Override
428+
@Override
429429
public Mono<Void> removeRoot(String rootUri) {
430430

431431
if (rootUri == null) {
@@ -454,7 +454,7 @@ public Mono<Void> removeRoot(String rootUri) {
454454
return Mono.error(new IllegalStateException("Root with uri '" + rootUri + "' not found"));
455455
}
456456

457-
@Override
457+
@Override
458458
public Mono<Void> rootsListChangedNotification() {
459459
return this.initializer.withInitialization("sending roots list changed notification",
460460
init -> init.mcpSession().sendNotification(McpSchema.METHOD_NOTIFICATION_ROOTS_LIST_CHANGED));
@@ -503,7 +503,7 @@ private RequestHandler<ElicitResult> elicitationCreateHandler() {
503503
private static final TypeRef<McpSchema.ListToolsResult> LIST_TOOLS_RESULT_TYPE_REF = new TypeRef<>() {
504504
};
505505

506-
@Override
506+
@Override
507507
public Mono<McpSchema.CallToolResult> callTool(McpSchema.CallToolRequest callToolRequest) {
508508
return this.initializer.withInitialization("calling tool", init -> {
509509
if (init.initializeResult().capabilities().tools() == null) {
@@ -544,7 +544,7 @@ private McpSchema.CallToolResult validateToolResult(String toolName, McpSchema.C
544544
return result;
545545
}
546546

547-
@Override
547+
@Override
548548
public Mono<McpSchema.ListToolsResult> listTools() {
549549
return this.listTools(McpSchema.FIRST_PAGE).expand(result -> {
550550
String next = result.nextCursor();
@@ -555,7 +555,7 @@ public Mono<McpSchema.ListToolsResult> listTools() {
555555
}).map(result -> new McpSchema.ListToolsResult(Collections.unmodifiableList(result.tools()), null));
556556
}
557557

558-
@Override
558+
@Override
559559
public Mono<McpSchema.ListToolsResult> listTools(String cursor) {
560560
return this.initializer.withInitialization("listing tools", init -> this.listToolsInternal(init, cursor));
561561
}
@@ -605,7 +605,7 @@ private NotificationHandler asyncToolsChangeNotificationHandler(
605605
private static final TypeRef<McpSchema.ListResourceTemplatesResult> LIST_RESOURCE_TEMPLATES_RESULT_TYPE_REF = new TypeRef<>() {
606606
};
607607

608-
@Override
608+
@Override
609609
public Mono<McpSchema.ListResourcesResult> listResources() {
610610
return this.listResources(McpSchema.FIRST_PAGE)
611611
.expand(result -> (result.nextCursor() != null) ? this.listResources(result.nextCursor()) : Mono.empty())
@@ -616,7 +616,7 @@ public Mono<McpSchema.ListResourcesResult> listResources() {
616616
.map(result -> new McpSchema.ListResourcesResult(Collections.unmodifiableList(result.resources()), null));
617617
}
618618

619-
@Override
619+
@Override
620620
public Mono<McpSchema.ListResourcesResult> listResources(String cursor) {
621621
return this.initializer.withInitialization("listing resources", init -> {
622622
if (init.initializeResult().capabilities().resources() == null) {
@@ -628,12 +628,12 @@ public Mono<McpSchema.ListResourcesResult> listResources(String cursor) {
628628
});
629629
}
630630

631-
@Override
631+
@Override
632632
public Mono<McpSchema.ReadResourceResult> readResource(McpSchema.Resource resource) {
633633
return this.readResource(new McpSchema.ReadResourceRequest(resource.uri()));
634634
}
635635

636-
@Override
636+
@Override
637637
public Mono<McpSchema.ReadResourceResult> readResource(McpSchema.ReadResourceRequest readResourceRequest) {
638638
return this.initializer.withInitialization("reading resources", init -> {
639639
if (init.initializeResult().capabilities().resources() == null) {
@@ -644,7 +644,7 @@ public Mono<McpSchema.ReadResourceResult> readResource(McpSchema.ReadResourceReq
644644
});
645645
}
646646

647-
@Override
647+
@Override
648648
public Mono<McpSchema.ListResourceTemplatesResult> listResourceTemplates() {
649649
return this.listResourceTemplates(McpSchema.FIRST_PAGE)
650650
.expand(result -> (result.nextCursor() != null) ? this.listResourceTemplates(result.nextCursor())
@@ -658,7 +658,7 @@ public Mono<McpSchema.ListResourceTemplatesResult> listResourceTemplates() {
658658
Collections.unmodifiableList(result.resourceTemplates()), null));
659659
}
660660

661-
@Override
661+
@Override
662662
public Mono<McpSchema.ListResourceTemplatesResult> listResourceTemplates(String cursor) {
663663
return this.initializer.withInitialization("listing resource templates", init -> {
664664
if (init.initializeResult().capabilities().resources() == null) {
@@ -670,13 +670,13 @@ public Mono<McpSchema.ListResourceTemplatesResult> listResourceTemplates(String
670670
});
671671
}
672672

673-
@Override
673+
@Override
674674
public Mono<Void> subscribeResource(McpSchema.SubscribeRequest subscribeRequest) {
675675
return this.initializer.withInitialization("subscribing to resources", init -> init.mcpSession()
676676
.sendRequest(McpSchema.METHOD_RESOURCES_SUBSCRIBE, subscribeRequest, VOID_TYPE_REFERENCE));
677677
}
678678

679-
@Override
679+
@Override
680680
public Mono<Void> unsubscribeResource(McpSchema.UnsubscribeRequest unsubscribeRequest) {
681681
return this.initializer.withInitialization("unsubscribing from resources", init -> init.mcpSession()
682682
.sendRequest(McpSchema.METHOD_RESOURCES_UNSUBSCRIBE, unsubscribeRequest, VOID_TYPE_REFERENCE));
@@ -720,7 +720,7 @@ private NotificationHandler asyncResourcesUpdatedNotificationHandler(
720720
private static final TypeRef<McpSchema.GetPromptResult> GET_PROMPT_RESULT_TYPE_REF = new TypeRef<>() {
721721
};
722722

723-
@Override
723+
@Override
724724
public Mono<ListPromptsResult> listPrompts() {
725725
return this.listPrompts(McpSchema.FIRST_PAGE)
726726
.expand(result -> (result.nextCursor() != null) ? this.listPrompts(result.nextCursor()) : Mono.empty())
@@ -731,13 +731,13 @@ public Mono<ListPromptsResult> listPrompts() {
731731
.map(result -> new McpSchema.ListPromptsResult(Collections.unmodifiableList(result.prompts()), null));
732732
}
733733

734-
@Override
734+
@Override
735735
public Mono<ListPromptsResult> listPrompts(String cursor) {
736736
return this.initializer.withInitialization("listing prompts", init -> init.mcpSession()
737737
.sendRequest(McpSchema.METHOD_PROMPT_LIST, new PaginatedRequest(cursor), LIST_PROMPTS_RESULT_TYPE_REF));
738738
}
739739

740-
@Override
740+
@Override
741741
public Mono<GetPromptResult> getPrompt(GetPromptRequest getPromptRequest) {
742742
return this.initializer.withInitialization("getting prompts", init -> init.mcpSession()
743743
.sendRequest(McpSchema.METHOD_PROMPT_GET, getPromptRequest, GET_PROMPT_RESULT_TYPE_REF));
@@ -770,7 +770,7 @@ private NotificationHandler asyncLoggingNotificationHandler(
770770
};
771771
}
772772

773-
@Override
773+
@Override
774774
public Mono<Void> setLoggingLevel(LoggingLevel loggingLevel) {
775775
if (loggingLevel == null) {
776776
return Mono.error(new IllegalArgumentException("Logging level must not be null"));
@@ -813,7 +813,7 @@ void setProtocolVersions(List<String> protocolVersions) {
813813
private static final TypeRef<McpSchema.CompleteResult> COMPLETION_COMPLETE_RESULT_TYPE_REF = new TypeRef<>() {
814814
};
815815

816-
@Override
816+
@Override
817817
public Mono<McpSchema.CompleteResult> completeCompletion(McpSchema.CompleteRequest completeRequest) {
818818
return this.initializer.withInitialization("complete completions", init -> init.mcpSession()
819819
.sendRequest(McpSchema.METHOD_COMPLETION_COMPLETE, completeRequest, COMPLETION_COMPLETE_RESULT_TYPE_REF));

0 commit comments

Comments
 (0)