No More Class Copies

virtualcell · Aug 28, 2024 · 5e9efab · 5e9efab
1 parent 1c88e93
commit 5e9efab
Show file tree

Hide file tree

Showing 7 changed files with 717 additions and 1,539 deletions.
diff --git a/vcell-rest/src/main/java/org/vcell/restq/Simulations/SimulationRestDB.java b/vcell-rest/src/main/java/org/vcell/restq/Simulations/SimulationRestDB.java
@@ -7,7 +7,7 @@
 import jakarta.enterprise.context.ApplicationScoped;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import cbit.vcell.message.server.dispatcher.SimulationDispatcherEngineCopy;
+import cbit.vcell.message.server.dispatcher.SimulationDispatcherEngine;
 import org.vcell.restq.Simulations.DTO.SimulationStatus;
 import org.vcell.restq.Simulations.DTO.StatusMessage;
 import org.vcell.restq.db.AgroalConnectionFactory;
@@ -31,13 +31,13 @@ public class SimulationRestDB {
 
     private final DatabaseServerImpl databaseServerImpl;
     private final SimulationDatabaseDirect simulationDatabaseDirect;
-    private final SimulationDispatcherEngineCopy simulationDispatcherEngine;
+    private final SimulationDispatcherEngine simulationDispatcherEngine;
     private final BioModelRestDB bioModelRestDB;
 
     public SimulationRestDB(AgroalConnectionFactory agroalConnectionFactory) throws DataAccessException, SQLException {
         databaseServerImpl = new DatabaseServerImpl(agroalConnectionFactory, agroalConnectionFactory.getKeyFactory());
         simulationDatabaseDirect = new SimulationDatabaseDirect(new AdminDBTopLevel(agroalConnectionFactory), databaseServerImpl, true);
-        simulationDispatcherEngine = new SimulationDispatcherEngineCopy();
+        simulationDispatcherEngine = new SimulationDispatcherEngine();
         bioModelRestDB = new BioModelRestDB(this, databaseServerImpl);
     }
 

diff --git a/vcell-rest/src/test/java/org/vcell/restq/apiclient/SimulationApiTest.java b/vcell-rest/src/test/java/org/vcell/restq/apiclient/SimulationApiTest.java
@@ -26,7 +26,7 @@
 import org.vcell.restclient.api.SimulationResourceApi;
 import org.vcell.restclient.model.SchedulerStatus;
 import org.vcell.restclient.model.Status;
-import cbit.vcell.message.server.dispatcher.SimulationDispatcherEngineCopy;
+import cbit.vcell.message.server.dispatcher.SimulationDispatcherEngine;
 import org.vcell.restq.Simulations.DTO.SimulationStatus;
 import org.vcell.restq.Simulations.DTO.StatusMessage;
 import org.vcell.restq.TestEndpointUtils;
@@ -188,7 +188,7 @@ public void testDifferentSimulationStates() throws Exception{
         SimulationJob simulationJob = new SimulationJob(simulation, 0, null);
         SimulationTask simulationTask = new SimulationTask(simulationJob, 0);
         WorkerEvent workerEvent = new WorkerEvent(WorkerEvent.JOB_ACCEPTED, "testService", simulationTask, "testHost", SimulationMessage.MESSAGE_JOB_ACCEPTED);
-        SimulationDispatcherEngineCopy simulationDispatcherEngine = new SimulationDispatcherEngineCopy();
+        SimulationDispatcherEngine simulationDispatcherEngine = new SimulationDispatcherEngine();
 
         simulationDispatcherEngine.onWorkerEvent(workerEvent, simulationDatabaseDirect, null);
 

diff --git a/...server/src/main/java/cbit/vcell/message/server/dispatcher/SimulationDispatcherEngine.java b/...server/src/main/java/cbit/vcell/message/server/dispatcher/SimulationDispatcherEngine.java
diff --git a/...er/src/main/java/cbit/vcell/message/server/dispatcher/SimulationDispatcherEngineCopy.java b/...er/src/main/java/cbit/vcell/message/server/dispatcher/SimulationDispatcherEngineCopy.java