update test

Author: clun

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

@@ -23,9 +23,8 @@
 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.core.options.DataAPIClientOptions;
 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;
 
@@ -111,17 +110,17 @@ public class DataAPIClient {
      * defaults to a pre-configured set of options designed for general use.
      * </p>
      **
-     * @see DataAPIOptions for more details on the available configuration parameters and their effects.
+     * @see DataAPIClientOptions for more details on the available configuration parameters and their effects.
      */
-    private final DataAPIOptions options;
+    private final DataAPIClientOptions options;
 
     /**
      * Constructs a {@code DataAPIClient} instance using the specified authentication token. This constructor
-     * initializes the client with default {@link DataAPIOptions} for its configuration.
+     * initializes the client with default {@link DataAPIClientOptions} for its configuration.
      * <p>
      * The provided token is used for authenticating HTTP requests made by this client. It is essential for accessing
      * secured resources. If specific HTTP configurations are required (e.g., custom timeouts, HTTP version), use the
-     * other constructor that accepts both a token and a {@link DataAPIOptions} instance.
+     * other constructor that accepts both a token and a {@link DataAPIClientOptions} instance.
      * </p>
      * <p>
      * This constructor is suitable for scenarios where default client settings are sufficient and no advanced
@@ -141,15 +140,15 @@ public class DataAPIClient {
      *              by the server, typically starting with "AstraCS:.." for Astra environments.
      */
     public DataAPIClient(String token) {
-        this(token, DataAPIOptions.builder().build());
+        this(token, DataAPIClientOptions.builder().build());
     }
 
     /**
      * Constructs a {@code DataAPIClient} with specified authentication token and HTTP client configuration options.
      * <p>
      * This constructor allows for the explicit specification of both the authentication token and the advanced
      * HTTP configuration settings. The authentication token is essential for securing access to the API, while the
-     * {@link DataAPIOptions} object provides granular control over the HTTP client's behavior, including timeouts,
+     * {@link DataAPIClientOptions} object provides granular control over the HTTP client's behavior, including timeouts,
      * HTTP version, and other properties impacting connectivity and request handling.
      * </p>
      * <p>
@@ -176,11 +175,11 @@ public DataAPIClient(String token) {
      *
      * @param token The authentication token to be used for securing API access. This token should adhere to the
      *              format required by the API, typically starting with "AstraCS:.." for Astra environments.
-     * @param options The {@link DataAPIOptions} specifying the detailed HTTP client configurations, offering
+     * @param options The {@link DataAPIClientOptions} specifying the detailed HTTP client configurations, offering
      *                customization over aspects such as timeouts and protocol versions.
      * @throws IllegalArgumentException if the token is empty or null, or if the options are null.
      */
-    public DataAPIClient(String token, DataAPIOptions options) {
+    public DataAPIClient(String token, DataAPIClientOptions options) {
         Assert.hasLength(token, ARG_TOKEN);
         Assert.notNull(options, ARG_OPTIONS);
         this.token   = token;

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

@@ -22,7 +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.core.options.DataAPIClientOptions;
 import com.datastax.astra.client.databases.Database;
 import com.datastax.astra.internal.command.LoggingCommandObserver;
 
@@ -78,7 +78,7 @@ private DataAPIClients() {}
     public static DataAPIClient createForLocal() {
         return new DataAPIClient(
                 new UsernamePasswordTokenProvider().getToken(),
-                DataAPIOptions.builder()
+                DataAPIClientOptions.builder()
                         .withDestination(DataAPIDestination.CASSANDRA)
                         .enableFeatureFlagTables()
                         .logRequests()
@@ -109,7 +109,7 @@ public static Database defaultLocalDatabase() {
      * as a service. This method streamlines the client setup by requiring only an authentication token, handling
      * the other configuration details internally to ensure compatibility with Astra's API and endpoints.
      *
-     * <p>By specifying the destination as Astra in the {@link DataAPIOptions}, this method ensures that the
+     * <p>By specifying the destination as Astra in the {@link DataAPIClientOptions}, this method ensures that the
      * client is properly configured to communicate with Astra's infrastructure, leveraging the provided token
      * for authentication. This approach enables developers to quickly establish a connection to Astra for
      * database operations without manually setting up connection parameters and authentication details.</p>
@@ -128,7 +128,7 @@ public static Database defaultLocalDatabase() {
      * </pre>
      */
     public static DataAPIClient create(String token) {
-        return new DataAPIClient(token, DataAPIOptions
+        return new DataAPIClient(token, DataAPIClientOptions
                 .builder()
                 .withDestination(DataAPIDestination.ASTRA)
                 .build());
@@ -155,7 +155,7 @@ public static DataAPIClient create(String token) {
      * </pre>
      */
     public static DataAPIClient createForAstraDev(String token) {
-        return new DataAPIClient(token, DataAPIOptions
+        return new DataAPIClient(token, DataAPIClientOptions
                 .builder()
                 .withDestination(DataAPIDestination.ASTRA_DEV)
                 .withObserver(new LoggingCommandObserver(DataAPIClient.class))
@@ -184,7 +184,7 @@ public static DataAPIClient createForAstraDev(String token) {
      * </pre>
      */
     public static DataAPIClient createForAstraTest(String token) {
-        return new DataAPIClient(token, DataAPIOptions
+        return new DataAPIClient(token, DataAPIClientOptions
                 .builder()
                 .withDestination(DataAPIDestination.ASTRA_TEST)
                 .withObserver(new LoggingCommandObserver(DataAPIClient.class))

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

@@ -20,9 +20,8 @@
  * #L%
  */
 
-import com.datastax.astra.client.core.options.DataAPIOptions;
+import com.datastax.astra.client.core.options.DataAPIClientOptions;
 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;
@@ -33,7 +32,6 @@
 import com.dtsx.astra.sdk.db.domain.DatabaseCreationRequest;
 import com.dtsx.astra.sdk.db.domain.DatabaseStatusType;
 import com.dtsx.astra.sdk.db.exception.DatabaseNotFoundException;
-import com.dtsx.astra.sdk.utils.AstraEnvironment;
 import com.dtsx.astra.sdk.utils.AstraRc;
 import com.dtsx.astra.sdk.utils.observability.ApiRequestObserver;
 import com.dtsx.astra.sdk.utils.observability.LoggingRequestObserver;
@@ -78,7 +76,7 @@ public class AstraDBAdmin {
     final AstraDBOpsClient devopsDbClient;
 
     /** Options to personalized http client other client options. */
-    final DataAPIOptions dataAPIOptions;
+    final DataAPIClientOptions dataAPIClientOptions;
 
     /** Astra Token (credentials). */
     final String token;
@@ -108,11 +106,11 @@ public class AstraDBAdmin {
      * @param options
      *      options for client
      */
-    public AstraDBAdmin(String token, DataAPIOptions options) {
+    public AstraDBAdmin(String token, DataAPIClientOptions options) {
         Assert.hasLength(token, "token");
         Assert.notNull(options, "options");
         this.token = token;
-        this.dataAPIOptions = options;
+        this.dataAPIClientOptions = options;
         if (options.getObservers() != null) {
             Map<String, ApiRequestObserver> devopsObservers = new HashMap<>();
             if (options.getObservers().containsKey(LoggingCommandObserver.class.getSimpleName())) {
@@ -337,16 +335,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());
+        if (!dataAPIClientOptions.isAstra()) {
+            throwErrorRestrictedAstra("getDatabase(id, keyspace)", dataAPIClientOptions.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, dataAPIOptions.getAstraEnvironment()).getApiEndPoint(),
-            token, keyspace, dataAPIOptions) {
+            new AstraApiEndpoint(databaseId, databaseRegion, dataAPIClientOptions.getAstraEnvironment()).getApiEndPoint(),
+            token, keyspace, dataAPIClientOptions) {
         };
     }
 
@@ -372,7 +370,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, dataAPIOptions);
+        return new AstraDBDatabaseAdmin(token, databaseId, dataAPIClientOptions);
     }
 
     /**

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

@@ -22,7 +22,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.options.DataAPIClientOptions;
 import com.datastax.astra.client.core.results.FindEmbeddingProvidersResult;
 import com.datastax.astra.internal.api.AstraApiEndpoint;
 import com.dtsx.astra.sdk.db.AstraDBOpsClient;
@@ -50,7 +50,7 @@ public class AstraDBDatabaseAdmin implements DatabaseAdmin {
     final UUID databaseId;
 
     /** Data Api Options. */
-    final DataAPIOptions dataAPIOptions;
+    final DataAPIClientOptions dataAPIClientOptions;
 
     /** Client for Astra Devops Api. */
     final AstraDBOpsClient devopsDbClient;
@@ -66,10 +66,10 @@ public class AstraDBDatabaseAdmin implements DatabaseAdmin {
      */
     public AstraDBDatabaseAdmin(com.datastax.astra.client.databases.Database db) {
         this.databaseId     = UUID.fromString(db.getDbApiEndpoint().substring(8, 44));
-        this.dataAPIOptions = db.getOptions();
+        this.dataAPIClientOptions = db.getOptions();
         this.token          = db.getToken();
         this.db             = db;
-        this.devopsDbClient = new AstraDBOpsClient(token, dataAPIOptions.getAstraEnvironment());
+        this.devopsDbClient = new AstraDBOpsClient(token, dataAPIClientOptions.getAstraEnvironment());
     }
 
     /**
@@ -82,10 +82,10 @@ public AstraDBDatabaseAdmin(com.datastax.astra.client.databases.Database db) {
      * @param options
      *      options used to initialize the http client
      */
-    public AstraDBDatabaseAdmin(String token, UUID databaseId, DataAPIOptions options) {
+    public AstraDBDatabaseAdmin(String token, UUID databaseId, DataAPIClientOptions options) {
         this.token          = token;
         this.databaseId     = databaseId;
-        this.dataAPIOptions = options;
+        this.dataAPIClientOptions = options;
         this.devopsDbClient = new AstraDBOpsClient(token, options.getAstraEnvironment());
         this.db = new com.datastax.astra.client.databases.Database(getApiEndpoint(), token, DEFAULT_KEYSPACE, options);
     }
@@ -136,7 +136,7 @@ private static AstraEnvironment getEnvironment(DataAPIDestination destination) {
      */
     private String getApiEndpoint() {
         return new AstraApiEndpoint(databaseId,
-                getDatabaseInformations().getInfo().getRegion(), dataAPIOptions.getAstraEnvironment())
+                getDatabaseInformations().getInfo().getRegion(), dataAPIClientOptions.getAstraEnvironment())
                 .getApiEndPoint();
     }
 

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

@@ -21,7 +21,7 @@
  */
 
 import com.datastax.astra.client.core.commands.CommandType;
-import com.datastax.astra.client.core.options.DataAPIOptions;
+import com.datastax.astra.client.core.options.DataAPIClientOptions;
 import com.datastax.astra.client.databases.Database;
 import com.datastax.astra.client.core.commands.Command;
 import com.datastax.astra.client.core.commands.CommandOptions;
@@ -71,7 +71,7 @@ public class DataAPIDatabaseAdmin extends AbstractCommandRunner implements Datab
      * @param options
      *      list of options for the admin
      */
-    public DataAPIDatabaseAdmin(String apiEndpoint, String token, DataAPIOptions options) {
+    public DataAPIDatabaseAdmin(String apiEndpoint, String token, DataAPIClientOptions options) {
         this(new Database(apiEndpoint, token, DEFAULT_KEYSPACE, options));
     }
 

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

@@ -45,12 +45,11 @@
 import com.datastax.astra.client.collections.results.FindOneAndReplaceResult;
 import com.datastax.astra.client.core.commands.Command;
 import com.datastax.astra.client.core.commands.CommandOptions;
-import com.datastax.astra.client.core.options.DataAPIOptions;
+import com.datastax.astra.client.core.options.DataAPIClientOptions;
 import com.datastax.astra.client.core.paging.CollectionCursor;
 import com.datastax.astra.client.core.paging.CollectionDistinctIterable;
 import com.datastax.astra.client.core.paging.FindIterable;
 import com.datastax.astra.client.core.paging.Page;
-import com.datastax.astra.client.core.paging.TableCursor;
 import com.datastax.astra.client.core.query.Filter;
 import com.datastax.astra.client.core.query.Filters;
 import com.datastax.astra.client.core.types.DataAPIKeywords;
@@ -167,7 +166,7 @@ public class Collection<T> extends AbstractCommandRunner {
 
     /** Get global Settings for the client. */
     @Getter
-    private final DataAPIOptions dataAPIOptions;
+    private final DataAPIClientOptions dataAPIClientOptions;
 
     /** Api Endpoint for the Database, if using an astra environment it will contain the database id and the database region.  */
     private final String apiEndpoint;
@@ -219,7 +218,7 @@ public Collection(Database db, String collectionName, CommandOptions<?> commandO
         hasLength(collectionName, ARG_COLLECTION_NAME);
         this.collectionName = collectionName;
         this.database       = db;
-        this.dataAPIOptions = db.getOptions();
+        this.dataAPIClientOptions = db.getOptions();
         this.documentClass  = clazz;
         this.commandOptions = commandOptions;
         // Defaulting to data in case of a Collection
@@ -632,8 +631,8 @@ public CollectionInsertManyResult insertMany(List<? extends T> documents, Collec
         if (options.concurrency() > 1 && options.ordered()) {
             throw new IllegalArgumentException("Cannot run ordered insert_many concurrently.");
         }
-        if (options.chunkSize() > dataAPIOptions.getMaxRecordsInInsert()) {
-            throw new IllegalArgumentException("Cannot insert more than " + dataAPIOptions.getMaxRecordsInInsert() + " at a time.");
+        if (options.chunkSize() > dataAPIClientOptions.getMaxRecordsInInsert()) {
+            throw new IllegalArgumentException("Cannot insert more than " + dataAPIClientOptions.getMaxRecordsInInsert() + " at a time.");
         }
         long start = System.currentTimeMillis();
         ExecutorService executor = Executors.newFixedThreadPool(options.concurrency());
@@ -1309,8 +1308,8 @@ public long estimatedDocumentCount(EstimatedCountDocumentsOptions options) {
     public int countDocuments(Filter filter, int upperBound, CountDocumentsOptions options)
     throws TooManyDocumentsToCountException {
         // Argument Validation
-        if (upperBound<1 || upperBound> dataAPIOptions.getMaxCount()) {
-            throw new IllegalArgumentException("UpperBound limit should be in between 1 and " + dataAPIOptions.getMaxCount());
+        if (upperBound<1 || upperBound> dataAPIClientOptions.getMaxCount()) {
+            throw new IllegalArgumentException("UpperBound limit should be in between 1 and " + dataAPIClientOptions.getMaxCount());
         }
         // Build command
         Command command = new Command("countDocuments").withFilter(filter);

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

@@ -20,7 +20,7 @@
  * #L%
  */
 
-import com.datastax.astra.client.core.options.DataAPIOptions;
+import com.datastax.astra.client.core.options.DataAPIClientOptions;
 import com.datastax.astra.client.exception.ClientErrorCodes;
 import com.datastax.astra.client.exception.DataAPIException;
 
@@ -33,7 +33,7 @@ public class TooManyDocumentsToCountException extends DataAPIException {
      * Default constructor.
      */
     public TooManyDocumentsToCountException() {
-        super(ClientErrorCodes.HTTP, "Document count exceeds '" + DataAPIOptions.DEFAULT_MAX_COUNT + ", the maximum allowed by the server");
+        super(ClientErrorCodes.HTTP, "Document count exceeds '" + DataAPIClientOptions.DEFAULT_MAX_COUNT + ", the maximum allowed by the server");
     }
 
     /**

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

@@ -20,9 +20,8 @@
  * #L%
  */
 
-import com.datastax.astra.client.core.options.DataAPIOptions;
+import com.datastax.astra.client.core.options.DataAPIClientOptions;
 import com.datastax.astra.client.core.commands.CommandOptions;
-import com.datastax.astra.client.core.http.HttpClientOptions;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -59,6 +58,6 @@ public class CollectionInsertManyOptions extends CommandOptions<CollectionInsert
     /**
      * If the flag is set to true the command is failing on first error
      */
-    int chunkSize = DataAPIOptions.DEFAULT_MAX_CHUNK_SIZE;
+    int chunkSize = DataAPIClientOptions.DEFAULT_MAX_CHUNK_SIZE;
 
 }

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

@@ -22,18 +22,16 @@
 
 import com.datastax.astra.client.core.auth.EmbeddingHeadersProvider;
 import com.datastax.astra.client.core.http.HttpClientOptions;
-import com.datastax.astra.client.core.options.DataAPIOptions;
+import com.datastax.astra.client.core.options.DataAPIClientOptions;
 import com.datastax.astra.client.core.options.TimeoutOptions;
 import com.datastax.astra.internal.command.CommandObserver;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.Getter;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.Optional;
 
-import static com.datastax.astra.client.core.options.DataAPIOptions.HEADER_FEATURE_FLAG_TABLES;
+import static com.datastax.astra.client.core.options.DataAPIClientOptions.HEADER_FEATURE_FLAG_TABLES;
 
 /**
  * Options that will be provided to all commands for this collection.
@@ -305,7 +303,7 @@ public CommandOptions() {
     /**
      * Default Constructor.
      */
-    public CommandOptions(DataAPIOptions options) {
+    public CommandOptions(DataAPIClientOptions options) {
        if (options != null) {
            this.embeddingAuthProvider     = options.getEmbeddingAuthProvider();
            this.adminAdditionalHeaders    = options.getAdminAdditionalHeaders();