Refactor SearchRequest builder methods

 - Add a new Builder inner class to move all the builder methods and deprecate the existing builder methods
 - Update docs and references

Author: ilayaperumalg

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

@@ -88,7 +88,7 @@ public class QuestionAnswerAdvisor implements CallAroundAdvisor, StreamAroundAdv
 	 * @param vectorStore The vector store to use
 	 */
 	public QuestionAnswerAdvisor(VectorStore vectorStore) {
-		this(vectorStore, SearchRequest.defaults(), DEFAULT_USER_TEXT_ADVISE);
+		this(vectorStore, SearchRequest.builder().build(), DEFAULT_USER_TEXT_ADVISE);
 	}
 
 	/**
@@ -218,8 +218,9 @@ private AdvisedRequest before(AdvisedRequest request) {
 		// 2. Search for similar documents in the vector store.
 		String query = new PromptTemplate(request.userText(), request.userParams()).render();
 		var searchRequestToUse = SearchRequest.from(this.searchRequest)
-			.withQuery(query)
-			.withFilterExpression(doGetFilterExpression(context));
+			.query(query)
+			.filterExpression(doGetFilterExpression(context))
+			.build();
 
 		List<Document> documents = this.vectorStore.similaritySearch(searchRequestToUse);
 
@@ -273,7 +274,7 @@ public static final class Builder {
 
 		private final VectorStore vectorStore;
 
-		private SearchRequest searchRequest = SearchRequest.defaults();
+		private SearchRequest searchRequest = SearchRequest.builder().build();
 
 		private String userTextAdvise = DEFAULT_USER_TEXT_ADVISE;
 

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

@@ -138,10 +138,12 @@ private AdvisedRequest before(AdvisedRequest request) {
 			advisedSystemText = this.systemTextAdvise;
 		}
 
-		var searchRequest = SearchRequest.query(request.userText())
-			.withTopK(this.doGetChatMemoryRetrieveSize(request.adviseContext()))
-			.withFilterExpression(DOCUMENT_METADATA_CONVERSATION_ID + "=='"
-					+ this.doGetConversationId(request.adviseContext()) + "'");
+		var searchRequest = SearchRequest.builder()
+			.query(request.userText())
+			.topK(this.doGetChatMemoryRetrieveSize(request.adviseContext()))
+			.filterExpression(
+					DOCUMENT_METADATA_CONVERSATION_ID + "=='" + this.doGetConversationId(request.adviseContext()) + "'")
+			.build();
 
 		List<Document> documents = this.getChatMemoryStore().similaritySearch(searchRequest);
 

spring-ai-core/src/main/java/org/springframework/ai/rag/retrieval/search/VectorStoreDocumentRetriever.java

@@ -75,10 +75,12 @@ public VectorStoreDocumentRetriever(VectorStore vectorStore, @Nullable Double si
 	@Override
 	public List<Document> retrieve(Query query) {
 		Assert.notNull(query, "query cannot be null");
-		var searchRequest = SearchRequest.query(query.text())
-			.withFilterExpression(this.filterExpression.get())
-			.withSimilarityThreshold(this.similarityThreshold)
-			.withTopK(this.topK);
+		var searchRequest = SearchRequest.builder()
+			.query(query.text())
+			.filterExpression(this.filterExpression.get())
+			.similarityThreshold(this.similarityThreshold)
+			.topK(this.topK)
+			.build();
 		return this.vectorStore.similaritySearch(searchRequest);
 	}