Pinecone vector store builder refactoring

Author: sobychacko

spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/pinecone/PineconeVectorStoreAutoConfiguration.java

@@ -21,8 +21,8 @@
 import org.springframework.ai.embedding.BatchingStrategy;
 import org.springframework.ai.embedding.EmbeddingModel;
 import org.springframework.ai.embedding.TokenCountBatchingStrategy;
-import org.springframework.ai.vectorstore.PineconeVectorStore;
-import org.springframework.ai.vectorstore.PineconeVectorStore.PineconeVectorStoreConfig;
+import org.springframework.ai.vectorstore.pinecone.PineconeVectorStore;
+import org.springframework.ai.vectorstore.pinecone.PineconeVectorStore.PineconeVectorStoreConfig;
 import org.springframework.ai.vectorstore.observation.VectorStoreObservationConvention;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
@@ -55,20 +55,20 @@ public PineconeVectorStore vectorStore(EmbeddingModel embeddingModel, PineconeVe
 			ObjectProvider<VectorStoreObservationConvention> customObservationConvention,
 			BatchingStrategy batchingStrategy) {
 
-		var config = PineconeVectorStoreConfig.builder()
-			.withApiKey(properties.getApiKey())
-			.withEnvironment(properties.getEnvironment())
-			.withProjectId(properties.getProjectId())
-			.withIndexName(properties.getIndexName())
-			.withNamespace(properties.getNamespace())
-			.withContentFieldName(properties.getContentFieldName())
-			.withDistanceMetadataFieldName(properties.getDistanceMetadataFieldName())
-			.withServerSideTimeout(properties.getServerSideTimeout())
+		return PineconeVectorStore.builder()
+			.embeddingModel(embeddingModel)
+			.apiKey(properties.getApiKey())
+			.environment(properties.getEnvironment())
+			.projectId(properties.getProjectId())
+			.indexName(properties.getIndexName())
+			.namespace(properties.getNamespace())
+			.contentFieldName(properties.getContentFieldName())
+			.distanceMetadataFieldName(properties.getDistanceMetadataFieldName())
+			.serverSideTimeout(properties.getServerSideTimeout())
+			.observationRegistry(observationRegistry.getIfUnique(() -> ObservationRegistry.NOOP))
+			.customObservationConvention(customObservationConvention.getIfAvailable(() -> null))
+			.batchingStrategy(batchingStrategy)
 			.build();
-
-		return new PineconeVectorStore(config, embeddingModel,
-				observationRegistry.getIfUnique(() -> ObservationRegistry.NOOP),
-				customObservationConvention.getIfAvailable(() -> null), batchingStrategy);
 	}
 
 }

spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/pinecone/PineconeVectorStoreProperties.java

@@ -19,7 +19,7 @@
 import java.time.Duration;
 
 import org.springframework.ai.document.DocumentMetadata;
-import org.springframework.ai.vectorstore.PineconeVectorStore;
+import org.springframework.ai.vectorstore.pinecone.PineconeVectorStore;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**

spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/pinecone/PineconeVectorStoreAutoConfigurationIT.java

@@ -33,7 +33,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.PineconeVectorStore;
+import org.springframework.ai.vectorstore.pinecone.PineconeVectorStore;
 import org.springframework.ai.vectorstore.SearchRequest;
 import org.springframework.ai.vectorstore.observation.VectorStoreObservationContext;
 import org.springframework.boot.autoconfigure.AutoConfigurations;

spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/pinecone/PineconeVectorStorePropertiesTests.java

@@ -21,7 +21,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.ai.document.DocumentMetadata;
-import org.springframework.ai.vectorstore.PineconeVectorStore;
+import org.springframework.ai.vectorstore.pinecone.PineconeVectorStore;
 
 import static org.assertj.core.api.Assertions.assertThat;