#2231 move common code to vuu

benchmark/src/main/java/org/finos/vuu/benchmark/TableDefs.java

@@ -5,9 +5,9 @@
 import org.finos.vuu.api.TableDef;
 import org.finos.vuu.core.table.Column;
 import org.finos.vuu.core.table.Columns;
-import org.finos.vuu.util.JoinTableDefBuilder;
-import org.finos.vuu.util.JoinToBuilder;
-import org.finos.vuu.util.TableDefBuilder;
+import org.finos.vuu.api.JoinTableDefBuilder;
+import org.finos.vuu.api.JoinToBuilder;
+import org.finos.vuu.api.TableDefBuilder;
 
 import java.util.List;
 import java.util.stream.Stream;

example/basket/src/main/scala/org/finos/vuu/core/module/basket/service/BasketTradingConstituentJoinService.scala

@@ -7,8 +7,9 @@ import org.finos.vuu.core.module.basket.BasketModule
 import org.finos.vuu.core.module.basket.BasketModule.{BasketConstituentColumnNames as BCColumnName, BasketTradingColumnNames as BTColumnName, BasketTradingConstituentColumnNames as ColumnName}
 import org.finos.vuu.core.module.basket.result.ErrorReason
 import org.finos.vuu.core.table.*
-import org.finos.vuu.net.rpc.{DefaultRpcHandler, EditTableRpcHandler, RpcFunctionFailure, RpcFunctionResult, RpcFunctionSuccess, RpcParams}
+import org.finos.vuu.net.rpc.{DefaultRpcHandler, RpcFunctionFailure, RpcFunctionResult, RpcFunctionSuccess, RpcParams}
 import org.finos.vuu.net.ClientSessionId
+import org.finos.vuu.net.rpc.sessiontable.EditTableRpcHandler
 import org.finos.vuu.viewport.*
 
 import scala.util.control.NonFatal

example/basket/src/main/scala/org/finos/vuu/core/module/basket/service/BasketTradingConstituentService.scala

@@ -5,6 +5,7 @@ import org.finos.vuu.core.module.basket.BasketModule.BasketTradingConstituentCol
 import org.finos.vuu.core.table.RowWithData
 import org.finos.vuu.net.ClientSessionId
 import org.finos.vuu.net.rpc.*
