update

Author: clun

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

@@ -25,6 +25,7 @@
 import com.datastax.astra.client.exception.TooManyDocumentsToCountException;
 import com.datastax.astra.client.model.BulkWriteOptions;
 import com.datastax.astra.client.model.BulkWriteResult;
+import com.datastax.astra.client.model.CollectionIdTypes;
 import com.datastax.astra.client.model.CollectionInfo;
 import com.datastax.astra.client.model.CollectionOptions;
 import com.datastax.astra.client.model.Command;
@@ -44,21 +45,30 @@
 import com.datastax.astra.client.model.InsertManyOptions;
 import com.datastax.astra.client.model.InsertManyResult;
 import com.datastax.astra.client.model.InsertOneResult;
+import com.datastax.astra.client.model.ObjectId;
 import com.datastax.astra.client.model.Page;
 import com.datastax.astra.client.model.ReplaceOneOptions;
+import com.datastax.astra.client.model.UUIDv6;
+import com.datastax.astra.client.model.UUIDv7;
 import com.datastax.astra.client.model.Update;
 import com.datastax.astra.client.model.UpdateOneOptions;
 import com.datastax.astra.client.model.UpdateResult;
 import com.datastax.astra.internal.command.AbstractCommandRunner;
 import com.datastax.astra.internal.api.ApiResponse;
+import com.datastax.astra.internal.command.LoggingCommandObserver;
 import com.datastax.astra.internal.utils.Assert;
+import com.datastax.astra.internal.utils.CustomEJsonInstantDeserializer;
+import com.datastax.astra.internal.utils.CustomUuidv6Serializer;
 import com.datastax.astra.internal.utils.JsonUtils;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
