Added missing methods to record builder. (#2012)

stonesmi · web-flow · commit 899e82dd9afd · 2026-01-27T09:52:08.000Z
diff --git a/benchmark/src/main/java/org/finos/vuu/benchmark/BenchmarkHelper.java b/benchmark/src/main/java/org/finos/vuu/benchmark/BenchmarkHelper.java
@@ -13,7 +13,6 @@
 import org.finos.vuu.core.table.Columns;
 import org.finos.vuu.core.table.DataTable;
 import org.finos.vuu.core.table.InMemDataTable;
-import org.finos.vuu.core.table.RowWithData;
 import org.finos.vuu.core.table.ViewPortColumnCreator;
 import org.finos.vuu.core.tree.TreeSessionTable;
 import org.finos.vuu.net.ClientSessionId;
@@ -66,17 +65,23 @@ public void addTableData(DataTable dataTable, int size) {
     }
 
     public void addTableData(DataTable dataTable, int offset, int size) {
+        var rowBuilder = dataTable.rowBuilder();
+        var ricColumn = dataTable.columnForName("ric");
+        var exchangeColumn = dataTable.columnForName("exchange");
+        var bidColumn = dataTable.columnForName("bid");
+        var askColumn = dataTable.columnForName("ask");
+        var lastColumn = dataTable.columnForName("last");
+        var closeColumn = dataTable.columnForName("close");
         for (int i = offset; i < offset + size; i++) {
             var ric = "TST-" + i;
-            var exchange = "exchange-" + i;
-            dataTable.processUpdate(ric, new RowWithData(ric, Map.of(
-                    "ric", ric,
-                    "bid", 101,
-                    "ask", 100,
-                    "last", 105,
-                    "close", 106,
-                    "exchange", exchange
-            )));
+            rowBuilder.setKey(ric);
+            rowBuilder.setString(ricColumn, ric);
+            rowBuilder.setString(exchangeColumn, "exchange-" + i);
+            rowBuilder.setDouble(bidColumn, 101);
+            rowBuilder.setDouble(askColumn, 100);
+            rowBuilder.setDouble(lastColumn, 105);
+            rowBuilder.setDouble(closeColumn, 106);
+            dataTable.processUpdate(rowBuilder.build());
         }
     }
 
diff --git a/example/basket/src/main/scala/org/finos/vuu/core/module/basket/provider/BasketConstituentProvider.scala b/example/basket/src/main/scala/org/finos/vuu/core/module/basket/provider/BasketConstituentProvider.scala
@@ -60,7 +60,7 @@ class BasketConstituentProvider(val table: DataTable)(implicit lifecycle: Lifecy
           .setString(volumeCol, Option(volume).getOrElse("").toString)
           .setString(descCol, name.toString)
           .setString(sideCol, side)
-          .asRow
+          .build
 
         table.processUpdate(rowData)
       }
diff --git a/example/basket/src/main/scala/org/finos/vuu/core/module/basket/provider/BasketProvider.scala b/example/basket/src/main/scala/org/finos/vuu/core/module/basket/provider/BasketProvider.scala
@@ -28,7 +28,7 @@ class BasketProvider(val table: DataTable)(implicit lifecycle: LifecycleContaine
         .setString(idColumn, id)
         .setString(nameColumn, id)
         //as row clears out the data from the builder
-        .asRow)
+        .build)
     })
   }
   override val lifecycleId: String = "org.finos.vuu.core.module.basket.provider.BasketProvider"
diff --git a/example/main-java/src/main/java/org/finos/vuu/module/JavaExampleModule.java b/example/main-java/src/main/java/org/finos/vuu/module/JavaExampleModule.java
@@ -26,8 +26,8 @@
 import java.util.List;
 
 import static org.finos.vuu.util.ScalaCollectionConverter.emptyList;
+import static org.finos.vuu.util.ScalaCollectionConverter.emptySeq;
 import static org.finos.vuu.util.ScalaCollectionConverter.toScala;