+import org.finos.vuu.net.rpc.sessiontable.EditTableRpcHandler
 import org.finos.vuu.viewport.*
 
 class BasketTradingConstituentService extends EditTableRpcHandler with DefaultRpcHandler with StrictLogging {

example/basket/src/main/scala/org/finos/vuu/core/module/basket/service/BasketTradingService.scala

@@ -5,7 +5,8 @@ import org.finos.vuu.core.module.basket.BasketConstants.Side
 import org.finos.vuu.core.module.basket.BasketModule
 import org.finos.vuu.core.module.basket.BasketModule.BasketTradingConstituentTable
 import org.finos.vuu.core.table.*
-import org.finos.vuu.net.rpc.{DefaultRpcHandler, EditTableRpcHandler, RpcFunctionResult, RpcFunctionSuccess, RpcParams}
+import org.finos.vuu.net.rpc.sessiontable.EditTableRpcHandler
+import org.finos.vuu.net.rpc.{DefaultRpcHandler, RpcFunctionResult, RpcFunctionSuccess, RpcParams}
 import org.finos.vuu.order.oms.{CancelOrder, NewOrder, OmsApi}
 
 trait BasketTradingServiceIF {

example/basket/src/test/scala/org/finos/vuu/core/module/basket/BasketCreateTest.scala

@@ -3,7 +3,7 @@ package org.finos.vuu.core.module.basket
 import org.finos.toolbox.jmx.{MetricsProvider, MetricsProviderImpl}
 import org.finos.toolbox.lifecycle.LifecycleContainer
 import org.finos.toolbox.time.{Clock, TestFriendlyClock}
-import org.finos.vuu.api.ViewPortDef
+import org.finos.vuu.api.{ViewPortDef}
 import org.finos.vuu.core.module.TableDefContainer
 import org.finos.vuu.core.module.basket.BasketModule.{BasketColumnNames as B, BasketConstituentColumnNames as BC}
 import org.finos.vuu.core.module.price.PriceModule
@@ -34,7 +34,7 @@ class BasketCreateTest extends VuuServerTestCase {
           vuuServer.login("testUser")
           val basketId = ".FTSE"
 
-          vuuServer.overrideViewPortDef("prices", (table, _, _, _) => ViewPortDef(table.getTableDef.getColumns, null))
+          vuuServer.overrideViewPortDef("prices", ViewPortDef.defaultViewPortDefFunc)
 
           val pricesProvider = vuuServer.getProvider(PriceModule.NAME, PriceModule.PriceTable)
           val basketProvider = vuuServer.getProvider(BasketModule.NAME, BasketModule.BasketTable)

example/editable/src/main/scala/org/finos/vuu/core/module/editable/FixSequenceRpcService.scala

@@ -2,6 +2,7 @@ package org.finos.vuu.core.module.editable
 
 import org.finos.vuu.core.table.RowWithData
 import org.finos.vuu.net.rpc.*
+import org.finos.vuu.net.rpc.sessiontable.EditTableRpcHandler
 
 class FixSequenceRpcService extends EditTableRpcHandler with DefaultRpcHandler {
 

example/editable/src/test/scala/org/finos/vuu/core/module/editable/EditableTestModule.scala

@@ -8,7 +8,8 @@ import org.finos.vuu.core.module.ModuleFactory.stringToString
 import org.finos.vuu.core.module.{ModuleFactory, TableDefContainer, ViewServerModule}
 import org.finos.vuu.core.table.{Columns, RowWithData}
 import org.finos.vuu.net.ClientSessionId
-import org.finos.vuu.net.rpc.{EditTableRpcHandler, RpcFunctionResult, RpcFunctionSuccess, RpcParams}
+import org.finos.vuu.net.rpc.sessiontable.EditTableRpcHandler
+import org.finos.vuu.net.rpc.{RpcFunctionResult, RpcFunctionSuccess, RpcParams}
 import org.finos.vuu.viewport.ViewPort
 
 class EditTableTestService(val originalData: Map[String, Any]) extends EditTableRpcHandler with StrictLogging {

example/main-java/src/main/java/org/finos/vuu/module/JavaExampleModule.java

@@ -12,20 +12,22 @@
 import org.finos.vuu.core.table.DefaultColumn;
 import org.finos.vuu.core.table.TableContainer;
 import org.finos.vuu.net.rpc.AllowAllRpcPermissionChecker$;
+import org.finos.vuu.net.rpc.DefaultRpcHandlerImpl;
 import org.finos.vuu.net.rpc.RpcHandler;
-import org.finos.vuu.person.DeleteRecordRpcHandler;
-import org.finos.vuu.person.DeleteRecordRpcHandlerIF;
-import org.finos.vuu.person.EditPersonRecordRpcHandler;
-import org.finos.vuu.person.PersonRpcHandler;
-import org.finos.vuu.person.UpdateRecordRpcHandler;
+import org.finos.vuu.person.rpc.DeleteRecordRpcHandler;
+import org.finos.vuu.person.rpc.DeleteRecordRpcHandlerIF;
+import org.finos.vuu.person.rpc.EditPersonRecordRpcHandler;
+import org.finos.vuu.person.rpc.EditRecordRpcHandler;
+import org.finos.vuu.person.rpc.ImportRecordRpcHandler;
+import org.finos.vuu.person.rpc.PersonRpcHandler;
 import org.finos.vuu.person.auto.AutoMappedPersonProvider;
 import org.finos.vuu.person.auto.EntitySchema;
 import org.finos.vuu.person.datasource.PersonStore;
 import org.finos.vuu.person.manual.PersonProvider;
-import org.finos.vuu.util.RpcHandlerBuilder;
-import org.finos.vuu.util.SessionTableDefBuilder;
-import org.finos.vuu.util.SortSpecBuilder;
-import org.finos.vuu.util.TableDefBuilder;
+import org.finos.vuu.net.rpc.RpcHandlerBuilder;
+import org.finos.vuu.api.SessionTableDefBuilder;
+import org.finos.vuu.net.SortSpecBuilder;
+import org.finos.vuu.api.TableDefBuilder;
 
 public class JavaExampleModule extends DefaultModule {
 
@@ -49,7 +51,7 @@ public ViewServerModule create(final TableDefContainer tableDefContainer, Clock
                         (table, vs) -> new PersonProvider(table, new PersonStore()),
                         (table, provider, providerContainer, tableContainer) -> new ViewPortDef(
                                 table.getTableDef().getColumns(),
-                                buildRpcHandler2(table, tableContainer)
+                                buildRpcHandler2(table)
                         )
                 )
                 .addTable(new TableDefBuilder()
@@ -70,6 +72,30 @@ public ViewServerModule create(final TableDefContainer tableDefContainer, Clock
                                 buildRpcHandler3(tableContainer)
                         )
                 )
+                .addTable(new TableDefBuilder()
+                                .name("edit-PersonManualMapped")
+                                .keyField("id")
+                                .customColumns(new ColumnBuilder().addString("id").addString("name")
+                                        .addInt("account").build())
+                                .build(),
+                        (table, vs) -> new PersonProvider(table, new PersonStore()),
+                        (table, p, pc, tableContainer) -> new ViewPortDef(
+                                table.getTableDef().getColumns(),
+                                buildEditRpcHandler(tableContainer)
+                        )
+                )
+                .addTable(new TableDefBuilder()
+                                .name("import-PersonManualMapped")
+                                .keyField("id")
+                                .customColumns(new ColumnBuilder().addString("id").addString("name")
+                                        .addInt("account").build())
+                                .build(),
+                        (table, vs) -> new PersonProvider(table, new PersonStore()),
+                        (table, p, pc, tableContainer) -> new ViewPortDef(
+                                table.getTableDef().getColumns(),
+                                buildImportRpcHandler(tableContainer)
+                        )
+                )
                 .addSessionTable(new SessionTableDefBuilder()
                                 .name("export-PersonManualMapped2")
                                 .keyField("Id")
@@ -106,17 +132,25 @@ private RpcHandler buildRpcHandler(DataTable table) {
     }
 
     // Example of a mixture of RPC handlers in scala and in java
-    private RpcHandler buildRpcHandler2(DataTable table, TableContainer tableContainer) {
+    private RpcHandler buildRpcHandler2(DataTable table) {
+        RpcHandler defaultHandler = new DefaultRpcHandlerImpl();
         PersonRpcHandler personRpcHandler = new PersonRpcHandler(table);
         DeleteRecordRpcHandlerIF deleteRecordRpcHandler = new DeleteRecordRpcHandler();
-        UpdateRecordRpcHandler updateRecordRpcHandler = new UpdateRecordRpcHandler(tableContainer);
-        updateRecordRpcHandler.registerRpc("UpdateName", personRpcHandler::processUpdateNameRpcRequest);
-        updateRecordRpcHandler.registerRpc("GetAccountId", personRpcHandler::processGetAccountIdRpcRequest);
-        updateRecordRpcHandler.registerRpc("DeleteRecprd", deleteRecordRpcHandler::deleteRecord);
-        return updateRecordRpcHandler;
+        defaultHandler.registerRpc("UpdateName", personRpcHandler::processUpdateNameRpcRequest);
+        defaultHandler.registerRpc("GetAccountId", personRpcHandler::processGetAccountIdRpcRequest);
+        defaultHandler.registerRpc("DeleteRecprd", deleteRecordRpcHandler::deleteRecord);
+        return defaultHandler;
     }
 
     private RpcHandler buildRpcHandler3(TableContainer tableContainer) {
         return new EditPersonRecordRpcHandler(AllowAllRpcPermissionChecker$.MODULE$, tableContainer);
     }
+
+    private RpcHandler buildEditRpcHandler(TableContainer tableContainer) {
+        return new EditRecordRpcHandler(tableContainer);
+    }
+
+    private RpcHandler buildImportRpcHandler(TableContainer tableContainer) {
+        return new ImportRecordRpcHandler(tableContainer);
+    }
 }

example/main-java/src/main/java/org/finos/vuu/person/DeleteRecordRpcHandler.java → example/main-java/src/main/java/org/finos/vuu/person/rpc/DeleteRecordRpcHandler.java

@@ -1,4 +1,4 @@
-package org.finos.vuu.person;
+package org.finos.vuu.person.rpc;
 
 import org.finos.vuu.net.rpc.RpcFunctionResult;
 import org.finos.vuu.net.rpc.RpcFunctionSuccess;

example/main-java/src/main/java/org/finos/vuu/person/DeleteRecordRpcHandlerIF.java → example/main-java/src/main/java/org/finos/vuu/person/rpc/DeleteRecordRpcHandlerIF.java

@@ -1,4 +1,4 @@
-package org.finos.vuu.person;
+package org.finos.vuu.person.rpc;
 
 import org.finos.vuu.net.rpc.RpcFunctionResult;
 import org.finos.vuu.net.rpc.RpcFunctionSuccess;

example/main-java/src/main/java/org/finos/vuu/person/rpc/EditPersonRecordRpcHandler.java

@@ -0,0 +1,29 @@
+package org.finos.vuu.person.rpc;
+
+import org.finos.vuu.core.table.TableContainer;
+import org.finos.vuu.net.rpc.DefaultRpcHandlerImpl;
+import org.finos.vuu.net.rpc.sessiontable.CreateSessionTableRpcHandler;
+import org.finos.vuu.net.rpc.RpcPermissionChecker;
+
+public class EditPersonRecordRpcHandler extends DefaultRpcHandlerImpl implements CreateSessionTableRpcHandler {
+
+    private final RpcPermissionChecker rpcPermissionChecker;
+    private final TableContainer tableContainer;
+
+    public EditPersonRecordRpcHandler(RpcPermissionChecker rpcPermissionChecker, TableContainer tableContainer) {
+        super();
+        registerCreateSessionTableRpcs();
+        this.rpcPermissionChecker = rpcPermissionChecker;
+        this.tableContainer = tableContainer;
+    }
+
+    @Override
+    public RpcPermissionChecker rpcPermissionChecker() {
+        return rpcPermissionChecker;
+    }
+
+    @Override
+    public TableContainer tableContainer() {
+        return tableContainer;
+    }
+}

example/main-java/src/main/java/org/finos/vuu/person/rpc/EditRecordRpcHandler.java

@@ -0,0 +1,38 @@
+package org.finos.vuu.person.rpc;
+
+import org.finos.vuu.core.table.TableContainer;
+import org.finos.vuu.net.rpc.DefaultRpcHandlerImpl;
+import org.finos.vuu.net.rpc.RpcParams;
+import org.finos.vuu.net.rpc.sessiontable.EditSessionRpcHandler;
+import org.finos.vuu.net.rpc.sessiontable.EndSessionRpcHandler;
+
+// An example of Java implementation of EditSessionRpcHandler and EndSessionRpcHandler
+public class EditRecordRpcHandler extends DefaultRpcHandlerImpl implements EditSessionRpcHandler, EndSessionRpcHandler {
+    private final TableContainer tableContainer;
+
+    public EditRecordRpcHandler(TableContainer tableContainer) {
+        this.tableContainer = tableContainer;
+        registerEditTableRpcs();
+        registerEndEditSessionRpcs();
+    }
+
+    @Override
+    public TableContainer tableContainer() {
+        return tableContainer;
+    }
+
+    @Override
+    public boolean verifyPermission(RpcParams params) {
+        return true;
+    }
+
+    @Override
+    public boolean validateData(RpcParams params) {
+        return true;
+    }
+
+    @Override
+    public boolean submit(RpcParams params) {
+        return true;
+    }
+}