Skip to content

Bump MCP to 0.12.0-SNAPSHOT #4286

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
wants to merge 1 commit into from
Closed

Bump MCP to 0.12.0-SNAPSHOT #4286

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
22 changes: 11 additions & 11 deletions ...ework/ai/mcp/client/httpclient/autoconfigure/SseHttpClientTransportAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@

import com.fasterxml.jackson.databind.ObjectMapper;
import io.modelcontextprotocol.client.McpSyncClient;
import io.modelcontextprotocol.client.transport.AsyncHttpRequestCustomizer;
import io.modelcontextprotocol.client.transport.HttpClientSseClientTransport;
import io.modelcontextprotocol.client.transport.SyncHttpRequestCustomizer;
import io.modelcontextprotocol.client.transport.customizer.McpAsyncHttpClientRequestCustomizer;
import io.modelcontextprotocol.client.transport.customizer.McpSyncHttpClientRequestCustomizer;
import io.modelcontextprotocol.spec.McpSchema;

import org.springframework.ai.mcp.client.common.autoconfigure.NamedClientMcpTransport;
Expand Down Expand Up @@ -87,17 +87,17 @@ public class SseHttpClientTransportAutoConfiguration {
* @param sseProperties the SSE client properties containing server configurations
* @param objectMapperProvider the provider for ObjectMapper or a new instance if not
* available
* @param syncHttpRequestCustomizer provider for {@link SyncHttpRequestCustomizer} if
* available
* @param asyncHttpRequestCustomizer provider fo {@link AsyncHttpRequestCustomizer} if
* available
* @param syncHttpRequestCustomizer provider for
* {@link McpSyncHttpClientRequestCustomizer} if available
* @param asyncHttpRequestCustomizer provider fo
* {@link McpAsyncHttpClientRequestCustomizer} if available
* @return list of named MCP transports
*/
@Bean
public List<NamedClientMcpTransport> sseHttpClientTransports(McpSseClientProperties sseProperties,
ObjectProvider<ObjectMapper> objectMapperProvider,
ObjectProvider<SyncHttpRequestCustomizer> syncHttpRequestCustomizer,
ObjectProvider<AsyncHttpRequestCustomizer> asyncHttpRequestCustomizer) {
ObjectProvider<McpSyncHttpClientRequestCustomizer> syncHttpRequestCustomizer,
ObjectProvider<McpAsyncHttpClientRequestCustomizer> asyncHttpRequestCustomizer) {

ObjectMapper objectMapper = objectMapperProvider.getIfAvailable(ObjectMapper::new);

Expand All @@ -117,9 +117,9 @@ public List<NamedClientMcpTransport> sseHttpClientTransports(McpSseClientPropert
syncHttpRequestCustomizer.ifUnique(transportBuilder::httpRequestCustomizer);
if (asyncHttpRequestCustomizer.getIfUnique() != null && syncHttpRequestCustomizer.getIfUnique() != null) {
logger.warn("Found beans of type %s and %s. Using %s.".formatted(
AsyncHttpRequestCustomizer.class.getSimpleName(),
SyncHttpRequestCustomizer.class.getSimpleName(),
SyncHttpRequestCustomizer.class.getSimpleName()));
McpAsyncHttpClientRequestCustomizer.class.getSimpleName(),
McpSyncHttpClientRequestCustomizer.class.getSimpleName(),
McpSyncHttpClientRequestCustomizer.class.getSimpleName()));
}

HttpClientSseClientTransport transport = transportBuilder.build();
Expand Down
22 changes: 11 additions & 11 deletions ...p/client/httpclient/autoconfigure/StreamableHttpHttpClientTransportAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@

import com.fasterxml.jackson.databind.ObjectMapper;
import io.modelcontextprotocol.client.McpSyncClient;
import io.modelcontextprotocol.client.transport.AsyncHttpRequestCustomizer;
import io.modelcontextprotocol.client.transport.HttpClientStreamableHttpTransport;
import io.modelcontextprotocol.client.transport.SyncHttpRequestCustomizer;
import io.modelcontextprotocol.client.transport.customizer.McpAsyncHttpClientRequestCustomizer;
import io.modelcontextprotocol.client.transport.customizer.McpSyncHttpClientRequestCustomizer;
import io.modelcontextprotocol.spec.McpSchema;

import org.springframework.ai.mcp.client.common.autoconfigure.NamedClientMcpTransport;
Expand Down Expand Up @@ -90,17 +90,17 @@ public class StreamableHttpHttpClientTransportAutoConfiguration {
* configurations
* @param objectMapperProvider the provider for ObjectMapper or a new instance if not
* available
* @param syncHttpRequestCustomizer provider for {@link SyncHttpRequestCustomizer} if
* available
* @param asyncHttpRequestCustomizer provider fo {@link AsyncHttpRequestCustomizer} if
* available
* @param syncHttpRequestCustomizer provider for
* {@link McpSyncHttpClientRequestCustomizer} if available
* @param asyncHttpRequestCustomizer provider fo
* {@link McpAsyncHttpClientRequestCustomizer} if available
* @return list of named MCP transports
*/
@Bean
public List<NamedClientMcpTransport> streamableHttpHttpClientTransports(
McpStreamableHttpClientProperties streamableProperties, ObjectProvider<ObjectMapper> objectMapperProvider,
ObjectProvider<SyncHttpRequestCustomizer> syncHttpRequestCustomizer,
ObjectProvider<AsyncHttpRequestCustomizer> asyncHttpRequestCustomizer) {
ObjectProvider<McpSyncHttpClientRequestCustomizer> syncHttpRequestCustomizer,
ObjectProvider<McpAsyncHttpClientRequestCustomizer> asyncHttpRequestCustomizer) {

ObjectMapper objectMapper = objectMapperProvider.getIfAvailable(ObjectMapper::new);

Expand All @@ -123,9 +123,9 @@ public List<NamedClientMcpTransport> streamableHttpHttpClientTransports(
syncHttpRequestCustomizer.ifUnique(transportBuilder::httpRequestCustomizer);
if (asyncHttpRequestCustomizer.getIfUnique() != null && syncHttpRequestCustomizer.getIfUnique() != null) {
logger.warn("Found beans of type %s and %s. Using %s.".formatted(
AsyncHttpRequestCustomizer.class.getSimpleName(),
SyncHttpRequestCustomizer.class.getSimpleName(),
SyncHttpRequestCustomizer.class.getSimpleName()));
McpAsyncHttpClientRequestCustomizer.class.getSimpleName(),
McpSyncHttpClientRequestCustomizer.class.getSimpleName(),
McpSyncHttpClientRequestCustomizer.class.getSimpleName()));
}

HttpClientStreamableHttpTransport transport = transportBuilder.build();
Expand Down
24 changes: 12 additions & 12 deletions ...pringframework/ai/mcp/client/autoconfigure/SseHttpClientTransportAutoConfigurationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
import java.util.List;

import io.modelcontextprotocol.client.McpSyncClient;
import io.modelcontextprotocol.client.transport.AsyncHttpRequestCustomizer;
import io.modelcontextprotocol.client.transport.SyncHttpRequestCustomizer;
import io.modelcontextprotocol.client.transport.customizer.McpAsyncHttpClientRequestCustomizer;
import io.modelcontextprotocol.client.transport.customizer.McpSyncHttpClientRequestCustomizer;
import io.modelcontextprotocol.spec.McpSchema.ListToolsResult;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
Expand Down Expand Up @@ -121,9 +121,9 @@ void usesSyncRequestCustomizer() {

mcpClient.ping();

verify(context.getBean(SyncHttpRequestCustomizer.class), atLeastOnce()).customize(any(), any(), any(),
any());
verifyNoInteractions(context.getBean(AsyncHttpRequestCustomizer.class));
verify(context.getBean(McpSyncHttpClientRequestCustomizer.class), atLeastOnce()).customize(any(), any(),
any(), any(), any());
verifyNoInteractions(context.getBean(McpAsyncHttpClientRequestCustomizer.class));
});
}

