Skip to content

Preserve configured server capabilities #1146

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

Open
zsewasdsdsd wants to merge 1 commit into
base: main
Choose a base branch
from
+47 −2
Open

Preserve configured server capabilities #1146

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
4 changes: 2 additions & 2 deletions mcp-core/src/main/java/io/modelcontextprotocol/server/McpAsyncServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ public class McpAsyncServer {
this.mcpTransportProvider = mcpTransportProvider;
this.jsonMapper = jsonMapper;
this.serverInfo = features.serverInfo();
this.serverCapabilities = features.serverCapabilities().mutate().logging().build();
this.serverCapabilities = features.serverCapabilities();
this.instructions = features.instructions();
this.tools.addAll(withStructuredOutputHandling(jsonSchemaValidator, features.tools()));
this.resources.putAll(features.resources());
Expand Down Expand Up @@ -170,7 +170,7 @@ public class McpAsyncServer {
this.mcpTransportProvider = mcpTransportProvider;
this.jsonMapper = jsonMapper;
this.serverInfo = features.serverInfo();
this.serverCapabilities = features.serverCapabilities().mutate().logging().build();
this.serverCapabilities = features.serverCapabilities();
this.instructions = features.instructions();
this.tools.addAll(withStructuredOutputHandling(jsonSchemaValidator, features.tools()));
this.resources.putAll(features.resources());
Expand Down
45 changes: 45 additions & 0 deletions mcp-core/src/test/java/io/modelcontextprotocol/server/McpAsyncServerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/*
* Copyright 2024-2026 the original author or authors.
*/

package io.modelcontextprotocol.server;

import io.modelcontextprotocol.json.McpJsonMapper;
import io.modelcontextprotocol.json.schema.JsonSchemaValidator;
import io.modelcontextprotocol.spec.McpSchema;
import io.modelcontextprotocol.spec.McpServerTransportProvider;
import io.modelcontextprotocol.spec.McpStreamableServerTransportProvider;
import org.junit.jupiter.api.Test;

import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;

class McpAsyncServerTests {

@Test
void singleSessionServerPreservesExplicitCapabilities() {
McpSchema.ServerCapabilities capabilities = McpSchema.ServerCapabilities.builder().tools(true).build();

McpAsyncServer server = McpServer.async(mock(McpServerTransportProvider.class))
.capabilities(capabilities)
.jsonMapper(mock(McpJsonMapper.class))
.jsonSchemaValidator(mock(JsonSchemaValidator.class))
.build();

assertThat(server.getServerCapabilities()).isEqualTo(capabilities);
}

@Test
void streamableServerPreservesExplicitCapabilities() {
McpSchema.ServerCapabilities capabilities = McpSchema.ServerCapabilities.builder().tools(true).build();

McpAsyncServer server = McpServer.async(mock(McpStreamableServerTransportProvider.class))
.capabilities(capabilities)
.jsonMapper(mock(McpJsonMapper.class))
.jsonSchemaValidator(mock(JsonSchemaValidator.class))
.build();

assertThat(server.getServerCapabilities()).isEqualTo(capabilities);
}

}