Skip to content

Support an HTTP GET handler for HttpServletStatelessServerTransport #643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
+79 −21
Closed

Support an HTTP GET handler for HttpServletStatelessServerTransport #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
44f4329
Add method to get the MCP handler
Randgalt Oct 30, 2025
dee088d
Make mcpHandler volatile and contextExtractor final
Randgalt Oct 30, 2025
1072617
Support an HTTP GET handler for HttpServletStatelessServerTransport
Randgalt Oct 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 30 additions & 12 deletions ...in/java/io/modelcontextprotocol/server/transport/HttpServletStatelessServerTransport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,8 @@

package io.modelcontextprotocol.server.transport;

import java.io.BufferedReader;
import java.io.IOException;
import java.io.PrintWriter;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import io.modelcontextprotocol.json.McpJsonMapper;

import io.modelcontextprotocol.common.McpTransportContext;
import io.modelcontextprotocol.json.McpJsonMapper;
import io.modelcontextprotocol.server.McpStatelessServerHandler;
import io.modelcontextprotocol.server.McpTransportContextExtractor;
import io.modelcontextprotocol.spec.McpError;
Expand All @@ -25,8 +17,14 @@
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import reactor.core.publisher.Mono;

import java.io.BufferedReader;
import java.io.IOException;
import java.io.PrintWriter;

