All Collections tests passing

Author: clun

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

@@ -25,17 +25,14 @@
 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.client.exception.InvalidEnvironmentException;
 import com.datastax.astra.internal.api.AstraApiEndpoint;
 import com.datastax.astra.internal.utils.Assert;
-import com.dtsx.astra.sdk.utils.AstraEnvironment;
 
-import java.util.Optional;
 import java.util.UUID;
 
-import static com.datastax.astra.client.DataAPIDestination.ASTRA;
-import static com.datastax.astra.client.DataAPIDestination.ASTRA_DEV;
-import static com.datastax.astra.client.DataAPIDestination.ASTRA_TEST;
 import static com.datastax.astra.client.admin.AstraDBAdmin.DEFAULT_KEYSPACE;
+import static com.datastax.astra.client.exception.InvalidEnvironmentException.throwErrorRestrictedAstra;
 
 /**
  * Serves as the primary entry point to the Data API client, offering streamlined access to the functionalities
@@ -256,42 +253,10 @@ public AstraDBAdmin getAdmin() {
      * @throws SecurityException if the provided {@code superUserToken} lacks the necessary privileges for administrative operations.
      */
     public AstraDBAdmin getAdmin(String superUserToken) {
-        return new AstraDBAdmin(superUserToken, getAstraEnvironment(), options);
-    }
-
-    /**
-     * Find the Astra Environment from the destination provided in the initial Optional. It will help
-     * shaping the Api endpoint to spawn sub database objects.
-     *
-     * @return
-     *     astra environment if found
-     */
-    private Optional<AstraEnvironment> findAstraEnvironment() {
-        if (options.getDestination() != null) {
-            switch (options.getDestination()) {
-                case ASTRA:
-                    return Optional.of(AstraEnvironment.PROD);
-                case ASTRA_DEV:
-                    return Optional.of(AstraEnvironment.DEV);
-                case ASTRA_TEST:
-                    return Optional.of(AstraEnvironment.TEST);
-            }
+        if (!options.isAstra()) {
+            throwErrorRestrictedAstra("getAdmin()", options.getDestination());
         }
-        return Optional.empty();
-    }
-
-    /**
-     * Access the Astra environment or throw an error. Some operation like getAdmin would anly work if the options
-     * are set to Astra. If this is not the case a {@link IllegalArgumentException is thrown.}
-     *
-     * @return
-     *      current astra environment
-     * @throws IllegalArgumentException
-     *      the destination was not set for Astra in initial options.
-     */
-    private AstraEnvironment getAstraEnvironment() {
-        return findAstraEnvironment()
-                .orElseThrow(() -> new IllegalArgumentException("'destination' should be ASTRA* to use the AstraDBAdmin"));
+        return new AstraDBAdmin(superUserToken, options);
     }
 
     // --------------------------------------------------
@@ -331,16 +296,12 @@ private AstraEnvironment getAstraEnvironment() {
     public Database getDatabase(UUID databaseId, String keyspace) {
         Assert.notNull(databaseId, ARG_DATABASE_ID);
         Assert.hasLength(keyspace, ARG_KEYSPACE);
-        if (options.getDestination() != ASTRA &&
-            options.getDestination() != ASTRA_DEV &&
-            options.getDestination() != ASTRA_TEST) {
-            throw new IllegalArgumentException("DataAPIOptions.destination " +
-                    "should be set to one of ASTRA* " +
-                    "to retrieve a database from an id.");
+        if (!options.isAstra()) {
+            throwErrorRestrictedAstra("getDatabase(id,keyspace)", options.getDestination());
         }
         return new Database(new AstraApiEndpoint(databaseId,
                 getAdmin().getDatabaseInfo(databaseId).getRegion(),
-                getAstraEnvironment()).getApiEndPoint(),
+                options.getAstraEnvironment()).getApiEndPoint(),
                 this.token, keyspace, options);
     }
 
@@ -360,8 +321,11 @@ public Database getDatabase(UUID databaseId, String keyspace, String region) {
         Assert.notNull(databaseId, ARG_DATABASE_ID);
         Assert.hasLength(keyspace, ARG_KEYSPACE);
         Assert.hasLength(region, ARG_REGION);
+        if (!options.isAstra()) {
+            throwErrorRestrictedAstra("getDatabase(dbId,keyspace,region)", options.getDestination());
+        }
         return new Database(new AstraApiEndpoint(databaseId, region,
-                getAstraEnvironment()).getApiEndPoint(),
+                options.getAstraEnvironment()).getApiEndPoint(),
                 this.token, keyspace, options);
     }
 

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

@@ -22,6 +22,7 @@
 
 import com.datastax.astra.client.core.options.DataAPIOptions;
 import com.datastax.astra.client.databases.DatabaseInfo;
+import com.datastax.astra.client.exception.InvalidEnvironmentException;
 import com.datastax.astra.internal.api.AstraApiEndpoint;
 import com.datastax.astra.internal.command.LoggingCommandObserver;
 import com.datastax.astra.internal.utils.Assert;
@@ -40,13 +41,15 @@
 import lombok.extern.slf4j.Slf4j;
 
 import java.net.http.HttpClient;
+import java.time.Duration;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
+import static com.datastax.astra.client.exception.InvalidEnvironmentException.throwErrorRestrictedAstra;
 import static com.datastax.astra.internal.utils.AnsiUtils.green;
 import static com.dtsx.astra.sdk.utils.Utils.readEnvVariable;
 
@@ -77,9 +80,6 @@ public class AstraDBAdmin {
     /** Options to personalized http client other client options. */
     final DataAPIOptions dataAPIOptions;
 
-    /** Astra Environment. */
-    final AstraEnvironment env;
-
     /** Astra Token (credentials). */
     final String token;
 
@@ -107,30 +107,26 @@ public class AstraDBAdmin {
      *      authentication token
      * @param options
      *      options for client
-     * @param env
-     *      astra environment
      */
-    public AstraDBAdmin(String token, AstraEnvironment env, DataAPIOptions options) {
+    public AstraDBAdmin(String token, DataAPIOptions options) {
         Assert.hasLength(token, "token");
-        Assert.notNull(env, "environment");
         Assert.notNull(options, "options");
         this.token = token;
-        this.env = env;
         this.dataAPIOptions = options;
         if (options.getObservers() != null) {
             Map<String, ApiRequestObserver> devopsObservers = new HashMap<>();
             if (options.getObservers().containsKey(LoggingCommandObserver.class.getSimpleName())) {
                 devopsObservers.put("logging", new LoggingRequestObserver(AstraDBAdmin.class));
             }
-            this.devopsDbClient = new AstraDBOpsClient(token, this.env, devopsObservers);
+            this.devopsDbClient = new AstraDBOpsClient(token, options.getAstraEnvironment(), devopsObservers);
         } else {
-            this.devopsDbClient = new AstraDBOpsClient(token, this.env);
+            this.devopsDbClient = new AstraDBOpsClient(token, options.getAstraEnvironment());
         }
 
         // Local Agent for Resume
         HttpClient.Builder httpClientBuilder = HttpClient.newBuilder();
         httpClientBuilder.version(options.getHttpClientOptions().getHttpVersion());
-        httpClientBuilder.connectTimeout(options.getHttpClientOptions().getConnectionTimeout());
+        httpClientBuilder.connectTimeout(Duration.ofMillis(options.getTimeoutOptions().connectTimeoutMillis()));
         this.httpClient = httpClientBuilder.build();
     }
 
@@ -341,13 +337,16 @@ public DatabaseInfo getDatabaseInfo(@NonNull UUID id) {
     public com.datastax.astra.client.databases.Database getDatabase(UUID databaseId, String keyspace) {
         Assert.notNull(databaseId, "databaseId");
         Assert.hasLength(keyspace, "keyspace");
+        if (!dataAPIOptions.isAstra()) {
+            throwErrorRestrictedAstra("getDatabase(id, keyspace)", dataAPIOptions.getDestination());
+        }
         String databaseRegion = devopsDbClient
                 .findById(databaseId.toString())
                 .map(db -> db.getInfo().getRegion())
                 .orElseThrow(() -> new DatabaseNotFoundException(databaseId.toString()));
         return new com.datastax.astra.client.databases.Database(
-            new AstraApiEndpoint(databaseId, databaseRegion, env).getApiEndPoint(),
-            token,keyspace, dataAPIOptions) {
+            new AstraApiEndpoint(databaseId, databaseRegion, dataAPIOptions.getAstraEnvironment()).getApiEndPoint(),
+            token, keyspace, dataAPIOptions) {
         };
     }
 
@@ -373,7 +372,7 @@ public com.datastax.astra.client.databases.Database getDatabase(UUID databaseId)
      */
     public AstraDBDatabaseAdmin getDatabaseAdmin(UUID databaseId) {
         Assert.notNull(databaseId, "databaseId");
-        return new AstraDBDatabaseAdmin(token, databaseId, env, dataAPIOptions);
+        return new AstraDBDatabaseAdmin(token, databaseId, dataAPIOptions);
     }
 
     /**

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

@@ -21,6 +21,7 @@
  */
 
 import com.datastax.astra.client.DataAPIDestination;
+import com.datastax.astra.client.core.commands.CommandOptions;
 import com.datastax.astra.client.core.options.DataAPIOptions;
 import com.datastax.astra.client.core.results.FindEmbeddingProvidersResult;
 import com.datastax.astra.internal.api.AstraApiEndpoint;
@@ -48,8 +49,8 @@ public class AstraDBDatabaseAdmin implements DatabaseAdmin {
     /** Token used for the credentials. */
     final UUID databaseId;
 
-    /** Working environment. */
-    final AstraEnvironment env;
+    /** Data Api Options. */
+    final DataAPIOptions dataAPIOptions;
 
     /** Client for Astra Devops Api. */
     final AstraDBOpsClient devopsDbClient;
@@ -64,11 +65,11 @@ public class AstraDBDatabaseAdmin implements DatabaseAdmin {
      *      target database
      */
     public AstraDBDatabaseAdmin(com.datastax.astra.client.databases.Database db) {
-        this.databaseId = UUID.fromString(db.getDbApiEndpoint().substring(8, 44));
-        this.env        = getEnvironment(db.getOptions().getDestination());
-        this.token      = db.getToken();
-        this.db         = db;
-        this.devopsDbClient = new AstraDBOpsClient(token, this.env);
+        this.databaseId     = UUID.fromString(db.getDbApiEndpoint().substring(8, 44));
+        this.dataAPIOptions = db.getOptions();
+        this.token          = db.getToken();
+        this.db             = db;
+        this.devopsDbClient = new AstraDBOpsClient(token, dataAPIOptions.getAstraEnvironment());
     }
 
     /**
@@ -78,16 +79,14 @@ public AstraDBDatabaseAdmin(com.datastax.astra.client.databases.Database db) {
      *      token value
      * @param databaseId
      *      database identifier
-     * @param env
-     *      working environment
      * @param options
      *      options used to initialize the http client
      */
-    public AstraDBDatabaseAdmin(String token, UUID databaseId, AstraEnvironment env, DataAPIOptions options) {
-        this.env            = env;
+    public AstraDBDatabaseAdmin(String token, UUID databaseId, DataAPIOptions options) {
         this.token          = token;
         this.databaseId     = databaseId;
-        this.devopsDbClient = new AstraDBOpsClient(token, this.env);
+        this.dataAPIOptions = options;
+        this.devopsDbClient = new AstraDBOpsClient(token, options.getAstraEnvironment());
         this.db = new com.datastax.astra.client.databases.Database(getApiEndpoint(), token, DEFAULT_KEYSPACE, options);
     }
 
@@ -137,7 +136,7 @@ private static AstraEnvironment getEnvironment(DataAPIDestination destination) {
      */
     private String getApiEndpoint() {
         return new AstraApiEndpoint(databaseId,
-                getDatabaseInformations().getInfo().getRegion(), env)
+                getDatabaseInformations().getInfo().getRegion(), dataAPIOptions.getAstraEnvironment())
                 .getApiEndPoint();
     }
 
@@ -199,6 +198,12 @@ public void dropKeyspace(String keyspace) {
         }
     }
 
+    @Override
+    public void dropKeyspace(String namespace, CommandOptions<?> options) {
+        log.warn("CommandOptions are not supported for dropKeyspace in Astra MODE");
+        dropKeyspace(namespace);
+    }
+
     /** {@inheritDoc} */
     @Override
     public com.datastax.astra.client.databases.Database getDatabase() {

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

@@ -20,6 +20,7 @@
  * #L%
  */
 
+import com.datastax.astra.client.core.commands.CommandType;
 import com.datastax.astra.client.core.options.DataAPIOptions;
 import com.datastax.astra.client.databases.Database;
 import com.datastax.astra.client.core.commands.Command;
@@ -82,12 +83,9 @@ public DataAPIDatabaseAdmin(String apiEndpoint, String token, DataAPIOptions opt
      */
     public DataAPIDatabaseAdmin(Database db) {
         this.db             = db;
-
-        this.commandOptions = new CommandOptions<>()
-                .token(db.getToken())
-                .embeddingAuthProvider(db.getOptions().getEmbeddingAuthProvider())
-                .httpClientOptions(db.getOptions().getHttpClientOptions());
-        db.getOptions().getObservers().forEach(this.commandOptions::registerObserver);
+        this.commandOptions = new CommandOptions<>(db.getOptions());
+        this.commandOptions.token(db.getToken());
+        this.commandOptions.commandType(CommandType.KEYSPACE_ADMIN);
     }
 
     // ------------------------------------------
@@ -163,12 +161,12 @@ public void createKeyspace(String keyspace, KeyspaceOptions options) {
     }
 
     @Override
-    public void dropKeyspace(String keyspace) {
+    public void dropKeyspace(String keyspace, CommandOptions<?> options) {
         hasLength(keyspace, ARG_KEYSPACE);
         Command dropNamespace = Command
                 .create("dropKeyspace")
                 .append("name", keyspace);
-        runCommand(dropNamespace);
+        runCommand(dropNamespace, options);
         log.info("Keyspace  '" + green("{}") + "' has been deleted", keyspace);
     }
 
@@ -184,8 +182,6 @@ protected DataAPISerializer getSerializer() {
         return SERIALIZER;
     }
 
-
-
     /**
      * Register a listener to execute commands on the collection. Please now use {@link CommandOptions}.
      *

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

@@ -20,6 +20,7 @@
  * #L%
  */
 
+import com.datastax.astra.client.core.commands.CommandOptions;
 import com.datastax.astra.client.databases.Database;
 import com.datastax.astra.client.core.commands.CommandRunner;
 import com.datastax.astra.client.core.vectorize.EmbeddingProvider;
@@ -202,7 +203,11 @@ default CompletableFuture<Set<String>> listKeyspacesNamesAsync() {
      *                  that should be deleted. The operation will proceed silently and without error even if the
      *                  keyspace does not exist, ensuring consistent behavior.
      */
-    void dropKeyspace(String namespace);
+    default void dropKeyspace(String namespace) {
+        dropKeyspace(namespace, null);
+    }
+
+    void dropKeyspace(String namespace, CommandOptions<?> options);
 
     /**
      * Asynchronously drops (deletes) the specified keyspace from the database. This operation is idempotent, meaning