Gemfire vector store builder refactoring

Author: sobychacko

spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/gemfire/GemFireVectorStoreAutoConfiguration.java

@@ -21,7 +21,7 @@
 import org.springframework.ai.embedding.BatchingStrategy;
 import org.springframework.ai.embedding.EmbeddingModel;
 import org.springframework.ai.embedding.TokenCountBatchingStrategy;
-import org.springframework.ai.vectorstore.GemFireVectorStore;
+import org.springframework.ai.vectorstore.gemfire.GemFireVectorStore;
 import org.springframework.ai.vectorstore.observation.VectorStoreObservationConvention;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
@@ -63,20 +63,23 @@ public GemFireVectorStore gemfireVectorStore(EmbeddingModel embeddingModel, GemF
 			GemFireConnectionDetails gemFireConnectionDetails, ObjectProvider<ObservationRegistry> observationRegistry,
 			ObjectProvider<VectorStoreObservationConvention> customObservationConvention,
 			BatchingStrategy batchingStrategy) {
-		var builder = new GemFireVectorStore.GemFireVectorStoreConfig.Builder();
 
-		builder.setHost(gemFireConnectionDetails.getHost())
-			.setPort(gemFireConnectionDetails.getPort())
-			.setIndexName(properties.getIndexName())
-			.setBeamWidth(properties.getBeamWidth())
-			.setMaxConnections(properties.getMaxConnections())
-			.setBuckets(properties.getBuckets())
-			.setVectorSimilarityFunction(properties.getVectorSimilarityFunction())
-			.setFields(properties.getFields())
-			.setSslEnabled(properties.isSslEnabled());
-		return new GemFireVectorStore(builder.build(), embeddingModel, properties.isInitializeSchema(),
-				observationRegistry.getIfUnique(() -> ObservationRegistry.NOOP),
-				customObservationConvention.getIfAvailable(() -> null), batchingStrategy);
+		return GemFireVectorStore.builder()
+			.host(gemFireConnectionDetails.getHost())
+			.port(gemFireConnectionDetails.getPort())
+			.indexName(properties.getIndexName())
+			.beamWidth(properties.getBeamWidth())
+			.maxConnections(properties.getMaxConnections())
+			.buckets(properties.getBuckets())
+			.vectorSimilarityFunction(properties.getVectorSimilarityFunction())
+			.fields(properties.getFields())
+			.sslEnabled(properties.isSslEnabled())
+			.embeddingModel(embeddingModel)
+			.initializeSchema(properties.isInitializeSchema())
+			.observationRegistry(observationRegistry.getIfUnique(() -> ObservationRegistry.NOOP))
+			.customObservationConvention(customObservationConvention.getIfAvailable(() -> null))
+			.batchingStrategy(batchingStrategy)
+			.build();
 	}
 
 	private static class PropertiesGemFireConnectionDetails implements GemFireConnectionDetails {

spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/gemfire/GemFireVectorStoreProperties.java

@@ -17,7 +17,7 @@
 package org.springframework.ai.autoconfigure.vectorstore.gemfire;
 
 import org.springframework.ai.autoconfigure.vectorstore.CommonVectorStoreProperties;
-import org.springframework.ai.vectorstore.GemFireVectorStore;
+import org.springframework.ai.vectorstore.gemfire.GemFireVectorStore;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
@@ -39,61 +39,61 @@ public class GemFireVectorStoreProperties extends CommonVectorStoreProperties {
 	 * "spring.ai.vectorstore.gemfire.host";
 	 *
 	 */
-	private String host = GemFireVectorStore.GemFireVectorStoreConfig.DEFAULT_HOST;
+	private String host = GemFireVectorStore.DEFAULT_HOST;
 
 	/**
 	 * The port of the GemFire to connect to. To specify a custom port, use
 	 * "spring.ai.vectorstore.gemfire.port";
 	 */
-	private int port = GemFireVectorStore.GemFireVectorStoreConfig.DEFAULT_PORT;
+	private int port = GemFireVectorStore.DEFAULT_PORT;
 
 	/**
 	 * The name of the index in the GemFire. To specify a custom index, use
 	 * "spring.ai.vectorstore.gemfire.index-name";
 	 */
-	private String indexName = GemFireVectorStore.GemFireVectorStoreConfig.DEFAULT_INDEX_NAME;
+	private String indexName = GemFireVectorStore.DEFAULT_INDEX_NAME;
 
 	/**
 	 * The beam width for similarity queries. Default value is {@code 100}. To specify a
 	 * custom beam width, use "spring.ai.vectorstore.gemfire.beam-width";
 	 */
-	private int beamWidth = GemFireVectorStore.GemFireVectorStoreConfig.DEFAULT_BEAM_WIDTH;
+	private int beamWidth = GemFireVectorStore.DEFAULT_BEAM_WIDTH;
 
 	/**
 	 * The maximum number of connections allowed. Default value is {@code 16}. To specify
 	 * custom number of connections, use "spring.ai.vectorstore.gemfire.max-connections";
 	 */
-	private int maxConnections = GemFireVectorStore.GemFireVectorStoreConfig.DEFAULT_MAX_CONNECTIONS;
+	private int maxConnections = GemFireVectorStore.DEFAULT_MAX_CONNECTIONS;
 
 	/**
 	 * The similarity function to be used for vector comparisons. Default value is
 	 * {@code "COSINE"}. To specify custom vectorSimilarityFunction, use
 	 * "spring.ai.vectorstore.gemfire.vector-similarity-function";
 	 *
 	 */
-	private String vectorSimilarityFunction = GemFireVectorStore.GemFireVectorStoreConfig.DEFAULT_SIMILARITY_FUNCTION;
+	private String vectorSimilarityFunction = GemFireVectorStore.DEFAULT_SIMILARITY_FUNCTION;
 
 	/**
 	 * The fields to be used for queries. Default value is an array containing
 	 * {@code "vector"}. To specify custom fields, use
 	 * "spring.ai.vectorstore.gemfire.fields"
 	 */
-	private String[] fields = GemFireVectorStore.GemFireVectorStoreConfig.DEFAULT_FIELDS;
+	private String[] fields = GemFireVectorStore.DEFAULT_FIELDS;
 
 	/**
 	 * The number of buckets to use for partitioning the data. Default value is {@code 0}.
 	 *
 	 * To specify custom buckets, use "spring.ai.vectorstore.gemfire.buckets";
 	 *
 	 */
-	private int buckets = GemFireVectorStore.GemFireVectorStoreConfig.DEFAULT_BUCKETS;
+	private int buckets = GemFireVectorStore.DEFAULT_BUCKETS;
 
 	/**
 	 * Set to true if GemFire cluster is ssl enabled
 	 *
 	 * To specify sslEnabled, use "spring.ai.vectorstore.gemfire.ssl-enabled";
 	 */
-	private boolean sslEnabled = GemFireVectorStore.GemFireVectorStoreConfig.DEFAULT_SSL_ENABLED;
+	private boolean sslEnabled = GemFireVectorStore.DEFAULT_SSL_ENABLED;
 
 	public int getBeamWidth() {
 		return this.beamWidth;

spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/gemfire/GemFireVectorStoreAutoConfigurationIT.java

@@ -38,7 +38,7 @@
 import org.springframework.ai.embedding.EmbeddingModel;
 import org.springframework.ai.observation.conventions.VectorStoreProvider;
 import org.springframework.ai.transformers.TransformersEmbeddingModel;
-import org.springframework.ai.vectorstore.GemFireVectorStore;
+import org.springframework.ai.vectorstore.gemfire.GemFireVectorStore;
 import org.springframework.ai.vectorstore.SearchRequest;
 import org.springframework.ai.vectorstore.VectorStore;
 import org.springframework.ai.vectorstore.observation.VectorStoreObservationContext;

spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/gemfire/GemFireVectorStorePropertiesTests.java

@@ -18,7 +18,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.ai.vectorstore.GemFireVectorStore;
+import org.springframework.ai.vectorstore.gemfire.GemFireVectorStore;
 
 import static org.assertj.core.api.Assertions.assertThat;