Merge branch 'main' into fix-issue-4251

# Conflicts:
#	spring-ai-template-st/src/test/java/org/springframework/ai/template/st/StTemplateRendererTests.java

Author: sunyuhan1998

.github/workflows/deploy-docs.yml

@@ -28,6 +28,8 @@ jobs:
         if: github.ref_type == 'branch'
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GIT_TRACE: 1
+          GIT_CURL_VERBOSE: 1
         run: gh workflow run deploy-docs.yml -r $(git rev-parse --abbrev-ref HEAD) -f build-refname=${{ github.ref_name }}
       - name: Dispatch (full build)
         if: github.ref_type == 'tag'

.github/workflows/documentation-upload.yml

@@ -33,7 +33,7 @@ jobs:
 
       - name: Generate assembly
         working-directory: spring-ai-docs
-        run: ./mvnw --batch-mode assembly:single
+        run: mvn --batch-mode assembly:single
 
       - name: Setup SSH key
         env:

.gitignore

@@ -1,3 +1,4 @@
+.checkstyle
 target
 .classpath
 .project
@@ -50,3 +51,8 @@ CLAUDE.md
 qodana.yaml
 __pycache__/
 *.pyc
+tmp
+
+
+plans
+

CONTRIBUTING.adoc

@@ -110,7 +110,7 @@ When issuing pull requests, please ensure that your commit history is linear.
 From the command line you can check this using:
 
 ----
-log --graph --pretty=oneline
+git log --graph --pretty=oneline
 ----
 
 As this may cause lots of typing, we recommend creating a global alias, e.g. `git logg` for this:

README.md

@@ -65,6 +65,8 @@ To clone it you have to either:
 
 ## Building
 
+Build using Java 17.
+
 To build with running unit tests
 
 ```shell
@@ -101,9 +103,10 @@ A full integration test is done twice a day in the [Spring AI Integration Test R
 One way to run integration tests on part of the code is to first do a quick compile and install of the project
 
 ```shell
