Remove vector store related deprecations introduced in 1.0.0-M5

Signed-off-by: leijendary <[email protected]>

Author: sobychacko

spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/cosmosdb/CosmosDBVectorStoreAutoConfiguration.java

@@ -24,14 +24,14 @@
 import org.springframework.ai.embedding.EmbeddingModel;
 import org.springframework.ai.embedding.TokenCountBatchingStrategy;
 import org.springframework.ai.vectorstore.cosmosdb.CosmosDBVectorStore;
-import org.springframework.ai.vectorstore.cosmosdb.CosmosDBVectorStoreConfig;
 import org.springframework.ai.vectorstore.observation.VectorStoreObservationConvention;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
+import java.util.List;
 
 /**
  * {@link AutoConfiguration Auto-configuration} for CosmosDB Vector Store.
@@ -71,14 +71,14 @@ public CosmosDBVectorStore cosmosDBVectorStore(ObservationRegistry observationRe
 			CosmosDBVectorStoreProperties properties, CosmosAsyncClient cosmosAsyncClient,
 			EmbeddingModel embeddingModel, BatchingStrategy batchingStrategy) {
 
-		CosmosDBVectorStoreConfig config = new CosmosDBVectorStoreConfig();
-		config.setDatabaseName(properties.getDatabaseName());
-		config.setContainerName(properties.getContainerName());
-		config.setMetadataFields(properties.getMetadataFields());
-		config.setVectorStoreThroughput(properties.getVectorStoreThroughput());
-		config.setVectorDimensions(properties.getVectorDimensions());
-		return new CosmosDBVectorStore(observationRegistry, customObservationConvention.getIfAvailable(),
-				cosmosAsyncClient, config, embeddingModel, batchingStrategy);
+		return CosmosDBVectorStore.builder(cosmosAsyncClient, embeddingModel)
+			.databaseName(properties.getDatabaseName())
+			.containerName(properties.getContainerName())
+			.metadataFields(List.of(properties.getMetadataFields()))
+			.vectorStoreThroughput(properties.getVectorStoreThroughput())
+			.vectorDimensions(properties.getVectorDimensions())
+			.build();
+
 	}
 
 }

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

@@ -22,7 +22,6 @@
 import org.springframework.ai.embedding.EmbeddingModel;
 import org.springframework.ai.embedding.TokenCountBatchingStrategy;
 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;

spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/typesense/TypesenseVectorStoreAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 the original author or authors.
+ * Copyright 2023-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,6 @@
 import org.springframework.ai.embedding.EmbeddingModel;
 import org.springframework.ai.embedding.TokenCountBatchingStrategy;
 import org.springframework.ai.vectorstore.typesense.TypesenseVectorStore;
-import org.springframework.ai.vectorstore.typesense.TypesenseVectorStore.TypesenseVectorStoreConfig;
 import org.springframework.ai.vectorstore.observation.VectorStoreObservationConvention;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfiguration;

spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/cassandra/CassandraVectorStorePropertiesTests.java

@@ -19,7 +19,6 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.ai.vectorstore.cassandra.CassandraVectorStore;
-import org.springframework.ai.vectorstore.cassandra.CassandraVectorStoreConfig;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

vector-stores/spring-ai-azure-cosmos-db-store/src/main/java/org/springframework/ai/vectorstore/cosmosdb/CosmosDBVectorStore.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 the original author or authors.
+ * Copyright 2023-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -102,50 +102,6 @@ public class CosmosDBVectorStore extends AbstractObservationVectorStore implemen
 
 	private CosmosAsyncContainer container;
 
-	/**
-	 * Creates a new CosmosDBVectorStore with basic configuration.
-	 * @param observationRegistry the observation registry
-	 * @param customObservationConvention the custom observation convention
-	 * @param cosmosClient the Cosmos DB client
-	 * @param properties the configuration properties
-	 * @param embeddingModel the embedding model
-	 * @deprecated Since 1.0.0-M5, use {@link #builder(CosmosAsyncClient, EmbeddingModel)}
-	 * ()} instead
-	 */
-	@Deprecated(since = "1.0.0-M5", forRemoval = true)
-	public CosmosDBVectorStore(ObservationRegistry observationRegistry,
-			VectorStoreObservationConvention customObservationConvention, CosmosAsyncClient cosmosClient,
-			CosmosDBVectorStoreConfig properties, EmbeddingModel embeddingModel) {
-		this(observationRegistry, customObservationConvention, cosmosClient, properties, embeddingModel,
-				new TokenCountBatchingStrategy());
-	}
-
-	/**
-	 * Creates a new CosmosDBVectorStore with full configuration.
-	 * @param observationRegistry the observation registry
-	 * @param customObservationConvention the custom observation convention
-	 * @param cosmosClient the Cosmos DB client
-	 * @param properties the configuration properties
-	 * @param embeddingModel the embedding model
-	 * @param batchingStrategy the batching strategy
-	 * @deprecated Since 1.0.0-M5, use {@link #builder(CosmosAsyncClient, EmbeddingModel)}
-	 * ()} instead
-	 */
-	@Deprecated(since = "1.0.0-M5", forRemoval = true)
-	public CosmosDBVectorStore(ObservationRegistry observationRegistry,
-			VectorStoreObservationConvention customObservationConvention, CosmosAsyncClient cosmosClient,
-			CosmosDBVectorStoreConfig properties, EmbeddingModel embeddingModel, BatchingStrategy batchingStrategy) {
-		this(builder(cosmosClient, embeddingModel).containerName(properties.getContainerName())
-			.databaseName(properties.getDatabaseName())
-			.partitionKeyPath(properties.getPartitionKeyPath())
-			.vectorStoreThroughput(properties.getVectorStoreThroughput())
-			.vectorDimensions(properties.getVectorDimensions())
-			.metadataFields(properties.getMetadataFieldsList())
-			.observationRegistry(observationRegistry)
-			.customObservationConvention(customObservationConvention)
-			.batchingStrategy(batchingStrategy));
-	}
-
 	/**
 	 * Protected constructor that accepts a builder instance. This is the preferred way to
 	 * create new CosmosDBVectorStore instances.