update examples

datastax · clun · Apr 4, 2025 · Nov 21, 2024 · Nov 30, 2024 · Nov 30, 2024
commit 98e9de352cbcbe7cd94ea9c7bd077d765a321ad6
diff --git a/astra-db-java/src/main/java/com/datastax/astra/client/tables/Table.java b/astra-db-java/src/main/java/com/datastax/astra/client/tables/Table.java
@@ -1008,26 +1008,17 @@ public Row mapAsRow(T input) {
         if (input == null || input instanceof Row) {
             return (Row) input;
         }
-        EntityTable annTable = input.getClass().getAnnotation(EntityTable.class);
-        // Custom Serialization with annotations
-        if (annTable != null) {
-            if (Utils.hasLength(annTable.value()) && !annTable.value().equals(tableName)) {
-                throw new IllegalArgumentException("Table name mismatch, expected '" + tableName + "' but got '" + annTable.value() + "'");
+        EntityBeanDefinition<?> bean = new EntityBeanDefinition<>(input.getClass());
+        Row row = new Row();
+        bean.getFields().forEach((name, field) -> {
+            try {
+                row.put(field.getColumnName() != null ? field.getColumnName() : name,
+                        field.getGetter().invoke(input));
+            } catch (IllegalAccessException | InvocationTargetException e) {
+                throw new RuntimeException(e);
             }
-            EntityBeanDefinition<?> bean = new EntityBeanDefinition<>(input.getClass());
-            Row row = new Row();
-            bean.getFields().forEach((name, field) -> {
-                try {
-                    row.put(field.getColumnName(), field.getGetter().invoke(input));
-                } catch (IllegalAccessException | InvocationTargetException e) {
-                    throw new RuntimeException(e);
-                }
-            });
-            return row;
-        } else {
-            // Defaults mapping as a Row
-            return getSerializer().convertValue(input, Row.class);
-        }
+        });
+        return row;
     }
 
     // ------------------------------------------

diff --git a/astra-db-java/src/main/java/com/datastax/astra/client/tables/definition/rows/Row.java b/astra-db-java/src/main/java/com/datastax/astra/client/tables/definition/rows/Row.java
@@ -139,94 +139,122 @@ public Row add(final String key, final Object value) {
         columnMap.put(key, value);
         return this;
     }
+
     public Row addText(final String key, final String value) {
         return add(key, value);
     }
+
     public Row addAscii(final String key, final String value) {
         return addText(key, value);
     }
+
     public Row addVectorize(final String key, final String value) {
         return add(key, value);
     }
 
-    // Integers
-
     public Row addVarInt(final String key, final BigInteger value) {
         return add(key, value);
     }
+
     public Row addBigInt(final String key, final Long value) {
         return add(key, value);
     }
+
     public Row addInt(final String key, final Integer value) {
         return add(key, value);
     }
+
     public Row addSmallInt(final String key, final Short value) {
         return add(key, value);
     }
+
     public Row addTinyInt(final String key, final Byte value) {
         return add(key, value);
     }
+
     public Row addBoolean(final String key, final Boolean value) {
         return add(key, value);
     }
+
     public Row addBlob(final String key, final byte[] value) {
         return add(key, value);
     }
+
     public Row addFloat(final String key, final Float value) {
         return add(key, value);
     }
+
     public Row addDecimal(String pDecimal, BigDecimal big) {
         return add(pDecimal, big);
     }
+
     public Row addDouble(final String key, final Double value) {
         return add(key, value);
     }
+
     public Row addDate(final String key, final Date value) {
         return add(key, value);
     }
+
     public Row addDate(final String key, final LocalDate localDate) {
         if (localDate == null) {
             return add(key, null);
         }
         return addDate(key, Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant()));
     }
+
     public Row addInet(final String key, final InetAddress value) {
         return add(key, value);
     }
+
     public Row addDuration(final String key, final Duration value) {
         return add(key, TableDuration.of(Period.ZERO, value));
     }
