add item

Author: clun

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

@@ -30,8 +30,8 @@
 import com.datastax.astra.internal.api.ApiResponse;
 import com.datastax.astra.internal.command.AbstractCommandRunner;
 import com.datastax.astra.internal.command.CommandObserver;
-import com.datastax.astra.internal.serializer.DataAPISerializer;
-import com.datastax.astra.internal.serializer.collections.DocumentSerializer;
+import com.datastax.astra.internal.serdes.DataAPISerializer;
+import com.datastax.astra.internal.serdes.collections.DocumentSerializer;
 import com.datastax.astra.internal.utils.Assert;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;

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

@@ -20,7 +20,7 @@
  * #L%
  */
 
-import com.datastax.astra.internal.serializer.collections.DocumentSerializer;
+import com.datastax.astra.internal.serdes.collections.DocumentSerializer;
 import lombok.Getter;
 import lombok.Setter;
 

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

@@ -22,7 +22,7 @@
 
 import com.datastax.astra.client.collections.documents.Document;
 import com.datastax.astra.client.core.paging.PageableIterable;
-import com.datastax.astra.internal.serializer.collections.DocumentSerializer;
+import com.datastax.astra.internal.serdes.collections.DocumentSerializer;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.HashSet;

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

@@ -38,8 +38,8 @@
 
 import com.datastax.astra.client.core.types.DataAPIKeywords;
 import com.datastax.astra.client.core.types.ObjectId;
-import com.datastax.astra.internal.serializer.DataAPISerializer;
-import com.datastax.astra.internal.serializer.collections.DocumentSerializer;
+import com.datastax.astra.internal.serdes.DataAPISerializer;
+import com.datastax.astra.internal.serdes.collections.DocumentSerializer;
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import lombok.NonNull;
 

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

@@ -20,8 +20,6 @@
  * #L%
  */
 
-import com.datastax.astra.internal.serializer.collections.DocumentSerializer;
-
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.LinkedHashMap;

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

@@ -20,7 +20,7 @@
  * #L%
  */
 
-import com.datastax.astra.client.exception.DataApiResponseException;
+import com.datastax.astra.client.exception.DataAPIResponseException;
 import com.datastax.astra.internal.api.ApiResponse;
 
 /**
@@ -37,7 +37,7 @@ public interface CommandRunner {
      *
      * @param command
      *     command to execute
-     * @throws DataApiResponseException
+     * @throws DataAPIResponseException
      *     if the returned object contains error response is encapsulated in a DataApiResponseException.
      * @return
      *     result as a document map
@@ -53,21 +53,21 @@ default ApiResponse runCommand(Command command) {
      *     command to execute
      * @param options
      *      options when running the command
-     * @throws DataApiResponseException
+     * @throws DataAPIResponseException
      *     if the returned object contains error response is encapsulated in a DataApiResponseException.
      * @return
      *     result as a document map
      */
     ApiResponse runCommand(Command command, CommandOptions<?> options)
-    throws DataApiResponseException;
+    throws DataAPIResponseException;
 
     /**
      * Extension point to run any command with typing constraints.
      * @param command
      *      command as a json Payload
      * @param documentClass
      *      document class to use for marshalling
-     * @throws DataApiResponseException
+     * @throws DataAPIResponseException
      *     if the returned object contains error response is encapsulated in a DataApiResponseException.
      * @return
      *      instance of expecting type.
@@ -86,13 +86,13 @@ default <T> T runCommand(Command command, Class<T> documentClass) {
      *      document class to use for marshalling
      * @param options
      *      options when running the command
-     * @throws DataApiResponseException
+     * @throws DataAPIResponseException
      *     if the returned object contains error response is encapsulated in a DataApiResponseException.
      * @return
      *      instance of expecting type.
      * @param <T>
      *      document type to use
      */
     <T> T runCommand(Command command, CommandOptions<?> options, Class<T> documentClass)
-    throws DataApiResponseException;
+    throws DataAPIResponseException;
 }

astra-db-java/src/main/java/com/datastax/astra/client/core/commands/CommandRunner.java

@@ -22,12 +22,10 @@
 
 import com.datastax.astra.client.collections.documents.Document;
 import com.datastax.astra.internal.utils.Assert;
-import com.datastax.astra.internal.serializer.collections.DocumentSerializer;
 import lombok.Getter;
 import lombok.NonNull;
 
 import java.util.Map;
-import java.util.Set;
 
 /**
  * Filter Builder.
@@ -42,6 +40,12 @@ public Filter() {
         super();
     }
 
+    public Filter(Map<String, Object> conditions) {
+        super();
+        if (conditions != null) {
+            documentMap.putAll(conditions);
+        }
+    }
     /**
      * Create a filter from a where clause.
      *

astra-db-java/src/main/java/com/datastax/astra/client/core/query/Filter.java

@@ -415,6 +415,27 @@ public static Filter and(final Iterable<Filter> filters) {
         return andFilter;
     }
 
+    /**
+     * Creates a filter that performs a logical AND of the provided list of filters.
+     *
+     * <blockquote><pre>
+     *    and(eq("x", 1), lt("y", 3))
+     * </pre></blockquote>
+     *
+     * will generate a MongoDB query like:
+     * <blockquote><pre>
+     *    { $and: [{x : 1}, {y : {$lt : 3}}]}
+     * </pre></blockquote>
+     *
+     * @param filters the list of filters to and together
+     * @return the filter
+     */
+    public static Filter eq(final Iterable<Filter> filters) {
+        Filter andFilter = new Filter();
+        andFilter.documentMap.put("$and", filters);
+        return andFilter;
+    }
+
     /**
      * Creates a filter that performs a logical OR of the provided list of filters.
      *

astra-db-java/src/main/java/com/datastax/astra/client/core/query/Filters.java

@@ -20,7 +20,7 @@
  * #L%
  */
 
-import com.datastax.astra.client.exception.DataApiException;
+import com.datastax.astra.client.exception.DataAPIException;
 import lombok.Getter;
 
 import java.io.InvalidObjectException;
@@ -31,7 +31,7 @@
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static com.datastax.astra.client.exception.DataApiException.ERROR_CODE_RANDOM;
+import static com.datastax.astra.client.exception.DataAPIException.ERROR_CODE_RANDOM;
 import static com.datastax.astra.internal.utils.Assert.isTrue;
 import static com.datastax.astra.internal.utils.Assert.notNull;
 
@@ -313,7 +313,7 @@ private Object readResolve() {
             RANDOM_VALUE1 = secureRandom.nextInt(0x01000000);
             RANDOM_VALUE2 = (short) secureRandom.nextInt(0x00008000);
         } catch (Exception e) {
-            throw new DataApiException(ERROR_CODE_RANDOM, "Cannot initialize ObjectId class", e);
+            throw new DataAPIException(ERROR_CODE_RANDOM, "Cannot initialize ObjectId class", e);
         }
     }