OK

Author: clun

README.MD

@@ -6,12 +6,19 @@
 
 [![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=clun_astra-db-java&metric=security_rating)](https://sonarcloud.io/summary/new_code?id=clun_db-java)
 [![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=clun_astra-db-java&metric=sqale_rating)](https://sonarcloud.io/summary/overall?id=clun_astra-db-java)
-[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=clun_astra-db-java&metric=vulnerabilities)](https://sonarcloud.io/summary/overall?id=clun_astra-db-java)
+[![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=clun_astra-db-java&metric=reliability_rating)](https://sonarcloud.io/summary/new_code?id=clun_astra-db-java)
 
 [![Bugs](https://sonarcloud.io/api/project_badges/measure?project=clun_astra-db-java&metric=bugs)](https://sonarcloud.io/summary/new_code?id=clun_astra-db-java)
-[![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=clun_astra-db-java&metric=reliability_rating)](https://sonarcloud.io/summary/new_code?id=clun_astra-db-java)
+[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=clun_astra-db-java&metric=vulnerabilities)](https://sonarcloud.io/summary/overall?id=clun_astra-db-java)
+![GitHub issues](https://img.shields.io/github/issues/datastax/astra-db-java)
+[![Duplicated Lines (%)](https://sonarcloud.io/api/project_badges/measure?project=clun_astra-db-java&metric=duplicated_lines_density)](https://sonarcloud.io/summary/new_code?id=clun_astra-db-java)
+
 [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=clun_astra-db-java&metric=coverage)](https://sonarcloud.io/summary/new_code?id=clun_astra-db-java)
-[![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=clun_astra-db-java&metric=reliability_rating)](https://sonarcloud.io/summary/new_code?id=clun_astra-db-java)
+
+
+[![Maven Central](https://img.shields.io/maven-central/v/com.datastax.astra/astra-db-java)](https://search.maven.org/artifact/com.datastax.astra/astra-db-java)
+
+
 
 This client library provides a simplified way to interact with Data API for AstraDB or local instances. For detailed documentation, each operation comes with a detailed description and examples.
 

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

@@ -194,14 +194,16 @@ public static class HttpClientOptions {
         /**
          * Default constructor.
          */
-        public HttpClientOptions() {}
+        public HttpClientOptions() {
+            // left blanks as default values are set
+        }
 
     }
 
     /**
      * Subclass to represent an http proxy.
      */
-    @Data @AllArgsConstructor
+    @Data
     public static class HttpProxy {
 
         /** hostname of the proxy. */
@@ -212,8 +214,16 @@ public static class HttpProxy {
 
         /**
          * Default constructor.
+         *
+         * @param hostname
+         *    host name
+         * @param port
+         *      roxy port
          */
-        public HttpProxy() {}
+        public HttpProxy(String hostname, int port) {
+            this.hostname = hostname;
+            this.port = port;
+        }
     }
 
 
@@ -258,7 +268,9 @@ public static class DataAPIClientOptionsBuilder {
         /**
          * Default constructor.
          */
-        public DataAPIClientOptionsBuilder() {}
+        public DataAPIClientOptionsBuilder() {
+            // left blanks as default values are set
+        }
 
         /**
          * Builder pattern, update caller information.

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

@@ -137,6 +137,9 @@ public Database(String apiEndpoint, String token, String namespace, DataAPIOptio
                     dbApiEndPointBuilder.append("/api/json");
                 }
             break;
+            default:
+                // left blank as local deployments does not require any change
+            break;
         }
         this.apiEndpoint = dbApiEndPointBuilder
                 .append("/")

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

@@ -44,6 +44,9 @@
 @Getter
 public class DataAPIDatabaseAdmin extends AbstractCommandRunner implements DatabaseAdmin {
 
+    /** parameters names. */
+    private static final String ARG_NAMESPACE = "namespaceName";
+
     /** Version of the API. */
     protected final DataAPIOptions options;
 
@@ -85,21 +88,21 @@ public Set<String> listNamespaceNames() {
     /** {@inheritDoc} */
     @Override
     public Database getDatabase(String namespaceName) {
-        Assert.hasLength(namespaceName, "namespaceName");
+        Assert.hasLength(namespaceName, ARG_NAMESPACE);
         return new Database(apiEndPoint, token, namespaceName, options);
     }
 
     /** {@inheritDoc} */
     @Override
     public Database getDatabase(String namespaceName, String userToken) {
-        Assert.hasLength(namespaceName, "namespaceName");
+        Assert.hasLength(namespaceName, ARG_NAMESPACE);
         Assert.hasLength(userToken, "userToken");
         return new Database(apiEndPoint, userToken, namespaceName, options);
     }
 
     /** {@inheritDoc} */
     public void createNamespace(String namespace) {
-        Assert.hasLength(namespace, "namespace");
+        Assert.hasLength(namespace, ARG_NAMESPACE);
         createNamespace(namespace, NamespaceOptions.simpleStrategy(1));
     }
 
@@ -112,7 +115,7 @@ public void createNamespace(String namespace) {
      *      options to create a namespace
      */
     public void createNamespace(String namespace, NamespaceOptions options) {
-        hasLength(namespace, "namespace");
+        hasLength(namespace, ARG_NAMESPACE);
         notNull(options, "options");
         Command createNamespace = Command
                         .create("createNamespace")
@@ -124,7 +127,7 @@ public void createNamespace(String namespace, NamespaceOptions options) {
 
     /** {@inheritDoc} */
     public void dropNamespace(String namespace) {
-        hasLength(namespace, "namespace");
+        hasLength(namespace, ARG_NAMESPACE);
         Command dropNamespace = Command
                 .create("dropNamespace")
                 .append("name", namespace);

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

@@ -41,6 +41,8 @@ public final class BulkWriteOptions {
     /**
      * Default constructor.
      */
-    public BulkWriteOptions() {}
+    public BulkWriteOptions() {
+        // left blank attributes have default values
+    }
 
 }

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

@@ -20,20 +20,59 @@
  * #L%
  */
 
+import lombok.Getter;
+
 /**
  * List of possible types for the collection 'defaultId'.
  */
+@Getter
 public enum CollectionIdTypes {
 
-    /** represent a bson ObjectId. */
-    objectId,
+    /**
+     * Represent a BSON ObjectId.
+     */
+    OBJECT_ID("objectId"),
+
+    /**
+     * UUID in version v6 allowing natural ordering.
+     */
+    UUIDV6("uuidv6"),
+
+    /**
+     * UUID in version v7, random and time-based.
+     */
+    UUIDV7("uuidv7"),
+
+    /**
+     * UUID v4, the default random UUID.
+     */
+    UUID("uuid");
 
-    /** uuid in version v6 allowing natural ordering. */
-    uuidv6,
+    private final String value;
 
-    /** uuid in version v7 random and time-based. */
-    uuidv7,
+    /**
+     * Constructor.
+     *
+     * @param value
+     *      value to the types
+     */
+    CollectionIdTypes(String value) {
+        this.value = value;
+    }
 
-    /** uuid v4, the default random uuid, */
-    uuid
+    /**
+     * Creates a CollectionIdTypes from its string value.
+     *
+     * @param value The string value to look for.
+     * @return The corresponding CollectionIdTypes enum constant.
+     * @throws IllegalArgumentException if the value does not correspond to any CollectionIdTypes.
+     */
+    public static CollectionIdTypes fromValue(String value) {
+        for (CollectionIdTypes type : values()) {
+            if (type.getValue().equals(value)) {
+                return type;
+            }
+        }
+        throw new IllegalArgumentException("Unknown value: " + value);
+    }
 }

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

@@ -37,7 +37,7 @@ public class CollectionOptions {
     /**
      * The 'defaultId' to allow working with different types of identifiers.
      */
-    private Map<String, CollectionIdTypes> defaultId;
+    private DefaultIdOptions defaultId;
 
     /**
      * Vector options.
@@ -52,7 +52,36 @@ public class CollectionOptions {
     /**
      * Default constructor.
      */
-    public CollectionOptions() {}
+    public CollectionOptions() {
+        // left blank on purpose, built with builder
+    }
+
+    /**
+     * Subclass representing the indexing options.
+     */
+    @Data
+    public static class DefaultIdOptions {
+
+        /** Type for the default id. */
+        private String type;
+
+        /**
+         * Default constructor.
+         */
+        public DefaultIdOptions() {
+            // marshalled by jackson
+        }
+
+        /**
+         * Default constructor.
+         *
+         * @param type
+         *      type for the default id
+         */
+        public DefaultIdOptions(String type) {
+            this.type = type;
+        }
+    }
 
     /**
      * Subclass representing the indexing options.
@@ -190,7 +219,7 @@ public static class CollectionOptionsBuilder {
         /**
          * Options for Default Id
          */
-        CollectionIdTypes defaultId;
+        String defaultId;
 
         /**
          * Access the vector options.
@@ -231,8 +260,8 @@ public CollectionOptionsBuilder() {}
          * @return
          *      self reference
          */
-        public CollectionOptionsBuilder defaultId(CollectionIdTypes idType) {
-            this.defaultId = idType;
+        public CollectionOptionsBuilder defaultIdType(CollectionIdTypes idType) {
+            this.defaultId = idType.getValue();
             return this;
         }
 
@@ -327,7 +356,7 @@ public CollectionOptions build() {
             req.vector    = this.vector;
             req.indexing  = this.indexing;
             if (defaultId != null) {
-                req.defaultId = Map.of("type", this.defaultId);
+                req.defaultId = new DefaultIdOptions(defaultId);
             }
             return req;
         }

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

@@ -36,16 +36,39 @@
  * #L%
  */
 
+import lombok.Getter;
+
 /**
  * Constants in the JSON API.
  */
-public enum FilterKeyword {
+@Getter
+public enum DataAPIKeywords {
+
+    /**
+     * ID.
+     */
+    ID("_id"),
 
     /**
      * ALL.
      */
     ALL("$all"),
 
+    /**
+     * ALL.
+     */
+    DATE("$date"),
+
+    /**
+     * UUID
+     */
+    UUID("$uuid"),
+
+    /**
+     * OBJECT_ID.
+     */
+    OBJECT_ID("$objectId"),
+
     /**
      * SIZE.
      */
@@ -82,16 +105,7 @@ public enum FilterKeyword {
      * @param op
      *      current operator
      */
-    FilterKeyword(String op) {
+    DataAPIKeywords(String op) {
         this.keyword = op;
     }
-
-    /**
-     * Gets keyword
-     *
-     * @return value of keyword
-     */
-    public String getKeyword() {
-        return keyword;
-    }
 }

astra-db-java/src/main/java/com/datastax/astra/client/model/FilterKeyword.java renamed to astra-db-java/src/main/java/com/datastax/astra/client/model/DataAPIKeywords.java

@@ -37,7 +37,9 @@ public class DeleteOneOptions {
     /**
      * Default constructor.
      */
-    public DeleteOneOptions() {}
+    public DeleteOneOptions() {
+        // Left blank as sort is populated in static way
+    }
 
     /**
      * Syntax sugar as delete option is only a sort