Oracle vector store builder refactoring

Author: sobychacko

spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/oracle/OracleVectorStoreAutoConfiguration.java

@@ -23,7 +23,7 @@
 import org.springframework.ai.embedding.BatchingStrategy;
 import org.springframework.ai.embedding.EmbeddingModel;
 import org.springframework.ai.embedding.TokenCountBatchingStrategy;
-import org.springframework.ai.vectorstore.OracleVectorStore;
+import org.springframework.ai.vectorstore.oracle.OracleVectorStore;
 import org.springframework.ai.vectorstore.observation.VectorStoreObservationConvention;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
@@ -59,11 +59,22 @@ public OracleVectorStore vectorStore(JdbcTemplate jdbcTemplate, EmbeddingModel e
 			OracleVectorStoreProperties properties, ObjectProvider<ObservationRegistry> observationRegistry,
 			ObjectProvider<VectorStoreObservationConvention> customObservationConvention,
 			BatchingStrategy batchingStrategy) {
-		return new OracleVectorStore(jdbcTemplate, embeddingModel, properties.getTableName(), properties.getIndexType(),
-				properties.getDistanceType(), properties.getDimensions(), properties.getSearchAccuracy(),
-				properties.isInitializeSchema(), properties.isRemoveExistingVectorStoreTable(),
-				properties.isForcedNormalization(), observationRegistry.getIfUnique(() -> ObservationRegistry.NOOP),
-				customObservationConvention.getIfAvailable(() -> null), batchingStrategy);
+
+		return OracleVectorStore.builder()
+			.jdbcTemplate(jdbcTemplate)
+			.embeddingModel(embeddingModel)
+			.tableName(properties.getTableName())
+			.indexType(properties.getIndexType())
+			.distanceType(properties.getDistanceType())
+			.dimensions(properties.getDimensions())
+			.searchAccuracy(properties.getSearchAccuracy())
+			.initializeSchema(properties.isInitializeSchema())
+			.removeExistingVectorStoreTable(properties.isRemoveExistingVectorStoreTable())
+			.forcedNormalization(properties.isForcedNormalization())
+			.observationRegistry(observationRegistry.getIfUnique(() -> ObservationRegistry.NOOP))
+			.customObservationConvention(customObservationConvention.getIfAvailable(() -> null))
+			.batchingStrategy(batchingStrategy)
+			.build();
 	}
 
 }

spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/oracle/OracleVectorStoreProperties.java

@@ -17,7 +17,7 @@
 package org.springframework.ai.autoconfigure.vectorstore.oracle;
 
 import org.springframework.ai.autoconfigure.vectorstore.CommonVectorStoreProperties;
-import org.springframework.ai.vectorstore.OracleVectorStore;
+import org.springframework.ai.vectorstore.oracle.OracleVectorStore;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
@@ -42,7 +42,7 @@ public class OracleVectorStoreProperties extends CommonVectorStoreProperties {
 
 	private boolean forcedNormalization;
 
-	private int searchAccuracy = org.springframework.ai.vectorstore.OracleVectorStore.DEFAULT_SEARCH_ACCURACY;
+	private int searchAccuracy = OracleVectorStore.DEFAULT_SEARCH_ACCURACY;
 
 	public String getTableName() {
 		return this.tableName;

spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/oracle/OracleVectorStorePropertiesTests.java

@@ -18,9 +18,9 @@
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.ai.vectorstore.OracleVectorStore;
-import org.springframework.ai.vectorstore.OracleVectorStore.OracleVectorStoreDistanceType;
-import org.springframework.ai.vectorstore.OracleVectorStore.OracleVectorStoreIndexType;
+import org.springframework.ai.vectorstore.oracle.OracleVectorStore;
+import org.springframework.ai.vectorstore.oracle.OracleVectorStore.OracleVectorStoreDistanceType;
+import org.springframework.ai.vectorstore.oracle.OracleVectorStore.OracleVectorStoreIndexType;
 
 import static org.assertj.core.api.Assertions.assertThat;