Fixing some merge issues

sdk/cosmos/azure-cosmos-test/CHANGELOG.md

@@ -6,6 +6,10 @@
 
 #### Breaking Changes
 
+#### Bugs Fixed
+
+#### Other Changes
+
 ### 1.0.0-beta.7 (2024-05-03)
 
 #### Bugs Fixed

sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/rx/VectorIndexTest.java

@@ -15,17 +15,11 @@
 import com.azure.cosmos.implementation.Utils;
 import com.azure.cosmos.implementation.guava25.collect.ImmutableList;
 import com.azure.cosmos.models.CosmosContainerProperties;
-import com.azure.cosmos.models.CosmosVectorDataType;
-import com.azure.cosmos.models.CosmosVectorDistanceFunction;
-import com.azure.cosmos.models.CosmosVectorEmbedding;
-import com.azure.cosmos.models.CosmosVectorEmbeddingPolicy;
 import com.azure.cosmos.models.ExcludedPath;
 import com.azure.cosmos.models.IncludedPath;
 import com.azure.cosmos.models.IndexingMode;
 import com.azure.cosmos.models.IndexingPolicy;
 import com.azure.cosmos.models.PartitionKeyDefinition;
-import com.azure.cosmos.models.CosmosVectorIndexSpec;
-import com.azure.cosmos.models.CosmosVectorIndexType;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;

sdk/cosmos/azure-cosmos/CHANGELOG.md

@@ -5,9 +5,7 @@
 #### Features Added
 * Added `cosmosVectorEmbeddingPolicy` in `cosmosContainerProperties` and `vectorIndexes` in `indexPolicy` to support vector search in CosmosDB - See[39379](https://github.com/Azure/azure-sdk-for-java/pull/39379)
 
-* Added support for non-streaming OrderBy query and a query feature `NonStreamingOrderBy` to support Vector Search queries. - See [PR 39897](https://github.com/Azure/azure-sdk-for-java/pull/39897/) 
-
-* Added support for non-streaming OrderBy query and a query feature `NonStreamingOrderBy` to support Vector Search queries. - See [PR 39897](https://github.com/Azure/azure-sdk-for-java/pull/39897/) 
+* Added support for non-streaming OrderBy query and a query feature `NonStreamingOrderBy` to support Vector Search queries. - See [PR 39897](https://github.com/Azure/azure-sdk-for-java/pull/39897/)
 
 #### Breaking Changes
 
@@ -16,9 +14,10 @@
 #### Other Changes
 
 ### 4.59.0 (2024-04-27)
+
 #### Features Added
 * Added public APIs `getCustomItemSerializer` and `setCustomItemSerializer` to allow customers to specify custom payload transformations or serialization settings. - See [PR 38997](https://github.com/Azure/azure-sdk-for-java/pull/38997) and [PR 39933](https://github.com/Azure/azure-sdk-for-java/pull/39933) 
-
+ 
 #### Other Changes
 * Load Blackbird or Afterburner into the ObjectMapper depending upon Java version and presence of modules in classpath. Make Afterburner and Blackbird optional maven dependencies. See - [PR 39689](https://github.com/Azure/azure-sdk-for-java/pull/39689)
 

sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/Constants.java

@@ -120,15 +120,6 @@ public static final class Properties {
         public static final String SPATIAL_INDEXES = "spatialIndexes";
         public static final String TYPES = "types";
 
-        // Vector Embedding Policy
-        public static final String VECTOR_EMBEDDING_POLICY = "vectorEmbeddingPolicy";
-        public static final String VECTOR_INDEXES = "vectorIndexes";
-        public static final String VECTOR_EMBEDDINGS = "vectorEmbeddings";
-        public static final String VECTOR_INDEX_TYPE = "type";
-        public static final String VECTOR_DATA_TYPE = "dataType";
-        public static final String VECTOR_DIMENSIONS = "dimensions";
-        public static final String DISTANCE_FUNCTION = "distanceFunction";
-
         // Unique index.
         public static final String UNIQUE_KEY_POLICY = "uniqueKeyPolicy";
         public static final String UNIQUE_KEYS = "uniqueKeys";

sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/DocumentCollection.java

@@ -10,7 +10,6 @@
 import com.azure.cosmos.models.ClientEncryptionPolicy;
 import com.azure.cosmos.models.ComputedProperty;
 import com.azure.cosmos.models.ConflictResolutionPolicy;
-import com.azure.cosmos.models.CosmosVectorEmbeddingPolicy;
 import com.azure.cosmos.models.IndexingPolicy;
 import com.azure.cosmos.models.ModelBridgeInternal;
 import com.azure.cosmos.models.PartitionKeyDefinition;
@@ -25,7 +24,6 @@
 import java.util.Collection;
 import java.util.Collections;
 
-import static com.azure.cosmos.implementation.guava25.base.Preconditions.checkNotNull;
 
 /**
  * Represents a document collection in the Azure Cosmos DB database service. A collection is a named logical container
@@ -43,7 +41,6 @@ public final class DocumentCollection extends Resource {
     private UniqueKeyPolicy uniqueKeyPolicy;
     private PartitionKeyDefinition partitionKeyDefinition;
     private ClientEncryptionPolicy clientEncryptionPolicyInternal;
-    private CosmosVectorEmbeddingPolicy cosmosVectorEmbeddingPolicy;
 
     /**
      * Constructor.
@@ -414,33 +411,6 @@ public void setClientEncryptionPolicy(ClientEncryptionPolicy value) {
         this.set(Constants.Properties.CLIENT_ENCRYPTION_POLICY, value, CosmosItemSerializer.DEFAULT_SERIALIZER);
     }
 
-    /**
-     * Gets the Vector Embedding Policy containing paths for embeddings along with path-specific settings for the item
-     * used in performing vector search on the items in a collection in the Azure CosmosDB database service.
-     *
-     * @return the Vector Embedding Policy.
-     */
-    public CosmosVectorEmbeddingPolicy getVectorEmbeddingPolicy() {
-        if (this.cosmosVectorEmbeddingPolicy == null) {
-            if (super.has(Constants.Properties.VECTOR_EMBEDDING_POLICY)) {
-                this.cosmosVectorEmbeddingPolicy = super.getObject(Constants.Properties.VECTOR_EMBEDDING_POLICY,
-                    CosmosVectorEmbeddingPolicy.class);
-            }
-        }
-        return this.cosmosVectorEmbeddingPolicy;
-    }
-
-    /**
-     * Sets the Vector Embedding Policy containing paths for embeddings along with path-specific settings for the item
-     * used in performing vector search on the items in a collection in the Azure CosmosDB database service.
-     *
-     * @param value the Vector Embedding Policy.
-     */
-    public void setVectorEmbeddingPolicy(CosmosVectorEmbeddingPolicy value) {
-        checkNotNull(value, "cosmosVectorEmbeddingPolicy cannot be null");
-        this.set(Constants.Properties.VECTOR_EMBEDDING_POLICY, value, CosmosItemSerializer.DEFAULT_SERIALIZER);
-    }
-
     public void populatePropertyBag() {
         super.populatePropertyBag();
         if (this.indexingPolicy == null) {

sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CompositePath.java

@@ -93,7 +93,7 @@ public CompositePathSortOrder getOrder() {
     }
 
     /**
-     * Sets the sort order for the composite path.
+     * Gets the sort order for the composite path.
      * <p>
      * For example if you want to run the query "SELECT * FROM c ORDER BY c.age asc, c.height desc",
      * then you need to make the order for "/age" "ascending" and the order for "/height" "descending".

sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosContainerProperties.java

@@ -347,28 +347,6 @@ public CosmosContainerProperties setClientEncryptionPolicy(ClientEncryptionPolic
         return this;
     }
 
-    /**
-     * Gets the Vector Embedding Policy containing paths for embeddings along with path-specific settings for the item
-     * used in performing vector search on the items in a collection in the Azure CosmosDB database service.
-     *
-     * @return the Vector Embedding Policy.
-     */
-    public CosmosVectorEmbeddingPolicy getVectorEmbeddingPolicy() {
-        return this.documentCollection.getVectorEmbeddingPolicy();
-    }
-
-    /**
-     * Sets the Vector Embedding Policy containing paths for embeddings along with path-specific settings for the item
-     * used in performing vector search on the items in a collection in the Azure CosmosDB database service.
-     *
-     * @param value the Vector Embedding Policy.
-     * @return the CosmosContainerProperties.
-     */
-    public CosmosContainerProperties setVectorEmbeddingPolicy(CosmosVectorEmbeddingPolicy value) {
-        this.documentCollection.setVectorEmbeddingPolicy(value);
-        return this;
-    }
-
     Resource getResource() {
         return this.documentCollection;
     }