add forked wf id as param and remove restart

Author: manojdbos

src/main/java/dev/dbos/transact/DBOS.java

@@ -371,38 +371,42 @@ public void cancelWorkflow(String workflowId) {
      * step are copied over
      *
      * @param workflowId Original workflow Id
+     * @param forkedWorkflowId Id of the new workflow
      * @param startStep Start execution from this step. Prior steps copied over
      * @param applicationVersion The version of the application to run
      * @return handle to the workflow
      */
-    public WorkflowHandle<?> forkWorkflow(String workflowId, int startStep, String applicationVersion) {
-        return this.dbosExecutor.forkWorkflow(workflowId, startStep, applicationVersion) ;
+    public WorkflowHandle<?> forkWorkflow(String workflowId, String forkedWorkflowId, int startStep, String applicationVersion) {
+        return this.dbosExecutor.forkWorkflow(workflowId, forkedWorkflowId, startStep, applicationVersion) ;
     }
 
     /**
-     *
      * Fork the workflow. Re-execute with another Id from the step provided. Steps prior to the provided
      * step are copied over
      *
      * @param workflowId Original workflow Id
      * @param startStep Start execution from this step. Prior steps copied over
+     * @param applicationVersion The version of the application to run
      * @return handle to the workflow
      */
-
-    public WorkflowHandle<?> forkWorkflow(String workflowId, int startStep) {
-        return this.dbosExecutor.forkWorkflow(workflowId, startStep, null) ;
+    public WorkflowHandle<?> forkWorkflow(String workflowId, int startStep, String applicationVersion) {
+        return this.dbosExecutor.forkWorkflow(workflowId, null, startStep, applicationVersion) ;
     }
 
     /**
-     * Rerun this workflow from the start with another generated workflow Id
      *
-     * @param workflowId Original workflow id
+     * Fork the workflow. Re-execute with another Id from the step provided. Steps prior to the provided
+     * step are copied over
+     *
+     * @param workflowId Original workflow Id
+     * @param startStep Start execution from this step. Prior steps copied over
      * @return handle to the workflow
      */
 
-    public WorkflowHandle<?> restartWorkflow(String workflowId) {
-        return this.dbosExecutor.forkWorkflow(workflowId, 0, null) ;
+    public WorkflowHandle<?> forkWorkflow(String workflowId, int startStep) {
+        return this.dbosExecutor.forkWorkflow(workflowId, null, startStep, null) ;
     }
 
+
 }
 

src/main/java/dev/dbos/transact/execution/DBOSExecutor.java

@@ -513,19 +513,22 @@ public void cancelWorkflow(String workflowId)  {
 
     }
 
-    public WorkflowHandle<?> forkWorkflow(String workflowId, int startStep, String applicationVersion) {
+    public WorkflowHandle<?> forkWorkflow(String workflowId, String forkedWorkflowId, int startStep, String applicationVersion) {
+
+        if (forkedWorkflowId == null) {
+            forkedWorkflowId = UUID.randomUUID().toString();
+        }
+
+        final String newId = forkedWorkflowId ;
 
-        String newId = UUID.randomUUID().toString();
         Supplier<String> forkFunction = () -> {
             logger.info(String.format("Forking workflow:%s from step:%d ", workflowId, startStep));
 
             return systemDatabase.forkWorkflow(workflowId, newId, startStep, applicationVersion);
         };
 
-        String forkedWorkflowId = systemDatabase.callFunctionAsStep(forkFunction, "DBOS.forkedWorkflow");
-
-        return retrieveWorkflow(forkedWorkflowId);
-
+        systemDatabase.callFunctionAsStep(forkFunction, "DBOS.forkedWorkflow");
+        return retrieveWorkflow(newId);
     }
 
 }

src/test/java/dev/dbos/transact/workflow/WorkflowMgmtTest.java

@@ -250,44 +250,13 @@ public void syncCancelResumeTest() throws Exception {
 
     }
 
-    @Test
-    public void testRestart() {
-
-        ForkService forkService = dbos.<ForkService>Workflow()
-                .interfaceClass(ForkService.class)
-                .implementation(new ForkServiceImpl())
-                .build();
-        forkService.setForkService(forkService);
-
-        String workflowId = "wfid1" ;
-        DBOSOptions options = new DBOSOptions.Builder(workflowId).build();
-        String result ;
-        try (SetDBOSOptions o = new SetDBOSOptions(options)) {
-            result = forkService.simpleWorkflow("hello");
-        }
-
-        assertEquals("hellohello", result);
-        WorkflowHandle<?> handle = dbosExecutor.retrieveWorkflow(workflowId);
-        assertEquals(WorkflowState.SUCCESS.name(), handle.getStatus().getStatus());
-
-        WorkflowHandle<?> rstatHandle = dbos.restartWorkflow(workflowId);
-        result = (String) rstatHandle.getResult() ;
-        assertEquals("hellohello", result);
-
-        assertEquals(WorkflowState.SUCCESS.name(), rstatHandle.getStatus().getStatus());
-        assertTrue(rstatHandle.getWorkflowId() != workflowId);
 
-        List<StepInfo> steps = systemDatabase.listWorkflowSteps(rstatHandle.getWorkflowId()) ;
-        assertEquals(5, steps.size()) ;
-
-
-    }
 
     @Test
-    public void restartNonExistent() {
+    public void forkNonExistent() {
 
         try {
-            WorkflowHandle<?> rstatHandle = dbos.restartWorkflow("12345");
+            WorkflowHandle<?> rstatHandle = dbos.forkWorkflow("12345", 2);
             fail("An exceptions should have been thrown");
         } catch (Throwable t) {
             logger.info(t.getClass().getName()) ;