+
     public Row addDuration(final String key, final Period period, final Duration duration) {
         return add(key, TableDuration.of(period, duration));
     }
+
     public Row addDuration(final String key, final Period period) {
         return add(key, TableDuration.of(period, Duration.ZERO));
     }
+
     public Row addTableDuration(final String key, final TableDuration value) {
         return add(key, value);
     }
+
     public Row addUUID(final String key, final UUID value) {
         return add(key, value);
     }
+
     public Row addTimeStamp(String key, Instant instant) {
         return add(key, instant);
     }
+
     public Row addTime(String key, LocalTime ltime) {
         return add(key, ltime);
     }
+
     public Row addVector(String key, DataAPIVector vector) {
         return add(key, vector);
     }
+
     public Row addVector(String key, float[] vector) {
         return add(key, new DataAPIVector(vector));
     }
+
     public <T> Row addList(String key, List<T> list) {
         return add(key, list);
     }
+
     public <T> Row addSet(String key, Set<T> set) {
         return add(key, set);
     }
 
+    public <K,V> Row addMap(String key, Map<K, V> myMap) {
+        return add(key, myMap);
+    }
+
     /**
      * Gets the value of the given key, casting it to the given {@code Class<T>}.  This is useful to avoid having casts in client code,
      * though the effect is the same.  So to get the value of a key that is of type String, you would write {@code String name =

diff --git a/astra-db-java/src/main/java/com/datastax/astra/internal/reflection/EntityBeanDefinition.java b/astra-db-java/src/main/java/com/datastax/astra/internal/reflection/EntityBeanDefinition.java
@@ -90,10 +90,11 @@ public EntityBeanDefinition(Class<T> clazz) {
 
         // Table Name
         EntityTable tableAnn = clazz.getAnnotation(EntityTable.class);
-        if (tableAnn == null) {
-            throw new IllegalArgumentException("Invalid class: It should be annotated with @Table(name=\"table_name\")");
+        if (tableAnn != null) {
+            this.name = tableAnn.value();
+        } else {
+            this.name = clazz.getSimpleName().toLowerCase();
         }
-        this.name = tableAnn.value();
 
         // Find properties
         List<BeanPropertyDefinition> properties = OBJECT_MAPPER
@@ -145,8 +146,6 @@ public EntityBeanDefinition(Class<T> clazz) {
                 }
                 field.setDimension(column.dimension());
                 field.setMetric(column.metric());
-            } else {
-                log.warn("Field {} is not annotated with @Column", field.getName());
             }
 
             PartitionBy partitionBy = annfield.getAnnotated().getAnnotation(PartitionBy.class);

diff --git a/examples/src/main/java/com/datastax/astra/client/tables/Game.java b/examples/src/main/java/com/datastax/astra/client/tables/Game.java
@@ -2,14 +2,18 @@
 
 import com.datastax.astra.client.core.vector.DataAPIVector;
 import com.datastax.astra.client.tables.mapping.Column;
-import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.Accessors;
 
 import java.time.Instant;
 import java.util.Set;
+import java.util.UUID;
 
-@Data
+@Setter
+@Accessors(fluent = true, chain = true)
 @NoArgsConstructor
+
 public class Game {
 
     @Column(name ="match_id")
@@ -28,4 +32,66 @@ public class Game {
     @Column(name ="m_vector")
     private DataAPIVector vector;
 
+    /**
+     * Gets matchId
+     *
+     * @return value of matchId
+     */
+    public String getMatchId() {
+        return matchId;
+    }
+
+    /**
+     * Gets round
+     *
+     * @return value of round
+     */
+    public Integer getRound() {
+        return round;
+    }
+
+    /**
+     * Gets score
+     *
+     * @return value of score
+     */
+    public Integer getScore() {
+        return score;
+    }
+
+    /**
+     * Gets when
+     *
+     * @return value of when
+     */
+    public Instant getWhen() {
+        return when;
+    }
+
+    /**
+     * Gets winner
+     *
+     * @return value of winner
+     */
+    public String getWinner() {
+        return winner;
+    }
+
+    /**
+     * Gets fighters
+     *
+     * @return value of fighters
+     */
+    public Set<UUID> getFighters() {
+        return fighters;
+    }
+
+    /**
+     * Gets vector
+     *
+     * @return value of vector
+     */
+    public DataAPIVector getVector() {
+        return vector;
+    }
 }