-import static org.finos.vuu.util.ScalaCollectionConverter.toScalaSeq;
 
 public class JavaExampleModule extends DefaultModule {
 
@@ -38,13 +38,13 @@ public ViewServerModule create(final TableDefContainer tableDefContainer, Clock
         return ModuleFactory.withNamespace(NAME, tableDefContainer)
                 .addTable(new TableDef(
                                 "PersonManualMapped",
-                                "Id",
+                                "id",
                                 new ColumnBuilder()
-                                        .addString("Id")
-                                        .addString("Name")
-                                        .addInt("Account")
+                                        .addString("id")
+                                        .addString("name")
+                                        .addInt("account")
                                         .build(),
-                                toScalaSeq(List.of()),
+                                emptySeq(),
                                 false,
                                 VisualLinks.apply(emptyList()),
                                 Indices.apply(emptyList()),
@@ -61,11 +61,11 @@ public ViewServerModule create(final TableDefContainer tableDefContainer, Clock
                 )
                 .addTable(TableDef.apply(
                                 "PersonAutoMapped",
-                                "Id",
+                                "id",
                                 Columns.fromExternalSchema(EntitySchema.person),
-                                toScalaSeq(List.of())
+                                emptySeq()
                         ),
-                        (table, vs) -> new AutoMappedPersonProvider(table, new PersonStore(), clock)
+                        (table, vs) -> new AutoMappedPersonProvider(table, new PersonStore())
                 )
                 .asModule();
     }
diff --git a/example/main-java/src/main/java/org/finos/vuu/person/Person.java b/example/main-java/src/main/java/org/finos/vuu/person/Person.java
@@ -1,14 +1,5 @@
 package org.finos.vuu.person;
 
-public class Person {
+public record Person(String id, String name, Integer accountNumber) {
 
-    public String Id;
-    public String Name;
-    public Integer AccountNumber;
-
-    public Person(String id, String name, Integer accountNumber) {
-        Id = id;
-        Name = name;
-        AccountNumber = accountNumber;
-    }
 }
diff --git a/example/main-java/src/main/java/org/finos/vuu/person/PersonRpcHandler.java b/example/main-java/src/main/java/org/finos/vuu/person/PersonRpcHandler.java
@@ -2,7 +2,10 @@
 
 import org.finos.vuu.core.table.DataTable;
 import org.finos.vuu.core.table.TableContainer;
-import org.finos.vuu.net.rpc.*;
+import org.finos.vuu.net.rpc.DefaultRpcHandler;
+import org.finos.vuu.net.rpc.RpcFunctionResult;
+import org.finos.vuu.net.rpc.RpcFunctionSuccess;
+import org.finos.vuu.net.rpc.RpcParams;
 
 public class PersonRpcHandler extends DefaultRpcHandler {
     private final DataTable table;
@@ -17,7 +20,7 @@ public PersonRpcHandler(DataTable table, TableContainer tableContainer) {
 
     public RpcFunctionResult processUpdateNameRpcRequest(RpcParams params) {
         var paramData = params.namedParams();
-        updateName(paramData.get("Id").get().toString(), paramData.get("Name").get().toString());
+        updateName(paramData.get("id").get().toString(), paramData.get("name").get().toString());
         return new RpcFunctionSuccess();
     }
 
@@ -36,7 +39,7 @@ public String[] updateName(String id, String newName) {
 
     public int getAccountId(String rowKey) {
         var rowData = this.table.pullRow(rowKey);
-        var accountNumber = (int) rowData.get("Account");
+        var accountNumber = (int) rowData.get("account");
         return accountNumber;
     }
 }
diff --git a/example/main-java/src/main/java/org/finos/vuu/person/auto/AutoMappedPersonProvider.java b/example/main-java/src/main/java/org/finos/vuu/person/auto/AutoMappedPersonProvider.java
@@ -1,6 +1,5 @@
 package org.finos.vuu.person.auto;
 
-import org.finos.toolbox.time.Clock;
 import org.finos.vuu.core.table.DataTable;
 import org.finos.vuu.core.table.RowWithData;
 import org.finos.vuu.person.Person;
@@ -19,27 +18,20 @@ public class AutoMappedPersonProvider implements Provider {
 
     private final DataTable table;
     private final PersonStore personStore;
-    private final Clock clock;
     private final SchemaMapper schemaMapper;
 
-    public AutoMappedPersonProvider(final DataTable table, PersonStore personStore, Clock clock) {
+    public AutoMappedPersonProvider(DataTable table, PersonStore personStore) {
         this.table = table;
         this.personStore = personStore;
-        this.clock = clock;
-
-        schemaMapper = CreateSchemaMapper(table);
-    }
-
-    private static SchemaMapper CreateSchemaMapper(DataTable table) {
-        return SchemaMapperBuilder.apply(EntitySchema.person, table.getTableDef().getColumns())
+        this.schemaMapper = SchemaMapperBuilder.apply(EntitySchema.person, table.getTableDef().getColumns())
                 .build();
     }
 
     @Override
     public void doStart() {
-        for (Person person : personStore.GetAll()) {
+        for (Person person : personStore.getAll()) {
             var rowMap = schemaMapper.toInternalRowMap(
-                    toScala(List.of(person.Id, person.Name, person.AccountNumber))
+                    toScala(List.of(person.id(), person.name(), person.accountNumber()))
             );
             var row = new RowWithData(getKeyValue(rowMap), rowMap);
             table.processUpdate(row.key(), row);
diff --git a/example/main-java/src/main/java/org/finos/vuu/person/auto/EntitySchema.java b/example/main-java/src/main/java/org/finos/vuu/person/auto/EntitySchema.java
@@ -12,6 +12,6 @@ public class EntitySchema {
 
     public static ExternalEntitySchema person = ExternalEntitySchemaBuilder.apply()
             .withEntity(Person.class)
-            .withIndex("ID_INDEX", toScala(List.of("Id")))
+            .withIndex("ID_INDEX", toScala(List.of("id")))
             .build();
 }
diff --git a/example/main-java/src/main/java/org/finos/vuu/person/datasource/PersonStore.java b/example/main-java/src/main/java/org/finos/vuu/person/datasource/PersonStore.java
@@ -4,7 +4,7 @@
 
 public class PersonStore {
 
-    public Person[] GetAll() {
+    public Person[] getAll() {
         return new Person[] {
                 new Person("uniqueId1", "Adam", 56440),
                 new Person("uniqueId2", "Natalie", 41687)
diff --git a/example/main-java/src/main/java/org/finos/vuu/person/manual/PersonProvider.java b/example/main-java/src/main/java/org/finos/vuu/person/manual/PersonProvider.java
@@ -1,29 +1,32 @@
 package org.finos.vuu.person.manual;
 
 import org.finos.vuu.core.table.DataTable;
-import org.finos.vuu.core.table.RowWithData;
 import org.finos.vuu.person.Person;
 import org.finos.vuu.person.datasource.PersonStore;
 import org.finos.vuu.provider.Provider;
 
-import java.util.Map;
-
 public class PersonProvider implements Provider {
 
     private final DataTable table;
     private final PersonStore personStore;
 
-    public PersonProvider(final DataTable table, PersonStore personStore){
+    public PersonProvider(DataTable table, PersonStore personStore){
         this.table = table;
         this.personStore = personStore;
     }
 
     @Override
     public void doStart() {
-
-        for (Person person : personStore.GetAll()) {
-            var row = new RowWithData(person.Id, Map.of( "Id", person.Id, "Name", person.Name, "Account", person.AccountNumber));
-            table.processUpdate(person.Id, row);
+        var rowBuilder = table.rowBuilder();
+        var idColumn = table.columnForName("id");
+        var nameColumn = table.columnForName("name");
+        var accountColumn = table.columnForName("account");
+        for (Person person : personStore.getAll()) {
+            rowBuilder.setKey(person.id());
+            rowBuilder.setString(idColumn, person.id());
+            rowBuilder.setString(nameColumn, person.name());
+            rowBuilder.setInt(accountColumn, person.accountNumber());
+            table.processUpdate(rowBuilder.build());
         }
     }
 
diff --git a/example/main-java/src/main/java/org/finos/vuu/person/manual/TestParam.java b/example/main-java/src/main/java/org/finos/vuu/person/manual/TestParam.java
diff --git a/example/main-java/src/test/java/org/finos/vuu/JavaTestExample.java b/example/main-java/src/test/java/org/finos/vuu/JavaTestExample.java
diff --git a/example/main-java/src/test/java/org/finos/vuu/PersonRpcHandlerWSApiTest.java b/example/main-java/src/test/java/org/finos/vuu/PersonRpcHandlerWSApiTest.java
@@ -31,7 +31,7 @@
 public class PersonRpcHandlerWSApiTest extends WebSocketApiJavaTestBase {
 
     private final String tableName = "PersonManualMapped";
-    private final String[] columnNames = new String[]{"Id", "Name", "Account"};
+    private final String[] columnNames = new String[]{"id", "name", "account"};
     private final String moduleName = JavaExampleModule.NAME;
 
     @Test
@@ -45,7 +45,7 @@ public void type_ahead_request_for_a_column() {
                 toScala(Map.of(
                         "table", tableName,
                         "module", moduleName,
-                        "column", "Name"
+                        "column", "name"
                 ))
         );
 
@@ -96,8 +96,8 @@ public void custom_rpc_request_updateName() {
                 new ViewPortContext(viewPortId),
                 "UpdateName",
                 toScala(Map.of(
-                        "Id", "uniqueId1",
-                        "Name", "Chris"
+                        "id", "uniqueId1",
+                        "name", "Chris"
                 ))
         );
 
diff --git a/vuu/src/main/scala/org/finos/vuu/core/row/InMemMapRowBuilder.scala b/vuu/src/main/scala/org/finos/vuu/core/row/InMemMapRowBuilder.scala
@@ -1,12 +1,15 @@
 package org.finos.vuu.core.row
+
+import org.finos.vuu.core.table.datatype.EpochTimestamp
 import org.finos.vuu.core.table.{Column, RowData, RowWithData}
 
 import scala.collection.mutable
 
 class InMemMapRowBuilder extends RowBuilder {
 
   private val mutableMap = new mutable.HashMap[String, Any]()
-  private var key: String = null
+  private var key: String = _
+
   override def setLong(column: Column, v: Long): RowBuilder = {
     mutableMap.put(column.name, v)
     this
@@ -31,11 +34,23 @@ class InMemMapRowBuilder extends RowBuilder {
     mutableMap.put(column.name, v)
     this
   }
+
+  override def setEpochTimestamp(column: Column, v: EpochTimestamp): RowBuilder = {
+    mutableMap.put(column.name, v)
+    this
+  }
+
+  override def setChar(column: Column, v: Char): RowBuilder = {
+    mutableMap.put(column.name, v)
+    this
+  }
+  
   override def setKey(key: String): RowBuilder = {
     this.key = key
     this
   }
-  override def asRow: RowData = {
+
+  override def build: RowData = {
     if(key == null){
       throw new RuntimeException("Key has not been set, this is likely a coding error.")
     }
diff --git a/vuu/src/main/scala/org/finos/vuu/core/row/RowBuilder.scala b/vuu/src/main/scala/org/finos/vuu/core/row/RowBuilder.scala
diff --git a/vuu/src/main/scala/org/finos/vuu/core/table/InMemDataTable.scala b/vuu/src/main/scala/org/finos/vuu/core/table/InMemDataTable.scala
diff --git a/vuu/src/test/scala/org/finos/vuu/core/row/RowBuilderTest.scala b/vuu/src/test/scala/org/finos/vuu/core/row/RowBuilderTest.scala
diff --git a/vuu/src/test/scala/org/finos/vuu/core/table/JavaToScalaRowUpdates.scala b/vuu/src/test/scala/org/finos/vuu/core/table/JavaToScalaRowUpdates.scala

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ class BasketConstituentProvider(val table: DataTable)(implicit lifecycle: Lifecy`
`60`	`60`	`.setString(volumeCol, Option(volume).getOrElse("").toString)`
`61`	`61`	`.setString(descCol, name.toString)`
`62`	`62`	`.setString(sideCol, side)`
`63`		`- .asRow`
	`63`	`+ .build`
`64`	`64`
`65`	`65`	`table.processUpdate(rowData)`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class BasketProvider(val table: DataTable)(implicit lifecycle: LifecycleContaine`
`28`	`28`	`.setString(idColumn, id)`
`29`	`29`	`.setString(nameColumn, id)`
`30`	`30`	`//as row clears out the data from the builder`
`31`		`- .asRow)`
	`31`	`+ .build)`
`32`	`32`	`})`
`33`	`33`	`}`
`34`	`34`	`override val lifecycleId: String = "org.finos.vuu.core.module.basket.provider.BasketProvider"`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@ public class EntitySchema {`
`12`	`12`
`13`	`13`	`public static ExternalEntitySchema person = ExternalEntitySchemaBuilder.apply()`
`14`	`14`	`.withEntity(Person.class)`
`15`		`- .withIndex("ID_INDEX", toScala(List.of("Id")))`
	`15`	`+ .withIndex("ID_INDEX", toScala(List.of("id")))`
`16`	`16`	`.build();`
`17`	`17`	`}`