Expand All @@ -140,17 +140,17 @@ void usesAsyncRequestCustomizer() {

mcpClient.ping();

verify(context.getBean(AsyncHttpRequestCustomizer.class), atLeastOnce()).customize(any(), any(), any(),
any());
verify(context.getBean(McpAsyncHttpClientRequestCustomizer.class), atLeastOnce()).customize(any(),
any(), any(), any(), any());
});
}

@Configuration
static class SyncRequestCustomizerConfiguration {

@Bean
SyncHttpRequestCustomizer syncHttpRequestCustomizer() {
return mock(SyncHttpRequestCustomizer.class);
McpSyncHttpClientRequestCustomizer syncHttpRequestCustomizer() {
return mock(McpSyncHttpClientRequestCustomizer.class);
}

}
Expand All @@ -159,9 +159,9 @@ SyncHttpRequestCustomizer syncHttpRequestCustomizer() {
static class AsyncRequestCustomizerConfiguration {

@Bean
AsyncHttpRequestCustomizer asyncHttpRequestCustomizer() {
AsyncHttpRequestCustomizer requestCustomizerMock = mock(AsyncHttpRequestCustomizer.class);
when(requestCustomizerMock.customize(any(), any(), any(), any()))
McpAsyncHttpClientRequestCustomizer asyncHttpRequestCustomizer() {
McpAsyncHttpClientRequestCustomizer requestCustomizerMock = mock(McpAsyncHttpClientRequestCustomizer.class);
when(requestCustomizerMock.customize(any(), any(), any(), any(), any()))
.thenAnswer(invocation -> Mono.just(invocation.getArguments()[0]));
return requestCustomizerMock;
}
Expand Down
24 changes: 12 additions & 12 deletions ...ork/ai/mcp/client/autoconfigure/StreamableHttpHttpClientTransportAutoConfigurationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
import java.util.List;

import io.modelcontextprotocol.client.McpSyncClient;
import io.modelcontextprotocol.client.transport.AsyncHttpRequestCustomizer;
import io.modelcontextprotocol.client.transport.SyncHttpRequestCustomizer;
import io.modelcontextprotocol.client.transport.customizer.McpAsyncHttpClientRequestCustomizer;
import io.modelcontextprotocol.client.transport.customizer.McpSyncHttpClientRequestCustomizer;
import io.modelcontextprotocol.spec.McpSchema.ListToolsResult;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
Expand Down Expand Up @@ -122,9 +122,9 @@ void usesSyncRequestCustomizer() {

mcpClient.ping();

verify(context.getBean(SyncHttpRequestCustomizer.class), atLeastOnce()).customize(any(), any(), any(),
any());
verifyNoInteractions(context.getBean(AsyncHttpRequestCustomizer.class));
verify(context.getBean(McpSyncHttpClientRequestCustomizer.class), atLeastOnce()).customize(any(), any(),
any(), any(), any());
verifyNoInteractions(context.getBean(McpAsyncHttpClientRequestCustomizer.class));
});
}

Expand All @@ -141,17 +141,17 @@ void usesAsyncRequestCustomizer() {

mcpClient.ping();

verify(context.getBean(AsyncHttpRequestCustomizer.class), atLeastOnce()).customize(any(), any(), any(),
any());
verify(context.getBean(McpAsyncHttpClientRequestCustomizer.class), atLeastOnce()).customize(any(),
any(), any(), any(), any());
});
}

