Skip to content

Introduce SSE message endpoint validator in WebFluxSseClientTransport #5967

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
Kehrlann wants to merge 2 commits into from
Closed

Introduce SSE message endpoint validator in WebFluxSseClientTransport #5967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03f6fe0
Align McpSchema builder usage with MCP Java SDK v2
chemicL May 5, 2026
d1a72da
WebFluxSseClientTransport: introduce SSE message endpoint validator
Kehrlann May 7, 2026
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 ...cp/client/common/autoconfigure/annotations/McpClientListChangedAnnotationsScanningIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ public void shouldScanAllThreeListChangedAnnotationsSync() {
new McpSchema.Prompt("prompt-1", "a test prompt", Collections.emptyList()),
new McpSchema.Prompt("prompt-2", "another test prompt", Collections.emptyList()));
List<McpSchema.Resource> updatedResources = List.of(
McpSchema.Resource.builder().name("resource-1").uri("file:///resource/1").build(),
McpSchema.Resource.builder().name("resource-2").uri("file:///resource/2").build());
McpSchema.Resource.builder("resource-1", "file:///resource/1").build(),
McpSchema.Resource.builder("resource-2", "file:///resource/2").build());

registry.handleToolListChanged("test-client", updatedTools);
registry.handleResourceListChanged("test-client", updatedResources);
Expand Down Expand Up @@ -100,8 +100,8 @@ public void shouldScanAllThreeListChangedAnnotationsAsync() {
new McpSchema.Prompt("prompt-1", "a test prompt", Collections.emptyList()),
new McpSchema.Prompt("prompt-2", "another test prompt", Collections.emptyList()));
List<McpSchema.Resource> updatedResources = List.of(
McpSchema.Resource.builder().name("resource-1").uri("file:///resource/1").build(),
McpSchema.Resource.builder().name("resource-2").uri("file:///resource/2").build());
McpSchema.Resource.builder("resource-1", "file:///resource/1").build(),
McpSchema.Resource.builder("resource-2", "file:///resource/2").build());

registry.handleToolListChanged("test-client", updatedTools).block();
registry.handleResourceListChanged("test-client", updatedResources).block();
Expand Down
15 changes: 6 additions & 9 deletions .../org/springframework/ai/mcp/server/webflux/autoconfigure/SseWebClientWebFluxServerIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,12 +258,11 @@ void clientServerCapabilities() {
assertThat(mcpClient.listResources()).isNotNull();
assertThat(mcpClient.listResources().resources()).hasSize(1);
assertThat(mcpClient.listResources().resources().get(0))
.isEqualToComparingFieldByFieldRecursively(Resource.builder()
.uri("file://resource")
.name("Test Resource")
.mimeType("text/plain")
.description("Test resource description")
.build());
.isEqualToComparingFieldByFieldRecursively(
Resource.builder("file://resource", "Test Resource")
.mimeType("text/plain")
.description("Test resource description")
.build());

});

