3131import io .modelcontextprotocol .modern .McpSchema .Prompt ;
3232import io .modelcontextprotocol .modern .McpSchema .PromptArgument ;
3333import io .modelcontextprotocol .modern .McpSchema .PromptMessage ;
34- import io .modelcontextprotocol .modern .McpSchema .ReadResourceOutcome ;
35- import io .modelcontextprotocol .modern .McpSchema .ReadResourceRequest ;
3634import io .modelcontextprotocol .modern .McpSchema .ReadResourceResult ;
3735import io .modelcontextprotocol .modern .McpSchema .Resource ;
3836import io .modelcontextprotocol .modern .McpSchema .Result ;
5048import io .modelcontextprotocol .modern .server .feature .CompletionsFeature ;
5149import io .modelcontextprotocol .modern .server .feature .McpChangeBroadcaster ;
5250import io .modelcontextprotocol .modern .server .feature .McpChangeFeed ;
51+ import io .modelcontextprotocol .modern .server .feature .McpSyncPrompt ;
5352import io .modelcontextprotocol .modern .server .feature .McpSyncPromptRepository ;
53+ import io .modelcontextprotocol .modern .server .feature .McpSyncResource ;
5454import io .modelcontextprotocol .modern .server .feature .McpSyncResourceRepository ;
55+ import io .modelcontextprotocol .modern .server .feature .McpSyncTool ;
5556import io .modelcontextprotocol .modern .server .feature .McpSyncToolRepository ;
5657import io .modelcontextprotocol .modern .server .feature .PromptsFeature ;
5758import io .modelcontextprotocol .modern .server .feature .PromptsPage ;
@@ -254,12 +255,9 @@ private static Handler<CallToolRequest, CallToolOutcome> stream(StreamingTool to
254255 return (ctx , request ) -> McpSyncResponse .streaming (notifier -> tool .run (ctx , request , notifier ));
255256 }
256257
257- private record ToolEntry (Tool tool , Handler <CallToolRequest , CallToolOutcome > handler ) {
258- }
259-
260258 private static final class ConformanceTools implements McpSyncToolRepository {
261259
262- private final Map <String , ToolEntry > tools = new LinkedHashMap <>();
260+ private final Map <String , McpSyncTool > tools = new LinkedHashMap <>();
263261
264262 ConformanceTools (McpChangeBroadcaster changes ) {
265263 add ("test_simple_text" , "Returns simple text content for testing" ,
@@ -465,27 +463,17 @@ private void add(String name, String description, Handler<CallToolRequest, CallT
465463 }
466464
467465 private void add (Tool tool , Handler <CallToolRequest , CallToolOutcome > handler ) {
468- this .tools .put (tool .name (), new ToolEntry (tool , handler ));
466+ this .tools .put (tool .name (), McpSyncTool . of (tool , handler :: handle ));
469467 }
470468
471469 @ Override
472470 public ToolsPage list (McpRequestContext ctx , String cursor ) {
473- return ToolsPage .of (this .tools .values ().stream ().map (ToolEntry ::tool ).toList ());
474- }
475-
476- @ Override
477- public Tool find (McpRequestContext ctx , String name ) {
478- ToolEntry entry = this .tools .get (name );
479- return entry != null ? entry .tool () : null ;
471+ return ToolsPage .of (this .tools .values ().stream ().map (McpSyncTool ::definition ).toList ());
480472 }
481473
482474 @ Override
483- public McpSyncResponse <CallToolOutcome > call (McpRequestContext ctx , CallToolRequest request ) {
484- ToolEntry entry = this .tools .get (request .name ());
485- if (entry == null ) {
486- throw McpException .invalidParams ("Unknown tool: " + request .name ());
487- }
488- return entry .handler ().handle (ctx , request );
475+ public McpSyncTool find (McpRequestContext ctx , String name ) {
476+ return this .tools .get (name );
489477 }
490478
491479 private static void sleep (long millis ) {
@@ -530,20 +518,20 @@ public ResourceTemplatesPage listTemplates(McpRequestContext ctx, String cursor)
530518 }
531519
532520 @ Override
533- public McpSyncResponse <ReadResourceOutcome > read (McpRequestContext ctx , ReadResourceRequest request ) {
534- String uri = request .uri ();
535- ReadResourceResult result = switch (uri ) {
521+ public McpSyncResource find (McpRequestContext ctx , String uri ) {
522+ ReadResourceResult result = read (uri );
523+ return result != null ? McpSyncResource .of ((c , request ) -> McpSyncResponse .result (result )) : null ;
524+ }
525+
526+ private static ReadResourceResult read (String uri ) {
527+ return switch (uri ) {
536528 case "test://static-text" -> textResource (uri , "This is the content of the static text resource." );
537529 case "test://watched-resource" -> textResource (uri , "This is a watched resource content." );
538530 case "test://static-binary" -> ReadResourceResult
539531 .builder (List .of (BlobResourceContents .builder (uri , RED_PIXEL_PNG ).mimeType ("image/png" ).build ()))
540532 .build ();
541533 default -> templateResource (uri );
542534 };
543- if (result == null ) {
544- throw McpException .invalidParams ("Unknown resource: " + uri , Map .of ("uri" , uri ));
545- }
546- return McpSyncResponse .result (result );
547535 }
548536
549537 @ Override
@@ -571,12 +559,9 @@ private static ReadResourceResult templateResource(String uri) {
571559
572560 }
573561
574- private record PromptEntry (Prompt prompt , Handler <GetPromptRequest , GetPromptOutcome > handler ) {
575- }
576-
577562 private static final class ConformancePrompts implements McpSyncPromptRepository {
578563
579- private final Map <String , PromptEntry > prompts = new LinkedHashMap <>();
564+ private final Map <String , McpSyncPrompt > prompts = new LinkedHashMap <>();
580565
581566 ConformancePrompts () {
582567 add (Prompt .builder ("test_simple_prompt" ).description ("A simple prompt for testing" ).build (),
@@ -637,7 +622,7 @@ private static final class ConformancePrompts implements McpSyncPromptRepository
637622 }
638623
639624 private void add (Prompt prompt , Handler <GetPromptRequest , GetPromptOutcome > handler ) {
640- this .prompts .put (prompt .name (), new PromptEntry (prompt , handler ));
625+ this .prompts .put (prompt .name (), McpSyncPrompt . of (prompt , handler :: handle ));
641626 }
642627
643628 private static GetPromptResult messages (PromptMessage ... messages ) {
@@ -646,22 +631,12 @@ private static GetPromptResult messages(PromptMessage... messages) {
646631
647632 @ Override
648633 public PromptsPage list (McpRequestContext ctx , String cursor ) {
649- return PromptsPage .of (this .prompts .values ().stream ().map (PromptEntry :: prompt ).toList ());
634+ return PromptsPage .of (this .prompts .values ().stream ().map (McpSyncPrompt :: definition ).toList ());
650635 }
651636
652637 @ Override
653- public Prompt find (McpRequestContext ctx , String name ) {
654- PromptEntry entry = this .prompts .get (name );
655- return entry != null ? entry .prompt () : null ;
656- }
657-
658- @ Override
659- public McpSyncResponse <GetPromptOutcome > get (McpRequestContext ctx , GetPromptRequest request ) {
660- PromptEntry entry = this .prompts .get (request .name ());
661- if (entry == null ) {
662- throw McpException .invalidParams ("Unknown prompt: " + request .name ());
663- }
664- return entry .handler ().handle (ctx , request );
638+ public McpSyncPrompt find (McpRequestContext ctx , String name ) {
639+ return this .prompts .get (name );
665640 }
666641
667642 }
0 commit comments