Redis vector store builder refactoring

Author: sobychacko

spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/redis/RedisVectorStoreAutoConfiguration.java

@@ -61,8 +61,8 @@ public RedisVectorStore vectorStore(EmbeddingModel embeddingModel, RedisVectorSt
 			ObjectProvider<VectorStoreObservationConvention> customObservationConvention,
 			BatchingStrategy batchingStrategy) {
 
-		return RedisVectorStore
-			.builder(new JedisPooled(jedisConnectionFactory.getHostName(), jedisConnectionFactory.getPort()))
+		return RedisVectorStore.builder()
+			.jedis(new JedisPooled(jedisConnectionFactory.getHostName(), jedisConnectionFactory.getPort()))
 			.embeddingModel(embeddingModel)
 			.initializeSchema(properties.isInitializeSchema())
 			.observationRegistry(observationRegistry.getIfUnique(() -> ObservationRegistry.NOOP))

vector-stores/spring-ai-redis-store/src/main/java/org/springframework/ai/redis/vectorstore/RedisVectorStore.java

@@ -155,7 +155,8 @@ public RedisVectorStore(RedisVectorStoreConfig config, EmbeddingModel embeddingM
 			boolean initializeSchema, ObservationRegistry observationRegistry,
 			VectorStoreObservationConvention customObservationConvention, BatchingStrategy batchingStrategy) {
 
-		this(builder(jedis).embeddingModel(embeddingModel)
+		this(builder().jedis(jedis)
+			.embeddingModel(embeddingModel)
 			.indexName(config.indexName)
 			.prefix(config.prefix)
 			.contentFieldName(config.contentFieldName)
@@ -168,8 +169,11 @@ public RedisVectorStore(RedisVectorStoreConfig config, EmbeddingModel embeddingM
 			.batchingStrategy(batchingStrategy));
 	}
 
-	private RedisVectorStore(RedisBuilder builder) {
+	protected RedisVectorStore(RedisBuilder builder) {
 		super(builder);
+
+		Assert.notNull(builder.jedis, "JedisPooled must not be null");
+
 		this.jedis = builder.jedis;
 		this.indexName = builder.indexName;
 		this.prefix = builder.prefix;
@@ -388,13 +392,13 @@ public static MetadataField tag(String name) {
 
 	}
 
-	public static RedisBuilder builder(JedisPooled jedis) {
-		return new RedisBuilder(jedis);
+	public static RedisBuilder builder() {
+		return new RedisBuilder();
 	}
 
 	public static class RedisBuilder extends AbstractVectorStoreBuilder<RedisBuilder> {
 
-		private final JedisPooled jedis;
+		private JedisPooled jedis;
 
 		private String indexName = DEFAULT_INDEX_NAME;
 
@@ -412,9 +416,10 @@ public static class RedisBuilder extends AbstractVectorStoreBuilder<RedisBuilder
 
 		private BatchingStrategy batchingStrategy = new TokenCountBatchingStrategy();
 
-		public RedisBuilder(JedisPooled jedis) {
+		public RedisBuilder jedis(JedisPooled jedis) {
 			Assert.notNull(jedis, "JedisPooled must not be null");
 			this.jedis = jedis;
+			return this;
 		}
 
 		/**

vector-stores/spring-ai-redis-store/src/test/java/org/springframework/ai/redis/vectorstore/RedisVectorStoreIT.java

@@ -257,8 +257,8 @@ public static class TestApplication {
 		@Bean
 		public RedisVectorStore vectorStore(EmbeddingModel embeddingModel,
 				JedisConnectionFactory jedisConnectionFactory) {
-			return RedisVectorStore
-				.builder(new JedisPooled(jedisConnectionFactory.getHostName(), jedisConnectionFactory.getPort()))
+			return RedisVectorStore.builder()
+				.jedis(new JedisPooled(jedisConnectionFactory.getHostName(), jedisConnectionFactory.getPort()))
 				.embeddingModel(embeddingModel)
 				.metadataFields(MetadataField.tag("meta1"), MetadataField.tag("meta2"), MetadataField.tag("country"),
 						MetadataField.numeric("year"))

vector-stores/spring-ai-redis-store/src/test/java/org/springframework/ai/redis/vectorstore/RedisVectorStoreObservationIT.java

@@ -177,8 +177,8 @@ public TestObservationRegistry observationRegistry() {
 		@Bean
 		public RedisVectorStore vectorStore(EmbeddingModel embeddingModel,
 				JedisConnectionFactory jedisConnectionFactory, ObservationRegistry observationRegistry) {
-			return RedisVectorStore
-				.builder(new JedisPooled(jedisConnectionFactory.getHostName(), jedisConnectionFactory.getPort()))
+			return RedisVectorStore.builder()
+				.jedis(new JedisPooled(jedisConnectionFactory.getHostName(), jedisConnectionFactory.getPort()))
 				.embeddingModel(embeddingModel)
 				.observationRegistry(observationRegistry)
 				.customObservationConvention(null)