Expand Down Expand Up @@ -435,9 +434,7 @@ public List<McpServerFeatures.SyncCompletionSpecification> myCompletions() {
@Bean
public List<McpServerFeatures.SyncResourceSpecification> myResources() {

var systemInfoResource = Resource.builder()
.uri("file://resource")
.name("Test Resource")
var systemInfoResource = Resource.builder("file://resource", "Test Resource")
.mimeType("text/plain")
.description("Test resource description")
.build();
Expand Down
15 changes: 6 additions & 9 deletions ...pringframework/ai/mcp/server/webflux/autoconfigure/StatelessWebClientWebFluxServerIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,12 +220,11 @@ void clientServerCapabilities() {
assertThat(mcpClient.listResources()).isNotNull();
assertThat(mcpClient.listResources().resources()).hasSize(1);
assertThat(mcpClient.listResources().resources().get(0))
.isEqualToComparingFieldByFieldRecursively(Resource.builder()
.uri("file://resource")
.name("Test Resource")
.mimeType("text/plain")
.description("Test resource description")
.build());
.isEqualToComparingFieldByFieldRecursively(
Resource.builder("file://resource", "Test Resource")
.mimeType("text/plain")
.description("Test resource description")
.build());

});

Expand Down Expand Up @@ -352,9 +351,7 @@ public List<McpStatelessServerFeatures.SyncCompletionSpecification> myCompletion
@Bean
public List<McpStatelessServerFeatures.SyncResourceSpecification> myResources() {

var systemInfoResource = Resource.builder()
.uri("file://resource")
.name("Test Resource")
var systemInfoResource = Resource.builder("file://resource", "Test Resource")
.mimeType("text/plain")
.description("Test resource description")
.build();
Expand Down
11 changes: 5 additions & 6 deletions .../org/springframework/ai/mcp/server/webflux/autoconfigure/StreamableMcpAnnotations2IT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,12 +238,11 @@ void clientServerCapabilities() {
assertThat(mcpClient.listResources()).isNotNull();
assertThat(mcpClient.listResources().resources()).hasSize(1);
assertThat(mcpClient.listResources().resources().get(0))
.isEqualToComparingFieldByFieldRecursively(Resource.builder()
.uri("file://resource")
.name("Test Resource")
.mimeType("text/plain")
.description("Test resource description")
.build());
.isEqualToComparingFieldByFieldRecursively(
Resource.builder("file://resource", "Test Resource")
.mimeType("text/plain")
.description("Test resource description")
.build());

// PROMPT / COMPLETION

Expand Down
11 changes: 5 additions & 6 deletions ...a/org/springframework/ai/mcp/server/webflux/autoconfigure/StreamableMcpAnnotationsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,12 +239,11 @@ void clientServerCapabilities() {
assertThat(mcpClient.listResources()).isNotNull();
assertThat(mcpClient.listResources().resources()).hasSize(1);
assertThat(mcpClient.listResources().resources().get(0))
.isEqualToComparingFieldByFieldRecursively(Resource.builder()
.uri("file://resource")
.name("Test Resource")
.mimeType("text/plain")
.description("Test resource description")
.build());
.isEqualToComparingFieldByFieldRecursively(
Resource.builder("file://resource", "Test Resource")
.mimeType("text/plain")
.description("Test resource description")
.build());

// PROMPT / COMPLETION

Expand Down
11 changes: 5 additions & 6 deletions ...springframework/ai/mcp/server/webflux/autoconfigure/StreamableMcpAnnotationsManualIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,12 +246,11 @@ void clientServerCapabilities() {
assertThat(mcpClient.listResources()).isNotNull();
assertThat(mcpClient.listResources().resources()).hasSize(1);
assertThat(mcpClient.listResources().resources().get(0))
.isEqualToComparingFieldByFieldRecursively(Resource.builder()
.uri("file://resource")
.name("Test Resource")
.mimeType("text/plain")
.description("Test resource description")
.build());
.isEqualToComparingFieldByFieldRecursively(
Resource.builder("file://resource", "Test Resource")
.mimeType("text/plain")
.description("Test resource description")
.build());

// PROMPT / COMPLETION

Expand Down
15 changes: 6 additions & 9 deletions ...ringframework/ai/mcp/server/webflux/autoconfigure/StreamableWebClientWebFluxServerIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,12 +266,11 @@ void clientServerCapabilities() {
assertThat(mcpClient.listResources()).isNotNull();
assertThat(mcpClient.listResources().resources()).hasSize(1);
assertThat(mcpClient.listResources().resources().get(0))
.isEqualToComparingFieldByFieldRecursively(Resource.builder()
.uri("file://resource")
.name("Test Resource")
.mimeType("text/plain")
.description("Test resource description")
.build());
.isEqualToComparingFieldByFieldRecursively(
Resource.builder("file://resource", "Test Resource")
.mimeType("text/plain")
.description("Test resource description")
.build());

});

Expand Down Expand Up @@ -434,9 +433,7 @@ public List<McpServerFeatures.SyncCompletionSpecification> myCompletions() {
@Bean
public List<McpServerFeatures.SyncResourceSpecification> myResources() {

var systemInfoResource = Resource.builder()
.uri("file://resource")
.name("Test Resource")
var systemInfoResource = Resource.builder("file://resource", "Test Resource")
.mimeType("text/plain")
.description("Test resource description")
.build();
Expand Down
5 changes: 2 additions & 3 deletions mcp/common/src/test/java/org/springframework/ai/mcp/AsyncMcpToolCallbackTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,7 @@ void callShouldIncludeToolContext() {
@Test
void getToolDefinitionShouldReturnCorrectDefinition() {
when(this.tool.description()).thenReturn("Test tool description");
var jsonSchema = mock(Map.class);
when(this.tool.inputSchema()).thenReturn(jsonSchema);
when(this.tool.inputSchema()).thenReturn(Map.of());

// Act
var callback = AsyncMcpToolCallback.builder()
Expand Down Expand Up @@ -294,7 +293,7 @@ void builderShouldAcceptCustomToolContextConverter() {
void deprecatedConstructorShouldWork() {
when(this.tool.name()).thenReturn("testTool");
when(this.tool.description()).thenReturn("Test description");
when(this.tool.inputSchema()).thenReturn(mock(Map.class));
when(this.tool.inputSchema()).thenReturn(Map.of());
var clientInfo = new Implementation("testClient", "1.0.0");
when(this.mcpClient.getClientInfo()).thenReturn(clientInfo);

Expand Down
2 changes: 1 addition & 1 deletion ...mmon/src/test/java/org/springframework/ai/mcp/SyncMcpToolCallbackProviderBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ private McpSyncClient createMockClient(String clientName, String toolName) {
Tool tool = Mockito.mock(Tool.class);
when(tool.name()).thenReturn(toolName);
when(tool.description()).thenReturn("Test tool description");
when(tool.inputSchema()).thenReturn(Mockito.mock(Map.class));
when(tool.inputSchema()).thenReturn(Map.of());

// Mock list tools response
McpSchema.ListToolsResult listToolsResult = Mockito.mock(McpSchema.ListToolsResult.class);
Expand Down
8 changes: 2 additions & 6 deletions ...otations/src/main/java/org/springframework/ai/mcp/annotation/adapter/ResourceAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,7 @@ public static McpSchema.Resource asResource(McpResource mcpResourceAnnotation) {
}
var meta = MetaUtils.getMeta(mcpResourceAnnotation.metaProvider());

var resourceBuilder = McpSchema.Resource.builder()
.uri(mcpResourceAnnotation.uri())
.name(name)
var resourceBuilder = McpSchema.Resource.builder(mcpResourceAnnotation.uri(), name)
.title(mcpResourceAnnotation.title())
.description(mcpResourceAnnotation.description())
.mimeType(mcpResourceAnnotation.mimeType())
Expand All @@ -75,9 +73,7 @@ public static McpSchema.ResourceTemplate asResourceTemplate(McpResource mcpResou
}
var meta = MetaUtils.getMeta(mcpResource.metaProvider());

return McpSchema.ResourceTemplate.builder()
.uriTemplate(mcpResource.uri())
.name(name)
return McpSchema.ResourceTemplate.builder(mcpResource.uri(), name)
.description(mcpResource.description())
.mimeType(mcpResource.mimeType())
.meta(meta)
Expand Down
8 changes: 2 additions & 6 deletions ...ava/org/springframework/ai/mcp/annotation/provider/resource/AsyncMcpResourceProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,7 @@ public List<AsyncResourceSpecification> getResourceSpecifications() {
var mimeType = resourceAnnotation.mimeType();
var meta = MetaUtils.getMeta(resourceAnnotation.metaProvider());

var mcpResource = McpSchema.Resource.builder()
.uri(uri)
.name(name)
var mcpResource = McpSchema.Resource.builder(uri, name)
.description(description)
.mimeType(mimeType)
.meta(meta)
Expand Down Expand Up @@ -146,9 +144,7 @@ public List<AsyncResourceTemplateSpecification> getResourceTemplateSpecification
var mimeType = resourceAnnotation.mimeType();
var meta = MetaUtils.getMeta(resourceAnnotation.metaProvider());

var mcpResourceTemplate = McpSchema.ResourceTemplate.builder()
.uriTemplate(uri)
.name(name)
var mcpResourceTemplate = McpSchema.ResourceTemplate.builder(uri, name)
.description(description)
.mimeType(mimeType)
.meta(meta)
Expand Down
8 changes: 2 additions & 6 deletions ...pringframework/ai/mcp/annotation/provider/resource/AsyncStatelessMcpResourceProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,7 @@ public List<AsyncResourceSpecification> getResourceSpecifications() {
var mimeType = resourceAnnotation.mimeType();
var meta = MetaUtils.getMeta(resourceAnnotation.metaProvider());

var mcpResource = McpSchema.Resource.builder()
.uri(uri)
.name(name)
var mcpResource = McpSchema.Resource.builder(uri, name)
.description(description)
.mimeType(mimeType)
.meta(meta)
Expand Down Expand Up @@ -146,9 +144,7 @@ public List<AsyncResourceTemplateSpecification> getResourceTemplateSpecification
var mimeType = resourceAnnotation.mimeType();
var meta = MetaUtils.getMeta(resourceAnnotation.metaProvider());

var mcpResourceTemplate = McpSchema.ResourceTemplate.builder()
.uriTemplate(uri)
.name(name)
var mcpResourceTemplate = McpSchema.ResourceTemplate.builder(uri, name)
.description(description)
.mimeType(mimeType)
.meta(meta)
Expand Down
8 changes: 2 additions & 6 deletions ...java/org/springframework/ai/mcp/annotation/provider/resource/SyncMcpResourceProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,7 @@ public List<SyncResourceSpecification> getResourceSpecifications() {
var mimeType = resourceAnnotation.mimeType();
var meta = MetaUtils.getMeta(resourceAnnotation.metaProvider());

var mcpResource = McpSchema.Resource.builder()
.uri(uri)
.name(name)
var mcpResource = McpSchema.Resource.builder(uri, name)
.description(description)
.mimeType(mimeType)
.meta(meta)
Expand Down Expand Up @@ -112,9 +110,7 @@ public List<SyncResourceTemplateSpecification> getResourceTemplateSpecifications
var mimeType = resourceAnnotation.mimeType();
var meta = MetaUtils.getMeta(resourceAnnotation.metaProvider());

var mcpResourceTemplate = McpSchema.ResourceTemplate.builder()
.uriTemplate(uri)
.name(name)
var mcpResourceTemplate = McpSchema.ResourceTemplate.builder(uri, name)
.description(description)
.mimeType(mimeType)
.meta(meta)
Expand Down
8 changes: 2 additions & 6 deletions ...springframework/ai/mcp/annotation/provider/resource/SyncStatelessMcpResourceProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,7 @@ public List<SyncResourceSpecification> getResourceSpecifications() {
var mimeType = resourceAnnotation.mimeType();
var meta = MetaUtils.getMeta(resourceAnnotation.metaProvider());

var mcpResource = McpSchema.Resource.builder()
.uri(uri)
.name(name)
var mcpResource = McpSchema.Resource.builder(uri, name)
.description(description)
.mimeType(mimeType)
.meta(meta)
Expand Down Expand Up @@ -145,9 +143,7 @@ public List<SyncResourceTemplateSpecification> getResourceTemplateSpecifications
var mimeType = resourceAnnotation.mimeType();
var meta = MetaUtils.getMeta(resourceAnnotation.metaProvider());

var mcpResourceTemplate = McpSchema.ResourceTemplate.builder()
.uriTemplate(uri)
.name(name)
var mcpResourceTemplate = McpSchema.ResourceTemplate.builder(uri, name)
.description(description)
.mimeType(mimeType)
.meta(meta)
Expand Down
8 changes: 2 additions & 6 deletions ...cp/annotation/method/changed/resource/AsyncMcpResourceListChangedMethodCallbackTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,11 @@
public class AsyncMcpResourceListChangedMethodCallbackTests {

private static final List<McpSchema.Resource> TEST_RESOURCES = List.of(
McpSchema.Resource.builder()
.uri("file:///test1.txt")
.name("test-resource-1")
McpSchema.Resource.builder("file:///test1.txt", "test-resource-1")
.description("Test Resource 1")
.mimeType("text/plain")
.build(),
McpSchema.Resource.builder()
.uri("file:///test2.txt")
.name("test-resource-2")
McpSchema.Resource.builder("file:///test2.txt", "test-resource-2")
.description("Test Resource 2")
.mimeType("text/plain")
.build());
Expand Down
8 changes: 2 additions & 6 deletions ...mcp/annotation/method/changed/resource/SyncMcpResourceListChangedMethodCallbackTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,11 @@
public class SyncMcpResourceListChangedMethodCallbackTests {

private static final List<McpSchema.Resource> TEST_RESOURCES = List.of(
McpSchema.Resource.builder()
.uri("file:///test1.txt")
.name("test-resource-1")
McpSchema.Resource.builder("file:///test1.txt", "test-resource-1")
.description("Test Resource 1")
.mimeType("text/plain")
.build(),
McpSchema.Resource.builder()
.uri("file:///test2.txt")
.name("test-resource-2")
McpSchema.Resource.builder("file:///test2.txt", "test-resource-2")
.description("Test Resource 2")
.mimeType("text/plain")
.build());
Expand Down
1 change: 1 addition & 0 deletions ...c/test/java/org/springframework/ai/mcp/annotation/method/sampling/SamplingTestHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ public static CreateMessageRequest createSampleRequest() {
.modelPreferences(ModelPreferences.builder().addHint("claude-3-haiku").build())
.systemPrompt("You are a helpful assistant.")
.temperature(0.7)
.maxTokens(100)
.build();
}

Expand Down
8 changes: 2 additions & 6 deletions ...ai/mcp/annotation/provider/changed/resource/AsyncMcpResourceListChangedProviderTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,11 @@
public class AsyncMcpResourceListChangedProviderTests {

private static final List<McpSchema.Resource> TEST_RESOURCES = List.of(
McpSchema.Resource.builder()
.uri("file:///test1.txt")
.name("test-resource-1")
McpSchema.Resource.builder("file:///test1.txt", "test-resource-1")
.description("Test Resource 1")
.mimeType("text/plain")
.build(),
McpSchema.Resource.builder()
.uri("file:///test2.txt")
.name("test-resource-2")
McpSchema.Resource.builder("file:///test2.txt", "test-resource-2")
.description("Test Resource 2")
.mimeType("text/plain")
.build());
Expand Down
8 changes: 2 additions & 6 deletions .../ai/mcp/annotation/provider/changed/resource/SyncMcpResourceListChangedProviderTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,11 @@
public class SyncMcpResourceListChangedProviderTests {

private static final List<McpSchema.Resource> TEST_RESOURCES = List.of(
McpSchema.Resource.builder()
.uri("file:///test1.txt")
.name("test-resource-1")
McpSchema.Resource.builder("file:///test1.txt", "test-resource-1")
.description("Test Resource 1")
.mimeType("text/plain")
.build(),
McpSchema.Resource.builder()
.uri("file:///test2.txt")
.name("test-resource-2")
McpSchema.Resource.builder("file:///test2.txt", "test-resource-2")
.description("Test Resource 2")
.mimeType("text/plain")
.build());
Expand Down
Loading