/**
* Implementation of an HttpServlet based {@link McpStatelessServerTransport}.
*
Expand All @@ -52,12 +50,15 @@ public class HttpServletStatelessServerTransport extends HttpServlet implements

private final String mcpEndpoint;

private McpStatelessServerHandler mcpHandler;
private volatile McpStatelessServerHandler mcpHandler;

private McpTransportContextExtractor<HttpServletRequest> contextExtractor;
private final McpTransportContextExtractor<HttpServletRequest> contextExtractor;

private volatile boolean isClosing = false;

private volatile GetHandler getHandler = (request, response) -> response
.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED);

private HttpServletStatelessServerTransport(McpJsonMapper jsonMapper, String mcpEndpoint,
McpTransportContextExtractor<HttpServletRequest> contextExtractor) {
Assert.notNull(jsonMapper, "jsonMapper must not be null");
Expand All @@ -74,11 +75,28 @@ public void setMcpHandler(McpStatelessServerHandler mcpHandler) {
this.mcpHandler = mcpHandler;
}

@Override
public McpStatelessServerHandler getMcpHandler() {
return mcpHandler;
}

@Override
public Mono<Void> closeGracefully() {
return Mono.fromRunnable(() -> this.isClosing = true);
}

public void setGetHandler(GetHandler getHandler) {
Assert.notNull(getHandler, "getHandler must not be null");

this.getHandler = getHandler;
}

public interface GetHandler {

void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException;

}

/**
* Handles GET requests - returns 405 METHOD NOT ALLOWED as stateless transport
* doesn't support GET requests.
Expand All @@ -97,7 +115,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
return;
}

response.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED);
getHandler.doGet(request, response);
}

/**
Expand Down
6 changes: 4 additions & 2 deletions mcp-core/src/main/java/io/modelcontextprotocol/spec/McpStatelessServerTransport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,17 @@

package io.modelcontextprotocol.spec;

import java.util.List;

import io.modelcontextprotocol.server.McpStatelessServerHandler;
import reactor.core.publisher.Mono;

import java.util.List;

public interface McpStatelessServerTransport {

void setMcpHandler(McpStatelessServerHandler mcpHandler);

McpStatelessServerHandler getMcpHandler();

/**
* Immediately closes all the transports with connected clients and releases any
* associated resources.
Expand Down
27 changes: 23 additions & 4 deletions ...c/main/java/io/modelcontextprotocol/server/transport/WebFluxStatelessServerTransport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

package io.modelcontextprotocol.server.transport;

import io.modelcontextprotocol.json.McpJsonMapper;
import io.modelcontextprotocol.common.McpTransportContext;
import io.modelcontextprotocol.json.McpJsonMapper;
import io.modelcontextprotocol.server.McpStatelessServerHandler;
import io.modelcontextprotocol.server.McpTransportContextExtractor;
import io.modelcontextprotocol.spec.McpError;
Expand Down Expand Up @@ -40,12 +40,14 @@ public class WebFluxStatelessServerTransport implements McpStatelessServerTransp

private final RouterFunction<?> routerFunction;

private McpStatelessServerHandler mcpHandler;
private volatile McpStatelessServerHandler mcpHandler;

private McpTransportContextExtractor<ServerRequest> contextExtractor;
private final McpTransportContextExtractor<ServerRequest> contextExtractor;

private volatile boolean isClosing = false;

private volatile GetHandler getHandler = (request) -> ServerResponse.status(HttpStatus.METHOD_NOT_ALLOWED).build();

private WebFluxStatelessServerTransport(McpJsonMapper jsonMapper, String mcpEndpoint,
McpTransportContextExtractor<ServerRequest> contextExtractor) {
Assert.notNull(jsonMapper, "jsonMapper must not be null");
Expand All @@ -66,6 +68,11 @@ public void setMcpHandler(McpStatelessServerHandler mcpHandler) {
this.mcpHandler = mcpHandler;
}

@Override
public McpStatelessServerHandler getMcpHandler() {
return mcpHandler;
}

@Override
public Mono<Void> closeGracefully() {
return Mono.fromRunnable(() -> this.isClosing = true);
Expand All @@ -87,8 +94,20 @@ public RouterFunction<?> getRouterFunction() {
return this.routerFunction;
}

public interface GetHandler {

Mono<ServerResponse> doGet(ServerRequest request);

}

public void setGetHandler(GetHandler getHandler) {
Assert.notNull(getHandler, "getHandler must not be null");

this.getHandler = getHandler;
}

private Mono<ServerResponse> handleGet(ServerRequest request) {
return ServerResponse.status(HttpStatus.METHOD_NOT_ALLOWED).build();
return getHandler.doGet(request);
}

private Mono<ServerResponse> handlePost(ServerRequest request) {
Expand Down
25 changes: 22 additions & 3 deletions ...rc/main/java/io/modelcontextprotocol/server/transport/WebMvcStatelessServerTransport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,14 @@ public class WebMvcStatelessServerTransport implements McpStatelessServerTranspo

private final RouterFunction<ServerResponse> routerFunction;

private McpStatelessServerHandler mcpHandler;
private volatile McpStatelessServerHandler mcpHandler;

private McpTransportContextExtractor<ServerRequest> contextExtractor;
private final McpTransportContextExtractor<ServerRequest> contextExtractor;

private volatile boolean isClosing = false;

private volatile GetHandler getHandler = (request) -> ServerResponse.status(HttpStatus.METHOD_NOT_ALLOWED).build();

private WebMvcStatelessServerTransport(McpJsonMapper jsonMapper, String mcpEndpoint,
McpTransportContextExtractor<ServerRequest> contextExtractor) {
Assert.notNull(jsonMapper, "jsonMapper must not be null");
Expand All @@ -70,6 +72,11 @@ public void setMcpHandler(McpStatelessServerHandler mcpHandler) {
this.mcpHandler = mcpHandler;
}

@Override
public McpStatelessServerHandler getMcpHandler() {
return mcpHandler;
}

@Override
public Mono<Void> closeGracefully() {
return Mono.fromRunnable(() -> this.isClosing = true);
Expand All @@ -91,8 +98,20 @@ public RouterFunction<ServerResponse> getRouterFunction() {
return this.routerFunction;
}

public interface GetHandler {

ServerResponse doGet(ServerRequest request);

}

public void setGetHandler(GetHandler getHandler) {
Assert.notNull(getHandler, "getHandler must not be null");

this.getHandler = getHandler;
}

private ServerResponse handleGet(ServerRequest request) {
return ServerResponse.status(HttpStatus.METHOD_NOT_ALLOWED).build();
return getHandler.doGet(request);
}

private ServerResponse handlePost(ServerRequest request) {
Expand Down