Authentication keys support

Author: clun

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

@@ -46,7 +46,7 @@ public class DataAPIOptions {
     public static final  int DEFAULT_MAX_PAGE_SIZE = 20;
 
     /** Maximum number of documents when you insert. */
-    public static final int DEFAULT_MAX_CHUNKSIZE = 20;
+    public static final int DEFAULT_MAX_CHUNK_SIZE = 100;
 
     /** Default user agent. */
     public static final String DEFAULT_CALLER_NAME = "astra-db-java";
@@ -238,7 +238,7 @@ public static class DataAPIClientOptionsBuilder {
         private int maxPageSize = DEFAULT_MAX_PAGE_SIZE;
 
         /** The maximum number of documents that can be inserted in a single operation. */
-        private int maxDocumentsInInsert = DEFAULT_MAX_CHUNKSIZE;
+        private int maxDocumentsInInsert = DEFAULT_MAX_CHUNK_SIZE;
 
         /** The embedding service API key can be provided at top level. */
         private String embeddingAPIKey;
@@ -505,9 +505,9 @@ public DataAPIClientOptionsBuilder withMaxDocumentsInInsert(int maxDocumentsInIn
             if (maxDocumentsInInsert <= 0) {
                 throw new IllegalArgumentException("Max documents in insert must be a positive number");
             }
-            if (maxDocumentsInInsert > DEFAULT_MAX_CHUNKSIZE) {
+            if (maxDocumentsInInsert > DEFAULT_MAX_CHUNK_SIZE) {
                 log.warn("Setting the maximum number of documents in insert to a value greater than the " +
-                        "default value of {} may impact performance or result in error at server level", DEFAULT_MAX_CHUNKSIZE);
+                        "default value of {} may impact performance or result in error at server level", DEFAULT_MAX_CHUNK_SIZE);
             }
             this.maxDocumentsInInsert = maxDocumentsInInsert;
             return this;

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

@@ -22,6 +22,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.Setter;
@@ -162,7 +163,7 @@ public static class Service {
         private String modelName;
 
         /** Authentication information like keys and secrets. */
-        private Authentication authentication;
+        private Map<String, Object> authentication;
 
         /** Free form parameters. */
         private Map<String, Object> parameters;
@@ -173,24 +174,6 @@ public Service() {
         }
     }
 
-    /**
-     * Subclass representing the Authentication options.
-     */
-    @Getter @Setter
-    public static class Authentication {
-
-        /** Type of authentication: Oauth, API Key, etc. */
-        private List<String> type;
-
-        /** Name of the secret if sstored in Astra. */
-        private String secretName;
-
-        /** Default constructor. */
-        public Authentication() {
-            // left blank, serialization with jackson
-        }
-    }
-
     /**
      * Subclass representing a parameters for LLM Services
      */

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

@@ -42,7 +42,7 @@ public class InsertManyOptions extends CommandOptions<InsertManyOptions> {
     /**
      * If the flag is set to true the command is failing on first error
      */
-    private int chunkSize = DataAPIOptions.DEFAULT_MAX_CHUNKSIZE;
+    private int chunkSize = DataAPIOptions.DEFAULT_MAX_CHUNK_SIZE;
 
     /**
      * If the flag is set to true the command is failing on first error

astra-db-java/src/test/java/com/datastax/astra/test/unit/DataApiOptionsTest.java

@@ -5,6 +5,7 @@
 import com.datastax.astra.client.model.CollectionOptions;
 import com.datastax.astra.client.model.DeleteOneOptions;
 import com.datastax.astra.client.model.DeleteResult;
+import com.datastax.astra.client.model.Document;
 import com.datastax.astra.client.model.Filter;
 import com.datastax.astra.client.model.FilterOperator;
 import com.datastax.astra.client.model.FindOneAndDeleteOptions;
@@ -28,6 +29,7 @@
 import org.junit.jupiter.api.Test;
 
 import java.net.http.HttpClient;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -192,9 +194,12 @@ void shouldTestCollectionOptions() {
         s.setModelName("OK");
 
         CollectionOptions.Authentication a = new CollectionOptions.Authentication();
-        a.setSecretName("secret");
+        a.setSecrets(Map.of("secretName", "secret"));
         a.setType(List.of("type"));
-        s.setAuthentication(a);
+        Map<String, Object> authentication = new HashMap<>();
+        authentication.put("type", new String[] {"type"});
+        authentication.put("secretName", "secret");
+        s.setAuthentication(authentication);
 
         CollectionOptions.Parameters p1 = new CollectionOptions.Parameters();
         p1.setHelp("sample parama");
@@ -205,6 +210,7 @@ void shouldTestCollectionOptions() {
 
         v.setService(s);
         c.setVector(v);
+        System.out.println(JsonUtils.marshall(c));
         assertThat(JsonUtils.marshall(c)).isNotNull();
     }