From cd871eaddcafa2dfec2023277fa320cd37c7bae1 Mon Sep 17 00:00:00 2001
From: ogbozoyan <oganes.bozoyan@mail.ru>
Date: Mon, 25 Nov 2024 20:44:05 +0300
Subject: [PATCH] VectorStoreChatMemoryAdvisor constructors cleanup

 - Deprecate all constructors except one with all fields
 - Update the build method to include order in the VectorStoreChatMemoryAdvisor's constructor
---
 .../advisor/VectorStoreChatMemoryAdvisor.java | 30 +++++++++++++++++--
 .../PgVectorStoreWithChatMemoryAdvisorIT.java |  2 +-
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/VectorStoreChatMemoryAdvisor.java b/spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/VectorStoreChatMemoryAdvisor.java
index 8f9660d47..bced70c6a 100644
--- a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/VectorStoreChatMemoryAdvisor.java
+++ b/spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/VectorStoreChatMemoryAdvisor.java
@@ -45,6 +45,7 @@ import org.springframework.util.StringUtils;
  *
  * @author Christian Tzolov
  * @author Thomas Vitale
+ * @author Oganes Bozoyan
  * @since 1.0.0
  */
 public class VectorStoreChatMemoryAdvisor extends AbstractChatMemoryAdvisor<VectorStore> {
@@ -65,20 +66,45 @@ public class VectorStoreChatMemoryAdvisor extends AbstractChatMemoryAdvisor<Vect
 
 	private final String systemTextAdvise;
 
+	@Deprecated(forRemoval = true, since = "1.0.0-M6")
+	/**
+	 * @deprecated use {@link Builder} instead.
+	 */
 	public VectorStoreChatMemoryAdvisor(VectorStore vectorStore) {
 		this(vectorStore, DEFAULT_SYSTEM_TEXT_ADVISE);
 	}
 
+	@Deprecated(forRemoval = true, since = "1.0.0-M6")
+	/**
+	 * @deprecated use {@link Builder} instead.
+	 */
 	public VectorStoreChatMemoryAdvisor(VectorStore vectorStore, String systemTextAdvise) {
 		super(vectorStore);
 		this.systemTextAdvise = systemTextAdvise;
 	}
 
+	@Deprecated(forRemoval = true, since = "1.0.0-M6")
+	/**
+	 * @deprecated use {@link Builder} instead.
+	 */
 	public VectorStoreChatMemoryAdvisor(VectorStore vectorStore, String defaultConversationId,
 			int chatHistoryWindowSize) {
 		this(vectorStore, defaultConversationId, chatHistoryWindowSize, DEFAULT_SYSTEM_TEXT_ADVISE);
 	}
 
+	@Deprecated(forRemoval = true, since = "1.0.0-M6")
+	/**
+	 * @deprecated use {@link Builder} instead.
+	 */
+	public VectorStoreChatMemoryAdvisor(VectorStore vectorStore, String defaultConversationId,
+			int chatHistoryWindowSize, int order) {
+		this(vectorStore, defaultConversationId, chatHistoryWindowSize, DEFAULT_SYSTEM_TEXT_ADVISE, order);
+	}
+
+	@Deprecated(forRemoval = true, since = "1.0.0-M6")
+	/**
+	 * @deprecated use {@link Builder} instead.
+	 */
 	public VectorStoreChatMemoryAdvisor(VectorStore vectorStore, String defaultConversationId,
 			int chatHistoryWindowSize, String systemTextAdvise) {
 		this(vectorStore, defaultConversationId, chatHistoryWindowSize, systemTextAdvise,
@@ -95,7 +121,7 @@ public class VectorStoreChatMemoryAdvisor extends AbstractChatMemoryAdvisor<Vect
 	 * @param systemTextAdvise the system text advice used for the chat advisor system.
 	 * @param order the order of precedence for this advisor in the chain.
 	 */
-	public VectorStoreChatMemoryAdvisor(VectorStore vectorStore, String defaultConversationId,
+	private VectorStoreChatMemoryAdvisor(VectorStore vectorStore, String defaultConversationId,
 			int chatHistoryWindowSize, String systemTextAdvise, int order) {
 		super(vectorStore, defaultConversationId, chatHistoryWindowSize, true, order);
 		this.systemTextAdvise = systemTextAdvise;
@@ -222,7 +248,7 @@ public class VectorStoreChatMemoryAdvisor extends AbstractChatMemoryAdvisor<Vect
 		@Override
 		public VectorStoreChatMemoryAdvisor build() {
 			return new VectorStoreChatMemoryAdvisor(this.chatMemory, this.conversationId, this.chatMemoryRetrieveSize,
-					this.systemTextAdvise);
+					this.systemTextAdvise, this.order);
 		}
 
 	}
diff --git a/vector-stores/spring-ai-pgvector-store/src/test/java/org/springframework/ai/vectorstore/pgvector/PgVectorStoreWithChatMemoryAdvisorIT.java b/vector-stores/spring-ai-pgvector-store/src/test/java/org/springframework/ai/vectorstore/pgvector/PgVectorStoreWithChatMemoryAdvisorIT.java
index 678fa3c43..22e00980c 100644
--- a/vector-stores/spring-ai-pgvector-store/src/test/java/org/springframework/ai/vectorstore/pgvector/PgVectorStoreWithChatMemoryAdvisorIT.java
+++ b/vector-stores/spring-ai-pgvector-store/src/test/java/org/springframework/ai/vectorstore/pgvector/PgVectorStoreWithChatMemoryAdvisorIT.java
@@ -135,7 +135,7 @@ class PgVectorStoreWithChatMemoryAdvisorIT {
 			.build()
 			.prompt()
 			.user("joke")
-			.advisors(new VectorStoreChatMemoryAdvisor(store))
+			.advisors(VectorStoreChatMemoryAdvisor.builder(store).build())
 			.call()
 			.chatResponse();