@Configuration
static class SyncRequestCustomizerConfiguration {

@Bean
SyncHttpRequestCustomizer syncHttpRequestCustomizer() {
return mock(SyncHttpRequestCustomizer.class);
McpSyncHttpClientRequestCustomizer syncHttpRequestCustomizer() {
return mock(McpSyncHttpClientRequestCustomizer.class);
}

}
Expand All @@ -160,9 +160,9 @@ SyncHttpRequestCustomizer syncHttpRequestCustomizer() {
static class AsyncRequestCustomizerConfiguration {

@Bean
AsyncHttpRequestCustomizer asyncHttpRequestCustomizer() {
AsyncHttpRequestCustomizer requestCustomizerMock = mock(AsyncHttpRequestCustomizer.class);
when(requestCustomizerMock.customize(any(), any(), any(), any()))
McpAsyncHttpClientRequestCustomizer asyncHttpRequestCustomizer() {
McpAsyncHttpClientRequestCustomizer requestCustomizerMock = mock(McpAsyncHttpClientRequestCustomizer.class);
when(requestCustomizerMock.customize(any(), any(), any(), any(), any()))
.thenAnswer(invocation -> Mono.just(invocation.getArguments()[0]));
return requestCustomizerMock;
}
Expand Down
2 changes: 1 addition & 1 deletion ...ngframework/ai/mcp/server/common/autoconfigure/McpStatelessServerAutoConfigurationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.util.function.BiFunction;

import io.modelcontextprotocol.client.McpSyncClient;
import io.modelcontextprotocol.common.McpTransportContext;
import io.modelcontextprotocol.server.McpStatelessAsyncServer;
import io.modelcontextprotocol.server.McpStatelessServerFeatures;
import io.modelcontextprotocol.server.McpStatelessServerFeatures.AsyncCompletionSpecification;
Expand All @@ -31,7 +32,6 @@
import io.modelcontextprotocol.server.McpStatelessServerFeatures.SyncToolSpecification;
import io.modelcontextprotocol.server.McpStatelessSyncServer;
import io.modelcontextprotocol.server.McpSyncServerExchange;
import io.modelcontextprotocol.server.McpTransportContext;
import io.modelcontextprotocol.spec.McpSchema;
import io.modelcontextprotocol.spec.McpStatelessServerTransport;
import org.junit.jupiter.api.Test;
Expand Down
2 changes: 1 addition & 1 deletion mcp/common/src/main/java/org/springframework/ai/mcp/McpToolUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ public static McpStatelessServerFeatures.AsyncToolSpecification toStatelessAsync

return new McpStatelessServerFeatures.AsyncToolSpecification(statelessSyncToolSpecification.tool(),
(context, request) -> Mono
.fromCallable(() -> statelessSyncToolSpecification.callHandler().apply(context.copy(), request))
.fromCallable(() -> statelessSyncToolSpecification.callHandler().apply(context, request))
.subscribeOn(Schedulers.boundedElastic()));
}

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@
<json-unit-assertj.version>4.1.0</json-unit-assertj.version>

<!-- MCP-->
<mcp.sdk.version>0.11.3</mcp.sdk.version>
<mcp.sdk.version>0.12.0-SNAPSHOT</mcp.sdk.version>
<mcp-annotations.version>0.3.0-SNAPSHOT</mcp-annotations.version>

<!-- plugin versions -->
Expand Down