+import java.util.UUID;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
@@ -125,6 +135,16 @@ public class Collection<T> extends AbstractCommandRunner {
     /** Api Endpoint for the Database, if using an astra environment it will contain the database id and the database region.  */
     private final String apiEndpoint;
 
+    /**
+     * Keep Collection options in -memory to avoid multiple calls to the API.
+     */
+    private CollectionOptions options;
+
+    /**
+     * Check if options has been fetched
+     */
+    private boolean optionChecked = false;
+
     /**
      * Constructs an instance of a collection within the specified database. This constructor
      * initializes the collection with a given name and associates it with a specific class type
@@ -257,10 +277,11 @@ public CollectionInfo getDefinition() {
      *         such as vector and indexing options. Returns {@code null} if no options are set or applicable.
      */
     public CollectionOptions getOptions() {
-        return Optional
-                .ofNullable(getDefinition()
-                        .getOptions())
-                .orElse(new CollectionOptions());
+        if (!optionChecked) {
+            options = Optional.ofNullable(getDefinition().getOptions()).orElse(new CollectionOptions());
+            optionChecked = true;
+        }
+        return options;
     }
 
     /**
@@ -545,7 +566,51 @@ public final CompletableFuture<InsertOneResult> insertOneAsync(T document, Strin
     private InsertOneResult _insertOne(Document document) {
         Assert.notNull(document, "document");
         Command insertOne = Command.create("insertOne").withDocument(document);
-        return new InsertOneResult(runCommand(insertOne).getStatusKeyAsList("insertedIds", Object.class).get(0));
+        Object documentId = runCommand(insertOne)
+                .getStatusKeyAsList("insertedIds", Object.class)
+                .get(0);
+        return new InsertOneResult(unmarshallDocumentId(documentId));
+    }
+
+    /**
+     * Unmarshall the document id.
+     *
+     * @param id
+     *      object id returned by the server
+     * @return
+     *      unmarshalled id
+     */
+    @SuppressWarnings("unchecked")
+    protected Object unmarshallDocumentId(Object id) {
+        if (id instanceof Map) {
+            // only maps will required to be unmarshalled
+            Map<String, Object> mapId = (Map<String, Object>) id;
+            if (mapId.containsKey("$date")) {
+                // eJson date
+                return  Instant.ofEpochMilli((Long) mapId.get("$date"));
+            }
+            if (mapId.containsKey("$uuid")) {
+                // defaultId with UUID
+                UUID uid = UUID.fromString((String) mapId.get("$uuid"));
+                if (getOptions() != null && getOptions().getDefaultId() != null) {
+                    switch(getOptions().getDefaultId().get("type")) {
+                        case uuidv6:
+                            return new UUIDv6(uid);
+                        case uuidv7:
+                            return new UUIDv7(uid);
+                        default:
+                            return uid;
+                    }
+                }
+                throw new IllegalStateException("Returned is is a UUID, but no defaultId is set in the collection definition.");
+            }
+            if (mapId.containsKey("$objectId")) {
+                // defaultId with ObjectId
+                return new ObjectId((String) mapId.get("$objectId"));
+            }
+            throw new IllegalArgumentException("Cannot marshall id " + id);
+        }
+        return id;
     }
 
     /**
@@ -786,7 +851,11 @@ private Callable<InsertManyResult> getInsertManyResultCallable(List<? extends T>
             Command insertMany = new Command("insertMany")
                     .withDocuments(documents.subList(start, end))
                     .withOptions(new Document().append("ordered", options.isOrdered()));
-            return new InsertManyResult(runCommand(insertMany).getStatusKeyAsList("insertedIds", Object.class));
+            return new InsertManyResult(runCommand(insertMany)
+                    .getStatusKeyAsList("insertedIds", Object.class)
+                    .stream()
+                    .map(this::unmarshallDocumentId)
+                    .collect(Collectors.toList()));
         };
     }
 
@@ -1792,6 +1861,18 @@ public BulkWriteResult bulkWrite(List<Command> commands, BulkWriteOptions option
 
     // --- Required for the Command Runner ---
 
+    /**
+     * Register the logging listener to the collection.
+     *
+     * @return
+     *      self reference
+     */
+    public Collection<T> enableLogging() {
+        registerListener("logger", new LoggingCommandObserver(Collection.class));
+        return this;
+    }
+
+
     /** {@inheritDoc} */
     @Override
     protected String getApiEndpoint() {

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

@@ -32,6 +32,7 @@
 import com.datastax.astra.client.admin.DataAPIDatabaseAdmin;
 import com.datastax.astra.internal.api.AstraApiEndpoint;
 import com.datastax.astra.client.admin.AstraDBDatabaseAdmin;
+import com.datastax.astra.internal.command.LoggingCommandObserver;
 import com.datastax.astra.internal.utils.JsonUtils;
 import lombok.Getter;
 import lombok.NonNull;
@@ -377,6 +378,17 @@ public void dropCollection(String collectionName) {
 
     // --- Required for the Command Runner ---
 
+    /**
+     * Register the logging listener to the collection.
+     *
+     * @return
+     *      self reference
+     */
+    public Database enableLogging() {
+        registerListener("logger", new LoggingCommandObserver(Database.class));
+        return this;
+    }
+
     /** {@inheritDoc} */
     @Override
     protected String getApiEndpoint() {

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

@@ -236,6 +236,7 @@ public <T> T getId(@NonNull final Class<T> clazz) {
         return get(ID, clazz);
     }
 
+
     /**
      * Set value for the identifier.
      *

astra-db-java/src/main/java/com/datastax/astra/client/model/UUIDv6.java

@@ -34,6 +34,13 @@ public class UUIDv6 {
      */
     private final UUID uuid;
 
+    /**
+     * Default constructor.
+     */
+    public UUIDv6() {
+        this(Generators.timeBasedReorderedGenerator().generate());
+    }
+
     /**
      * Constructor.
      *
@@ -72,16 +79,4 @@ public static UUIDv6 fromString(String strUUID) {
         return new UUIDv6(UUID.fromString(strUUID));
     }
 
-    /**
-     * Generate a new UUIDv6.
-     *
-     * @return
-     *      uuid v6.
-     */
-    public static UUIDv6 generate() {
-        return new UUIDv6(Generators.timeBasedReorderedGenerator().generate());
-    }
-
-
-
 }

astra-db-java/src/main/java/com/datastax/astra/client/model/UUIDv7.java

@@ -35,6 +35,13 @@ public class UUIDv7 {
      */
     private final UUID uuid;
 
+    /**
+     * Default constructor.
+     */
+    public UUIDv7() {
+        this(Generators.timeBasedEpochRandomGenerator(new SecureRandom()).generate());
+    }
+
     /**
      * Constructor.
      *
@@ -73,14 +80,4 @@ public static UUIDv7 fromString(String strUUID) {
         return new UUIDv7(UUID.fromString(strUUID));
     }
 
-    /**
-     * Generate a new UUIDv6.
-     *
-     * @return
-     *      uuid v6.
-     */
-    public static UUIDv7 generate() {
-        return new UUIDv7(Generators.timeBasedEpochRandomGenerator(new SecureRandom()).generate());
-    }
-
 }

astra-db-java/src/main/java/com/datastax/astra/internal/command/AbstractCommandRunner.java

@@ -20,6 +20,7 @@
  * #L%
  */
 
+import com.datastax.astra.client.Collection;
 import com.datastax.astra.client.DataAPIOptions;
 import com.datastax.astra.internal.http.RetryHttpClient;
 import com.datastax.astra.internal.api.ApiResponse;
@@ -34,7 +35,6 @@
 import java.util.Collections;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
@@ -111,13 +111,10 @@ public ApiResponse runCommand(Command command) {
     /**
      * Asynchronously send calls to listener for tracing.
      *
-     * @param lambda
-     *      operations to execute
-     * @return
-     *      the void object
+     * @param lambda operations to execute
      */
-    private CompletionStage<Void> notifyASync(Consumer<CommandObserver> lambda) {
-        return CompletableFutures.allDone(observers.values().stream()
+    private void notifyASync(Consumer<CommandObserver> lambda) {
+        CompletableFutures.allDone(observers.values().stream()
                 .map(l -> CompletableFuture.runAsync(() -> lambda.accept(l)))
                 .collect(Collectors.toList()));
     }

astra-db-java/src/main/java/com/datastax/astra/internal/utils/CustomEJsonCalendarDeserializer.java

@@ -45,6 +45,9 @@ public CustomEJsonCalendarDeserializer() {
     public Calendar deserialize(JsonParser jp, DeserializationContext ctxt)
     throws IOException, JsonProcessingException {
         JsonNode node = jp.getCodec().readTree(jp);
+        if (null == node.get("$date")) {
+            throw new IllegalArgumentException("Cannot convert the expression as an Calendar " + node);
+        }
         long timestamp = node.get("$date").asLong();
         Calendar calendar = Calendar.getInstance();
         calendar.setTimeInMillis(timestamp);

astra-db-java/src/main/java/com/datastax/astra/internal/utils/CustomEJsonDateDeserializer.java

@@ -45,6 +45,9 @@ public CustomEJsonDateDeserializer() {
     public Date deserialize(JsonParser jp, DeserializationContext ctxt)
     throws IOException, JsonProcessingException {
         JsonNode node = jp.getCodec().readTree(jp);
+        if (null == node.get("$date")) {
+            throw new IllegalArgumentException("Cannot convert the expression as an Date " + node);
+        }
         long timestamp = node.get("$date").asLong();
         return new Date(timestamp);
     }

astra-db-java/src/main/java/com/datastax/astra/internal/utils/CustomEJsonInstantDeserializer.java

@@ -45,6 +45,9 @@ public CustomEJsonInstantDeserializer() {
     public Instant deserialize(JsonParser jp, DeserializationContext ctxt)
         throws IOException, JsonProcessingException {
         JsonNode node = jp.getCodec().readTree(jp);
+        if (null == node.get("$date")) {
+            throw new IllegalArgumentException("Cannot convert the expression as an Instant " + node);
+        }
         long timestamp = node.get("$date").asLong();
         return Instant.ofEpochMilli(timestamp);
     }

astra-db-java/src/main/java/com/datastax/astra/internal/utils/CustomUuidDeserializer.java

@@ -45,8 +45,10 @@ public CustomUuidDeserializer() {
     public UUID deserialize(JsonParser jp, DeserializationContext ctxt)
     throws IOException, JsonProcessingException {
         JsonNode node = jp.getCodec().readTree(jp);
-        String hexString = node.get("$uuid").asText();
-        return UUID.fromString(hexString);
+        if (null == node.get("$uuid")) {
+            throw new IllegalArgumentException("Cannot convert the expression as an UUID " + node);
+        }
+        return UUID.fromString(node.get("$uuid").asText());
     }
 
 }