Skip to content

F
Flowable Engine

开发团队 / Flowable Engine

通知 9
Star 0
Fork 0
F
Flowable Engine

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

提交 b80e89a1 编写于 作者: J Joram Barrez
浏览文件
操作

Multi instance refactoring: introduced the 'IS_MI_ROOT_' column to indicate an... 

Multi instance refactoring: introduced the 'IS_MI_ROOT_' column to indicate an execution is the root of a multi instance. Every multi instance (sequential and parallel, parallel already had it) will now spawn an execution that acts as parent for the whole multi instance. This has two benefits: cleanup becomes way easier and it opens up the possibility to dynamically add new instances to a multi instance (not yet implemented).
上级 265d8348
隐藏空白更改
内联 并排
Showing with 408 addition and 329 deletion
modules/activiti-bpmn-model/src/main/java/org/activiti/bpmn/model/Activity.java
浏览文件 @ b80e89a1
......@@ -68,6 +68,10 @@ public abstract class Activity extends FlowNode {
public void setLoopCharacteristics(MultiInstanceLoopCharacteristics loopCharacteristics) {
this.loopCharacteristics = loopCharacteristics;
}
public boolean hasMultiInstanceLoopCharacteristics() {
return getLoopCharacteristics() != null;
}
public IOSpecification getIoSpecification() {
return ioSpecification;
......
modules/activiti-engine/src/main/java/org/activiti/engine/delegate/DelegateExecution.java
浏览文件 @ b80e89a1
......@@ -139,8 +139,19 @@ public interface DelegateExecution extends VariableScope {
boolean isScope();
/**
* Changes whether this execution is a scope or not
* Changes whether this execution is a scope or not.
*/
void setScope(boolean isScope);
/**
* Returns whather this execution is the root of a multi instance execution.
*/
boolean isMultiInstanceRoot();
/**
* Changes whether this execution is a multi instance root or not.
* @param isMultiInstanceRoot
*/
void setMultiInstanceRoot(boolean isMultiInstanceRoot);
}
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/BoundaryEventActivityBehavior.java
浏览文件 @ b80e89a1
......@@ -60,11 +60,6 @@ public class BoundaryEventActivityBehavior extends FlowNodeActivityBehavior {
protected void executeInterruptingBehavior(ExecutionEntity executionEntity, CommandContext commandContext) {
// TODO: is this needed???
// if (executionEntity.getSubProcessInstance() != null) {
// executionEntity.getSubProcessInstance().deleteCascade(executionEntity.getDeleteReason());
// }
// The destroy scope operation will look for the parent execution and
// destroy the whole scope, and leave the boundary event using this parent execution.
//
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/BpmnActivityBehavior.java
浏览文件 @ b80e89a1
......@@ -85,94 +85,7 @@ public class BpmnActivityBehavior implements Serializable {
* If true, an {@link ActivitiException} will be thrown in case no transition could be found to leave the activity.
*/
protected void performOutgoingBehavior(ExecutionEntity execution, boolean checkConditions, boolean throwExceptionIfExecutionStuck) {
Context.getAgenda().planTakeOutgoingSequenceFlowsOperation(execution, true);
// if (log.isDebugEnabled()) {
// log.debug("Leaving activity '{}'", execution.getActivity().getId());
// }
//
// String defaultSequenceFlow = (String)
// execution.getActivity().getProperty("default");
// List<PvmTransition> transitionsToTake = new
// ArrayList<PvmTransition>();
//
// List<PvmTransition> outgoingTransitions =
// execution.getActivity().getOutgoingTransitions();
// for (PvmTransition outgoingTransition : outgoingTransitions) {
// Expression skipExpression = outgoingTransition.getSkipExpression();
//
// if (!SkipExpressionUtil.isSkipExpressionEnabled(execution,
// skipExpression)) {
// if (defaultSequenceFlow == null ||
// !outgoingTransition.getId().equals(defaultSequenceFlow)) {
// Condition condition = (Condition)
// outgoingTransition.getProperty(BpmnParse.PROPERTYNAME_CONDITION);
// if (condition == null || !checkConditions ||
// condition.evaluate(execution)) {
// transitionsToTake.add(outgoingTransition);
// }
// }
//
// } else if (SkipExpressionUtil.shouldSkipFlowElement(execution,
// skipExpression)){
// transitionsToTake.add(outgoingTransition);
// }
// }
//
// if (transitionsToTake.size() == 1) {
//
// execution.take(transitionsToTake.get(0));
//
// } else if (transitionsToTake.size() >= 1) {
//
// execution.inactivate();
// if (reusableExecutions == null || reusableExecutions.isEmpty()) {
// execution.takeAll(transitionsToTake, Arrays.asList(execution));
// } else {
// execution.takeAll(transitionsToTake, reusableExecutions);
// }
//
// } else {
//
// if (defaultSequenceFlow != null) {
// PvmTransition defaultTransition =
// execution.getActivity().findOutgoingTransition(defaultSequenceFlow);
// if (defaultTransition != null) {
// execution.take(defaultTransition);
// } else {
// throw new ActivitiException("Default sequence flow '" +
// defaultSequenceFlow + "' could not be not found");
// }
// } else {
//
// Object isForCompensation =
// execution.getActivity().getProperty(BpmnParse.PROPERTYNAME_IS_FOR_COMPENSATION);
// if(isForCompensation != null && (Boolean) isForCompensation) {
//
// InterpretableExecution parentExecution = (InterpretableExecution)
// execution.getParent();
// ((InterpretableExecution)execution).remove();
// parentExecution.signal("compensationDone", null);
//
// } else {
//
// if (log.isDebugEnabled()) {
// log.debug("No outgoing sequence flow found for {}. Ending execution.",
// execution.getActivity().getId());
// }
// execution.end();
//
// if (throwExceptionIfExecutionStuck) {
// throw new
// ActivitiException("No outgoing sequence flow of the inclusive gateway '"
// + execution.getActivity().getId()
// + "' could be selected for continuing the process");
// }
// }
//
// }
// }
}
}
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/MultiInstanceActivityBehavior.java
浏览文件 @ b80e89a1
......@@ -89,21 +89,25 @@ public abstract class MultiInstanceActivityBehavior extends FlowNodeActivityBeha
public void execute(DelegateExecution execution) {
if (getLocalLoopVariable(execution, getCollectionElementIndexVariable()) == null) {
int nrOfInstances = 0;
try {
createInstances(execution);
nrOfInstances = createInstances(execution);
} catch (BpmnError error) {
ErrorPropagation.propagateError(error, execution);
}
if (resolveNrOfInstances(execution) == 0) {
leave(execution);
if (nrOfInstances == 0) {
super.leave(execution);
}
} else {
innerActivityBehavior.execute(execution);
}
}
protected abstract void createInstances(DelegateExecution execution);
protected abstract int createInstances(DelegateExecution execution);
protected void executeCompensationBoundaryEvents(FlowElement flowElement, DelegateExecution execution) {
......@@ -278,7 +282,7 @@ public abstract class MultiInstanceActivityBehavior extends FlowNodeActivityBeha
}
return (Integer) (value != null ? value : 0);
}
protected Integer getLocalLoopVariable(DelegateExecution execution, String variableName) {
return (Integer) execution.getVariableLocal(variableName);
}
......@@ -380,10 +384,24 @@ public abstract class MultiInstanceActivityBehavior extends FlowNodeActivityBeha
protected void logLoopDetails(DelegateExecution execution, String custom, int loopCounter, int nrOfCompletedInstances, int nrOfActiveInstances, int nrOfInstances) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Multi-instance '{}' {}. Details: loopCounter={}, nrOrCompletedInstances={},nrOfActiveInstances={},nrOfInstances={}", execution.getCurrentFlowElement(), custom, loopCounter,
LOGGER.debug("Multi-instance '{}' {}. Details: loopCounter={}, nrOrCompletedInstances={},nrOfActiveInstances={},nrOfInstances={}",
execution.getCurrentFlowElement() != null ? execution.getCurrentFlowElement().getId() : "", custom, loopCounter,
nrOfCompletedInstances, nrOfActiveInstances, nrOfInstances);
}
}
protected DelegateExecution getMultiInstanceRootExecution(DelegateExecution executionEntity) {
DelegateExecution multiInstanceRootExecution = null;
DelegateExecution currentExecution = executionEntity;
while (currentExecution != null && multiInstanceRootExecution == null && currentExecution.getParent() != null) {
if (currentExecution.isMultiInstanceRoot()) {
multiInstanceRootExecution = currentExecution;
} else {
currentExecution = currentExecution.getParent();
}
}
return multiInstanceRootExecution;
}
// Getters and Setters
// ///////////////////////////////////////////////////////////
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/ParallelMultiInstanceBehavior.java
浏览文件 @ b80e89a1
......@@ -52,16 +52,18 @@ public class ParallelMultiInstanceBehavior extends MultiInstanceActivityBehavior
/**
* Handles the parallel case of spawning the instances. Will create child executions accordingly for every instance needed.
*/
protected void createInstances(DelegateExecution execution) {
protected int createInstances(DelegateExecution execution) {
int nrOfInstances = resolveNrOfInstances(execution);
if (nrOfInstances < 0) {
throw new ActivitiIllegalArgumentException("Invalid number of instances: must be non-negative integer value" + ", but was " + nrOfInstances);
}
execution.setMultiInstanceRoot(true);
setLoopVariable(execution, NUMBER_OF_INSTANCES, nrOfInstances);
setLoopVariable(execution, NUMBER_OF_COMPLETED_INSTANCES, 0);
setLoopVariable(execution, NUMBER_OF_ACTIVE_INSTANCES, nrOfInstances);
List<DelegateExecution> concurrentExecutions = new ArrayList<DelegateExecution>();
for (int loopCounter = 0; loopCounter < nrOfInstances; loopCounter++) {
DelegateExecution concurrentExecution = Context.getCommandContext().getExecutionEntityManager()
......@@ -96,6 +98,8 @@ public class ParallelMultiInstanceBehavior extends MultiInstanceActivityBehavior
ExecutionEntity executionEntity = (ExecutionEntity) execution;
executionEntity.setActive(false);
}
return nrOfInstances;
}
/**
......@@ -108,7 +112,8 @@ public class ParallelMultiInstanceBehavior extends MultiInstanceActivityBehavior
// Empty collection, just leave.
zeroNrOfInstances = true;
removeLocalLoopVariable(execution, getCollectionElementIndexVariable());
super.leave(execution);
super.leave(execution); // Plan the default leave
execution.setMultiInstanceRoot(false);
}
int loopCounter = getLoopVariable(execution, getCollectionElementIndexVariable());
......@@ -204,7 +209,8 @@ public class ParallelMultiInstanceBehavior extends MultiInstanceActivityBehavior
} else {
removeLocalLoopVariable(execution, getCollectionElementIndexVariable());
super.leave(executionEntity);
execution.setMultiInstanceRoot(false);
super.leave(execution);
}
}
......@@ -225,7 +231,7 @@ public class ParallelMultiInstanceBehavior extends MultiInstanceActivityBehavior
parentScopeExecution.forceUpdate();
}
// TODO: can the ExecutionManager.deleteChildExecution not be used?
protected void deleteChildExecutions(ExecutionEntity parentExecution, boolean deleteExecution, CommandContext commandContext) {
// Delete all child executions
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/SequentialMultiInstanceBehavior.java
浏览文件 @ b80e89a1
......@@ -23,6 +23,7 @@ import org.activiti.engine.ActivitiIllegalArgumentException;
import org.activiti.engine.delegate.BpmnError;
import org.activiti.engine.delegate.DelegateExecution;
import org.activiti.engine.impl.bpmn.helper.ScopeUtil;
import org.activiti.engine.impl.context.Context;
import org.activiti.engine.impl.delegate.ActivityBehavior;
import org.activiti.engine.impl.persistence.entity.ExecutionEntity;
import org.apache.commons.collections.CollectionUtils;
......@@ -42,21 +43,35 @@ public class SequentialMultiInstanceBehavior extends MultiInstanceActivityBehavi
/**
* Handles the sequential case of spawning the instances. Will only create one instance, since at most one instance can be active.
*/
protected void createInstances(DelegateExecution execution) {
int nrOfInstances = resolveNrOfInstances(execution);
if (nrOfInstances < 0) {
protected int createInstances(DelegateExecution multiInstanceExecution) {
int nrOfInstances = resolveNrOfInstances(multiInstanceExecution);
if (nrOfInstances == 0) {
return nrOfInstances;
} else if (nrOfInstances < 0) {
throw new ActivitiIllegalArgumentException("Invalid number of instances: must be a non-negative integer value" + ", but was " + nrOfInstances);
}
setLoopVariable(execution, NUMBER_OF_INSTANCES, nrOfInstances);
setLoopVariable(execution, NUMBER_OF_COMPLETED_INSTANCES, 0);
// Create child execution that will execute the inner behavior
ExecutionEntity execution = Context.getCommandContext().getExecutionEntityManager()
.createChildExecution((ExecutionEntity) multiInstanceExecution);
execution.setCurrentFlowElement(multiInstanceExecution.getCurrentFlowElement());
multiInstanceExecution.setCurrentFlowElement(null);
multiInstanceExecution.setMultiInstanceRoot(true);
// Set Multi Instance variables
setLoopVariable(multiInstanceExecution, NUMBER_OF_INSTANCES, nrOfInstances);
setLoopVariable(multiInstanceExecution, NUMBER_OF_COMPLETED_INSTANCES, 0);
setLoopVariable(multiInstanceExecution, NUMBER_OF_ACTIVE_INSTANCES, 1);
setLoopVariable(multiInstanceExecution, getCollectionElementIndexVariable(), 0);
setLoopVariable(execution, getCollectionElementIndexVariable(), 0);
setLoopVariable(execution, NUMBER_OF_ACTIVE_INSTANCES, 1);
logLoopDetails(execution, "initialized", 0, 0, 1, nrOfInstances);
logLoopDetails(multiInstanceExecution, "initialized", 0, 0, 1, nrOfInstances);
if (nrOfInstances > 0) {
executeOriginalBehavior(execution, 0);
}
return nrOfInstances;
}
/**
......@@ -64,13 +79,16 @@ public class SequentialMultiInstanceBehavior extends MultiInstanceActivityBehavi
* the sequential behavior.
*/
public void leave(DelegateExecution execution) {
int loopCounter = getLoopVariable(execution, getCollectionElementIndexVariable()) + 1;
int nrOfInstances = getLoopVariable(execution, NUMBER_OF_INSTANCES);
int loopCounter = getLoopVariable(execution, getCollectionElementIndexVariable()) + 1;
int nrOfCompletedInstances = getLoopVariable(execution, NUMBER_OF_COMPLETED_INSTANCES) + 1;
int nrOfActiveInstances = getLoopVariable(execution, NUMBER_OF_ACTIVE_INSTANCES);
DelegateExecution multiInstanceRootExecution = getMultiInstanceRootExecution(execution);
setLoopVariable(multiInstanceRootExecution, NUMBER_OF_COMPLETED_INSTANCES, nrOfCompletedInstances);
setLoopVariable(multiInstanceRootExecution, getCollectionElementIndexVariable(), loopCounter);
setLoopVariable(execution, getCollectionElementIndexVariable(), loopCounter);
setLoopVariable(execution, NUMBER_OF_COMPLETED_INSTANCES, nrOfCompletedInstances);
logLoopDetails(execution, "instance completed", loopCounter, nrOfCompletedInstances, nrOfActiveInstances, nrOfInstances);
callActivityEndListeners(execution);
......@@ -106,11 +124,26 @@ public class SequentialMultiInstanceBehavior extends MultiInstanceActivityBehavi
ScopeUtil.createCopyOfSubProcessExecutionForCompensation(executionEntity, executionEntity.getParent());
}
removeLocalLoopVariable(multiInstanceRootExecution, getCollectionElementIndexVariable());
removeLocalLoopVariable(execution, getCollectionElementIndexVariable());
super.leave(execution);
multiInstanceRootExecution.setMultiInstanceRoot(false);
multiInstanceRootExecution.setCurrentFlowElement(execution.getCurrentFlowElement());
Context.getCommandContext().getExecutionEntityManager()
.deleteChildExecutions((ExecutionEntity) multiInstanceRootExecution, "MI_END", false);
super.leave(multiInstanceRootExecution);
} else {
try {
// ExecutionEntityManager executionEntityManager = Context.getCommandContext().getExecutionEntityManager();
// FlowElement currentFlowElement = execution.getCurrentFlowElement();
// executionEntityManager.deleteChildExecutions((ExecutionEntity) multiInstanceRootExecution, "MI_END", false);
//
// ExecutionEntity executionToContinue = executionEntityManager.createChildExecution((ExecutionEntity) multiInstanceRootExecution);
// executionToContinue.setCurrentFlowElement(currentFlowElement);
//
// executeOriginalBehavior(executionToContinue, loopCounter);
executeOriginalBehavior(execution, loopCounter);
} catch (BpmnError error) {
// re-throw business fault so that it can be caught by an Error
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/TerminateEndEventActivityBehavior.java
浏览文件 @ b80e89a1
......@@ -12,6 +12,7 @@
*/
package org.activiti.engine.impl.bpmn.behavior;
import org.activiti.bpmn.model.CallActivity;
import org.activiti.bpmn.model.FlowElement;
import org.activiti.bpmn.model.FlowNode;
import org.activiti.bpmn.model.SubProcess;
......@@ -29,160 +30,168 @@ import org.activiti.engine.impl.util.tree.ExecutionTreeNode;
* @author Joram Barrez
*/
public class TerminateEndEventActivityBehavior extends FlowNodeActivityBehavior {
private static final long serialVersionUID = 1L;
protected boolean terminateAll;
protected boolean terminateAll;
public TerminateEndEventActivityBehavior() {
}
public TerminateEndEventActivityBehavior(boolean terminateAll) {
this.terminateAll = terminateAll;
}
@Override
public void execute(DelegateExecution execution) {
CommandContext commandContext = Context.getCommandContext();
ExecutionEntityManager executionEntityManager = commandContext.getExecutionEntityManager();
ExecutionTree executionTree = executionEntityManager.findExecutionTree(execution.getRootProcessInstanceId());
if (terminateAll) {
deleteExecutionEntities(commandContext, executionEntityManager, executionTree.leafsFirstIterator());
} else {
// Find the lowest scope for the element, and schedule the destruction of the scope
ExecutionTreeNode scopeTreeNode = executionTree.getTreeNode(execution.getId());
while (!scopeTreeNode.getExecutionEntity().isScope()) {
scopeTreeNode = scopeTreeNode.getParent();
if (scopeTreeNode == null) {
break;
}
}
ExecutionEntity scopeExecutionEntity = scopeTreeNode.getExecutionEntity();
sendProcessInstanceCancelledEvent(scopeExecutionEntity, execution.getCurrentFlowElement());
if (scopeExecutionEntity.getParentId() == null) {
// Call activity needs special handling: the call activity is destroyed, but the main process continues
if (scopeExecutionEntity.getSuperExecutionId() != null) {
executionEntityManager.deleteProcessInstanceExecutionEntity(scopeExecutionEntity.getId(),
execution.getCurrentFlowElement().getId(), "terminate end event",
false, false, true);
ExecutionEntity superExecutionEntity = executionEntityManager.findById(scopeExecutionEntity.getSuperExecutionId());
commandContext.getAgenda().planTakeOutgoingSequenceFlowsOperation(superExecutionEntity);
} else {
deleteExecutionEntities(commandContext, executionEntityManager, executionTree.leafsFirstIterator());
}
} else {
SubProcess subProcess = null;
boolean isMultiInstance = false;
if (scopeExecutionEntity.getCurrentFlowElement() instanceof SubProcess) {
subProcess = (SubProcess) scopeExecutionEntity.getCurrentFlowElement();
if (subProcess.getLoopCharacteristics() != null) {
isMultiInstance = true;
}
}
if (isMultiInstance) {
MultiInstanceActivityBehavior multiInstanceBehavior = (MultiInstanceActivityBehavior) subProcess.getBehavior();
@Override
public void execute(DelegateExecution execution) {
CommandContext commandContext = Context.getCommandContext();
ExecutionEntityManager executionEntityManager = commandContext.getExecutionEntityManager();
ExecutionTree executionTree = executionEntityManager.findExecutionTree(execution.getRootProcessInstanceId());
if (terminateAll) {
deleteExecutionEntities(commandContext, executionEntityManager, executionTree.leafsFirstIterator());
} else {
ExecutionTreeNode scopeTreeNode = findFirstScope(execution, executionTree);
ExecutionEntity scopeExecutionEntity = scopeTreeNode.getExecutionEntity();
sendProcessInstanceCancelledEvent(scopeExecutionEntity, execution.getCurrentFlowElement());
// If the scope is the process instance, we can just terminate it all
// Special treatment is needed when the terminated activity is a subprocess (embedded/callactivity/..)
// The subprocess is destroyed, but the execution calling it, continues further on.
// In case of a multi-instance subprocess, only one instance is terminated, the other instances continue to exist.
if (scopeExecutionEntity.isProcessInstanceType() && scopeExecutionEntity.getSuperExecutionId() == null) {
deleteExecutionEntities(commandContext, executionEntityManager, executionTree.leafsFirstIterator());
} else if (scopeExecutionEntity.getCurrentFlowElement() != null
&& scopeExecutionEntity.getCurrentFlowElement() instanceof SubProcess) { // SubProcess
SubProcess subProcess = (SubProcess) scopeExecutionEntity.getCurrentFlowElement();
if (subProcess.hasMultiInstanceLoopCharacteristics()) {
commandContext.getAgenda().planDestroyScopeOperation(scopeExecutionEntity);
MultiInstanceActivityBehavior multiInstanceBehavior = (MultiInstanceActivityBehavior) subProcess.getBehavior();
multiInstanceBehavior.leave(scopeExecutionEntity);
if (subProcess.getLoopCharacteristics().isSequential() == false) {
commandContext.getAgenda().planDestroyScopeOperation(scopeExecutionEntity);
}
} else {
commandContext.getAgenda().planDestroyScopeOperation(scopeExecutionEntity);
commandContext.getAgenda().planTakeOutgoingSequenceFlowsOperation(scopeExecutionEntity);
}
}
}
}
protected void deleteExecutionEntities(CommandContext commandContext,
ExecutionEntityManager executionEntityManager, ExecutionTreeBfsIterator treeIterator) {
// Delete the execution in leafs-first order to avoid foreign key constraints firing
while (treeIterator.hasNext()) {
ExecutionTreeNode treeNode = treeIterator.next();
ExecutionEntity executionEntity = treeNode.getExecutionEntity();
executionEntityManager.deleteExecutionAndRelatedData(executionEntity, null, false);
}
}
protected void sendProcessInstanceCancelledEvent(DelegateExecution execution, FlowElement terminateEndEvent) {
if (Context.getProcessEngineConfiguration().getEventDispatcher().isEnabled()) {
Context.getProcessEngineConfiguration().getEventDispatcher()
.dispatchEvent(ActivitiEventBuilder.createCancelledEvent(execution.getId(), execution.getProcessInstanceId(), execution.getProcessDefinitionId(), execution.getCurrentFlowElement()));
} else {
commandContext.getAgenda().planDestroyScopeOperation(scopeExecutionEntity);
commandContext.getAgenda().planTakeOutgoingSequenceFlowsOperation(scopeExecutionEntity);
}
} else if (scopeExecutionEntity.getParentId() == null
&& scopeExecutionEntity.getSuperExecutionId() != null) { // CallActivity
ExecutionEntity callActivityExecution = scopeExecutionEntity.getSuperExecution();
CallActivity callActivity = (CallActivity) callActivityExecution.getCurrentFlowElement();
if (callActivity.hasMultiInstanceLoopCharacteristics()) {
MultiInstanceActivityBehavior multiInstanceBehavior = (MultiInstanceActivityBehavior) callActivity.getBehavior();
multiInstanceBehavior.leave(callActivityExecution);
executionEntityManager.deleteProcessInstanceExecutionEntity(scopeExecutionEntity.getId(), execution.getCurrentFlowElement().getId(), "terminate end event", false, false, true);
} else {
executionEntityManager.deleteProcessInstanceExecutionEntity(scopeExecutionEntity.getId(), execution.getCurrentFlowElement().getId(), "terminate end event", false, false, true);
ExecutionEntity superExecutionEntity = executionEntityManager.findById(scopeExecutionEntity.getSuperExecutionId());
commandContext.getAgenda().planTakeOutgoingSequenceFlowsOperation(superExecutionEntity);
}
dispatchExecutionCancelled(execution, terminateEndEvent);
}
}
}
protected void dispatchExecutionCancelled(DelegateExecution execution, FlowElement terminateEndEvent) {
ExecutionEntityManager executionEntityManager = Context.getCommandContext().getExecutionEntityManager();
// subprocesses
for (DelegateExecution subExecution : executionEntityManager.findChildExecutionsByParentExecutionId(execution.getId())) {
dispatchExecutionCancelled(subExecution, terminateEndEvent);
}
protected ExecutionTreeNode findFirstScope(DelegateExecution execution, ExecutionTree executionTree) {
ExecutionTreeNode scopeTreeNode = executionTree.getTreeNode(execution.getId());
while (!scopeTreeNode.getExecutionEntity().isScope()) {
scopeTreeNode = scopeTreeNode.getParent();
// call activities
ExecutionEntity subProcessInstance = Context.getCommandContext().getExecutionEntityManager().findSubProcessInstanceBySuperExecutionId(execution.getId());
if (subProcessInstance != null) {
dispatchExecutionCancelled(subProcessInstance, terminateEndEvent);
}
if (scopeTreeNode == null) {
break;
}
}
return scopeTreeNode;
}
// activity with message/signal boundary events
FlowElement currentFlowElement = execution.getCurrentFlowElement();
if (currentFlowElement != null && currentFlowElement instanceof FlowNode) {
dispatchActivityCancelled(execution, terminateEndEvent);
}
protected void deleteExecutionEntities(CommandContext commandContext, ExecutionEntityManager executionEntityManager, ExecutionTreeBfsIterator treeIterator) {
// Delete the execution in leafs-first order to avoid foreign key
// constraints firing
while (treeIterator.hasNext()) {
ExecutionTreeNode treeNode = treeIterator.next();
ExecutionEntity executionEntity = treeNode.getExecutionEntity();
executionEntityManager.deleteExecutionAndRelatedData(executionEntity, null, false);
}
}
protected void dispatchActivityCancelled(DelegateExecution execution, FlowElement terminateEndEvent) {
Context.getProcessEngineConfiguration()
.getEventDispatcher()
.dispatchEvent(
ActivitiEventBuilder.createActivityCancelledEvent(
execution.getCurrentFlowElement().getId(),
execution.getCurrentFlowElement().getName(),
execution.getId(),
execution.getProcessInstanceId(),
execution.getProcessDefinitionId(),
execution.getCurrentFlowElement().getClass().getName(),
((FlowNode) execution.getCurrentFlowElement()).getBehavior().getClass().getCanonicalName(),
terminateEndEvent));
protected void sendProcessInstanceCancelledEvent(DelegateExecution execution, FlowElement terminateEndEvent) {
if (Context.getProcessEngineConfiguration().getEventDispatcher().isEnabled()) {
Context.getProcessEngineConfiguration().getEventDispatcher()
.dispatchEvent(ActivitiEventBuilder.createCancelledEvent(execution.getId(), execution.getProcessInstanceId(), execution.getProcessDefinitionId(), execution.getCurrentFlowElement()));
}
protected boolean hasMultiInstanceParent(FlowNode flowNode) {
boolean hasMultiInstanceParent = false;
if (flowNode.getSubProcess() != null) {
if (flowNode.getSubProcess().getLoopCharacteristics() != null) {
dispatchExecutionCancelled(execution, terminateEndEvent);
}
protected void dispatchExecutionCancelled(DelegateExecution execution, FlowElement terminateEndEvent) {
ExecutionEntityManager executionEntityManager = Context.getCommandContext().getExecutionEntityManager();
// subprocesses
for (DelegateExecution subExecution : executionEntityManager.findChildExecutionsByParentExecutionId(execution.getId())) {
dispatchExecutionCancelled(subExecution, terminateEndEvent);
}
// call activities
ExecutionEntity subProcessInstance = Context.getCommandContext().getExecutionEntityManager().findSubProcessInstanceBySuperExecutionId(execution.getId());
if (subProcessInstance != null) {
dispatchExecutionCancelled(subProcessInstance, terminateEndEvent);
}
// activity with message/signal boundary events
FlowElement currentFlowElement = execution.getCurrentFlowElement();
if (currentFlowElement != null && currentFlowElement instanceof FlowNode) {
dispatchActivityCancelled(execution, terminateEndEvent);
}
}
protected void dispatchActivityCancelled(DelegateExecution execution, FlowElement terminateEndEvent) {
Context
.getProcessEngineConfiguration()
.getEventDispatcher()
.dispatchEvent(
ActivitiEventBuilder.createActivityCancelledEvent(execution.getCurrentFlowElement().getId(), execution.getCurrentFlowElement().getName(), execution.getId(),
execution.getProcessInstanceId(), execution.getProcessDefinitionId(), execution.getCurrentFlowElement().getClass().getName(), ((FlowNode) execution.getCurrentFlowElement())
.getBehavior().getClass().getCanonicalName(), terminateEndEvent));
}
protected boolean hasMultiInstanceParent(FlowNode flowNode) {
boolean hasMultiInstanceParent = false;
if (flowNode.getSubProcess() != null) {
if (flowNode.getSubProcess().getLoopCharacteristics() != null) {
hasMultiInstanceParent = true;
} else {
boolean hasNestedMultiInstanceParent = hasMultiInstanceParent(flowNode.getSubProcess());
if (hasNestedMultiInstanceParent) {
hasMultiInstanceParent = true;
} else {
boolean hasNestedMultiInstanceParent = hasMultiInstanceParent(flowNode.getSubProcess());
if (hasNestedMultiInstanceParent) {
hasMultiInstanceParent = true;
}
}
}
return hasMultiInstanceParent;
}
return hasMultiInstanceParent;
}
}
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/helper/ErrorPropagation.java
浏览文件 @ b80e89a1
......@@ -65,7 +65,7 @@ public class ErrorPropagation {
if (eventMap.size() > 0) {
executeCatch(eventMap, execution, errorCode);
} else {
if (execution.getProcessInstanceId().equals(execution.getRootProcessInstanceId()) == false) {
if (execution.getProcessInstanceId().equals(execution.getRootProcessInstanceId()) == false) { // Call activity
ExecutionEntityManager executionEntityManager = Context.getCommandContext().getExecutionEntityManager();
ExecutionTree executionTree = executionEntityManager.findExecutionTree(execution.getRootProcessInstanceId());
ExecutionTreeNode rootNode = executionTree.getRoot();
......@@ -131,9 +131,8 @@ public class ErrorPropagation {
if (eventMap.containsKey(currentExecution.getActivityId())) {
matchingEvent = eventMap.get(currentExecution.getActivityId()).get(0);
// check for parallel multi instance execution --> if so, get the parent execution
FlowElement parentElement = currentExecution.getParent().getCurrentFlowElement();
if (parentElement != null && parentElement.getId().equals(currentExecution.getCurrentFlowElement().getId())) {
// Check for multi instance
if (currentExecution.getParentId() != null && currentExecution.getParent().isMultiInstanceRoot()) {
currentExecution = currentExecution.getParent();
}
......@@ -162,11 +161,11 @@ public class ErrorPropagation {
if (eventMap.containsKey(currentExecution.getActivityId())) {
matchingEvent = eventMap.get(currentExecution.getActivityId()).get(0);
// check for parallel multi instance execution --> if so, get the parent execution
FlowElement parentElement = currentExecution.getParent().getCurrentFlowElement();
if (parentElement != null && parentElement.getId().equals(currentExecution.getCurrentFlowElement().getId())) {
// Check for multi instance
if (currentExecution.getParentId() != null && currentExecution.getParent().isMultiInstanceRoot()) {
currentExecution = currentExecution.getParent();
}
} else if (StringUtils.isNotEmpty(currentExecution.getParentId())) {
currentExecution = currentExecution.getParent();
} else {
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ExecutionEntity.java
浏览文件 @ b80e89a1
......@@ -93,6 +93,10 @@ public interface ExecutionEntity extends DelegateExecution, Execution, ProcessIn
boolean isEventScope();
void setEventScope(boolean isEventScope);
boolean isMultiInstanceRoot();
void setMultiInstanceRoot(boolean isMultiInstanceRoot);
void setName(String name);
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ExecutionEntityImpl.java
浏览文件 @ b80e89a1
......@@ -69,13 +69,12 @@ public class ExecutionEntityImpl extends VariableScopeImpl implements ExecutionE
// state/type of execution //////////////////////////////////////////////////
// TODO: remnants of Activti 5. Check which ones should be kept and which ones deleted.
protected boolean isActive = true;
protected boolean isScope = true;
protected boolean isConcurrent;
protected boolean isEnded;
protected boolean isEventScope;
protected boolean isMultiInstanceRoot;
// events ///////////////////////////////////////////////////////////////////
......@@ -660,6 +659,16 @@ public class ExecutionEntityImpl extends VariableScopeImpl implements ExecutionE
public void setEventScope(boolean isEventScope) {
this.isEventScope = isEventScope;
}
@Override
public boolean isMultiInstanceRoot() {
return isMultiInstanceRoot;
}
@Override
public void setMultiInstanceRoot(boolean isMultiInstanceRoot) {
this.isMultiInstanceRoot = isMultiInstanceRoot;
}
public String getCurrentActivityId() {
return activityId;
......@@ -727,9 +736,21 @@ public class ExecutionEntityImpl extends VariableScopeImpl implements ExecutionE
if (isProcessInstanceType()) {
return "ProcessInstance[" + getId() + "]";
} else {
return (isScope ? "Scope" : "") + "Execution[ id '" + getId() + "'"
+ (activityId != null ? " - activity '" + activityId + "'" : "")
+ (parentId != null ? " - parent '" + parentId + "'" : "") + "] ";
StringBuilder strb = new StringBuilder();
if (isScope) {
strb.append("Scoped execution[ id '" + getId() + "' ]");
} else if(isMultiInstanceRoot) {
strb.append("Multi instance root execution[ id '" + getId() + "' ]");
} else {
strb.append("Execution[ id '" + getId() + "' ]");
}
if (activityId != null) {
strb.append(" - activity '" + activityId);
}
if (parentId != null) {
strb.append(" - parent '" + parentId + "'");
}
return strb.toString();
}
}
......
modules/activiti-engine/src/main/java/org/activiti/engine/impl/util/tree/ExecutionTreeNode.java
浏览文件 @ b80e89a1
......@@ -79,8 +79,10 @@ public class ExecutionTreeNode implements Iterable<ExecutionTreeNode> {
protected void internalToString(StringBuilder strb, String prefix, boolean isTail) {
strb.append(prefix).append(isTail ? "└── " : "├── ").append(getExecutionEntity().getId()).append(" : ")
.append(getExecutionEntity().getActivityId()).append(", parent id ").append(getExecutionEntity().getParentId())
.append(getExecutionEntity().isScope() ? " (scope)" : "").append("\r\n");
.append("activityId=" + getExecutionEntity().getActivityId()).append(", parent id ").append(getExecutionEntity().getParentId())
.append(getExecutionEntity().isScope() ? " (scope)" : "")
.append(getExecutionEntity().isMultiInstanceRoot() ? " (multi instance root)" : "")
.append("\r\n");
if (children != null) {
for (int i = 0; i < children.size() - 1; i++) {
children.get(i).internalToString(strb, prefix + (isTail ? " " : "│ "), false);
......
modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.db2.create.engine.sql
浏览文件 @ b80e89a1
......@@ -65,11 +65,12 @@ create table ACT_RU_EXECUTION (
IS_CONCURRENT_ smallint check(IS_CONCURRENT_ in (1,0)),
IS_SCOPE_ smallint check(IS_SCOPE_ in (1,0)),
IS_EVENT_SCOPE_ smallint check(IS_EVENT_SCOPE_ in (1,0)),
SUSPENSION_STATE_ integer,
CACHED_ENT_STATE_ integer,
TENANT_ID_ varchar(255) default '',
NAME_ varchar(255),
LOCK_TIME_ timestamp,
IS_MI_ROOT_ smallint check(IS_MI_ROOT_ in (1,0)),
SUSPENSION_STATE_ integer,
CACHED_ENT_STATE_ integer,
TENANT_ID_ varchar(255) default '',
NAME_ varchar(255),
LOCK_TIME_ timestamp,
primary key (ID_)
);
......
modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.h2.create.engine.sql
浏览文件 @ b80e89a1
......@@ -65,6 +65,7 @@ create table ACT_RU_EXECUTION (
IS_CONCURRENT_ bit,
IS_SCOPE_ bit,
IS_EVENT_SCOPE_ bit,
IS_MI_ROOT_ bit,
SUSPENSION_STATE_ integer,
CACHED_ENT_STATE_ integer,
TENANT_ID_ varchar(255) default '',
......
modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.hsql.create.engine.sql
浏览文件 @ b80e89a1
......@@ -65,6 +65,7 @@ create table ACT_RU_EXECUTION (
IS_CONCURRENT_ bit,
IS_SCOPE_ bit,
IS_EVENT_SCOPE_ bit,
IS_MI_ROOT_ bit,
SUSPENSION_STATE_ integer,
CACHED_ENT_STATE_ integer,
TENANT_ID_ varchar(255) default '',
......
modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.mssql.create.engine.sql
浏览文件 @ b80e89a1
......@@ -65,6 +65,7 @@ create table ACT_RU_EXECUTION (
IS_CONCURRENT_ tinyint,
IS_SCOPE_ tinyint,
IS_EVENT_SCOPE_ tinyint,
IS_MI_ROOT_ tinyint,
SUSPENSION_STATE_ tinyint,
CACHED_ENT_STATE_ int,
TENANT_ID_ nvarchar(255) default '',
......
modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.mysql.create.engine.sql
浏览文件 @ b80e89a1
......@@ -65,6 +65,7 @@ create table ACT_RU_EXECUTION (
IS_CONCURRENT_ TINYINT,
IS_SCOPE_ TINYINT,
IS_EVENT_SCOPE_ TINYINT,
IS_MI_ROOT_ TINYINT,
SUSPENSION_STATE_ integer,
CACHED_ENT_STATE_ integer,
TENANT_ID_ varchar(255) default '',
......
modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.mysql55.create.engine.sql
浏览文件 @ b80e89a1
......@@ -65,6 +65,7 @@ create table ACT_RU_EXECUTION (
IS_CONCURRENT_ TINYINT,
IS_SCOPE_ TINYINT,
IS_EVENT_SCOPE_ TINYINT,
IS_MI_ROOT_ TINYINT,
SUSPENSION_STATE_ integer,
CACHED_ENT_STATE_ integer,
TENANT_ID_ varchar(255) default '',
......
modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.oracle.create.engine.sql
浏览文件 @ b80e89a1
......@@ -65,6 +65,7 @@ create table ACT_RU_EXECUTION (
IS_CONCURRENT_ NUMBER(1,0) CHECK (IS_CONCURRENT_ IN (1,0)),
IS_SCOPE_ NUMBER(1,0) CHECK (IS_SCOPE_ IN (1,0)),
IS_EVENT_SCOPE_ NUMBER(1,0) CHECK (IS_EVENT_SCOPE_ IN (1,0)),
IS_MI_ROOT_ NUMBER(1,0) CHECK (IS_MI_ROOT_ IN (1,0)),
SUSPENSION_STATE_ INTEGER,
CACHED_ENT_STATE_ INTEGER,
TENANT_ID_ NVARCHAR2(255) DEFAULT '',
......
modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.postgres.create.engine.sql
浏览文件 @ b80e89a1
......@@ -65,6 +65,7 @@ create table ACT_RU_EXECUTION (
IS_CONCURRENT_ boolean,
IS_SCOPE_ boolean,
IS_EVENT_SCOPE_ boolean,
IS_MI_ROOT_ boolean,
SUSPENSION_STATE_ integer,
CACHED_ENT_STATE_ integer,
TENANT_ID_ varchar(255) default '',
......
modules/activiti-engine/src/main/resources/org/activiti/db/mapping/entity/Execution.xml
浏览文件 @ b80e89a1
......@@ -7,7 +7,7 @@
<!-- EXECUTION INSERT -->
<insert id="insertExecution" parameterType="org.activiti.engine.impl.persistence.entity.ExecutionEntityImpl">
insert into ${prefix}ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_,IS_EVENT_SCOPE_, PARENT_ID_, SUPER_EXEC_, ROOT_PROC_INST_ID_, SUSPENSION_STATE_, CACHED_ENT_STATE_, TENANT_ID_, NAME_)
insert into ${prefix}ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_,IS_EVENT_SCOPE_, IS_MI_ROOT_, PARENT_ID_, SUPER_EXEC_, ROOT_PROC_INST_ID_, SUSPENSION_STATE_, CACHED_ENT_STATE_, TENANT_ID_, NAME_)
values (
#{id ,jdbcType=VARCHAR},
1,
......@@ -19,6 +19,7 @@
#{isConcurrent ,jdbcType=BOOLEAN},
#{isScope ,jdbcType=BOOLEAN},
#{isEventScope ,jdbcType=BOOLEAN},
#{isMultiInstanceRoot, jdbcType=BOOLEAN},
#{parentId, jdbcType=VARCHAR},
#{superExecutionId, jdbcType=VARCHAR},
#{rootProcessInstanceId, jdbcType=VARCHAR},
......@@ -30,7 +31,7 @@
</insert>
<insert id="bulkInsertExecution" parameterType="java.util.List">
insert into ${prefix}ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_,IS_EVENT_SCOPE_, PARENT_ID_, SUPER_EXEC_, ROOT_PROC_INST_ID_, SUSPENSION_STATE_, CACHED_ENT_STATE_, TENANT_ID_, NAME_)
insert into ${prefix}ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_,IS_EVENT_SCOPE_, IS_MI_ROOT_, PARENT_ID_, SUPER_EXEC_, ROOT_PROC_INST_ID_, SUSPENSION_STATE_, CACHED_ENT_STATE_, TENANT_ID_, NAME_)
values
<foreach collection="list" item="execution" index="index" separator=",">
(#{execution.id ,jdbcType=VARCHAR},
......@@ -43,6 +44,7 @@
#{execution.isConcurrent ,jdbcType=BOOLEAN},
#{execution.isScope ,jdbcType=BOOLEAN},
#{execution.isEventScope ,jdbcType=BOOLEAN},
#{execution.isMultiInstanceRoot, jdbcType=BOOLEAN},
#{execution.parentId, jdbcType=VARCHAR},
#{execution.superExecutionId, jdbcType=VARCHAR},
#{execution.rootProcessInstanceId, jdbcType=VARCHAR},
......@@ -57,7 +59,7 @@
INSERT ALL
<foreach collection="list" item="execution" index="index">
into ${prefix}ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_,
IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_,IS_EVENT_SCOPE_, PARENT_ID_, SUPER_EXEC_, ROOT_PROC_INST_ID_, SUSPENSION_STATE_, CACHED_ENT_STATE_, TENANT_ID_, NAME_) VALUES
IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_,IS_EVENT_SCOPE_, IS_MI_ROOT_, PARENT_ID_, SUPER_EXEC_, ROOT_PROC_INST_ID_, SUSPENSION_STATE_, CACHED_ENT_STATE_, TENANT_ID_, NAME_) VALUES
(#{execution.id ,jdbcType=VARCHAR},
1,
#{execution.processInstanceId, jdbcType=VARCHAR},
......@@ -68,6 +70,7 @@
#{execution.isConcurrent ,jdbcType=BOOLEAN},
#{execution.isScope ,jdbcType=BOOLEAN},
#{execution.isEventScope ,jdbcType=BOOLEAN},
#{execution.isMultiInstanceRoot, jdbcType=BOOLEAN},
#{execution.parentId, jdbcType=VARCHAR},
#{execution.superExecutionId, jdbcType=VARCHAR},
#{execution.rootProcessInstanceId, jdbcType=VARCHAR},
......@@ -91,6 +94,7 @@
IS_CONCURRENT_ = #{isConcurrent, jdbcType=BOOLEAN},
IS_SCOPE_ = #{isScope, jdbcType=BOOLEAN},
IS_EVENT_SCOPE_ = #{isEventScope, jdbcType=BOOLEAN},
IS_MI_ROOT_ = #{isMultiInstanceRoot, jdbcType=BOOLEAN},
PARENT_ID_ = #{parentId, jdbcType=VARCHAR},
SUPER_EXEC_ = #{superExecutionId, jdbcType=VARCHAR},
ROOT_PROC_INST_ID_ = #{rootProcessInstanceId, jdbcType=VARCHAR},
......@@ -175,6 +179,7 @@
<result property="isConcurrent" column="IS_CONCURRENT_" jdbcType="BOOLEAN" />
<result property="isScope" column="IS_SCOPE_" jdbcType="BOOLEAN" />
<result property="isEventScope" column="IS_EVENT_SCOPE_" jdbcType="BOOLEAN" />
<result property="isMultiInstanceRoot" column="IS_MI_ROOT_" jdbcType="BOOLEAN" />
<result property="parentId" column="PARENT_ID_" jdbcType="VARCHAR" />
<result property="superExecutionId" column="SUPER_EXEC_" jdbcType="VARCHAR" />
<result property="rootProcessInstanceId" column="ROOT_PROC_INST_ID_" jdbcType="VARCHAR" />
......@@ -202,6 +207,7 @@
<result property="isConcurrent" column="IS_CONCURRENT_" jdbcType="BOOLEAN" />
<result property="isScope" column="IS_SCOPE_" jdbcType="BOOLEAN" />
<result property="isEventScope" column="IS_EVENT_SCOPE_" jdbcType="BOOLEAN" />
<result property="isMultiInstanceRoot" column="IS_MI_ROOT_" jdbcType="BOOLEAN" />
<result property="parentId" column="PARENT_ID_" jdbcType="VARCHAR" />
<result property="superExecutionId" column="SUPER_EXEC_" jdbcType="VARCHAR" />
<result property="rootProcessInstanceId" column="ROOT_PROC_INST_ID_" jdbcType="VARCHAR" />
......@@ -223,6 +229,7 @@
<result property="isConcurrent" column="IS_CONCURRENT_" jdbcType="BOOLEAN" />
<result property="isScope" column="IS_SCOPE_" jdbcType="BOOLEAN" />
<result property="isEventScope" column="IS_EVENT_SCOPE_" jdbcType="BOOLEAN" />
<result property="isMultiInstanceRoot" column="IS_MI_ROOT_" jdbcType="BOOLEAN" />
<result property="parentId" column="PARENT_ID_" jdbcType="VARCHAR" />
<result property="superExecutionId" column="SUPER_EXEC_" jdbcType="VARCHAR" />
<result property="rootProcessInstanceId" column="ROOT_PROC_INST_ID_" jdbcType="VARCHAR" />
......@@ -261,6 +268,7 @@
<result property="isConcurrent" column="IS_CONCURRENT_" jdbcType="BOOLEAN" />
<result property="isScope" column="IS_SCOPE_" jdbcType="BOOLEAN" />
<result property="isEventScope" column="IS_EVENT_SCOPE_" jdbcType="BOOLEAN" />
<result property="isMultiInstanceRoot" column="IS_MI_ROOT_" jdbcType="BOOLEAN" />
<result property="parentId" column="PARENT_ID_" jdbcType="VARCHAR" />
<result property="superExecutionId" column="SUPER_EXEC_" jdbcType="VARCHAR" />
<result property="rootProcessInstanceId" column="ROOT_PROC_INST_ID_" jdbcType="VARCHAR" />
......@@ -401,9 +409,10 @@
TEMPRES_REV_ as REV_, TEMPRES_ACT_ID_ as ACT_ID_,
TEMPRES_BUSINESS_KEY_ as BUSINESS_KEY_, TEMPRES_IS_ACTIVE_ as IS_ACTIVE_,
TEMPRES_IS_CONCURRENT_ as IS_CONCURRENT_, TEMPRES_IS_SCOPE_ as IS_SCOPE_,
TEMPRES_IS_EVENT_SCOPE_ as IS_EVENT_SCOPE_, TEMPRES_PARENT_ID_ as PARENT_ID_,
TEMPRES_PROC_INST_ID_ as PROC_INST_ID_, TEMPRES_SUPER_EXEC_ as SUPER_EXEC_,
TEMPRES_PROC_DEF_ID_ as PROC_DEF_ID_, TEMPRES_NAME_ as NAME_, TEMPRES_TENANT_ID_ as TENANT_ID_,
TEMPRES_IS_EVENT_SCOPE_ as IS_EVENT_SCOPE_, TEMPRES_IS_MI_ROOT_ as IS_MI_ROOT_,
TEMPRES_PARENT_ID_ as PARENT_ID_, TEMPRES_PROC_INST_ID_ as PROC_INST_ID_,
TEMPRES_SUPER_EXEC_ as SUPER_EXEC_, TEMPRES_PROC_DEF_ID_ as PROC_DEF_ID_,
TEMPRES_NAME_ as NAME_, TEMPRES_TENANT_ID_ as TENANT_ID_,
TEMPRES_SUSPENSION_STATE_ as SUSPENSION_STATE_, TEMPRES_CACHED_ENT_STATE_ as CACHED_ENT_STATE_,
TEMPVAR_ID_ as VAR_ID_, TEMPVAR_NAME_ as VAR_NAME_, TEMPVAR_TYPE_ as VAR_TYPE_, TEMPVAR_REV_ as VAR_REV_,
TEMPVAR_PROC_INST_ID_ as VAR_PROC_INST_ID_, TEMPVAR_EXECUTION_ID_ as VAR_EXECUTION_ID_, TEMPVAR_TASK_ID_ as VAR_TASK_ID_,
......@@ -414,9 +423,9 @@
RES.ACT_ID_ as TEMPRES_ACT_ID_, RES.PROC_INST_ID_ as TEMPRES_PROC_INST_ID_,
RES.BUSINESS_KEY_ as TEMPRES_BUSINESS_KEY_, RES.IS_ACTIVE_ as TEMPRES_IS_ACTIVE_,
RES.IS_CONCURRENT_ as TEMPRES_IS_CONCURRENT_, RES.IS_SCOPE_ as TEMPRES_IS_SCOPE_,
RES.IS_EVENT_SCOPE_ as TEMPRES_IS_EVENT_SCOPE_, RES.PARENT_ID_ as TEMPRES_PARENT_ID_,
RES.SUPER_EXEC_ as TEMPRES_SUPER_EXEC_, RES.SUSPENSION_STATE_ as TEMPRES_SUSPENSION_STATE_,
RES.CACHED_ENT_STATE_ as TEMPRES_CACHED_ENT_STATE_,
RES.IS_EVENT_SCOPE_ as TEMPRES_IS_EVENT_SCOPE_, RES.IS_MI_ROOT_ as TEMPRES_IS_MI_ROOT_,
RES.PARENT_ID_ as TEMPRES_PARENT_ID_, RES.SUPER_EXEC_ as TEMPRES_SUPER_EXEC_,
RES.SUSPENSION_STATE_ as TEMPRES_SUSPENSION_STATE_, RES.CACHED_ENT_STATE_ as TEMPRES_CACHED_ENT_STATE_,
RES.PROC_DEF_ID_ as TEMPRES_PROC_DEF_ID_, RES.NAME_ as TEMPRES_NAME_, RES.TENANT_ID_ as TEMPRES_TENANT_ID_,
VAR.ID_ as TEMPVAR_ID_, VAR.NAME_ as TEMPVAR_NAME_, VAR.TYPE_ as TEMPVAR_TYPE_, VAR.REV_ as TEMPVAR_REV_,
VAR.PROC_INST_ID_ as TEMPVAR_PROC_INST_ID_, VAR.EXECUTION_ID_ as TEMPVAR_EXECUTION_ID_, VAR.TASK_ID_ as TEMPVAR_TASK_ID_,
......
modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/event/end/TerminateEndEventTest.java
浏览文件 @ b80e89a1
......@@ -12,7 +12,6 @@
*/
package org.activiti.engine.test.bpmn.event.end;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
......@@ -22,13 +21,12 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.activiti.bpmn.model.BpmnModel;
import org.activiti.bpmn.model.EndEvent;
import org.activiti.bpmn.model.ExtensionAttribute;
import org.activiti.bpmn.model.ExtensionElement;
import org.activiti.engine.delegate.DelegateExecution;
import org.activiti.engine.delegate.JavaDelegate;
import org.activiti.engine.impl.bpmn.behavior.TerminateEndEventActivityBehavior;
import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
import org.activiti.engine.impl.pvm.process.ActivityImpl;
import org.activiti.engine.impl.test.PluggableActivitiTestCase;
import org.activiti.engine.repository.ProcessDefinition;
import org.activiti.engine.runtime.ProcessInstance;
......@@ -52,7 +50,7 @@ public class TerminateEndEventTest extends PluggableActivitiTestCase {
public static class CountDelegate implements JavaDelegate {
public void execute(DelegateExecution execution) throws Exception {
public void execute(DelegateExecution execution) {
serviceTaskInvokedCount++;
// leave only 3 out of n subprocesses
......@@ -64,7 +62,7 @@ public class TerminateEndEventTest extends PluggableActivitiTestCase {
public static class CountDelegate2 implements JavaDelegate {
public void execute(DelegateExecution execution) throws Exception {
public void execute(DelegateExecution execution) {
serviceTaskInvokedCount2++;
}
}
......@@ -139,9 +137,6 @@ public class TerminateEndEventTest extends PluggableActivitiTestCase {
public void testTerminateWithCallActivity() throws Exception {
ProcessInstance pi = runtimeService.startProcessInstanceByKey("terminateEndEventExample");
long executionEntities = runtimeService.createExecutionQuery().processInstanceId(pi.getId()).count();
assertEquals(4, executionEntities);
Task task = taskService.createTaskQuery().processInstanceId(pi.getId()).taskDefinitionKey("preTerminateEnd").singleResult();
taskService.complete(task.getId());
......@@ -169,9 +164,6 @@ public class TerminateEndEventTest extends PluggableActivitiTestCase {
public void testTerminateInExclusiveGatewayWithCallActivity() throws Exception {
ProcessInstance pi = runtimeService.startProcessInstanceByKey("terminateEndEventExample-terminateAfterExclusiveGateway");
long executionEntities = runtimeService.createExecutionQuery().processInstanceId(pi.getId()).count();
assertEquals(4, executionEntities);
Task task = taskService.createTaskQuery().processInstanceId(pi.getId()).taskDefinitionKey("preTerminateEnd").singleResult();
Map<String, Object> variables = new HashMap<String, Object>();
variables.put("input", 1);
......@@ -184,9 +176,6 @@ public class TerminateEndEventTest extends PluggableActivitiTestCase {
public void testTerminateInExclusiveGatewayWithMultiInstanceSubProcess() throws Exception {
ProcessInstance pi = runtimeService.startProcessInstanceByKey("terminateEndEventExample-terminateAfterExclusiveGateway");
long executionEntities = runtimeService.createExecutionQuery().processInstanceId(pi.getId()).count();
assertEquals(14, executionEntities);
Task task = taskService.createTaskQuery().processInstanceId(pi.getId()).taskDefinitionKey("preTerminateEnd").singleResult();
Map<String, Object> variables = new HashMap<String, Object>();
variables.put("input", 1);
......@@ -223,7 +212,7 @@ public class TerminateEndEventTest extends PluggableActivitiTestCase {
// should terminate the subprocess and continue the parent
long executionEntities = runtimeService.createExecutionQuery().processInstanceId(pi.getId()).count();
assertEquals(1, executionEntities);
assertTrue(executionEntities > 0);
Task task = taskService.createTaskQuery().processInstanceId(pi.getId()).taskDefinitionKey("preNormalEnd").singleResult();
taskService.complete(task.getId());
......@@ -302,7 +291,7 @@ public class TerminateEndEventTest extends PluggableActivitiTestCase {
ProcessInstance pi = runtimeService.startProcessInstanceByKey("terminateEndEventExample");
long executionEntities = runtimeService.createExecutionQuery().count();
assertEquals(1, executionEntities);
assertTrue(executionEntities > 0);
Task task = taskService.createTaskQuery().processInstanceId(pi.getId()).taskDefinitionKey("preNormalEnd").singleResult();
taskService.complete(task.getId());
......@@ -333,9 +322,6 @@ public class TerminateEndEventTest extends PluggableActivitiTestCase {
public void testTerminateInSubProcessConcurrentMultiInstance() throws Exception {
ProcessInstance pi = runtimeService.startProcessInstanceByKey("terminateEndEventExample");
long executionEntities = runtimeService.createExecutionQuery().count();
assertEquals(12, executionEntities);
List<Task> tasks = taskService.createTaskQuery().processInstanceId(pi.getId()).list();
assertEquals(4, tasks.size()); // 3 user tasks in MI +1 (preNormalEnd) = 4 (2 were killed because it went directly to the terminate end event)
......@@ -397,7 +383,7 @@ public class TerminateEndEventTest extends PluggableActivitiTestCase {
ProcessInstance pi = runtimeService.startProcessInstanceByKey("terminateEndEventExample");
long executionEntities = runtimeService.createExecutionQuery().count();
assertEquals(1, executionEntities);
assertTrue(executionEntities > 0);
Task task = taskService.createTaskQuery().processInstanceId(pi.getId()).taskDefinitionKey("preNormalEnd").singleResult();
taskService.complete(task.getId());
......@@ -405,7 +391,6 @@ public class TerminateEndEventTest extends PluggableActivitiTestCase {
assertProcessEnded(pi.getId());
}
@Deployment
public void testTerminateInSubProcessSequentialConcurrentMultiInstance() throws Exception {
......@@ -413,9 +398,7 @@ public class TerminateEndEventTest extends PluggableActivitiTestCase {
ProcessInstance pi = runtimeService.startProcessInstanceByKey("terminateEndEventExample");
long remainingExecutions = runtimeService.createExecutionQuery().count();
// outer execution still available
assertEquals(1, remainingExecutions);
assertTrue(remainingExecutions > 0);
// three finished
assertEquals(3, serviceTaskInvokedCount2);
......@@ -442,7 +425,7 @@ public class TerminateEndEventTest extends PluggableActivitiTestCase {
// should terminate the called process and continue the parent
long executionEntities = runtimeService.createExecutionQuery().count();
assertEquals(1, executionEntities);
assertTrue(executionEntities > 0);
Task task = taskService.createTaskQuery().processInstanceId(pi.getId()).taskDefinitionKey("preNormalEnd").singleResult();
taskService.complete(task.getId());
......@@ -459,7 +442,7 @@ public class TerminateEndEventTest extends PluggableActivitiTestCase {
// should terminate the called process and continue the parent
long executionEntities = runtimeService.createExecutionQuery().count();
assertEquals(1, executionEntities);
assertTrue(executionEntities > 0);
Task task = taskService.createTaskQuery().processInstanceId(pi.getId()).taskDefinitionKey("preNormalEnd").singleResult();
taskService.complete(task.getId());
......@@ -484,7 +467,7 @@ public class TerminateEndEventTest extends PluggableActivitiTestCase {
// should terminate the called process and continue the parent
long executionEntities = runtimeService.createExecutionQuery().count();
assertEquals(1, executionEntities);
assertTrue(executionEntities > 0);
Task task = taskService.createTaskQuery().processInstanceId(pi.getId()).taskDefinitionKey("preNormalEnd").singleResult();
taskService.complete(task.getId());
......@@ -540,10 +523,10 @@ public class TerminateEndEventTest extends PluggableActivitiTestCase {
if (i != 8) {
aTasks = taskService.createTaskQuery().taskName("A").list();
assertEquals(1, aTasks.size());
assertEquals("Expected task for i=" + i, 1, aTasks.size());
bTasks = taskService.createTaskQuery().taskName("B").list();
assertEquals(1, bTasks.size());
assertEquals("Expected task for i=" +i, 1, bTasks.size());
}
}
......@@ -574,7 +557,7 @@ public class TerminateEndEventTest extends PluggableActivitiTestCase {
// should terminate the called process and continue the parent
long executionEntities = runtimeService.createExecutionQuery().count();
assertEquals(1, executionEntities);
assertTrue(executionEntities > 0);
Task task = taskService.createTaskQuery().processInstanceId(pi.getId()).taskDefinitionKey("preNormalEnd").singleResult();
taskService.complete(task.getId());
......@@ -687,6 +670,7 @@ public class TerminateEndEventTest extends PluggableActivitiTestCase {
// Should have 7 tasks C active after each other
for (int i=0; i<7; i++) {
Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).taskName("C").singleResult();
assertNotNull("Task was null for i = " + i, task);
taskService.complete(task.getId());
}
......@@ -814,14 +798,11 @@ public class TerminateEndEventTest extends PluggableActivitiTestCase {
public void testParseTerminateEndEventDefinitionWithExtensions() {
org.activiti.engine.repository.Deployment deployment = repositoryService.createDeployment().addClasspathResource("org/activiti/engine/test/bpmn/event/end/TerminateEndEventTest.parseExtensionElements.bpmn20.xml").deploy();
ProcessDefinition processDefinitionQuery = repositoryService.createProcessDefinitionQuery().deploymentId(deployment.getId()).singleResult();
ProcessDefinitionEntity processDefinition = this.processEngineConfiguration.getProcessDefinitionCache().get(processDefinitionQuery.getId());
assertThat(processDefinition.getActivities().size(), is(2));
ActivityImpl endEvent = processDefinition.getActivities().get(1);
assertThat(endEvent.getId(), is("terminateEnd"));
assertThat(endEvent.getActivityBehavior(), instanceOf(TerminateEndEventActivityBehavior.class));
TerminateEndEventActivityBehavior terminateEndEventBehavior = (TerminateEndEventActivityBehavior) endEvent.getActivityBehavior();
Map<String, List<ExtensionElement>> extensionElements = terminateEndEventBehavior.getEndEvent().getExtensionElements();
BpmnModel bpmnModel = this.processEngineConfiguration.getProcessDefinitionCache()
.get(processDefinitionQuery.getId()).getBpmnModel();
Map<String, List<ExtensionElement>> extensionElements = bpmnModel.getProcesses().get(0)
.findFlowElementsOfType(EndEvent.class).get(0).getExtensionElements();
assertThat(extensionElements.size(), is(1));
List<ExtensionElement> strangeProperties = extensionElements.get("strangeProperty");
assertThat(strangeProperties.size(), is(1));
......
modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/event/end/TerminateEndEventTest.subProcessConcurrentTerminate.bpmn
浏览文件 @ b80e89a1
<?xml version="1.0" encoding="UTF-8"?>
<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="Definitions_1" targetNamespace="http://activiti.org/bpmn">
<bpmn2:process id="terminateEndEventSubprocessExample" name="Default Process">
<bpmn2:startEvent id="start" />
<bpmn2:receiveTask id="subProcessWait" />
<bpmn2:sequenceFlow id="flow1" sourceRef="start" targetRef="subProcessWait"/>
<bpmn2:parallelGateway id="ParallelGateway_1" />
<bpmn2:sequenceFlow id="SequenceFlow_1" sourceRef="subProcessWait" targetRef="ParallelGateway_1"/>
<bpmn2:sequenceFlow id="SequenceFlow_2" sourceRef="ParallelGateway_1" targetRef="EndEvent_2"/>
<bpmn2:userTask id="UserTask_1" name="User Task" />
<bpmn2:startEvent id="start">
<bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
</bpmn2:startEvent>
<bpmn2:endEvent id="EndEvent_2">
<bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
<bpmn2:terminateEventDefinition id="TerminateEventDefinition_1"/>
</bpmn2:endEvent>
<bpmn2:parallelGateway id="ParallelGateway_1">
<bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
<bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>
</bpmn2:parallelGateway>
<bpmn2:sequenceFlow id="SequenceFlow_1" sourceRef="start" targetRef="ParallelGateway_1"/>
<bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="ParallelGateway_1" targetRef="EndEvent_2"/>
<bpmn2:userTask id="UserTask_1" name="User Task">
<bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>
</bpmn2:userTask>
<bpmn2:sequenceFlow id="SequenceFlow_3" sourceRef="ParallelGateway_1" targetRef="UserTask_1"/>
<bpmn2:sequenceFlow id="SequenceFlow_4" sourceRef="UserTask_1" targetRef="EndEvent_1"/>
<bpmn2:endEvent id="EndEvent_1">
<bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>
</bpmn2:endEvent>
<bpmn2:endEvent id="EndEvent_2">
<bpmn2:terminateEventDefinition id="TerminateEventDefinition_1"/>
</bpmn2:endEvent>
<bpmn2:sequenceFlow id="SequenceFlow_4" sourceRef="UserTask_1" targetRef="EndEvent_1"/>
</bpmn2:process>
<bpmndi:BPMNDiagram id="BPMNDiagram_1" name="Default Process Diagram">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="process_1">
<bpmndi:BPMNShape id="BPMNShape_1" bpmnElement="start">
<dc:Bounds height="36.0" width="36.0" x="110.0" y="198.0"/>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_EndEvent_1" bpmnElement="EndEvent_2">
<dc:Bounds height="36.0" width="36.0" x="470.0" y="200.0"/>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_ParallelGateway_1" bpmnElement="ParallelGateway_1">
<dc:Bounds height="50.0" width="50.0" x="196.0" y="191.0"/>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="BPMNShape_1" targetElement="BPMNShape_ParallelGateway_1">
<di:waypoint xsi:type="dc:Point" x="146.0" y="216.0"/>
<di:waypoint xsi:type="dc:Point" x="196.0" y="216.0"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_2" sourceElement="BPMNShape_ParallelGateway_1" targetElement="BPMNShape_EndEvent_1">
<di:waypoint xsi:type="dc:Point" x="247.0" y="216.0"/>
<di:waypoint xsi:type="dc:Point" x="470.0" y="218.0"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="BPMNShape_UserTask_1" bpmnElement="UserTask_1">
<dc:Bounds height="50.0" width="110.0" x="271.0" y="110.0"/>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_3" sourceElement="BPMNShape_ParallelGateway_1" targetElement="BPMNShape_UserTask_1">
<di:waypoint xsi:type="dc:Point" x="221.0" y="191.0"/>
<di:waypoint xsi:type="dc:Point" x="271.0" y="135.0"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="BPMNShape_EndEvent_2" bpmnElement="EndEvent_1">
<dc:Bounds height="36.0" width="36.0" x="431.0" y="117.0"/>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_4" sourceElement="BPMNShape_UserTask_1" targetElement="BPMNShape_EndEvent_2">
<di:waypoint xsi:type="dc:Point" x="381.0" y="135.0"/>
<di:waypoint xsi:type="dc:Point" x="431.0" y="135.0"/>
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</bpmn2:definitions>
\ No newline at end of file
modules/activiti5-engine/src/main/java/org/activiti5/engine/impl/persistence/entity/ExecutionEntity.java
浏览文件 @ b80e89a1
......@@ -1690,4 +1690,16 @@ public class ExecutionEntity extends VariableScopeImpl implements ActivityExecut
}
// NOT IN V5
@Override
public boolean isMultiInstanceRoot() {
return false;
}
@Override
public void setMultiInstanceRoot(boolean isMultiInstanceRoot) {
}
}
modules/activiti5-engine/src/main/java/org/activiti5/engine/impl/pvm/runtime/ExecutionImpl.java
浏览文件 @ b80e89a1
......@@ -973,4 +973,15 @@ public class ExecutionImpl implements
public String getTenantId() {
return null; // Not implemented
}
// NOT IN V5
@Override
public boolean isMultiInstanceRoot() {
return false;
}
@Override
public void setMultiInstanceRoot(boolean isMultiInstanceRoot) {
}
}
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或