objectID

Author: clun

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

@@ -322,10 +322,10 @@ private InsertOneResult _insertOne(Document document) {
         Command insertOne = Command
                 .create("insertOne")
                 .withDocument(document);
+
         ApiResponse res = runCommand(insertOne);
-        return new InsertOneResult(res
-                .getStatusKeyAsList("insertedIds", Object.class)
-                .get(0));
+        // Object
+        return new InsertOneResult(res.getStatusKeyAsList("insertedIds", Object.class).get(0));
     }
 
     /**

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

@@ -1,7 +1,11 @@
 package com.datastax.astra.client;
 
+import com.datastax.astra.client.observer.LoggerCommandObserver;
+import com.datastax.astra.internal.DataAPIDatabaseAdmin;
 import com.datastax.astra.internal.auth.StargateAuthenticationService;
 
+import static com.datastax.astra.client.AstraDBAdmin.DEFAULT_NAMESPACE;
+
 /**
  * Initialization of the client in a Static way.
  */
@@ -27,12 +31,21 @@ private DataAPIClients() {}
     /**
      * Create from an Endpoint only
      */
-    public static DataAPIClient localStargate() {
+    public static DataAPIClient localClient() {
         return new DataAPIClient(
                 new StargateAuthenticationService().getToken(),
                 DataAPIOptions.builder().withDestination(DataAPIDestination.CASSANDRA).build());
     }
 
+    public static Database localDatabase() {
+        Database db = localClient().getDatabase(DEFAULT_ENDPOINT, DEFAULT_NAMESPACE);
+        db.registerListener("logger", new LoggerCommandObserver(Database.class));
+        DataAPIDatabaseAdmin dbAdmin = (DataAPIDatabaseAdmin) db.getDatabaseAdmin();
+        dbAdmin.registerListener("logger", new LoggerCommandObserver(Database.class));
+        dbAdmin.createNamespace(DEFAULT_NAMESPACE);
+        return db;
+    }
+
     public static DataAPIClient astra(String token) {
         return new DataAPIClient(token, DataAPIOptions
                 .builder()

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

@@ -331,7 +331,7 @@ protected String getApiEndpoint() {
     /** {@inheritDoc} */
     @Override
     protected String getToken() {
-        return null;
+        return token;
     }
 
     /** {@inheritDoc} */

src/main/java/com/datastax/astra/client/model/collections/CollectionOptions.java

@@ -15,7 +15,7 @@ public class CollectionOptions {
     /**
      * Defaulting to Object I
      */
-    private CollectionIdTypes defaultId;
+    private Map<String, CollectionIdTypes> defaultId;
 
     /**
      * Vector options.
@@ -216,7 +216,9 @@ public CollectionOptions build() {
             CollectionOptions req = new CollectionOptions();
             req.vector    = this.vector;
             req.indexing  = this.indexing;
-            req.defaultId = this.defaultId;
+            if (defaultId != null) {
+                req.defaultId = Map.of("type", this.defaultId);
+            }
             return req;
         }
     }

src/main/java/com/datastax/astra/internal/AbstractCommandRunner.java

@@ -65,15 +65,12 @@ public ApiResponse runCommand(Command command) {
             String jsonCommand = JsonUtils.marshallForDataApi(command);
             ApiResponseHttp httpRes = getHttpClient().POST(getApiEndpoint(), getToken(), jsonCommand);
             executionInfo.withHttpResponse(httpRes);
-
             ApiResponse jsonRes = JsonUtils.unmarshallBeanForDataApi(httpRes.getBody(), ApiResponse.class);
             executionInfo.withApiResponse(jsonRes);
-
             // Encapsulate Errors
             if (jsonRes.getErrors() != null) {
                 throw new DataApiResponseException(Collections.singletonList(executionInfo.build()));
             }
-
             return jsonRes;
         } finally {
             // Notify the observers

src/main/java/com/datastax/astra/internal/DataAPIDatabaseAdmin.java

@@ -6,6 +6,7 @@
 import com.datastax.astra.client.model.Command;
 import com.datastax.astra.client.model.namespaces.CreateNamespaceOptions;
 import com.datastax.astra.internal.http.HttpClientOptions;
+import com.datastax.astra.internal.utils.Assert;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 
@@ -31,6 +32,7 @@ public class DataAPIDatabaseAdmin extends AbstractCommandRunner implements Datab
     /** Version of the API. */
     protected final String token;
 
+    /** Endpoint for a Database in particular. */
     private final String apiEndpointDatabase;
 
     /**
@@ -45,11 +47,7 @@ public DataAPIDatabaseAdmin(String apiEndpoint, String token, DataAPIOptions opt
         this.apiEndPoint = apiEndpoint;
         this.token       = token;
         this.options     = options;
-        StringBuilder dbApiEndPointBuilder = new StringBuilder(apiEndpoint);
-        dbApiEndPointBuilder
-                .append("/")
-                .append(options.getApiVersion());
-        this.apiEndpointDatabase = dbApiEndPointBuilder.toString();
+        this.apiEndpointDatabase = apiEndpoint + "/" + options.getApiVersion();
     }
 
     // ------------------------------------------
@@ -63,18 +61,24 @@ public Stream<String> listNamespaceNames() {
         return runCommand(cmd).getStatusKeyAsStringStream("namespaces");
     }
 
+    /** {@inheritDoc} */
     @Override
     public Database getDatabase(String namespaceName) {
-        return null;
+        Assert.hasLength(namespaceName, "namespaceName");
+        return new Database(apiEndPoint, token, namespaceName, options);
     }
 
+    /** {@inheritDoc} */
     @Override
     public Database getDatabase(String namespaceName, String userToken) {
-        return null;
+        Assert.hasLength(namespaceName, "namespaceName");
+        Assert.hasLength(userToken, "userToken");
+        return new Database(apiEndPoint, userToken, namespaceName, options);
     }
 
     /** {@inheritDoc} */
     public void createNamespace(String namespace) {
+        Assert.hasLength(namespace, "namespace");
         createNamespace(namespace, CreateNamespaceOptions.simpleStrategy(1));
     }
 

src/main/java/com/datastax/astra/internal/serialization/CustomUuidv6Serializer.java

@@ -32,7 +32,7 @@ public CustomUuidv6Serializer(Class<UUIDv6> t) {
     @Override
     public void serialize(UUIDv6 uuidv6, JsonGenerator gen, SerializerProvider provider) throws IOException {
         gen.writeStartObject();
-        gen.writeStringField("$uuidv6", uuidv6.toString());
+        gen.writeStringField("$uuid", uuidv6.toString());
         gen.writeEndObject();
     }
 }

src/main/java/com/datastax/astra/internal/serialization/CustomUuidv7Serializer.java

@@ -32,7 +32,7 @@ public CustomUuidv7Serializer(Class<UUIDv7> t) {
     @Override
     public void serialize(UUIDv7 uuidv7, JsonGenerator gen, SerializerProvider provider) throws IOException {
         gen.writeStartObject();
-        gen.writeStringField("$uuidv7", uuidv7.toString());
+        gen.writeStringField("$uuid", uuidv7.toString());
         gen.writeEndObject();
     }
 }

src/main/java/com/datastax/astra/internal/utils/JsonUtils.java

@@ -101,10 +101,10 @@ public static synchronized ObjectMapper getDataApiObjectMapper() {
             module.addDeserializer(UUID.class, new CustomUuidDeserializer());
             // UUIDv6
             module.addSerializer(UUIDv6.class, new CustomUuidv6Serializer());
-            module.addDeserializer(UUIDv6.class, new CustomUuidv6Deserializer());
+            //module.addDeserializer(UUIDv6.class, new CustomUuidv6Deserializer());
             // UUIDv7
             module.addSerializer(UUIDv7.class, new CustomUuidv7Serializer());
-            module.addDeserializer(UUIDv7.class, new CustomUuidv7Deserializer());
+            //module.addDeserializer(UUIDv7.class, new CustomUuidv7Deserializer());
             // ObjectId
             module.addSerializer(ObjectId.class, new CustomObjectIdSerializer());
             module.addDeserializer(ObjectId.class, new CustomObjectIdDeserializer());

src/test/java/com/datastax/astra/AstraDBTestSupport.java

@@ -23,6 +23,26 @@ public class AstraDBTestSupport {
      */
     public static final String DATABASE_NAME = "astra_db_client";
 
+    /**
+     * Initialize the Test database on an Astra Environment.
+     *
+     * @param env
+     *      target environment
+     * @param cloud
+     *      target cloud
+     * @param region
+     *      target region
+     * @return
+     *      the database instance
+     */
+    public static Database initializeDb(AstraEnvironment env, CloudProviderType cloud, String region) {
+        log.info("Working in environment '{}'", env.name());
+        AstraDBAdmin client = getAstraDBClient(env);
+        UUID databaseId =  client.createDatabase(DATABASE_NAME, cloud, region);
+        log.info("Working with api Endpoint '{}'", ApiLocator.getApiJsonEndpoint(env, databaseId.toString(), region));
+        return client.getDatabase(databaseId);
+    }
+
     /**
      * Access AstraDBAdmin for different environment (to create DB).
      *
@@ -47,27 +67,7 @@ public static AstraDBAdmin getAstraDBClient(AstraEnvironment env) {
                         .getAdmin();
             default:
                 throw new IllegalArgumentException("Invalid Environment");
-         }
-    }
-
-    /**
-     * Initialize the Test database on an Astra Environment.
-     *
-     * @param env
-     *      target environment
-     * @param cloud
-     *      target cloud
-     * @param region
-     *      target region
-     * @return
-     *      the database instance
-     */
-    public static Database initializeDb(AstraEnvironment env, CloudProviderType cloud, String region) {
-        log.info("Working in environment '{}'", env.name());
-        AstraDBAdmin client = getAstraDBClient(env);
-        UUID databaseId =  client.createDatabase(DATABASE_NAME, cloud, region);
-        log.info("Working with api Endpoint '{}'", ApiLocator.getApiJsonEndpoint(env, databaseId.toString(), region));
-        return client.getDatabase(databaseId);
+        }
     }