-./mvnw clean install -DskipTests -Dmaven.javadoc.skip=true
+./mvnw spring-javaformat:apply clean install -DskipTests -Dmaven.javadoc.skip=true
 ```
 Then run the integration test for a specific module using the `-pl` option
+
 ```shell
 ./mvnw verify -Pintegration-tests -pl spring-ai-spring-boot-testcontainers
 ```

advisors/spring-ai-advisors-vector-store/src/main/java/org/springframework/ai/chat/client/advisor/vectorstore/VectorStoreChatMemoryAdvisor.java

@@ -20,6 +20,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -37,9 +38,11 @@
 import org.springframework.ai.chat.messages.AssistantMessage;
 import org.springframework.ai.chat.messages.Message;
 import org.springframework.ai.chat.messages.MessageType;
+import org.springframework.ai.chat.messages.SystemMessage;
 import org.springframework.ai.chat.messages.UserMessage;
 import org.springframework.ai.chat.prompt.PromptTemplate;
 import org.springframework.ai.document.Document;
+import org.springframework.ai.vectorstore.SearchRequest;
 import org.springframework.ai.vectorstore.VectorStore;
 import org.springframework.util.Assert;
 
@@ -122,31 +125,23 @@ public ChatClientRequest before(ChatClientRequest request, AdvisorChain advisorC
 		String query = request.prompt().getUserMessage() != null ? request.prompt().getUserMessage().getText() : "";
 		int topK = getChatMemoryTopK(request.context());
 		String filter = DOCUMENT_METADATA_CONVERSATION_ID + "=='" + conversationId + "'";
-		var searchRequest = org.springframework.ai.vectorstore.SearchRequest.builder()
-			.query(query)
-			.topK(topK)
-			.filterExpression(filter)
-			.build();
-		java.util.List<org.springframework.ai.document.Document> documents = this.vectorStore
-			.similaritySearch(searchRequest);
+		SearchRequest searchRequest = SearchRequest.builder().query(query).topK(topK).filterExpression(filter).build();
+		List<Document> documents = this.vectorStore.similaritySearch(searchRequest);
 
 		String longTermMemory = documents == null ? ""
-				: documents.stream()
-					.map(org.springframework.ai.document.Document::getText)
-					.collect(java.util.stream.Collectors.joining(System.lineSeparator()));
+				: documents.stream().map(Document::getText).collect(Collectors.joining(System.lineSeparator()));
 
-		org.springframework.ai.chat.messages.SystemMessage systemMessage = request.prompt().getSystemMessage();
+		SystemMessage systemMessage = request.prompt().getSystemMessage();
 		String augmentedSystemText = this.systemPromptTemplate
-			.render(java.util.Map.of("instructions", systemMessage.getText(), "long_term_memory", longTermMemory));
+			.render(Map.of("instructions", systemMessage.getText(), "long_term_memory", longTermMemory));
 
 		ChatClientRequest processedChatClientRequest = request.mutate()
 			.prompt(request.prompt().augmentSystemMessage(augmentedSystemText))
 			.build();
 
-		org.springframework.ai.chat.messages.UserMessage userMessage = processedChatClientRequest.prompt()
-			.getUserMessage();
+		UserMessage userMessage = processedChatClientRequest.prompt().getUserMessage();
 		if (userMessage != null) {
-			this.vectorStore.write(toDocuments(java.util.List.of(userMessage), conversationId));
+			this.vectorStore.write(toDocuments(List.of(userMessage), conversationId));
 		}
 
 		return processedChatClientRequest;
@@ -186,10 +181,11 @@ public Flux<ChatClientResponse> adviseStream(ChatClientRequest chatClientRequest
 	}
 
 	private List<Document> toDocuments(List<Message> messages, String conversationId) {
-		List<Document> docs = messages.stream()
+		return messages.stream()
 			.filter(m -> m.getMessageType() == MessageType.USER || m.getMessageType() == MessageType.ASSISTANT)
 			.map(message -> {
-				var metadata = new HashMap<>(message.getMetadata() != null ? message.getMetadata() : new HashMap<>());
+				Map<String, Object> metadata = new HashMap<>(
+						message.getMetadata() != null ? message.getMetadata() : new HashMap<>());
 				metadata.put(DOCUMENT_METADATA_CONVERSATION_ID, conversationId);
 				metadata.put(DOCUMENT_METADATA_MESSAGE_TYPE, message.getMessageType().name());
 				if (message instanceof UserMessage userMessage) {
@@ -208,8 +204,6 @@ else if (message instanceof AssistantMessage assistantMessage) {
 				throw new RuntimeException("Unknown message type: " + message.getMessageType());
 			})
 			.toList();
-
-		return docs;
 	}
 
 	/**

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

@@ -42,7 +42,7 @@ public class SpringAiRetryProperties {
 	 * Exponential Backoff properties.
 	 */
 	@NestedConfigurationProperty
-	private Backoff backoff = new Backoff();
+	private final Backoff backoff = new Backoff();
 
 	/**
 	 * If false, throw a NonTransientAiException, and do not attempt retry for 4xx client

auto-configurations/mcp/spring-ai-autoconfigure-mcp-client-common/pom.xml

@@ -35,11 +35,12 @@
 			<optional>true</optional>
 		</dependency>
 
-		<!-- <dependency>
-			<groupId>io.modelcontextprotocol.sdk</groupId>
-			<artifactId>mcp-spring-webflux</artifactId>
+		<dependency>
+			<groupId>org.springframework.ai</groupId>
+			<artifactId>spring-ai-mcp-annotations</artifactId>
+			<version>${project.parent.version}</version>
 			<optional>true</optional>
-		</dependency> -->
+		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

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

@@ -23,7 +23,23 @@
 import io.modelcontextprotocol.client.McpClient;
 import io.modelcontextprotocol.client.McpSyncClient;
 import io.modelcontextprotocol.spec.McpSchema;
-
+import org.springaicommunity.mcp.method.changed.prompt.AsyncPromptListChangedSpecification;
+import org.springaicommunity.mcp.method.changed.prompt.SyncPromptListChangedSpecification;
+import org.springaicommunity.mcp.method.changed.resource.AsyncResourceListChangedSpecification;
+import org.springaicommunity.mcp.method.changed.resource.SyncResourceListChangedSpecification;
+import org.springaicommunity.mcp.method.changed.tool.AsyncToolListChangedSpecification;
+import org.springaicommunity.mcp.method.changed.tool.SyncToolListChangedSpecification;
+import org.springaicommunity.mcp.method.elicitation.AsyncElicitationSpecification;
+import org.springaicommunity.mcp.method.elicitation.SyncElicitationSpecification;
+import org.springaicommunity.mcp.method.logging.AsyncLoggingSpecification;
+import org.springaicommunity.mcp.method.logging.SyncLoggingSpecification;
+import org.springaicommunity.mcp.method.progress.AsyncProgressSpecification;
+import org.springaicommunity.mcp.method.progress.SyncProgressSpecification;
+import org.springaicommunity.mcp.method.sampling.AsyncSamplingSpecification;
+import org.springaicommunity.mcp.method.sampling.SyncSamplingSpecification;
+
+import org.springframework.ai.mcp.client.common.autoconfigure.annotations.McpAsyncAnnotationCustomizer;
+import org.springframework.ai.mcp.client.common.autoconfigure.annotations.McpSyncAnnotationCustomizer;
 import org.springframework.ai.mcp.client.common.autoconfigure.configurer.McpAsyncClientConfigurer;
 import org.springframework.ai.mcp.client.common.autoconfigure.configurer.McpSyncClientConfigurer;
 import org.springframework.ai.mcp.client.common.autoconfigure.properties.McpClientCommonProperties;
@@ -95,8 +111,6 @@
  * @see McpSyncClientCustomizer
  * @see McpAsyncClientCustomizer
  * @see StdioTransportAutoConfiguration
- * @see SseHttpClientTransportAutoConfiguration
- * @see SseWebFluxTransportAutoConfiguration
  */
 @AutoConfiguration(afterName = {
 		"org.springframework.ai.mcp.client.common.autoconfigure.StdioTransportAutoConfiguration",
@@ -158,7 +172,7 @@ public List<McpSyncClient> mcpSyncClients(McpSyncClientConfigurer mcpSyncClientC
 
 				McpSchema.Implementation clientInfo = new McpSchema.Implementation(
 						this.connectedClientName(commonProperties.getName(), namedTransport.name()),
-						commonProperties.getVersion());
+						namedTransport.name(), commonProperties.getVersion());
 
 				McpClient.SyncSpec spec = McpClient.sync(namedTransport.transport())
 					.clientInfo(clientInfo)
@@ -208,6 +222,20 @@ McpSyncClientConfigurer mcpSyncClientConfigurer(ObjectProvider<McpSyncClientCust
 		return new McpSyncClientConfigurer(customizerProvider.orderedStream().toList());
 	}
 
+	@Bean
+	@ConditionalOnProperty(prefix = McpClientCommonProperties.CONFIG_PREFIX, name = "type", havingValue = "SYNC",
+			matchIfMissing = true)
+	public McpSyncClientCustomizer mcpAnnotationMcpSyncClientCustomizer(List<SyncLoggingSpecification> loggingSpecs,
+			List<SyncSamplingSpecification> samplingSpecs, List<SyncElicitationSpecification> elicitationSpecs,
+			List<SyncProgressSpecification> progressSpecs,
+			List<SyncToolListChangedSpecification> syncToolListChangedSpecifications,
+			List<SyncResourceListChangedSpecification> syncResourceListChangedSpecifications,
+			List<SyncPromptListChangedSpecification> syncPromptListChangedSpecifications) {
+		return new McpSyncAnnotationCustomizer(samplingSpecs, loggingSpecs, elicitationSpecs, progressSpecs,
+				syncToolListChangedSpecifications, syncResourceListChangedSpecifications,
+				syncPromptListChangedSpecifications);
+	}
+
 	// Async client configuration
 
 	@Bean
@@ -259,6 +287,18 @@ McpAsyncClientConfigurer mcpAsyncClientConfigurer(ObjectProvider<McpAsyncClientC
 		return new McpAsyncClientConfigurer(customizerProvider.orderedStream().toList());
 	}
 
+	@Bean
+	@ConditionalOnProperty(prefix = McpClientCommonProperties.CONFIG_PREFIX, name = "type", havingValue = "ASYNC")
+	public McpAsyncClientCustomizer mcpAnnotationMcpAsyncClientCustomizer(List<AsyncLoggingSpecification> loggingSpecs,
+			List<AsyncSamplingSpecification> samplingSpecs, List<AsyncElicitationSpecification> elicitationSpecs,
+			List<AsyncProgressSpecification> progressSpecs,
+			List<AsyncToolListChangedSpecification> toolListChangedSpecs,
+			List<AsyncResourceListChangedSpecification> resourceListChangedSpecs,
+			List<AsyncPromptListChangedSpecification> promptListChangedSpecs) {
+		return new McpAsyncAnnotationCustomizer(samplingSpecs, loggingSpecs, elicitationSpecs, progressSpecs,
+				toolListChangedSpecs, resourceListChangedSpecs, promptListChangedSpecs);
+	}
+
 	/**
 	 * Record class that implements {@link AutoCloseable} to ensure proper cleanup of MCP
 	 * clients.

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

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2025-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.ai.mcp.client.common.autoconfigure;
+
+import java.util.Map;
+
+import org.springframework.ai.mcp.client.common.autoconfigure.properties.McpSseClientProperties;
+import org.springframework.boot.autoconfigure.service.connection.ConnectionDetails;
+
+/**
+ * Connection details for an MCP client.
+ *
+ * @author Eddú Meléndez
+ */
+public interface McpSseClientConnectionDetails extends ConnectionDetails {
+
+	Map<String, McpSseClientProperties.SseParameters> getConnections();
+
+}