Improve support for MI handling for process migration

flowable · Nov 13, 2023 · b59a1f1 · b59a1f1
1 parent bd17ae7
commit b59a1f1
Show file tree

Hide file tree

Showing 12 changed files with 1,069 additions and 36 deletions.
diff --git a/...le-engine/src/main/java/org/flowable/engine/impl/dynamic/AbstractDynamicStateManager.java b/...le-engine/src/main/java/org/flowable/engine/impl/dynamic/AbstractDynamicStateManager.java
diff --git a/...e-engine/src/main/java/org/flowable/engine/impl/dynamic/MoveExecutionEntityContainer.java b/...e-engine/src/main/java/org/flowable/engine/impl/dynamic/MoveExecutionEntityContainer.java
@@ -43,6 +43,7 @@ public class MoveExecutionEntityContainer {
     protected String newOwnerId;
     protected Map<String, ExecutionEntity> continueParentExecutionMap = new HashMap<>();
     protected Map<String, FlowElementMoveEntry> moveToFlowElementMap = new LinkedHashMap<>();
+    protected Map<String, Map<String, Object>> flowElementLocalVariableMap = new HashMap<>();
     protected List<String> newExecutionIds = new ArrayList<>();
 
     public MoveExecutionEntityContainer(List<ExecutionEntity> executions, List<String> moveToActivityIds) {
@@ -206,6 +207,18 @@ public void addNewExecutionId(String executionId) {
         this.newExecutionIds.add(executionId);
     }
 
+    public Map<String, Map<String, Object>> getFlowElementLocalVariableMap() {
+        return flowElementLocalVariableMap;
+    }
+
+    public void setFlowElementLocalVariableMap(Map<String, Map<String, Object>> flowElementLocalVariableMap) {
+        this.flowElementLocalVariableMap = flowElementLocalVariableMap;
+    }
+
+    public void addLocalVariableMap(String activityId, Map<String, Object> localVariables) {
+        this.flowElementLocalVariableMap.put(activityId, localVariables);
+    }
+
     public static class FlowElementMoveEntry {
 
         protected FlowElement originalFlowElement;

diff --git a/...ble-engine/src/main/java/org/flowable/engine/impl/dynamic/ProcessInstanceChangeState.java b/...ble-engine/src/main/java/org/flowable/engine/impl/dynamic/ProcessInstanceChangeState.java
@@ -34,6 +34,7 @@ public class ProcessInstanceChangeState {
     protected Map<String, List<ExecutionEntity>> processInstanceActiveEmbeddedExecutions;
     protected List<MoveExecutionEntityContainer> moveExecutionEntityContainers;
     protected HashMap<String, ExecutionEntity> createdEmbeddedSubProcess = new HashMap<>();
+    protected HashMap<String, ExecutionEntity> createdMultiInstanceRootExecution = new HashMap<>();
     protected HashMap<StartEvent, ExecutionEntity> pendingEventSubProcessesStartEvents = new HashMap<>();
 
     public ProcessInstanceChangeState() {
@@ -100,6 +101,18 @@ public void addCreatedEmbeddedSubProcess(String key, ExecutionEntity executionEn
         this.createdEmbeddedSubProcess.put(key, executionEntity);
     }
 
+    public HashMap<String, ExecutionEntity> getCreatedMultiInstanceRootExecution() {
+        return createdMultiInstanceRootExecution;
+    }
+
+    public void setCreatedMultiInstanceRootExecution(HashMap<String, ExecutionEntity> createdMultiInstanceRootExecution) {
+        this.createdMultiInstanceRootExecution = createdMultiInstanceRootExecution;
+    }
+
+    public void addCreatedMultiInstanceRootExecution(String key, ExecutionEntity executionEntity) {
+        this.createdMultiInstanceRootExecution.put(key, executionEntity);
+    }
+
     public Map<String, List<ExecutionEntity>> getProcessInstanceActiveEmbeddedExecutions() {
         return processInstanceActiveEmbeddedExecutions;
     }

diff --git a/...engine/src/main/java/org/flowable/engine/impl/persistence/entity/ExecutionEntityImpl.java b/...engine/src/main/java/org/flowable/engine/impl/persistence/entity/ExecutionEntityImpl.java
@@ -1048,7 +1048,7 @@ public boolean isEnded() {
         return isEnded;
     }
 
-    public boolean setIsEnded() {
+    public boolean getIsEnded() {
         return isEnded;
     }
 

diff --git a/...flowable/engine/test/api/runtime/migration/ProcessInstanceMigrationMultiInstanceTest.java b/...flowable/engine/test/api/runtime/migration/ProcessInstanceMigrationMultiInstanceTest.java
diff --git a/...est/java/org/flowable/engine/test/api/runtime/migration/ProcessInstanceMigrationTest.java b/...est/java/org/flowable/engine/test/api/runtime/migration/ProcessInstanceMigrationTest.java
@@ -1441,15 +1441,15 @@ public void testSimpleMigrationWithMultiInstanceTask() {
 	        .contains("parallelTasks");
 
         if (HistoryTestHelper.isHistoryLevelAtLeast(HistoryLevel.ACTIVITY, processEngineConfiguration)) {
-            checkActivityInstances(procDefTwoTasks, processInstance, "userTask", "beforeMultiInstance", "parallelTasks", "parallelTasks", "parallelTasks", "parallelTasks");
+            checkActivityInstances(procDefTwoTasks, processInstance, "userTask", "beforeMultiInstance", "parallelTasks", "parallelTasks");
 
             checkTaskInstance(procDefTwoTasks, processInstance, "beforeMultiInstance", "parallelTasks", "parallelTasks", "parallelTasks", "parallelTasks");
         }
 
         completeProcessInstanceTasks(processInstance.getId());
 
         if (HistoryTestHelper.isHistoryLevelAtLeast(HistoryLevel.ACTIVITY, processEngineConfiguration)) {
-            checkActivityInstances(procDefTwoTasks, processInstance, "userTask", "beforeMultiInstance", "parallelTasks", "parallelTasks", "parallelTasks", "parallelTasks");
+            checkActivityInstances(procDefTwoTasks, processInstance, "userTask", "beforeMultiInstance", "parallelTasks", "parallelTasks");
 
             checkTaskInstance(procDefTwoTasks, processInstance, "beforeMultiInstance", "parallelTasks", "parallelTasks", "parallelTasks", "parallelTasks");
         }

diff --git a/...test/api/runtime/migration/parallel-multi-instance-callactivity-local-variable.bpmn20.xml b/...test/api/runtime/migration/parallel-multi-instance-callactivity-local-variable.bpmn20.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions id="definition"
+             xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
+             xmlns:flowable="http://flowable.org/bpmn"
+             targetNamespace="Examples">
+
+    <process id="parallelMultiInstanceSubProcess">
+
+        <startEvent id="theStart"/>
+        <sequenceFlow id="flow1" sourceRef="theStart" targetRef="beforeMultiInstance"/>
+        <userTask id="beforeMultiInstance"/>
+        <sequenceFlow sourceRef="beforeMultiInstance" targetRef="callActivity"/>
+
+        <callActivity id="callActivity" calledElement="oneTaskProcess">
+            <multiInstanceLoopCharacteristics isSequential="false" flowable:collection="myCollection" flowable:elementVariable="myElement" />
+        </callActivity>
+
+        <sequenceFlow id="flow2" sourceRef="callActivity" targetRef="afterMultiInstance"/>
+        <userTask id="afterMultiInstance"/>
+        <sequenceFlow id="flow3" sourceRef="afterMultiInstance" targetRef="theEnd"/>
+        <endEvent id="theEnd"/>
+
+    </process>
+
+</definitions>
diff --git a/...flowable/engine/test/api/runtime/migration/parallel-multi-instance-servicetask.bpmn20.xml b/...flowable/engine/test/api/runtime/migration/parallel-multi-instance-servicetask.bpmn20.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions id="definition"
+             xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
+             xmlns:flowable="http://flowable.org/bpmn"
+             targetNamespace="Examples">
+
+    <process id="parallelMultiInstanceSubProcess">
+
+        <startEvent id="theStart"/>
+        <sequenceFlow id="flow1" sourceRef="theStart" targetRef="beforeMultiInstance"/>
+        <userTask id="beforeMultiInstance"/>
+        <sequenceFlow sourceRef="beforeMultiInstance" targetRef="task"/>
+
+        <serviceTask id="task" flowable:expression="${'test'}" flowable:async="true">
+            <multiInstanceLoopCharacteristics isSequential="false" flowable:collection="myCollection" flowable:elementVariable="myElement" />
+        </serviceTask>
+
+        <sequenceFlow id="flow2" sourceRef="task" targetRef="afterMultiInstance"/>
+        <userTask id="afterMultiInstance"/>
+        <sequenceFlow id="flow3" sourceRef="afterMultiInstance" targetRef="theEnd"/>
+        <endEvent id="theEnd"/>
+
+    </process>
+
+</definitions>
diff --git a/...ine/test/api/runtime/migration/parallel-multi-instance-subprocess-callactivity.bpmn20.xml b/...ine/test/api/runtime/migration/parallel-multi-instance-subprocess-callactivity.bpmn20.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions id="definition"
+             xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
+             xmlns:flowable="http://flowable.org/bpmn"
+             targetNamespace="Examples">
+
+    <process id="parallelMultiInstanceSubProcess">
+
+        <startEvent id="theStart"/>
+        <sequenceFlow id="flow1" sourceRef="theStart" targetRef="beforeMultiInstance"/>
+        <userTask id="beforeMultiInstance"/>
+        <sequenceFlow sourceRef="beforeMultiInstance" targetRef="parallelMISubProcess"/>
+
+        <subProcess id="parallelMISubProcess" name="Multi Instance Sequential SubProcess">
+            <multiInstanceLoopCharacteristics isSequential="false" flowable:collection="myCollection" flowable:elementVariable="myElement" />
+            <startEvent id="parallelSubProcStart"/>
+            <sequenceFlow id="subFlow1" sourceRef="parallelSubProcStart" targetRef="subtask"/>
+            <callActivity id="subtask" calledElement="oneTaskProcess" />
+            <sequenceFlow id="subFlow2" sourceRef="subtask" targetRef="parallelSubProcEnd"/>
+            <endEvent id="parallelSubProcEnd"/>
+        </subProcess>
+
+        <sequenceFlow id="flow2" sourceRef="parallelMISubProcess" targetRef="afterMultiInstance"/>
+        <userTask id="afterMultiInstance"/>
+        <sequenceFlow id="flow3" sourceRef="afterMultiInstance" targetRef="theEnd"/>
+        <endEvent id="theEnd"/>
+
+    </process>
+
+</definitions>
diff --git a/...e/test/api/runtime/migration/parallel-multi-instance-subprocess-local-variable.bpmn20.xml b/...e/test/api/runtime/migration/parallel-multi-instance-subprocess-local-variable.bpmn20.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions id="definition"
+             xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
+             xmlns:flowable="http://flowable.org/bpmn"
+             targetNamespace="Examples">
+
+    <process id="parallelMultiInstanceSubProcess">
+
+        <startEvent id="theStart"/>
+        <sequenceFlow id="flow1" sourceRef="theStart" targetRef="beforeMultiInstance"/>
+        <userTask id="beforeMultiInstance"/>
+        <sequenceFlow sourceRef="beforeMultiInstance" targetRef="parallelMISubProcess"/>
+
+        <subProcess id="parallelMISubProcess" name="Multi Instance Sequential SubProcess">
+            <multiInstanceLoopCharacteristics isSequential="false" flowable:collection="myCollection" flowable:elementVariable="myElement" />
+            <startEvent id="parallelSubProcStart"/>
+            <sequenceFlow id="subFlow1" sourceRef="parallelSubProcStart" targetRef="subTask1"/>
+            <userTask id="subTask1"/>
+            <sequenceFlow id="subFlow2" sourceRef="subTask1" targetRef="parallelSubProcEnd"/>
+            <endEvent id="parallelSubProcEnd"/>
+        </subProcess>
+
+        <sequenceFlow id="flow2" sourceRef="parallelMISubProcess" targetRef="afterMultiInstance"/>
+        <userTask id="afterMultiInstance"/>
+        <sequenceFlow id="flow3" sourceRef="afterMultiInstance" targetRef="theEnd"/>
+        <endEvent id="theEnd"/>
+
+    </process>
+
+</definitions>
diff --git a/...gine/test/api/runtime/migration/parallel-multi-instance-subprocess-servicetask.bpmn20.xml b/...gine/test/api/runtime/migration/parallel-multi-instance-subprocess-servicetask.bpmn20.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions id="definition"
+             xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
+             xmlns:flowable="http://flowable.org/bpmn"
+             targetNamespace="Examples">
+
+    <process id="parallelMultiInstanceSubProcess">
+
+        <startEvent id="theStart"/>
+        <sequenceFlow id="flow1" sourceRef="theStart" targetRef="beforeMultiInstance"/>
+        <userTask id="beforeMultiInstance"/>
+        <sequenceFlow sourceRef="beforeMultiInstance" targetRef="parallelMISubProcess"/>
+
+        <subProcess id="parallelMISubProcess" name="Multi Instance Sequential SubProcess">
+            <multiInstanceLoopCharacteristics isSequential="false" flowable:collection="myCollection" flowable:elementVariable="myElement" />
+            <startEvent id="parallelSubProcStart"/>
+            <sequenceFlow id="subFlow1" sourceRef="parallelSubProcStart" targetRef="subtask"/>
+            <serviceTask id="subtask" flowable:expression="${'test'}" flowable:async="true" />
+            <sequenceFlow id="subFlow2" sourceRef="subtask" targetRef="parallelSubProcEnd"/>
+            <endEvent id="parallelSubProcEnd"/>
+        </subProcess>
+
+        <sequenceFlow id="flow2" sourceRef="parallelMISubProcess" targetRef="afterMultiInstance"/>
+        <userTask id="afterMultiInstance"/>
+        <sequenceFlow id="flow3" sourceRef="afterMultiInstance" targetRef="theEnd"/>
+        <endEvent id="theEnd"/>
+
+    </process>
+
+</definitions>
diff --git a/.../engine/test/api/runtime/migration/parallel-multi-instance-task-local-variable.bpmn20.xml b/.../engine/test/api/runtime/migration/parallel-multi-instance-task-local-variable.bpmn20.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions id="definition"
+             xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
+             xmlns:flowable="http://flowable.org/bpmn"
+             targetNamespace="Examples">
+
+    <process id="parallelMultiInstanceSubProcess">
+
+        <startEvent id="theStart"/>
+        <sequenceFlow id="flow1" sourceRef="theStart" targetRef="beforeMultiInstance"/>
+        <userTask id="beforeMultiInstance"/>
+        <sequenceFlow sourceRef="beforeMultiInstance" targetRef="task"/>
+
+        <userTask id="task" flowable:assignee="kermit">
+            <multiInstanceLoopCharacteristics isSequential="false" flowable:collection="myCollection" flowable:elementVariable="myElement" />
+        </userTask>
+
+        <sequenceFlow id="flow2" sourceRef="task" targetRef="afterMultiInstance"/>
+        <userTask id="afterMultiInstance"/>
+        <sequenceFlow id="flow3" sourceRef="afterMultiInstance" targetRef="theEnd"/>
+        <endEvent id="theEnd"/>
+
+    </process>
+
+</definitions>