Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,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 @@ -167,7 +167,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
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
/*
* 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 McpAsyncServerCapabilitiesTests {

@Test
void standardTransportPreservesCallerProvidedCapabilities() {
McpServerTransportProvider transportProvider = mock(McpServerTransportProvider.class);
McpSchema.ServerCapabilities capabilities = McpSchema.ServerCapabilities.builder().tools(true).build();

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

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

@Test
void streamableTransportPreservesCallerProvidedCapabilities() {
McpStreamableServerTransportProvider transportProvider = mock(McpStreamableServerTransportProvider.class);
McpSchema.ServerCapabilities capabilities = McpSchema.ServerCapabilities.builder().tools(true).build();

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

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

@Test
void preservesExplicitLoggingCapability() {
McpServerTransportProvider transportProvider = mock(McpServerTransportProvider.class);
McpSchema.ServerCapabilities capabilities = McpSchema.ServerCapabilities.builder().logging().build();

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

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

}
Original file line number Diff line number Diff line change
Expand Up @@ -1493,7 +1493,7 @@ void testLoggingNotification() throws InterruptedException {
.build();

var mcpServer = prepareAsyncServerBuilder().serverInfo("test-server", "1.0.0")
.capabilities(ServerCapabilities.builder().tools(true).build())
.capabilities(ServerCapabilities.builder().tools(true).logging().build())
.tools(tool)
.build();

Expand Down