fix: update sync tool/resource/prompt handlers to use McpSyncServerExchange

This commit changes the parameter type in sync handler interfaces from McpAsyncServerExchange to McpSyncServerExchange
for better API consistency. It also adds proper wrapping of async exchanges in sync exchanges when bridging between
async and sync contexts in the adapter methods.

Signed-off-by: Christian Tzolov <[email protected]>

Author: tzolov

mcp/src/main/java/io/modelcontextprotocol/server/McpServer.java

@@ -668,7 +668,7 @@ public SyncSpecification capabilities(McpSchema.ServerCapabilities serverCapabil
 		 * @throws IllegalArgumentException if tool or handler is null
 		 */
 		public SyncSpecification tool(McpSchema.Tool tool,
-				BiFunction<McpAsyncServerExchange, Map<String, Object>, McpSchema.CallToolResult> handler) {
+				BiFunction<McpSyncServerExchange, Map<String, Object>, McpSchema.CallToolResult> handler) {
 			Assert.notNull(tool, "Tool must not be null");
 			Assert.notNull(handler, "Handler must not be null");
 

mcp/src/main/java/io/modelcontextprotocol/server/McpServerFeatures.java

@@ -220,7 +220,8 @@ static AsyncToolSpecification fromSync(SyncToolSpecification tool) {
 				return null;
 			}
 			return new AsyncToolSpecification(tool.tool(),
-					(exchange, map) -> Mono.fromCallable(() -> tool.call().apply(exchange, map))
+					(exchange, map) -> Mono
+						.fromCallable(() -> tool.call().apply(new McpSyncServerExchange(exchange), map))
 						.subscribeOn(Schedulers.boundedElastic()));
 		}
 	}
@@ -259,7 +260,8 @@ static AsyncResourceSpecification fromSync(SyncResourceSpecification resource) {
 				return null;
 			}
 			return new AsyncResourceSpecification(resource.resource(),
-					(exchange, req) -> Mono.fromCallable(() -> resource.readHandler().apply(exchange, req))
+					(exchange, req) -> Mono
+						.fromCallable(() -> resource.readHandler().apply(new McpSyncServerExchange(exchange), req))
 						.subscribeOn(Schedulers.boundedElastic()));
 		}
 	}
@@ -301,7 +303,8 @@ static AsyncPromptSpecification fromSync(SyncPromptSpecification prompt) {
 				return null;
 			}
 			return new AsyncPromptSpecification(prompt.prompt(),
-					(exchange, req) -> Mono.fromCallable(() -> prompt.promptHandler().apply(exchange, req))
+					(exchange, req) -> Mono
+						.fromCallable(() -> prompt.promptHandler().apply(new McpSyncServerExchange(exchange), req))
 						.subscribeOn(Schedulers.boundedElastic()));
 		}
 	}
@@ -340,7 +343,7 @@ static AsyncPromptSpecification fromSync(SyncPromptSpecification prompt) {
 	 * returning results
 	 */
 	public record SyncToolSpecification(McpSchema.Tool tool,
-			BiFunction<McpAsyncServerExchange, Map<String, Object>, McpSchema.CallToolResult> call) {
+			BiFunction<McpSyncServerExchange, Map<String, Object>, McpSchema.CallToolResult> call) {
 	}
 
 	/**
@@ -369,7 +372,7 @@ public record SyncToolSpecification(McpSchema.Tool tool,
 	 * @param readHandler The function that handles resource read requests
 	 */
 	public record SyncResourceSpecification(McpSchema.Resource resource,
-			BiFunction<McpAsyncServerExchange, McpSchema.ReadResourceRequest, McpSchema.ReadResourceResult> readHandler) {
+			BiFunction<McpSyncServerExchange, McpSchema.ReadResourceRequest, McpSchema.ReadResourceResult> readHandler) {
 	}
 
 	/**
@@ -401,7 +404,7 @@ public record SyncResourceSpecification(McpSchema.Resource resource,
 	 * formatted templates
 	 */
 	public record SyncPromptSpecification(McpSchema.Prompt prompt,
-			BiFunction<McpAsyncServerExchange, McpSchema.GetPromptRequest, McpSchema.GetPromptResult> promptHandler) {
+			BiFunction<McpSyncServerExchange, McpSchema.GetPromptRequest, McpSchema.GetPromptResult> promptHandler) {
 	}
 
 	// ---------------------------------------