Skip to content

Support o.s.h.HttpHeaders from both 6.x and 7.x Spring branches #639

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

Merged
merged 1 commit into from
Oct 30, 2025
+8 −8
Merged

Support o.s.h.HttpHeaders from both 6.x and 7.x Spring branches #639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions ...va/io/modelcontextprotocol/server/transport/WebFluxStreamableServerTransportProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ private Mono<ServerResponse> handleGet(ServerRequest request) {
return ServerResponse.badRequest().build();
}

if (!request.headers().asHttpHeaders().containsKey(HttpHeaders.MCP_SESSION_ID)) {
if (request.headers().header(HttpHeaders.MCP_SESSION_ID).isEmpty()) {
return ServerResponse.badRequest().build(); // TODO: say we need a session
// id
}
Expand All @@ -187,7 +187,7 @@ private Mono<ServerResponse> handleGet(ServerRequest request) {
return ServerResponse.notFound().build();
}

if (request.headers().asHttpHeaders().containsKey(HttpHeaders.LAST_EVENT_ID)) {
if (!request.headers().header(HttpHeaders.LAST_EVENT_ID).isEmpty()) {
String lastId = request.headers().asHttpHeaders().getFirst(HttpHeaders.LAST_EVENT_ID);
return ServerResponse.ok()
.contentType(MediaType.TEXT_EVENT_STREAM)
Expand Down Expand Up @@ -258,7 +258,7 @@ private Mono<ServerResponse> handlePost(ServerRequest request) {
.bodyValue(initResult));
}

if (!request.headers().asHttpHeaders().containsKey(HttpHeaders.MCP_SESSION_ID)) {
if (request.headers().header(HttpHeaders.MCP_SESSION_ID).isEmpty()) {
return ServerResponse.badRequest().bodyValue(new McpError("Session ID missing"));
}

Expand Down Expand Up @@ -313,7 +313,7 @@ private Mono<ServerResponse> handleDelete(ServerRequest request) {
McpTransportContext transportContext = this.contextExtractor.extract(request);

return Mono.defer(() -> {
if (!request.headers().asHttpHeaders().containsKey(HttpHeaders.MCP_SESSION_ID)) {
if (request.headers().header(HttpHeaders.MCP_SESSION_ID).isEmpty()) {
return ServerResponse.badRequest().build(); // TODO: say we need a session
// id
}
Expand Down
8 changes: 4 additions & 4 deletions ...ava/io/modelcontextprotocol/server/transport/WebMvcStreamableServerTransportProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ private ServerResponse handleGet(ServerRequest request) {

McpTransportContext transportContext = this.contextExtractor.extract(request);

if (!request.headers().asHttpHeaders().containsKey(HttpHeaders.MCP_SESSION_ID)) {
if (request.headers().header(HttpHeaders.MCP_SESSION_ID).isEmpty()) {
return ServerResponse.badRequest().body("Session ID required in mcp-session-id header");
}

Expand All @@ -263,7 +263,7 @@ private ServerResponse handleGet(ServerRequest request) {
sessionId, sseBuilder);

// Check if this is a replay request
if (request.headers().asHttpHeaders().containsKey(HttpHeaders.LAST_EVENT_ID)) {
if (!request.headers().header(HttpHeaders.LAST_EVENT_ID).isEmpty()) {
String lastId = request.headers().asHttpHeaders().getFirst(HttpHeaders.LAST_EVENT_ID);

try {
Expand Down Expand Up @@ -354,7 +354,7 @@ private ServerResponse handlePost(ServerRequest request) {
}

// Handle other messages that require a session
if (!request.headers().asHttpHeaders().containsKey(HttpHeaders.MCP_SESSION_ID)) {
if (request.headers().header(HttpHeaders.MCP_SESSION_ID).isEmpty()) {
return ServerResponse.badRequest().body(new McpError("Session ID missing"));
}

Expand Down Expand Up @@ -433,7 +433,7 @@ private ServerResponse handleDelete(ServerRequest request) {

McpTransportContext transportContext = this.contextExtractor.extract(request);

if (!request.headers().asHttpHeaders().containsKey(HttpHeaders.MCP_SESSION_ID)) {
if (request.headers().header(HttpHeaders.MCP_SESSION_ID).isEmpty()) {
return ServerResponse.badRequest().body("Session ID required in mcp-session-id header");
}

Expand Down