Add a CSV loader

Author: clun

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

@@ -1240,10 +1240,8 @@ public Page<T> findPage(Filter filter, FindOptions options) {
                         .appendIfNotNull("limit", options.getLimit())
                         .appendIfNotNull(INPUT_PAGE_STATE, options.getPageState())
                         .appendIfNotNull(INPUT_INCLUDE_SIMILARITY, options.getIncludeSimilarity()));
-
         ApiResponse apiResponse = runCommand(findCommand);
-
-        return new Page<>(DataAPIOptions.getMaxPageSize(),
+        return new Page<>(
                 apiResponse.getData().getNextPageState(),
                 apiResponse.getData().getDocuments()
                         .stream()
@@ -1806,6 +1804,18 @@ public Optional<T> findOneAndDelete(Filter filter) {
         return findOneAndDelete(filter, new FindOneAndDeleteOptions());
     }
 
+    /**
+     * Delete and return a document asynchronous.
+     *
+     * @param filter
+     *      filter to delete
+     * @return
+     *      the document that was removed.  If no documents matched the query filter, then null will be returned
+     */
+    public CompletableFuture<Optional<T>> findOneAndDeleteAsync(Filter filter) {
+        return CompletableFuture.supplyAsync(() -> findOneAndDelete(filter));
+    }
+
     /**
      * Atomically find a document and remove it.
      *

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

@@ -19,10 +19,10 @@
  * limitations under the License.
  * #L%
  */
+
 import com.datastax.astra.internal.utils.Assert;
-import lombok.AllArgsConstructor;
-import lombok.Data;
 import lombok.Getter;
+import lombok.Setter;
 
 import java.net.http.HttpClient;
 
@@ -143,7 +143,7 @@ public enum DataAPIDestination {
     /**
      * Options to set up http Client.
      */
-    @Data
+    @Getter @Setter
     public static class HttpClientOptions {
 
         /** Default user agent. */
@@ -201,7 +201,7 @@ public HttpClientOptions() {
     /**
      * Subclass to represent an http proxy.
      */
-    @Data
+    @Getter @Setter
     public static class HttpProxy {
 
         /** hostname of the proxy. */
@@ -255,7 +255,7 @@ public static class DataAPIClientOptionsBuilder {
         private HttpProxy httpProxy;
 
         /** Moving to HTTP/2. */
-        private HttpClient.Version httpVersion = HttpClient.Version.HTTP_2;
+        private HttpClient.Version httpVersion = HttpClient.Version.HTTP_1_1;
 
         /** Redirect  */
         private HttpClient.Redirect httpRedirect = HttpClient.Redirect.NORMAL;

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

@@ -19,6 +19,7 @@
  * limitations under the License.
  * #L%
  */
+
 import com.datastax.astra.client.DataAPIOptions;
 import com.datastax.astra.client.model.DatabaseInfo;
 import com.datastax.astra.internal.api.AstraApiEndpoint;
@@ -30,17 +31,12 @@
 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.ApiLocator;
 import com.dtsx.astra.sdk.utils.AstraEnvironment;
 import com.dtsx.astra.sdk.utils.AstraRc;
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
 
-import java.net.URI;
 import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-import java.net.http.HttpResponse.BodyHandlers;
 import java.time.Duration;
 import java.util.List;
 import java.util.Optional;
@@ -226,20 +222,9 @@ public DatabaseAdmin createDatabase(String name, CloudProviderType cloud, String
                 case INITIALIZING:
                 case PENDING:
                 case RESUMING:
-                    log.info("Database {} already exists and is in {} state, waiting for it to be ACTIVE", name, db.getStatus());
-                    if (waitForDb) {
-                        waitForDatabase(devopsDbClient.database(db.getId()));
-                    }
-                    return getDatabaseAdmin(UUID.fromString(db.getId()));
                 case HIBERNATED:
-                    log.info("Database {} is in {} state, resuming...", name, db.getStatus());
-                    resumeDb(db);
-                    if (waitForDb) {
-                        waitForDatabase(devopsDbClient.database(db.getId()));
-                    }
-                    return getDatabaseAdmin(UUID.fromString(db.getId()));
                 default:
-                    throw new IllegalStateException("Database already exist but cannot be activate");
+                    throw new IllegalStateException("Database already exists but is not in expected state.");
             }
         }
         // Database is not present, creating and waiting for it to be active.
@@ -410,33 +395,4 @@ private DatabaseStatusType getStatus(DbOpsClient dbc) {
         return dbc.find().orElseThrow(() -> new DatabaseNotFoundException(dbc.getDatabaseId())).getStatus();
     }
 
-    /**
-     * Database name.
-     *
-     * @param db
-     *      database name
-     */
-    private void resumeDb(Database db) {
-        try {
-            // Compute Endpoint for the Keyspace
-            String endpoint = ApiLocator.getApiRestEndpoint(db.getId(), db.getInfo().getRegion()) + "/v2/schemas/keyspace";
-            HttpRequest request = HttpRequest.newBuilder()
-                    .uri(URI.create(endpoint))
-                    .timeout(Duration.ofSeconds(20))
-                    .header("Content-Type", "application/json")
-                    .header(TOKEN_HEADER_PARAM, token)
-                    .GET()
-                    .build();
-            HttpResponse<String> response = httpClient.send(request, BodyHandlers.ofString());
-            if (response.statusCode() == 500) {
-                throw new IllegalStateException("Cannot resume database, please check your account");
-            }
-        } catch (InterruptedException e) {
-            log.warn("Interrupted {}",e.getMessage());
-            Thread.currentThread().interrupt();
-        } catch (Exception e) {
-            log.warn("Resuming request might have failed, please check {}}",e.getMessage());
-        }
-    }
-
 }

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

@@ -144,6 +144,10 @@ public void createNamespace(String namespace) {
     /** {@inheritDoc} */
     @Override
     public void dropNamespace(String namespace) {
-        devopsDbClient.database(databaseId.toString()).keyspaces().delete(namespace);
+        try {
+            devopsDbClient.database(databaseId.toString()).keyspaces().delete(namespace);
+        } catch(NullPointerException e) {
+            // Left blank to parse output from a delete
+        }
     }
 }

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

@@ -21,13 +21,12 @@
  */
 
 import lombok.Getter;
-import lombok.Setter;
 
 /**
  *
  * Options used in the `bulkWrite` command.
  */
-@Getter @Setter
+@Getter
 public final class BulkWriteOptions {
 
     /**

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

@@ -21,7 +21,6 @@
  */
 
 import com.datastax.astra.internal.api.ApiResponse;
-import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 

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

@@ -22,7 +22,6 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.Setter;
@@ -63,7 +62,7 @@ public CollectionOptions() {
     /**
      * Subclass representing the indexing options.
      */
-    @Data
+    @Getter @Setter
     public static class DefaultIdOptions {
 
         /** Type for the default id. */
@@ -90,7 +89,7 @@ public DefaultIdOptions(String type) {
     /**
      * Subclass representing the indexing options.
      */
-    @Data
+    @Getter @Setter
     public static class IndexingOptions {
 
         /**
@@ -114,7 +113,7 @@ public IndexingOptions() {
     /**
      * Subclass representing the vector options.
      */
-    @Data
+    @Getter @Setter
     public static class VectorOptions {
 
         /**
@@ -152,7 +151,7 @@ public SimilarityMetric getSimilarityMetric() {
     /**
      * Subclass representing the services options.
      */
-    @Data
+    @Getter @Setter
     public static class Service {
 
         /** LLM provider. */
@@ -177,7 +176,7 @@ public Service() {
     /**
      * Subclass representing the Authentication options.
      */
-    @Data
+    @Getter @Setter
     public static class Authentication {
 
         /** Type of authentication: Oauth, API Key, etc. */
@@ -195,7 +194,7 @@ public Authentication() {
     /**
      * Subclass representing a parameters for LLM Services
      */
-    @Data
+    @Getter @Setter
     public static class Parameters {
 
         /** Type for the parameters. */

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

@@ -47,6 +47,13 @@ public class Command implements Serializable {
     /** Command payload.*/
     protected Document payload = new Document();
 
+    /**
+     * Default constructor.
+     */
+    public Command() {
+        // left blank and initialize with Jackson
+    }
+
     /**
      * Create an empty command from its name.
      *
@@ -59,11 +66,6 @@ public static Command create(String name) {
         return new Command(name);
     }
 
-    /**
-     * Default constructor.
-     */
-    public Command() {}
-
     /**
      * Constructor with a name.
      *

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

@@ -26,13 +26,13 @@
 /**
  * Hold the result of delete commands (deleteOne, deleteMany).
  */
-@Getter @Setter
+@Getter
 public class DeleteResult {
 
     /**
      * NUmber of documents deleted.
      */
-    int deletedCount;
+    private final int deletedCount;
 
     /**
      * Default constructor.