modelcontextprotocol/java-sdk
Watch
1
0
Fork
You've already forked java-sdk
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add option for immediate execution in McpSyncServer

Browse source 
- The McpSyncServer wraps an async server. By default, reactive
  operations are scheduled on a bounded-elastic scheduler, to offload
  blocking work and prevent accidental blocking of non-blocking
  operations.
- With the default behavior, there will be thead ops, even in a blocking
  context, which means thread-locals from the request thread will be
  lost. This is inconenvient for frameworks that store state in
  thread-locals.
- This commit adds the ability to avoid offloading, when the user is
  sure they are executing code in a blocking environment. Work happens
  in the calling thread, and thread-locals are available throughout the
  execution.
This commit is contained in:
Daniel Garnier-Moiroux 2025-06-27 11:47:12 +02:00 • committed by Christian Tzolov
commit b5a1e3b8f4
1 changed files with 172 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

28
mcp/src/main/java/io/modelcontextprotocol/server/McpSyncServer.java
View file

@ -54,13 +54,27 @@ public class McpSyncServer {
*/
private final McpAsyncServer asyncServer;
private final boolean immediateExecution;
/**
* Creates a new synchronous server that wraps the provided async server.
* @param asyncServer The async server to wrap
*/
public McpSyncServer(McpAsyncServer asyncServer) {
this(asyncServer, false);
}
/**
* Creates a new synchronous server that wraps the provided async server.
* @param asyncServer The async server to wrap
* @param immediateExecution Tools, prompts, and resources handlers execute work
* without blocking code offloading. Do NOT set to true if the {@code asyncServer}'s
* transport is non-blocking.
*/
public McpSyncServer(McpAsyncServer asyncServer, boolean immediateExecution) {
Assert.notNull(asyncServer, "Async server must not be null");
this.asyncServer = asyncServer;
this.immediateExecution = immediateExecution;
}
/**
@ -68,7 +82,9 @@ public class McpSyncServer {
* @param toolHandler The tool handler to add
*/
public void addTool(McpServerFeatures.SyncToolSpecification toolHandler) {
this.asyncServer.addTool(McpServerFeatures.AsyncToolSpecification.fromSync(toolHandler)).block();
this.asyncServer
.addTool(McpServerFeatures.AsyncToolSpecification.fromSync(toolHandler, this.immediateExecution))
.block();
}
/**
@ -84,7 +100,10 @@ public class McpSyncServer {
* @param resourceHandler The resource handler to add
*/
public void addResource(McpServerFeatures.SyncResourceSpecification resourceHandler) {
this.asyncServer.addResource(McpServerFeatures.AsyncResourceSpecification.fromSync(resourceHandler)).block();
this.asyncServer
.addResource(
McpServerFeatures.AsyncResourceSpecification.fromSync(resourceHandler, this.immediateExecution))
.block();
}
/**
@ -100,7 +119,10 @@ public class McpSyncServer {
* @param promptSpecification The prompt specification to add
*/
public void addPrompt(McpServerFeatures.SyncPromptSpecification promptSpecification) {
this.asyncServer.addPrompt(McpServerFeatures.AsyncPromptSpecification.fromSync(promptSpecification)).block();
this.asyncServer
.addPrompt(
McpServerFeatures.AsyncPromptSpecification.fromSync(promptSpecification, this.immediateExecution))
.block();
}
/**