Improve annotation system not to have to provide types and names

datastax · clun · Nov 30, 2024 · Nov 19, 2024 · Nov 20, 2024 · Nov 21, 2024
commit c9bf29a7a1f4ba7d48b9039a36c33e4eb7cbb6be
diff --git a/astra-db-java/src/main/java/com/datastax/astra/client/core/commands/BaseOptions.java b/astra-db-java/src/main/java/com/datastax/astra/client/core/commands/BaseOptions.java
@@ -159,6 +159,7 @@ public T timeout(Duration duration) {
      */
     @SuppressWarnings("unchecked")
     public T embeddingAuthProvider(EmbeddingHeadersProvider embeddingAuthProvider) {
+        Assert.notNull(embeddingAuthProvider, "embeddingAuthProvider");
         getDataAPIClientOptions().embeddingAuthProvider(embeddingAuthProvider);
         return (T) this;
     }
@@ -173,7 +174,9 @@ public T embeddingAuthProvider(EmbeddingHeadersProvider embeddingAuthProvider) {
      */
     @SuppressWarnings("unchecked")
     public T databaseAdditionalHeaders(Map<String, String> params) {
-        getDataAPIClientOptions().databaseAdditionalHeaders(params);
+        if (params!=null && !params.isEmpty()) {
+            getDataAPIClientOptions().databaseAdditionalHeaders(params);
+        }
         return (T) this;
     }
 
@@ -187,7 +190,9 @@ public T databaseAdditionalHeaders(Map<String, String> params) {
      */
     @SuppressWarnings("unchecked")
     public T adminAdditionalHeaders(Map<String, String> params) {
-        getDataAPIClientOptions().adminAdditionalHeaders(params);
+        if (params!=null && !params.isEmpty()) {
+            getDataAPIClientOptions().adminAdditionalHeaders(params);
+        }
         return (T) this;
     }
 
@@ -215,9 +220,7 @@ public T httpClientOptions(HttpClientOptions options) {
      */
     @SuppressWarnings("unchecked")
     public T timeoutOptions(TimeoutOptions timeoutOptions) {
-        if (getDataAPIClientOptions() == null) {
-            this.dataAPIClientOptions = new DataAPIClientOptions();
-        }
+        Assert.notNull(timeoutOptions, "timeoutOptions");
         getDataAPIClientOptions().timeoutOptions(timeoutOptions);
         return (T) this;
     }
@@ -233,9 +236,9 @@ public T timeoutOptions(TimeoutOptions timeoutOptions) {
      */
     @SuppressWarnings("unchecked")
     public T registerObserver(String name, CommandObserver observer) {
-        if (observer != null) {
-            getDataAPIClientOptions().addObserver(name, observer);
-        }
+        Assert.hasLength(name, "name");
+        Assert.notNull(observer, "observer");
+        getDataAPIClientOptions().addObserver(name, observer);
         return (T) this;
     }
 
@@ -253,24 +256,6 @@ public T unregisterObserver(String name) {
         return (T) this;
     }
 
-    /**
-     * Return the HTTP Request Timeout based on the command type
-     *
-     * @return value of token
-     */
-    public long getTimeout(CommandType commandType) {
-        return getTimeout(getDataAPIClientOptions().getTimeoutOptions(), commandType);
-    }
-
-    /**
-     * Return the HTTP Request Timeout based on the command type
-     *
-     * @return value of token
-     */
-    public long getRequestTimeout(CommandType commandType) {
-        return getRequestTimeout(getDataAPIClientOptions().getTimeoutOptions(), commandType);
-    }
-
     /**
      * Request timeout based on the command type.
      *
@@ -320,9 +305,6 @@ public long getRequestTimeout(TimeoutOptions timeoutOptions, CommandType type) {
      *      service key
      */
     public T timeout(long timeoutMillis, CommandType commandType) {
-        if (getDataAPIClientOptions() == null) {
-            dataAPIClientOptions = new DataAPIClientOptions();
-        }
         if (getDataAPIClientOptions().getTimeoutOptions() == null) {
             getDataAPIClientOptions().timeoutOptions(new TimeoutOptions());
         }
@@ -348,6 +330,9 @@ public T timeout(long timeoutMillis, CommandType commandType) {
      */
     @JsonIgnore
     public DataAPIClientOptions getDataAPIClientOptions() {
+        if (this.dataAPIClientOptions == null) {
+            this.dataAPIClientOptions = new DataAPIClientOptions();
+        }
         return dataAPIClientOptions;
     }
 

diff --git a/astra-db-java/src/main/java/com/datastax/astra/client/core/options/DataAPIClientOptions.java b/astra-db-java/src/main/java/com/datastax/astra/client/core/options/DataAPIClientOptions.java
@@ -47,9 +47,8 @@
 /**
  * Options to set up the client for DataApiClient.
  */
-@Setter
 @Slf4j
-@NoArgsConstructor
+@Setter
 @Accessors(fluent = true, chain = true)
 public class DataAPIClientOptions implements Cloneable {
 
@@ -374,6 +373,13 @@ public String toString() {
         return new DatabaseSerializer().marshall(this);
     }
 
+    /**
+     * A default Client Options
+     */
+    public DataAPIClientOptions() {
+        // defaulting values
+    }
+
     public DataAPIClientOptions(DataAPIClientOptions options) {
         Assert.notNull(options, "Options");
         this.apiVersion                 = options.apiVersion;

diff --git a/astra-db-java/src/main/java/com/datastax/astra/client/core/options/TimeoutOptions.java b/astra-db-java/src/main/java/com/datastax/astra/client/core/options/TimeoutOptions.java
@@ -20,10 +20,13 @@
  * #L%
  */
 
+import com.datastax.astra.internal.utils.Assert;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
+import java.time.Duration;
+
 /**
  * This class is used to define the timeout options for the client.
  */
@@ -84,6 +87,48 @@ public TimeoutOptions clone() {
         }
     }
 
+    public TimeoutOptions connectTimeout(Duration timeout) {
+        Assert.notNull(timeout, "Timeout");
+        this.connectTimeoutMillis = timeout.toMillis();
+        return this;
+    }
+
+    public TimeoutOptions requestTimeout(Duration timeout) {
+        Assert.notNull(timeout, "Timeout");
+        this.requestTimeoutMillis = timeout.toMillis();
+        return this;
+    }
+
+    public TimeoutOptions generalMethodTimeout(Duration timeout) {
+        Assert.notNull(timeout, "Timeout");
+        this.generalMethodTimeoutMillis = timeout.toMillis();
+        return this;
+    }
+
+    public TimeoutOptions databaseAdminTimeout(Duration timeout) {
+        Assert.notNull(timeout, "Timeout");
+        this.databaseAdminTimeoutMillis = timeout.toMillis();
+        return this;
+    }
+
+    public TimeoutOptions keyspaceAdminTimeout(Duration timeout) {
+        Assert.notNull(timeout, "Timeout");
+        this.keyspaceAdminTimeoutMillis = timeout.toMillis();
+        return this;
+    }
+
+    public TimeoutOptions collectionAdminTimeout(Duration timeout) {
+        Assert.notNull(timeout, "Timeout");
+        this.collectionAdminTimeoutMillis = timeout.toMillis();
+        return this;
+    }
+
+    public TimeoutOptions tableAdminTimeout(Duration timeout) {
+        Assert.notNull(timeout, "Timeout");
+        this.tableAdminTimeoutMillis = timeout.toMillis();
+        return this;
+    }
+
     /**
      * Gets connectTimeoutMillis
      *

diff --git a/astra-db-java/src/main/java/com/datastax/astra/client/databases/Database.java b/astra-db-java/src/main/java/com/datastax/astra/client/databases/Database.java
@@ -1260,7 +1260,7 @@ public <T> Table<T> createTable(String tableName,
      * @param rowClass  the class representing the row type; must not be null
      * @return the created table object
      */
-    private <T> String getTableName(Class<T> rowClass) {
+    public <T> String getTableName(Class<T> rowClass) {
         notNull(rowClass, "rowClass");
         EntityTable ann = rowClass.getAnnotation(EntityTable.class);
         if (ann == null) {

diff --git a/...va/src/main/java/com/datastax/astra/client/databases/options/CreateCollectionOptions.java b/...va/src/main/java/com/datastax/astra/client/databases/options/CreateCollectionOptions.java
@@ -24,7 +24,7 @@
 
 import static com.datastax.astra.client.core.commands.CommandType.COLLECTION_ADMIN;
 
-public class CreateCollectionOptions extends BaseOptions<ListCollectionOptions> {
+public class CreateCollectionOptions extends BaseOptions<CreateCollectionOptions> {
 
     public CreateCollectionOptions() {
         super(null, COLLECTION_ADMIN, null);

diff --git a/astra-db-java/src/main/java/com/datastax/astra/client/tables/columns/ColumnTypeMapper.java b/astra-db-java/src/main/java/com/datastax/astra/client/tables/columns/ColumnTypeMapper.java
@@ -0,0 +1,68 @@
+package com.datastax.astra.client.tables.columns;
+
+import com.datastax.astra.client.core.vector.DataAPIVector;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.InetAddress;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
+/**
+ * Maps Java types to Cassandra column types.
+ */
+public class ColumnTypeMapper {
+
+    private static final Map<Class<?>, ColumnTypes> typeMapping = new HashMap<>();
+
+    static {
+        typeMapping.put(Integer.class, ColumnTypes.INT);
+        typeMapping.put(int.class, ColumnTypes.INT);
+        typeMapping.put(Long.class, ColumnTypes.BIGINT);
+        typeMapping.put(long.class, ColumnTypes.BIGINT);
+
+        typeMapping.put(Double.class, ColumnTypes.DOUBLE);
+        typeMapping.put(double.class, ColumnTypes.DOUBLE);
+
+        typeMapping.put(Float.class, ColumnTypes.FLOAT);
+        typeMapping.put(float.class, ColumnTypes.FLOAT);
+        typeMapping.put(Boolean.class, ColumnTypes.BOOLEAN);
+        typeMapping.put(boolean.class, ColumnTypes.BOOLEAN);
+        typeMapping.put(Byte.class, ColumnTypes.TINYINT);
+        typeMapping.put(byte.class, ColumnTypes.TINYINT);
+        typeMapping.put(Short.class, ColumnTypes.SMALLINT);
+        typeMapping.put(short.class, ColumnTypes.SMALLINT);
+
+        // Commonly used Java types
+        typeMapping.put(String.class, ColumnTypes.TEXT);
+        typeMapping.put(UUID.class, ColumnTypes.UUID);
+        typeMapping.put(BigDecimal.class, ColumnTypes.DECIMAL);
+        typeMapping.put(BigInteger.class, ColumnTypes.VARINT);
+        typeMapping.put(InetAddress.class, ColumnTypes.INET);
+
+        // Date and time types
+        typeMapping.put(Instant.class, ColumnTypes.TIMESTAMP);
+        typeMapping.put(LocalDate.class, ColumnTypes.DATE);
+        typeMapping.put(LocalTime.class, ColumnTypes.TIME);
+
+        // Collection types
+        typeMapping.put(List.class, ColumnTypes.LIST);
+        typeMapping.put(Set.class, ColumnTypes.SET);
+        typeMapping.put(Map.class, ColumnTypes.MAP);
+        typeMapping.put(DataAPIVector.class, ColumnTypes.VECTOR);
+
+        // Unsupported or undefined
+        typeMapping.put(Object.class, ColumnTypes.UNSUPPORTED);
+    }
+
+    public static ColumnTypes getColumnType(Class<?> clazz) {
+        return typeMapping.getOrDefault(clazz, ColumnTypes.UNSUPPORTED);
+    }
+
+}
diff --git a/astra-db-java/src/main/java/com/datastax/astra/client/tables/mapping/Column.java b/astra-db-java/src/main/java/com/datastax/astra/client/tables/mapping/Column.java
@@ -35,7 +35,7 @@
     /**
      * Column Name, if not provided the field name will be used
      */
-    String value();
+    String name();
 
     /**
      * Column Type, if not provided the field type will be used