diff --git a/examples/src/main/java/com/datastax/astra/client/tables/WorkingWithRows.java b/examples/src/main/java/com/datastax/astra/client/tables/WorkingWithRows.java
@@ -0,0 +1,77 @@
+package com.datastax.astra.client.tables;
+
+import com.datastax.astra.client.DataAPIClients;
+import com.datastax.astra.client.core.vector.DataAPIVector;
+import com.datastax.astra.client.databases.Database;
+import com.datastax.astra.client.tables.definition.TableDefinition;
+import com.datastax.astra.client.tables.definition.columns.ColumnTypes;
+import com.datastax.astra.client.tables.definition.rows.Row;
+import com.datastax.astra.internal.serdes.tables.RowSerializer;
+
+import java.time.Instant;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
+public class WorkingWithRows {
+
+    public static void main(String[] args) {
+        insertFullRow();
+    }
+
+    public static void workingWithList() {
+        Database db = DataAPIClients.localDbWithDefaultKeyspace();
+        TableDefinition def = new TableDefinition()
+                .addColumnSet("set_column", ColumnTypes.INT);
+        Table<Row> table = db.createTable("TABLE_NAME", def);
+        table.insertOne(new Row().addSet("set_column", Set.of(9,8,7)));
+    }
+
+    public static void workingWithSet() {
+        Database db = DataAPIClients.localDbWithDefaultKeyspace();
+        TableDefinition def = new TableDefinition()
+                .addColumnList("list_column", ColumnTypes.TEXT);
+        Table<Row> table = db.createTable("TABLE_NAME", def);
+        table.insertOne(new Row().addList("list_column", List.of("Hello", "World")));
+    }
+
+    public static void workingWithMap() {
+        Database db = DataAPIClients.localDbWithDefaultKeyspace();
+        TableDefinition def = new TableDefinition()
+                .addColumnMap("map_column", ColumnTypes.TEXT, ColumnTypes.INT);
+        Table<Row> table = db.createTable("TABLE_NAME", def);
+        table.insertOne(new Row().addMap("map_column", Map.of("key1", 1)));
+    }
+
+    public static void insertFullRow() {
+        Database db = DataAPIClients.localDbWithDefaultKeyspace();
+        Table<Row> table = db.getTable("games");
+//        table.insertOne(new Row()
+//                .addText("match_id", "mtch_0")
+//                .addInt("round", 1)
+//                .addVector("m_vector", new DataAPIVector(new float[]{0.4f, -0.6f, 0.2f}))
+//                .addInt("score", 18)
+//                .addTimeStamp("when", Instant.now())
+//                .addText("winner", "Victor")
+//                .addSet("fighters", Set.of(UUID.fromString("0193539a-2770-8c09-a32a-111111111111"))));
+
+        // Leveraging object mapping
+        Table<Game> table2 = db.getTable("games", Game.class);
+
+        Game match1 = new Game()
+                .matchId("mtch_1")
+                .round(2)
+                .score(20)
+                .when(Instant.now())
+                .winner("Victor")
+                .fighters(Set.of(UUID.fromString("0193539a-2770-8c09-a32a-111111111111")))
+                .vector(new DataAPIVector(new float[]{0.4f, -0.6f, 0.2f}));
+        Row row = new RowSerializer().convertValue(match1, Row.class);
+        System.out.println(row.get("vector"));
+        System.out.println(((Map<String, Object>) row.get("vector")).get("$binary").getClass());
+        System.out.println();
+        //table2.insertOne(match1);
+    }
+
+}