Refine McpJsonDefaults method names (#789)
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:
parent
8549e36dfc
commit
e60a0743a5
5 changed files with 94 additions and 108 deletions
|
|
@ -600,9 +600,8 @@ public class WebMvcSseServerTransportProvider implements McpServerTransportProvi
|
|||
if (messageEndpoint == null) {
|
||||
throw new IllegalStateException("MessageEndpoint must be set");
|
||||
}
|
||||
return new WebMvcSseServerTransportProvider(
|
||||
jsonMapper == null ? McpJsonDefaults.getDefaultMcpJsonMapper() : jsonMapper, baseUrl,
|
||||
messageEndpoint, sseEndpoint, keepAliveInterval, contextExtractor, securityValidator);
|
||||
return new WebMvcSseServerTransportProvider(jsonMapper == null ? McpJsonDefaults.getMapper() : jsonMapper,
|
||||
baseUrl, messageEndpoint, sseEndpoint, keepAliveInterval, contextExtractor, securityValidator);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -264,9 +264,8 @@ public class WebMvcStatelessServerTransport implements McpStatelessServerTranspo
|
|||
*/
|
||||
public WebMvcStatelessServerTransport build() {
|
||||
Assert.notNull(mcpEndpoint, "Message endpoint must be set");
|
||||
return new WebMvcStatelessServerTransport(
|
||||
jsonMapper == null ? McpJsonDefaults.getDefaultMcpJsonMapper() : jsonMapper, mcpEndpoint,
|
||||
contextExtractor, securityValidator);
|
||||
return new WebMvcStatelessServerTransport(jsonMapper == null ? McpJsonDefaults.getMapper() : jsonMapper,
|
||||
mcpEndpoint, contextExtractor, securityValidator);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -731,8 +731,8 @@ public class WebMvcStreamableServerTransportProvider implements McpStreamableSer
|
|||
public WebMvcStreamableServerTransportProvider build() {
|
||||
Assert.notNull(this.mcpEndpoint, "MCP endpoint must be set");
|
||||
return new WebMvcStreamableServerTransportProvider(
|
||||
jsonMapper == null ? McpJsonDefaults.getDefaultMcpJsonMapper() : jsonMapper, mcpEndpoint,
|
||||
disallowDelete, contextExtractor, keepAliveInterval, securityValidator);
|
||||
jsonMapper == null ? McpJsonDefaults.getMapper() : jsonMapper, mcpEndpoint, disallowDelete,
|
||||
contextExtractor, keepAliveInterval, securityValidator);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -239,7 +239,7 @@ public class ServerTransportSecurityIntegrationTests {
|
|||
McpSyncClient createMcpClient(McpSyncHttpClientRequestCustomizer requestCustomizer) {
|
||||
var transport = HttpClientSseClientTransport.builder(baseUrl)
|
||||
.httpRequestCustomizer(requestCustomizer)
|
||||
.jsonMapper(McpJsonDefaults.getDefaultMcpJsonMapper())
|
||||
.jsonMapper(McpJsonDefaults.getMapper())
|
||||
.build();
|
||||
return McpClient.sync(transport).initializationTimeout(Duration.ofMillis(500)).build();
|
||||
}
|
||||
|
|
@ -278,7 +278,7 @@ public class ServerTransportSecurityIntegrationTests {
|
|||
McpSyncClient createMcpClient(McpSyncHttpClientRequestCustomizer 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();
|
||||
|
|
@ -316,7 +316,7 @@ public class ServerTransportSecurityIntegrationTests {
|
|||
McpSyncClient createMcpClient(McpSyncHttpClientRequestCustomizer 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();
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ class WebMvcSseServerTransportProviderTests {
|
|||
.baseUrl("http://localhost:" + PORT + "/")
|
||||
.messageEndpoint(MESSAGE_ENDPOINT)
|
||||
.sseEndpoint(WebMvcSseServerTransportProvider.DEFAULT_SSE_ENDPOINT)
|
||||
.jsonMapper(McpJsonDefaults.getDefaultMcpJsonMapper())
|
||||
.jsonMapper(McpJsonDefaults.getMapper())
|
||||
.contextExtractor(req -> McpTransportContext.EMPTY)
|
||||
.build();
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue