deleteOne, deleteMany, returnDocumentResponses

Author: clun

astra-db-java/src/main/java/com/datastax/astra/client/DataAPIClient.java

@@ -23,6 +23,7 @@
 import com.datastax.astra.client.admin.AstraDBAdmin;
 import com.datastax.astra.client.admin.AstraDBDatabaseAdmin;
 import com.datastax.astra.client.admin.DatabaseAdmin;
+import com.datastax.astra.client.core.options.DataAPIOptions;
 import com.datastax.astra.client.databases.Database;
 import com.datastax.astra.internal.api.AstraApiEndpoint;
 import com.datastax.astra.internal.utils.Assert;

astra-db-java/src/main/java/com/datastax/astra/client/DataAPIClients.java

@@ -22,6 +22,7 @@
 
 import com.datastax.astra.client.admin.DataAPIDatabaseAdmin;
 import com.datastax.astra.client.core.auth.UsernamePasswordTokenProvider;
+import com.datastax.astra.client.core.options.DataAPIOptions;
 import com.datastax.astra.client.databases.Database;
 import com.datastax.astra.internal.command.LoggingCommandObserver;
 

astra-db-java/src/main/java/com/datastax/astra/client/admin/AstraDBAdmin.java

@@ -20,7 +20,7 @@
  * #L%
  */
 
-import com.datastax.astra.client.DataAPIOptions;
+import com.datastax.astra.client.core.options.DataAPIOptions;
 import com.datastax.astra.client.databases.DatabaseInfo;
 import com.datastax.astra.internal.api.AstraApiEndpoint;
 import com.datastax.astra.internal.command.LoggingCommandObserver;

astra-db-java/src/main/java/com/datastax/astra/client/admin/AstraDBDatabaseAdmin.java

@@ -21,7 +21,7 @@
  */
 
 import com.datastax.astra.client.DataAPIDestination;
-import com.datastax.astra.client.DataAPIOptions;
+import com.datastax.astra.client.core.options.DataAPIOptions;
 import com.datastax.astra.client.collections.commands.FindEmbeddingProvidersResult;
 import com.datastax.astra.internal.api.AstraApiEndpoint;
 import com.dtsx.astra.sdk.db.AstraDBOpsClient;

astra-db-java/src/main/java/com/datastax/astra/client/admin/DataAPIDatabaseAdmin.java

@@ -20,11 +20,11 @@
  * #L%
  */
 
-import com.datastax.astra.client.DataAPIOptions;
+import com.datastax.astra.client.core.options.DataAPIOptions;
 import com.datastax.astra.client.databases.Database;
 import com.datastax.astra.client.core.commands.Command;
 import com.datastax.astra.client.core.commands.CommandOptions;
-import com.datastax.astra.client.collections.commands.EmbeddingProvider;
+import com.datastax.astra.client.core.vectorize.EmbeddingProvider;
 import com.datastax.astra.client.collections.commands.FindEmbeddingProvidersResult;
 import com.datastax.astra.client.keyspaces.KeyspaceOptions;
 import com.datastax.astra.internal.api.DataAPIResponse;

astra-db-java/src/main/java/com/datastax/astra/client/admin/DatabaseAdmin.java

@@ -22,7 +22,7 @@
 
 import com.datastax.astra.client.databases.Database;
 import com.datastax.astra.client.core.commands.CommandRunner;
-import com.datastax.astra.client.collections.commands.EmbeddingProvider;
+import com.datastax.astra.client.core.vectorize.EmbeddingProvider;
 import com.datastax.astra.client.collections.commands.FindEmbeddingProvidersResult;
 
 import java.util.Set;

astra-db-java/src/main/java/com/datastax/astra/client/collections/Collection.java

@@ -22,7 +22,7 @@
 
 import com.datastax.astra.client.core.vector.SimilarityMetric;
 import com.datastax.astra.client.core.vector.VectorOptions;
-import com.datastax.astra.client.core.vector.VectorServiceOptions;
+import com.datastax.astra.client.core.vectorize.VectorServiceOptions;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.Setter;

astra-db-java/src/main/java/com/datastax/astra/client/collections/CollectionOptions.java

@@ -29,12 +29,12 @@
  */
 @Getter
 @Setter
-public class DeleteManyOptions extends CommandOptions<DeleteManyOptions> {
+public class CollectionDeleteManyOptions extends CommandOptions<CollectionDeleteManyOptions> {
 
     /**
      * Default constructor.
      */
-    public DeleteManyOptions() {
+    public CollectionDeleteManyOptions() {
         // Left blank as sort is populated in static way
     }
 

astra-db-java/src/main/java/com/datastax/astra/client/collections/commands/DeleteManyOptions.java renamed to astra-db-java/src/main/java/com/datastax/astra/client/collections/commands/CollectionDeleteManyOptions.java

@@ -33,7 +33,7 @@
  */
 @Getter
 @Setter
-public class DeleteOneOptions extends CommandOptions<DeleteOneOptions> {
+public class CollectionDeleteOneOptions extends CommandOptions<CollectionDeleteOneOptions> {
 
     /**
      * Order by.
@@ -43,7 +43,7 @@ public class DeleteOneOptions extends CommandOptions<DeleteOneOptions> {
     /**
      * Default constructor.
      */
-    public DeleteOneOptions() {
+    public CollectionDeleteOneOptions() {
         // Left blank as sort is populated in static way
     }
 
@@ -55,7 +55,7 @@ public DeleteOneOptions() {
      * @return
      *      current command.
      */
-    public DeleteOneOptions sort(Sort... sort) {
+    public CollectionDeleteOneOptions sort(Sort... sort) {
         setSort(OptionsUtils.sort(sort));
         return this;
     }
@@ -67,7 +67,7 @@ public DeleteOneOptions sort(Sort... sort) {
      * @param sorts The sort criteria to be applied to the findOne operation.
      * @return current command
      */
-    public DeleteOneOptions sort(String vectorize, Sort ... sorts) {
+    public CollectionDeleteOneOptions sort(String vectorize, Sort ... sorts) {
         setSort(Sorts.vectorize(vectorize));
         if (sorts != null) {
             getSort().putAll(OptionsUtils.sort(sorts));
@@ -82,7 +82,7 @@ public DeleteOneOptions sort(String vectorize, Sort ... sorts) {
      * @param sorts The sort criteria to be applied to the findOne operation.
      * @return current command
      */
-    public DeleteOneOptions sort(float[] vector, Sort... sorts) {
+    public CollectionDeleteOneOptions sort(float[] vector, Sort... sorts) {
         setSort(Sorts.vector(vector));
         if (sorts != null) {
             getSort().putAll(OptionsUtils.sort(sorts));
@@ -91,7 +91,7 @@ public DeleteOneOptions sort(float[] vector, Sort... sorts) {
     }
 
     /**
-     * Builder for creating {@link DeleteOneOptions} instances with a fluent API.
+     * Builder for creating {@link CollectionDeleteOneOptions} instances with a fluent API.
      */
     @Deprecated
     public static class Builder {
@@ -105,32 +105,32 @@ private Builder() {}
          * Initializes the building process with sorting options.
          *
          * @param sort The sort criteria to be applied to the delete operation.
-         * @return A new {@link DeleteOneOptions} instance configured with the provided sort criteria.
+         * @return A new {@link CollectionDeleteOneOptions} instance configured with the provided sort criteria.
          */
-        public static DeleteOneOptions sort(Sort... sort) {
-            return new DeleteOneOptions().sort(sort);
+        public static CollectionDeleteOneOptions sort(Sort... sort) {
+            return new CollectionDeleteOneOptions().sort(sort);
         }
 
         /**
          * Initializes the building process with vectorize options.
          *
          * @param vectorize The vectorize criteria to be applied to the findOne operation
          * @param sorts The sort criteria to be applied to the findOne operation.
-         * @return A new {@link DeleteOneOptions} instance configured with the provided vectorize criteria.
+         * @return A new {@link CollectionDeleteOneOptions} instance configured with the provided vectorize criteria.
          */
-        public static DeleteOneOptions vectorize(String vectorize, Sort... sorts) {
-            return new DeleteOneOptions().sort(vectorize, sorts);
+        public static CollectionDeleteOneOptions vectorize(String vectorize, Sort... sorts) {
+            return new CollectionDeleteOneOptions().sort(vectorize, sorts);
         }
 
         /**
          * Initializes the building process with vector options.
          *
          * @param vector The vector criteria to be applied to the findOne operation
          * @param sorts The sort criteria to be applied to the findOne operation.
-         * @return A new {@link DeleteOneOptions} instance configured with the provided vector criteria.
+         * @return A new {@link CollectionDeleteOneOptions} instance configured with the provided vector criteria.
          */
-        public static DeleteOneOptions vector(float[] vector, Sort... sorts) {
-            return new DeleteOneOptions().sort(vector, sorts);
+        public static CollectionDeleteOneOptions vector(float[] vector, Sort... sorts) {
+            return new CollectionDeleteOneOptions().sort(vector, sorts);
         }
     }