modelcontextprotocol/java-sdk
Watch
1
0
Fork
You've already forked java-sdk
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refine McpJsonDefaults method names (#789)

Browse source 
As a follow-up of #779, this commit refines McpJsonDefaults
method names by shortening them to not repeat the qualifiers
already expressed at type level.
This commit is contained in:
Sébastien Deleuze 2026-02-13 16:54:01 +01:00 • committed by GitHub
commit e60a0743a5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 94 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mcp-test/src/test/java/io/modelcontextprotocol/MockMcpClientTransport.java
View file

@ -100,7 +100,7 @@ public class MockMcpClientTransport implements McpClientTransport {
@Override
public <T> T unmarshalFrom(Object data, TypeRef<T> typeRef) {
return McpJsonDefaults.getDefaultMcpJsonMapper().convertValue(data, typeRef);
return McpJsonDefaults.getMapper().convertValue(data, typeRef);
}
}

2
mcp-test/src/test/java/io/modelcontextprotocol/MockMcpServerTransport.java
View file

@ -68,7 +68,7 @@ public class MockMcpServerTransport implements McpServerTransport {
@Override
public <T> T unmarshalFrom(Object data, TypeRef<T> typeRef) {
return McpJsonDefaults.getDefaultMcpJsonMapper().convertValue(data, typeRef);
return McpJsonDefaults.getMapper().convertValue(data, typeRef);
}
}

6
mcp-test/src/test/java/io/modelcontextprotocol/server/transport/ServerTransportSecurityIntegrationTests.java
View file

@ -223,7 +223,7 @@ class ServerTransportSecurityIntegrationTests {
public McpSyncClient createMcpClient(String baseUrl, TestRequestCustomizer requestCustomizer) {
var transport = HttpClientSseClientTransport.builder(baseUrl)
.httpRequestCustomizer(requestCustomizer)
.jsonMapper(McpJsonDefaults.getDefaultMcpJsonMapper())
.jsonMapper(McpJsonDefaults.getMapper())
.build();
return McpClient.sync(transport).initializationTimeout(Duration.ofMillis(500)).build();
}
@ -256,7 +256,7 @@ class ServerTransportSecurityIntegrationTests {
public McpSyncClient createMcpClient(String baseUrl, TestRequestCustomizer requestCustomizer) {
var transport = HttpClientStreamableHttpTransport.builder(baseUrl)
.httpRequestCustomizer(requestCustomizer)
.jsonMapper(McpJsonDefaults.getDefaultMcpJsonMapper())
.jsonMapper(McpJsonDefaults.getMapper())
.openConnectionOnStartup(true)
.build();
return McpClient.sync(transport).initializationTimeout(Duration.ofMillis(500)).build();
@ -290,7 +290,7 @@ class ServerTransportSecurityIntegrationTests {
public McpSyncClient createMcpClient(String baseUrl, TestRequestCustomizer requestCustomizer) {
var transport = HttpClientStreamableHttpTransport.builder(baseUrl)
.httpRequestCustomizer(requestCustomizer)
.jsonMapper(McpJsonDefaults.getDefaultMcpJsonMapper())
.jsonMapper(McpJsonDefaults.getMapper())
.openConnectionOnStartup(true)
.build();
return McpClient.sync(transport).initializationTimeout(Duration.ofMillis(500)).build();

10
mcp-test/src/test/java/io/modelcontextprotocol/server/transport/StdioServerTransportProviderTests.java
View file

@ -70,7 +70,7 @@ class StdioServerTransportProviderTests {
when(mockSession.closeGracefully()).thenReturn(Mono.empty());
when(mockSession.sendNotification(any(), any())).thenReturn(Mono.empty());
transportProvider = new StdioServerTransportProvider(McpJsonDefaults.getDefaultMcpJsonMapper(), System.in,
transportProvider = new StdioServerTransportProvider(McpJsonDefaults.getMapper(), System.in,
testOutPrintStream);
}
@ -101,8 +101,7 @@ class StdioServerTransportProviderTests {
String jsonMessage = "{\"jsonrpc\":\"2.0\",\"method\":\"test\",\"params\":{},\"id\":1}\n";
InputStream stream = new ByteArrayInputStream(jsonMessage.getBytes(StandardCharsets.UTF_8));
transportProvider = new StdioServerTransportProvider(McpJsonDefaults.getDefaultMcpJsonMapper(), stream,
System.out);
transportProvider = new StdioServerTransportProvider(McpJsonDefaults.getMapper(), stream, System.out);
// Set up a real session to capture the message
AtomicReference<McpSchema.JSONRPCMessage> capturedMessage = new AtomicReference<>();
CountDownLatch messageLatch = new CountDownLatch(1);
@ -182,7 +181,7 @@ class StdioServerTransportProviderTests {
@Test
void shouldHandleNotificationBeforeSessionFactoryIsSet() {
transportProvider = new StdioServerTransportProvider(McpJsonDefaults.getDefaultMcpJsonMapper());
transportProvider = new StdioServerTransportProvider(McpJsonDefaults.getMapper());
// Send notification before setting session factory
StepVerifier.create(transportProvider.notifyClients("testNotification", Map.of("key", "value")))
.verifyErrorSatisfies(error -> {
@ -197,8 +196,7 @@ class StdioServerTransportProviderTests {
String jsonMessage = "{invalid json}\n";
InputStream stream = new ByteArrayInputStream(jsonMessage.getBytes(StandardCharsets.UTF_8));
transportProvider = new StdioServerTransportProvider(McpJsonDefaults.getDefaultMcpJsonMapper(), stream,
testOutPrintStream);
transportProvider = new StdioServerTransportProvider(McpJsonDefaults.getMapper(), stream, testOutPrintStream);
// Set up a session factory
transportProvider.setSessionFactory(sessionFactory);

2
mcp-test/src/test/java/io/modelcontextprotocol/spec/CompleteCompletionSerializationTest.java
View file

@ -11,7 +11,7 @@ class CompleteCompletionSerializationTest {
@Test
void codeCompletionSerialization() throws IOException {
McpJsonMapper jsonMapper = McpJsonDefaults.getDefaultMcpJsonMapper();
McpJsonMapper jsonMapper = McpJsonDefaults.getMapper();
McpSchema.CompleteResult.CompleteCompletion codeComplete = new McpSchema.CompleteResult.CompleteCompletion(
Collections.emptyList(), 0, false);
String json = jsonMapper.writeValueAsString(codeComplete);