feat: added missed builder methods; deprecated all constructors except one with all fields

Author: ogbozoyan

spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/VectorStoreChatMemoryAdvisor.java

@@ -78,18 +78,18 @@ public VectorStoreChatMemoryAdvisor(VectorStore vectorStore, String systemTextAd
 
 	@Deprecated
 	public VectorStoreChatMemoryAdvisor(VectorStore vectorStore, String defaultConversationId,
-										int chatHistoryWindowSize) {
+			int chatHistoryWindowSize) {
 		this(vectorStore, defaultConversationId, chatHistoryWindowSize, DEFAULT_SYSTEM_TEXT_ADVISE);
 	}
 
 	@Deprecated
 	public VectorStoreChatMemoryAdvisor(VectorStore vectorStore, String defaultConversationId,
-										int chatHistoryWindowSize, int order) {
+			int chatHistoryWindowSize, int order) {
 		this(vectorStore, defaultConversationId, chatHistoryWindowSize, DEFAULT_SYSTEM_TEXT_ADVISE, order);
 	}
 
 	public VectorStoreChatMemoryAdvisor(VectorStore vectorStore, String defaultConversationId,
-										int chatHistoryWindowSize, String systemTextAdvise) {
+			int chatHistoryWindowSize, String systemTextAdvise) {
 		this(vectorStore, defaultConversationId, chatHistoryWindowSize, systemTextAdvise,
 				Advisor.DEFAULT_CHAT_MEMORY_PRECEDENCE_ORDER);
 	}
@@ -105,7 +105,7 @@ public VectorStoreChatMemoryAdvisor(VectorStore vectorStore, String defaultConve
 	 * @param order the order of precedence for this advisor in the chain.
 	 */
 	public VectorStoreChatMemoryAdvisor(VectorStore vectorStore, String defaultConversationId,
-										int chatHistoryWindowSize, String systemTextAdvise, int order) {
+			int chatHistoryWindowSize, String systemTextAdvise, int order) {
 		super(vectorStore, defaultConversationId, chatHistoryWindowSize, true, order);
 		this.systemTextAdvise = systemTextAdvise;
 	}
@@ -148,60 +148,60 @@ private AdvisedRequest before(AdvisedRequest request) {
 		}
 
 		var searchRequest = SearchRequest.query(request.userText())
-				.withTopK(this.doGetChatMemoryRetrieveSize(request.adviseContext()))
-				.withFilterExpression(DOCUMENT_METADATA_CONVERSATION_ID + "=='"
-						+ this.doGetConversationId(request.adviseContext()) + "'");
+			.withTopK(this.doGetChatMemoryRetrieveSize(request.adviseContext()))
+			.withFilterExpression(DOCUMENT_METADATA_CONVERSATION_ID + "=='"
+					+ this.doGetConversationId(request.adviseContext()) + "'");
 
 		List<Document> documents = this.getChatMemoryStore().similaritySearch(searchRequest);
 
 		String longTermMemory = documents.stream()
-				.map(Content::getContent)
-				.collect(Collectors.joining(System.lineSeparator()));
+			.map(Content::getContent)
+			.collect(Collectors.joining(System.lineSeparator()));
 
 		Map<String, Object> advisedSystemParams = new HashMap<>(request.systemParams());
 		advisedSystemParams.put("long_term_memory", longTermMemory);
 
 		AdvisedRequest advisedRequest = AdvisedRequest.from(request)
-				.withSystemText(advisedSystemText)
-				.withSystemParams(advisedSystemParams)
-				.build();
+			.withSystemText(advisedSystemText)
+			.withSystemParams(advisedSystemParams)
+			.build();
 
 		UserMessage userMessage = new UserMessage(request.userText(), request.media());
 		this.getChatMemoryStore()
-				.write(toDocuments(List.of(userMessage), this.doGetConversationId(request.adviseContext())));
+			.write(toDocuments(List.of(userMessage), this.doGetConversationId(request.adviseContext())));
 
 		return advisedRequest;
 	}
 
 	private void observeAfter(AdvisedResponse advisedResponse) {
 
 		List<Message> assistantMessages = advisedResponse.response()
-				.getResults()
-				.stream()
-				.map(g -> (Message) g.getOutput())
-				.toList();
+			.getResults()
+			.stream()
+			.map(g -> (Message) g.getOutput())
+			.toList();
 
 		this.getChatMemoryStore()
-				.write(toDocuments(assistantMessages, this.doGetConversationId(advisedResponse.adviseContext())));
+			.write(toDocuments(assistantMessages, this.doGetConversationId(advisedResponse.adviseContext())));
 	}
 
 	private List<Document> toDocuments(List<Message> messages, String conversationId) {
 
 		List<Document> docs = 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<>());
-					metadata.put(DOCUMENT_METADATA_CONVERSATION_ID, conversationId);
-					metadata.put(DOCUMENT_METADATA_MESSAGE_TYPE, message.getMessageType().name());
-					if (message instanceof UserMessage userMessage) {
-						return new Document(userMessage.getContent(), userMessage.getMedia(), metadata);
-					}
-					else if (message instanceof AssistantMessage assistantMessage) {
-						return new Document(assistantMessage.getContent(), metadata);
-					}
-					throw new RuntimeException("Unknown message type: " + message.getMessageType());
-				})
-				.toList();
+			.filter(m -> m.getMessageType() == MessageType.USER || m.getMessageType() == MessageType.ASSISTANT)
+			.map(message -> {
+				var 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) {
+					return new Document(userMessage.getContent(), userMessage.getMedia(), metadata);
+				}
+				else if (message instanceof AssistantMessage assistantMessage) {
+					return new Document(assistantMessage.getContent(), metadata);
+				}
+				throw new RuntimeException("Unknown message type: " + message.getMessageType());
+			})
+			.toList();
 
 		return docs;
 	}