Skip to content

F
Flowable Engine

开发团队 / Flowable Engine

通知 9
Star 0
Fork 0
F
Flowable Engine

体验新版 GitCode，发现更多精彩内容 >>

提交 6ecfae6a 编写于 作者: J Joram Barrez 提交者： Tijs Rademakers
浏览文件
操作

Added use case 'tricky merge'. Not possible on current Activiti version.

上级 f1a9010a
隐藏空白更改
内联 并排
Showing with 201 addition and 5 deletion
modules/activiti-engine/src/main/java/org/activiti/engine/impl/agenda/Agenda.java
浏览文件 @ 6ecfae6a
......@@ -15,6 +15,7 @@ package org.activiti.engine.impl.agenda;
import java.util.LinkedList;
import org.activiti.engine.impl.interceptor.CommandContext;
import org.activiti.engine.impl.persistence.entity.ExecutionEntity;
import org.activiti.engine.impl.pvm.delegate.ActivityExecution;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -46,30 +47,41 @@ public class Agenda {
* Generic method to plan a {@link Runnable}.
*/
public void planOperation(Runnable operation) {
planOperation(operation, null);
}
/**
* Generic method to plan a {@link Runnable}.
*/
public void planOperation(Runnable operation, ExecutionEntity executionEntity) {
operations.add(operation);
logger.debug("Operation {} added to agenda", operation.getClass());
if (executionEntity != null) {
commandContext.addInvolvedExecution(executionEntity);
}
}
/* SPECIFIC operations */
public void planContinueProcessOperation(ActivityExecution execution) {
planOperation(new ContinueProcessOperation(this, execution));
planOperation(new ContinueProcessOperation(this, execution), (ExecutionEntity) execution);
}
public void planTakeOutgoingSequenceFlowsOperation(ActivityExecution execution, boolean evaluateConditions) {
planOperation(new TakeOutgoingSequenceFlowsOperation(this, execution, evaluateConditions));
planOperation(new TakeOutgoingSequenceFlowsOperation(this, execution, evaluateConditions), (ExecutionEntity) execution);
}
public void planEndExecutionOperation(ActivityExecution execution) {
planOperation(new EndExecutionOperation(this, execution));
planOperation(new EndExecutionOperation(this, execution), (ExecutionEntity) execution);
}
public void planTriggerExecutionOperation(ActivityExecution execution) {
planOperation(new TriggerExecutionOperation(this, execution));
planOperation(new TriggerExecutionOperation(this, execution), (ExecutionEntity) execution);
}
public void planDestroyScopeOperation(ActivityExecution execution) {
planOperation(new DestroyScopeOperation(this, execution));
planOperation(new DestroyScopeOperation(this, execution), (ExecutionEntity) execution);
}
public void planExecuteInactiveBehaviorsOperation() {
......
modules/activiti-engine/src/test/java/org/activiti6/Activiti6Tests.java
浏览文件 @ 6ecfae6a
......@@ -410,5 +410,71 @@ public class Activiti6Tests extends AbstractActvitiTest {
}
/**
* Based on the process and use cases described in http://www.bp-3.com/blogs/2013/09/joins-and-ibm-bpm-diving-deeper/
*/
@Test
@org.activiti.engine.test.Deployment
public void testInclusiveTrickyMerge() {
// Use case 1 (easy): "When C completes, depending on the data, we can immediately issue E no matter what the status is of A or B."
ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("trickyInclusiveMerge");
assertNotNull(processInstance);
assertFalse(processInstance.isEnded());
assertEquals(3, taskService.createTaskQuery().count());
Task taskC = taskService.createTaskQuery().taskName("C").singleResult();
taskService.complete(taskC.getId());
List<Task> tasks = taskService.createTaskQuery().orderByTaskName().asc().list();
assertEquals(3, tasks.size());
assertEquals("A", tasks.get(0).getName());
assertEquals("B", tasks.get(1).getName());
assertEquals("E", tasks.get(2).getName());
taskService.complete(tasks.get(0).getId());
taskService.complete(tasks.get(1).getId());
tasks = taskService.createTaskQuery().orderByTaskName().asc().list();
assertEquals(2, tasks.size());
assertEquals("D", tasks.get(0).getName());
assertEquals("E", tasks.get(1).getName());
taskService.complete(tasks.get(0).getId());
taskService.complete(tasks.get(1).getId());
assertEquals(0, runtimeService.createExecutionQuery().count());
// Use case 2 (tricky): "If A and B are complete and C routes to E, D will be issued in Parallel to E"
// It's tricky cause the inclusive gateway is not visited directly.
// Instead, it's done by the InactivatedActivityBehavior
processInstance = runtimeService.startProcessInstanceByKey("trickyInclusiveMerge");
assertEquals(3, taskService.createTaskQuery().count());
tasks = taskService.createTaskQuery().orderByTaskName().asc().list();
assertEquals(3, tasks.size());
assertEquals("A", tasks.get(0).getName());
assertEquals("B", tasks.get(1).getName());
assertEquals("C", tasks.get(2).getName());
taskService.complete(tasks.get(0).getId());
taskService.complete(tasks.get(1).getId());
// C should still be open
tasks = taskService.createTaskQuery().orderByTaskName().asc().list();
assertEquals(1, tasks.size());
assertEquals("C", tasks.get(0).getName());
// If C is now completed, the inclusive gateway should also be completed and D and E should be open tasks
taskService.complete(tasks.get(0).getId());
tasks = taskService.createTaskQuery().orderByTaskName().asc().list();
assertEquals(2, tasks.size());
assertEquals("D", tasks.get(0).getName());
assertEquals("E", tasks.get(1).getName());
// Completing them should just end the process instance
taskService.complete(tasks.get(0).getId());
taskService.complete(tasks.get(1).getId());
assertEquals(0, runtimeService.createExecutionQuery().count());
}
}
modules/activiti-engine/src/test/resources/org/activiti6/Activiti6Tests.testInclusiveTrickyMerge.bpmn20.xml 0 → 100644
浏览文件 @ 6ecfae6a
<?xml version="1.0" encoding="UTF-8"?>
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/processdef" xmlns:modeler="http://activiti.com/modeler" modeler:version="1.0en" modeler:exportDateTime="20140421191706244">
<process id="trickyInclusiveMerge" isExecutable="true">
<startEvent id="theStart"></startEvent>
<sequenceFlow id="sid-87AB7BB9-AC7C-4B6E-8B99-5E6294959837" sourceRef="theStart" targetRef="fork"></sequenceFlow>
<parallelGateway id="fork"></parallelGateway>
<userTask id="taskA" name="A" activiti:exclusive="false"></userTask>
<sequenceFlow id="sid-0AD4C17D-0E7F-46EC-91B8-205965917236" sourceRef="fork" targetRef="taskA"></sequenceFlow>
<userTask id="taskB" name="B" activiti:exclusive="false"></userTask>
<sequenceFlow id="sid-37192829-D226-4640-AF20-6BCE54772CDF" sourceRef="fork" targetRef="taskB"></sequenceFlow>
<userTask id="taskC" name="C" activiti:exclusive="false"></userTask>
<sequenceFlow id="sid-E5B3B71B-D1F3-46BE-931F-3468B68C07C9" sourceRef="fork" targetRef="taskC"></sequenceFlow>
<sequenceFlow id="sid-69B5F283-1E1B-4513-958B-862236ABFE6D" sourceRef="taskA" targetRef="sid-CB7DAFFD-3C54-45B8-AEAA-4CC5995999A6"></sequenceFlow>
<inclusiveGateway id="sid-CB7DAFFD-3C54-45B8-AEAA-4CC5995999A6"></inclusiveGateway>
<sequenceFlow id="sid-5832DC3D-6752-4E98-9EC1-60EB7077E99E" sourceRef="taskB" targetRef="sid-CB7DAFFD-3C54-45B8-AEAA-4CC5995999A6"></sequenceFlow>
<exclusiveGateway id="sid-F188101B-940D-4926-8974-F159AE87901E" default="sid-A490C30A-1D05-4FD9-95D0-FC36FCCF8E23"></exclusiveGateway>
<sequenceFlow id="sid-0CE6FC09-B872-4B12-B50C-AA566061BE89" sourceRef="taskC" targetRef="sid-F188101B-940D-4926-8974-F159AE87901E"></sequenceFlow>
<sequenceFlow id="sid-A490C30A-1D05-4FD9-95D0-FC36FCCF8E23" sourceRef="sid-F188101B-940D-4926-8974-F159AE87901E" targetRef="sid-CB7DAFFD-3C54-45B8-AEAA-4CC5995999A6"></sequenceFlow>
<userTask id="taskD" name="D" activiti:exclusive="false"></userTask>
<sequenceFlow id="sid-4D5E3EDA-4B5D-4F8F-B526-242D09490D8C" sourceRef="sid-CB7DAFFD-3C54-45B8-AEAA-4CC5995999A6" targetRef="taskD"></sequenceFlow>
<userTask id="taskE" name="E" activiti:exclusive="false"></userTask>
<endEvent id="theEnd1"></endEvent>
<sequenceFlow id="sid-ED3127ED-88BA-4A3E-B0C7-9ADF155591BD" sourceRef="taskD" targetRef="theEnd1"></sequenceFlow>
<endEvent id="theEnd2"></endEvent>
<sequenceFlow id="sid-C346C04D-46E5-4748-99BD-C7E0E81B3700" sourceRef="taskE" targetRef="theEnd2"></sequenceFlow>
<sequenceFlow id="sid-F4E15E6B-43E6-40C7-A35B-7A8D40A62712" sourceRef="sid-F188101B-940D-4926-8974-F159AE87901E" targetRef="taskE">
<conditionExpression xsi:type="tFormalExpression"><![CDATA[${1 == 1}]]></conditionExpression>
</sequenceFlow>
</process>
<bpmndi:BPMNDiagram id="BPMNDiagram_trickyInclusiveMerge">
<bpmndi:BPMNPlane bpmnElement="trickyInclusiveMerge" id="BPMNPlane_trickyInclusiveMerge">
<bpmndi:BPMNShape bpmnElement="theStart" id="BPMNShape_theStart">
<omgdc:Bounds height="30.0" width="30.0" x="121.5" y="193.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="fork" id="BPMNShape_fork">
<omgdc:Bounds height="40.0" width="40.0" x="195.0" y="188.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="taskA" id="BPMNShape_taskA">
<omgdc:Bounds height="80.0" width="100.0" x="281.75" y="60.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="taskB" id="BPMNShape_taskB">
<omgdc:Bounds height="80.0" width="100.0" x="280.0" y="168.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="taskC" id="BPMNShape_taskC">
<omgdc:Bounds height="80.0" width="100.0" x="280.0" y="285.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="sid-CB7DAFFD-3C54-45B8-AEAA-4CC5995999A6" id="BPMNShape_sid-CB7DAFFD-3C54-45B8-AEAA-4CC5995999A6">
<omgdc:Bounds height="40.0" width="40.0" x="525.0" y="188.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="sid-F188101B-940D-4926-8974-F159AE87901E" id="BPMNShape_sid-F188101B-940D-4926-8974-F159AE87901E">
<omgdc:Bounds height="40.0" width="40.0" x="525.0" y="305.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="taskD" id="BPMNShape_taskD">
<omgdc:Bounds height="80.0" width="100.0" x="610.0" y="168.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="taskE" id="BPMNShape_taskE">
<omgdc:Bounds height="80.0" width="100.0" x="615.0" y="285.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="theEnd1" id="BPMNShape_theEnd1">
<omgdc:Bounds height="28.0" width="28.0" x="755.0" y="194.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="theEnd2" id="BPMNShape_theEnd2">
<omgdc:Bounds height="28.0" width="28.0" x="760.0" y="311.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge bpmnElement="sid-0AD4C17D-0E7F-46EC-91B8-205965917236" id="BPMNEdge_sid-0AD4C17D-0E7F-46EC-91B8-205965917236">
<omgdi:waypoint x="215.5" y="188.5"></omgdi:waypoint>
<omgdi:waypoint x="215.5" y="100.0"></omgdi:waypoint>
<omgdi:waypoint x="281.75" y="100.0"></omgdi:waypoint>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="sid-87AB7BB9-AC7C-4B6E-8B99-5E6294959837" id="BPMNEdge_sid-87AB7BB9-AC7C-4B6E-8B99-5E6294959837">
<omgdi:waypoint x="151.4997015402831" y="208.09462400556436"></omgdi:waypoint>
<omgdi:waypoint x="195.3713837994214" y="208.3713837994214"></omgdi:waypoint>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="sid-ED3127ED-88BA-4A3E-B0C7-9ADF155591BD" id="BPMNEdge_sid-ED3127ED-88BA-4A3E-B0C7-9ADF155591BD">
<omgdi:waypoint x="710.0" y="208.0"></omgdi:waypoint>
<omgdi:waypoint x="755.0" y="208.0"></omgdi:waypoint>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="sid-C346C04D-46E5-4748-99BD-C7E0E81B3700" id="BPMNEdge_sid-C346C04D-46E5-4748-99BD-C7E0E81B3700">
<omgdi:waypoint x="715.0" y="325.0"></omgdi:waypoint>
<omgdi:waypoint x="760.0" y="325.0"></omgdi:waypoint>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="sid-A490C30A-1D05-4FD9-95D0-FC36FCCF8E23" id="BPMNEdge_sid-A490C30A-1D05-4FD9-95D0-FC36FCCF8E23">
<omgdi:waypoint x="545.4145299145299" y="305.4145299145299"></omgdi:waypoint>
<omgdi:waypoint x="545.0847457627119" y="227.91525423728814"></omgdi:waypoint>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="sid-0CE6FC09-B872-4B12-B50C-AA566061BE89" id="BPMNEdge_sid-0CE6FC09-B872-4B12-B50C-AA566061BE89">
<omgdi:waypoint x="380.0" y="325.11600928074245"></omgdi:waypoint>
<omgdi:waypoint x="525.453488372093" y="325.45348837209303"></omgdi:waypoint>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="sid-E5B3B71B-D1F3-46BE-931F-3468B68C07C9" id="BPMNEdge_sid-E5B3B71B-D1F3-46BE-931F-3468B68C07C9">
<omgdi:waypoint x="215.5" y="227.5"></omgdi:waypoint>
<omgdi:waypoint x="215.5" y="325.0"></omgdi:waypoint>
<omgdi:waypoint x="280.0" y="325.0"></omgdi:waypoint>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="sid-4D5E3EDA-4B5D-4F8F-B526-242D09490D8C" id="BPMNEdge_sid-4D5E3EDA-4B5D-4F8F-B526-242D09490D8C">
<omgdi:waypoint x="564.5833333333334" y="208.41666666666666"></omgdi:waypoint>
<omgdi:waypoint x="610.0" y="208.2183406113537"></omgdi:waypoint>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="sid-5832DC3D-6752-4E98-9EC1-60EB7077E99E" id="BPMNEdge_sid-5832DC3D-6752-4E98-9EC1-60EB7077E99E">
<omgdi:waypoint x="380.0" y="208.0"></omgdi:waypoint>
<omgdi:waypoint x="525.0" y="208.0"></omgdi:waypoint>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="sid-37192829-D226-4640-AF20-6BCE54772CDF" id="BPMNEdge_sid-37192829-D226-4640-AF20-6BCE54772CDF">
<omgdi:waypoint x="234.58333333333334" y="208.41666666666666"></omgdi:waypoint>
<omgdi:waypoint x="280.0" y="208.2183406113537"></omgdi:waypoint>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="sid-F4E15E6B-43E6-40C7-A35B-7A8D40A62712" id="BPMNEdge_sid-F4E15E6B-43E6-40C7-A35B-7A8D40A62712">
<omgdi:waypoint x="564.5798319327731" y="325.4201680672269"></omgdi:waypoint>
<omgdi:waypoint x="615.0" y="325.20920502092054"></omgdi:waypoint>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="sid-69B5F283-1E1B-4513-958B-862236ABFE6D" id="BPMNEdge_sid-69B5F283-1E1B-4513-958B-862236ABFE6D">
<omgdi:waypoint x="381.75" y="100.0"></omgdi:waypoint>
<omgdi:waypoint x="545.8917197452229" y="100.0"></omgdi:waypoint>
<omgdi:waypoint x="545.8917197452229" y="188.89171974522287"></omgdi:waypoint>
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</definitions>
\ No newline at end of file
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或