Skip to content

Commit 7921839

Browse files
Hyeri1eeHyeri1ee
authored
Merge branch 'spring-projects:main' into main
2 parents c1dbb97 + 133eb40 commit 7921839

File tree

348 files changed

+12644
-1618
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

348 files changed

+12644
-1618
lines changed

‎.github/workflows/deploy-docs.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ jobs:
2828
if: github.ref_type == 'branch'
2929
env:
3030
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
31+
GIT_TRACE: 1
32+
GIT_CURL_VERBOSE: 1
3133
run: gh workflow run deploy-docs.yml -r $(git rev-parse --abbrev-ref HEAD) -f build-refname=${{ github.ref_name }}
3234
- name: Dispatch (full build)
3335
if: github.ref_type == 'tag'

‎auto-configurations/common/spring-ai-autoconfigure-retry/src/main/java/org/springframework/ai/retry/autoconfigure/SpringAiRetryProperties.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public class SpringAiRetryProperties {
4242
* Exponential Backoff properties.
4343
*/
4444
@NestedConfigurationProperty
45-
private Backoff backoff = new Backoff();
45+
private final Backoff backoff = new Backoff();
4646

4747
/**
4848
* If false, throw a NonTransientAiException, and do not attempt retry for 4xx client

‎auto-configurations/mcp/spring-ai-autoconfigure-mcp-client-common/src/main/java/org/springframework/ai/mcp/client/common/autoconfigure/McpToolCallbackAutoConfiguration.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@
4242
* ToolCallbacksProviders. These providers are used by Spring AI to discover and execute
4343
* tools.
4444
*/
45-
@AutoConfiguration(after = { McpClientAutoConfiguration.class })
45+
@AutoConfiguration(after = { McpClientAutoConfiguration.class },
46+
beforeName = { "org.springframework.ai.model.chat.client.autoconfigure.ChatClientAutoConfiguration" })
4647
@EnableConfigurationProperties(McpClientCommonProperties.class)
4748
@Conditional(McpToolCallbackAutoConfiguration.McpToolCallbackAutoConfigurationCondition.class)
4849
public class McpToolCallbackAutoConfiguration {

‎auto-configurations/mcp/spring-ai-autoconfigure-mcp-client-common/src/main/java/org/springframework/ai/mcp/client/common/autoconfigure/annotations/McpClientAnnotationScannerAutoConfiguration.java‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,30 @@
2424
import org.springaicommunity.mcp.annotation.McpProgress;
2525
import org.springaicommunity.mcp.annotation.McpSampling;
2626

27+
import org.springframework.ai.mcp.annotation.spring.scan.AbstractAnnotatedMethodBeanFactoryInitializationAotProcessor;
2728
import org.springframework.ai.mcp.annotation.spring.scan.AbstractAnnotatedMethodBeanPostProcessor;
2829
import org.springframework.ai.mcp.annotation.spring.scan.AbstractMcpAnnotatedBeans;
30+
import org.springframework.aot.hint.MemberCategory;
31+
import org.springframework.aot.hint.RuntimeHints;
32+
import org.springframework.aot.hint.RuntimeHintsRegistrar;
2933
import org.springframework.boot.autoconfigure.AutoConfiguration;
3034
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
3135
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3236
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
3337
import org.springframework.boot.context.properties.EnableConfigurationProperties;
3438
import org.springframework.context.annotation.Bean;
39+
import org.springframework.context.annotation.ImportRuntimeHints;
3540

3641
/**
3742
* @author Christian Tzolov
43+
* @author Josh Long
3844
*/
3945
@AutoConfiguration
4046
@ConditionalOnClass(McpLogging.class)
4147
@ConditionalOnProperty(prefix = McpClientAnnotationScannerProperties.CONFIG_PREFIX, name = "enabled",
4248
havingValue = "true", matchIfMissing = true)
4349
@EnableConfigurationProperties(McpClientAnnotationScannerProperties.class)
50+
@ImportRuntimeHints(McpClientAnnotationScannerAutoConfiguration.AnnotationHints.class)
4451
public class McpClientAnnotationScannerAutoConfiguration {
4552

4653
private static final Set<Class<? extends Annotation>> CLIENT_MCP_ANNOTATIONS = Set.of(McpLogging.class,
@@ -54,15 +61,30 @@ public ClientMcpAnnotatedBeans clientAnnotatedBeans() {
5461

5562
@Bean
5663
@ConditionalOnMissingBean
57-
public ClientAnnotatedMethodBeanPostProcessor clientAnnotatedMethodBeanPostProcessor(
64+
public static ClientAnnotatedMethodBeanPostProcessor clientAnnotatedMethodBeanPostProcessor(
5865
ClientMcpAnnotatedBeans clientMcpAnnotatedBeans, McpClientAnnotationScannerProperties properties) {
5966
return new ClientAnnotatedMethodBeanPostProcessor(clientMcpAnnotatedBeans, CLIENT_MCP_ANNOTATIONS);
6067
}
6168

69+
@Bean
70+
static ClientAnnotatedBeanFactoryInitializationAotProcessor clientAnnotatedBeanFactoryInitializationAotProcessor() {
71+
return new ClientAnnotatedBeanFactoryInitializationAotProcessor(CLIENT_MCP_ANNOTATIONS);
72+
}
73+
6274
public static class ClientMcpAnnotatedBeans extends AbstractMcpAnnotatedBeans {
6375

6476
}
6577

78+
public static class ClientAnnotatedBeanFactoryInitializationAotProcessor
79+
extends AbstractAnnotatedMethodBeanFactoryInitializationAotProcessor {
80+
81+
public ClientAnnotatedBeanFactoryInitializationAotProcessor(
82+
Set<Class<? extends Annotation>> targetAnnotations) {
83+
super(targetAnnotations);
84+
}
85+
86+
}
87+
6688
public static class ClientAnnotatedMethodBeanPostProcessor extends AbstractAnnotatedMethodBeanPostProcessor {
6789

6890
public ClientAnnotatedMethodBeanPostProcessor(ClientMcpAnnotatedBeans clientMcpAnnotatedBeans,
@@ -72,4 +94,13 @@ public ClientAnnotatedMethodBeanPostProcessor(ClientMcpAnnotatedBeans clientMcpA
7294

7395
}
7496

97+
static class AnnotationHints implements RuntimeHintsRegistrar {
98+
99+
@Override
100+
public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
101+
CLIENT_MCP_ANNOTATIONS.forEach(an -> hints.reflection().registerType(an, MemberCategory.values()));
102+
}
103+
104+
}
105+
75106
}

‎auto-configurations/mcp/spring-ai-autoconfigure-mcp-client-httpclient/src/test/java/org/springframework/ai/mcp/client/autoconfigure/SseHttpClientTransportAutoConfigurationIT.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,6 @@ void streamableHttpTest() {
9494

9595
mcpClient.ping();
9696

97-
System.out.println("mcpClient = " + mcpClient.getServerInfo());
98-
9997
ListToolsResult toolsResult = mcpClient.listTools();
10098

10199
assertThat(toolsResult).isNotNull();

‎auto-configurations/mcp/spring-ai-autoconfigure-mcp-client-httpclient/src/test/java/org/springframework/ai/mcp/client/autoconfigure/StreamableHttpHttpClientTransportAutoConfigurationIT.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,6 @@ void streamableHttpTest() {
9595

9696
mcpClient.ping();
9797

98-
System.out.println("mcpClient = " + mcpClient.getServerInfo());
99-
10098
ListToolsResult toolsResult = mcpClient.listTools();
10199

102100
assertThat(toolsResult).isNotNull();

‎auto-configurations/mcp/spring-ai-autoconfigure-mcp-client-webflux/src/test/java/org/springframework/ai/mcp/client/webflux/autoconfigure/SseWebFluxTransportAutoConfigurationIT.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@ void streamableHttpTest() {
8181

8282
mcpClient.ping();
8383

84-
System.out.println("mcpClient = " + mcpClient.getServerInfo());
85-
8684
ListToolsResult toolsResult = mcpClient.listTools();
8785

8886
assertThat(toolsResult).isNotNull();

‎auto-configurations/mcp/spring-ai-autoconfigure-mcp-client-webflux/src/test/java/org/springframework/ai/mcp/client/webflux/autoconfigure/StreamableHttpHttpClientTransportAutoConfigurationIT.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,6 @@ void streamableHttpTest() {
8282

8383
mcpClient.ping();
8484

85-
System.out.println("mcpClient = " + mcpClient.getServerInfo());
86-
8785
ListToolsResult toolsResult = mcpClient.listTools();
8886

8987
assertThat(toolsResult).isNotNull();

‎auto-configurations/mcp/spring-ai-autoconfigure-mcp-server-common/src/main/java/org/springframework/ai/mcp/server/common/autoconfigure/McpServerAutoConfiguration.java‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,12 @@
3131
import io.modelcontextprotocol.server.McpServerFeatures.AsyncCompletionSpecification;
3232
import io.modelcontextprotocol.server.McpServerFeatures.AsyncPromptSpecification;
3333
import io.modelcontextprotocol.server.McpServerFeatures.AsyncResourceSpecification;
34+
import io.modelcontextprotocol.server.McpServerFeatures.AsyncResourceTemplateSpecification;
3435
import io.modelcontextprotocol.server.McpServerFeatures.AsyncToolSpecification;
3536
import io.modelcontextprotocol.server.McpServerFeatures.SyncCompletionSpecification;
3637
import io.modelcontextprotocol.server.McpServerFeatures.SyncPromptSpecification;
3738
import io.modelcontextprotocol.server.McpServerFeatures.SyncResourceSpecification;
39+
import io.modelcontextprotocol.server.McpServerFeatures.SyncResourceTemplateSpecification;
3840
import io.modelcontextprotocol.server.McpServerFeatures.SyncToolSpecification;
3941
import io.modelcontextprotocol.server.McpSyncServer;
4042
import io.modelcontextprotocol.server.McpSyncServerExchange;
@@ -111,6 +113,7 @@ public McpSyncServer mcpSyncServer(McpServerTransportProviderBase transportProvi
111113
McpServerChangeNotificationProperties changeNotificationProperties,
112114
ObjectProvider<List<SyncToolSpecification>> tools,
113115
ObjectProvider<List<SyncResourceSpecification>> resources,
116+
ObjectProvider<List<SyncResourceTemplateSpecification>> resourceTemplates,
114117
ObjectProvider<List<SyncPromptSpecification>> prompts,
115118
ObjectProvider<List<SyncCompletionSpecification>> completions,
116119
ObjectProvider<BiConsumer<McpSyncServerExchange, List<McpSchema.Root>>> rootsChangeConsumers,
@@ -157,6 +160,21 @@ public McpSyncServer mcpSyncServer(McpServerTransportProviderBase transportProvi
157160
}
158161
}
159162

163+
// Resources Templates
164+
if (serverProperties.getCapabilities().isResource()) {
165+
logger.info("Enable resources templates capabilities, notification: "
166+
+ changeNotificationProperties.isResourceChangeNotification());
167+
capabilitiesBuilder.resources(false, changeNotificationProperties.isResourceChangeNotification());
168+
169+
List<SyncResourceTemplateSpecification> resourceTemplateSpecifications = resourceTemplates.stream()
170+
.flatMap(List::stream)
171+
.toList();
172+
if (!CollectionUtils.isEmpty(resourceTemplateSpecifications)) {
173+
serverBuilder.resourceTemplates(resourceTemplateSpecifications);
174+
logger.info("Registered resource templates: " + resourceTemplateSpecifications.size());
175+
}
176+
}
177+
160178
// Prompts
161179
if (serverProperties.getCapabilities().isPrompt()) {
162180
logger.info("Enable prompts capabilities, notification: "
@@ -210,6 +228,7 @@ public McpAsyncServer mcpAsyncServer(McpServerTransportProviderBase transportPro
210228
McpServerChangeNotificationProperties changeNotificationProperties,
211229
ObjectProvider<List<AsyncToolSpecification>> tools,
212230
ObjectProvider<List<AsyncResourceSpecification>> resources,
231+
ObjectProvider<List<AsyncResourceTemplateSpecification>> resourceTemplates,
213232
ObjectProvider<List<AsyncPromptSpecification>> prompts,
214233
ObjectProvider<List<AsyncCompletionSpecification>> completions,
215234
ObjectProvider<BiConsumer<McpAsyncServerExchange, List<McpSchema.Root>>> rootsChangeConsumer) {
@@ -255,6 +274,21 @@ public McpAsyncServer mcpAsyncServer(McpServerTransportProviderBase transportPro
255274
}
256275
}
257276

277+
// Resources Templates
278+
if (serverProperties.getCapabilities().isResource()) {
279+
logger.info("Enable resources templates capabilities, notification: "
280+
+ changeNotificationProperties.isResourceChangeNotification());
281+
capabilitiesBuilder.resources(false, changeNotificationProperties.isResourceChangeNotification());
282+
283+
List<AsyncResourceTemplateSpecification> resourceTemplateSpecifications = resourceTemplates.stream()
284+
.flatMap(List::stream)
285+
.toList();
286+
if (!CollectionUtils.isEmpty(resourceTemplateSpecifications)) {
287+
serverBuilder.resourceTemplates(resourceTemplateSpecifications);
288+
logger.info("Registered resources templates: " + resourceTemplateSpecifications.size());
289+
}
290+
}
291+
258292
// Prompts
259293
if (serverProperties.getCapabilities().isPrompt()) {
260294
logger.info("Enable prompts capabilities, notification: "

‎auto-configurations/mcp/spring-ai-autoconfigure-mcp-server-common/src/main/java/org/springframework/ai/mcp/server/common/autoconfigure/McpServerStatelessAutoConfiguration.java‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,12 @@
2626
import io.modelcontextprotocol.server.McpStatelessServerFeatures.AsyncCompletionSpecification;
2727
import io.modelcontextprotocol.server.McpStatelessServerFeatures.AsyncPromptSpecification;
2828
import io.modelcontextprotocol.server.McpStatelessServerFeatures.AsyncResourceSpecification;
29+
import io.modelcontextprotocol.server.McpStatelessServerFeatures.AsyncResourceTemplateSpecification;
2930
import io.modelcontextprotocol.server.McpStatelessServerFeatures.AsyncToolSpecification;
3031
import io.modelcontextprotocol.server.McpStatelessServerFeatures.SyncCompletionSpecification;
3132
import io.modelcontextprotocol.server.McpStatelessServerFeatures.SyncPromptSpecification;
3233
import io.modelcontextprotocol.server.McpStatelessServerFeatures.SyncResourceSpecification;
34+
import io.modelcontextprotocol.server.McpStatelessServerFeatures.SyncResourceTemplateSpecification;
3335
import io.modelcontextprotocol.server.McpStatelessServerFeatures.SyncToolSpecification;
3436
import io.modelcontextprotocol.server.McpStatelessSyncServer;
3537
import io.modelcontextprotocol.spec.McpSchema;
@@ -80,6 +82,7 @@ public McpStatelessSyncServer mcpStatelessSyncServer(McpStatelessServerTransport
8082
McpSchema.ServerCapabilities.Builder capabilitiesBuilder, McpServerProperties serverProperties,
8183
ObjectProvider<List<SyncToolSpecification>> tools,
8284
ObjectProvider<List<SyncResourceSpecification>> resources,
85+
ObjectProvider<List<SyncResourceTemplateSpecification>> resourceTemplates,
8386
ObjectProvider<List<SyncPromptSpecification>> prompts,
8487
ObjectProvider<List<SyncCompletionSpecification>> completions, Environment environment) {
8588

@@ -113,6 +116,19 @@ public McpStatelessSyncServer mcpStatelessSyncServer(McpStatelessServerTransport
113116
}
114117
}
115118

119+
// Resources Templates
120+
if (serverProperties.getCapabilities().isResource()) {
121+
capabilitiesBuilder.resources(false, false);
122+
123+
List<SyncResourceTemplateSpecification> resourceSpecifications = resourceTemplates.stream()
124+
.flatMap(List::stream)
125+
.toList();
126+
if (!CollectionUtils.isEmpty(resourceSpecifications)) {
127+
serverBuilder.resourceTemplates(resourceSpecifications);
128+
logger.info("Registered resource templates: " + resourceSpecifications.size());
129+
}
130+
}
131+
116132
// Prompts
117133
if (serverProperties.getCapabilities().isPrompt()) {
118134
capabilitiesBuilder.prompts(false);
@@ -156,6 +172,7 @@ public McpStatelessAsyncServer mcpStatelessAsyncServer(McpStatelessServerTranspo
156172
McpSchema.ServerCapabilities.Builder capabilitiesBuilder, McpServerProperties serverProperties,
157173
ObjectProvider<List<AsyncToolSpecification>> tools,
158174
ObjectProvider<List<AsyncResourceSpecification>> resources,
175+
ObjectProvider<List<AsyncResourceTemplateSpecification>> resourceTemplates,
159176
ObjectProvider<List<AsyncPromptSpecification>> prompts,
160177
ObjectProvider<List<AsyncCompletionSpecification>> completions) {
161178

@@ -189,6 +206,19 @@ public McpStatelessAsyncServer mcpStatelessAsyncServer(McpStatelessServerTranspo
189206
}
190207
}
191208

209+
// Resources Templates
210+
if (serverProperties.getCapabilities().isResource()) {
211+
capabilitiesBuilder.resources(false, false);
212+
213+
List<AsyncResourceTemplateSpecification> resourceSpecifications = resourceTemplates.stream()
214+
.flatMap(List::stream)
215+
.toList();
216+
if (!CollectionUtils.isEmpty(resourceSpecifications)) {
217+
serverBuilder.resourceTemplates(resourceSpecifications);
218+
logger.info("Registered resource templates: " + resourceSpecifications.size());
219+
}
220+
}
221+
192222
// Prompts
193223
if (serverProperties.getCapabilities().isPrompt()) {
194224
capabilitiesBuilder.prompts(false);

0 commit comments

Comments
 (0)