Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ public boolean evaluateForCompletion(PlanItemInstanceEntity planItemInstanceEnti
CommandContextUtil.getAgenda(commandContext).planExitPlanItemInstanceOperation(planItemInstanceEntity, satisfiedExitCriterion.getId(),
satisfiedExitCriterion.getExitType(), satisfiedExitCriterion.getExitEventType());

} else if (planItem.getPlanItemDefinition() instanceof Stage) {
} else if (planItem.getPlanItemDefinition() instanceof Stage stage) {

if (PlanItemInstanceState.ACTIVE.equals(state)) {

Expand All @@ -153,7 +153,6 @@ public boolean evaluateForCompletion(PlanItemInstanceEntity planItemInstanceEnti
evaluationResult.markCriteriaChanged();
planItemInstanceEntity.setCompletable(false); // an active child = stage cannot be completed anymore
} else {
Stage stage = (Stage) planItem.getPlanItemDefinition();
if (isStageCompletable(planItemInstanceEntity, stage)) {
evaluationResult.markCriteriaChanged();
CommandContextUtil.getAgenda(commandContext).planCompletePlanItemInstanceOperation(planItemInstanceEntity);
Expand Down Expand Up @@ -203,11 +202,10 @@ protected boolean evaluatePlanItemsCriteria(PlanItemInstanceContainer planItemIn
List<PlanItemInstanceEntity> planItemInstances = planItemInstanceContainer.getChildPlanItemInstances();

// needed because when doing case instance migration the child plan item instances can be null
if ((planItemInstances == null || (migrationContext != null && migrationContext.isFetchPlanItemInstances())) &&
planItemInstanceContainer instanceof CaseInstanceEntity) {
if ((planItemInstances == null || (migrationContext != null && migrationContext.isFetchPlanItemInstances())) &&
planItemInstanceContainer instanceof CaseInstanceEntity caseInstance) {

PlanItemInstanceEntityManager planItemInstanceEntityManager = CommandContextUtil.getPlanItemInstanceEntityManager(commandContext);
CaseInstanceEntity caseInstance = (CaseInstanceEntity) planItemInstanceContainer;
planItemInstances = planItemInstanceEntityManager.findByCaseInstanceId(caseInstance.getId());
planItemInstanceContainer.setChildPlanItemInstances(planItemInstances);

Expand Down Expand Up @@ -693,8 +691,7 @@ protected SentryPartInstanceEntity createSentryPartInstanceEntity(EntityWithSent
if (entityWithSentryPartInstances instanceof CaseInstanceEntity) {
sentryPartInstanceEntity.setCaseInstanceId(((CaseInstanceEntity) entityWithSentryPartInstances).getId());
sentryPartInstanceEntity.setCaseDefinitionId(((CaseInstanceEntity) entityWithSentryPartInstances).getCaseDefinitionId());
} else if (entityWithSentryPartInstances instanceof PlanItemInstanceEntity) {
PlanItemInstanceEntity planItemInstanceEntity = (PlanItemInstanceEntity) entityWithSentryPartInstances;
} else if (entityWithSentryPartInstances instanceof PlanItemInstanceEntity planItemInstanceEntity) {
sentryPartInstanceEntity.setCaseInstanceId(planItemInstanceEntity.getCaseInstanceId());
sentryPartInstanceEntity.setCaseDefinitionId(planItemInstanceEntity.getCaseDefinitionId());
sentryPartInstanceEntity.setPlanItemInstanceId(planItemInstanceEntity.getId());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,7 @@ protected boolean evaluateManualActivationRule() {
}

public boolean isAsync() {
if (planItemInstanceEntity.getPlanItem().getPlanItemDefinition() instanceof Task) {
Task task = (Task) planItemInstanceEntity.getPlanItem().getPlanItemDefinition();
if (planItemInstanceEntity.getPlanItem().getPlanItemDefinition() instanceof Task task) {
if (task.isAsync()) {
return true;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,10 @@ public abstract class AbstractPlanItemParseHandler<T extends BaseElement> extend

@Override
protected void executeParse(CmmnParserImpl cmmnParser, CmmnParseResult cmmnParseResult, T element) {
if (!(element instanceof PlanItem)) {
if (!(element instanceof PlanItem planItem)) {
throw new FlowableException("Programmatic error: passed element is not a PlanItem instance, but an instance of " + element.getClass());
}

PlanItem planItem = (PlanItem) element;
executePlanItemParse(cmmnParser, cmmnParseResult, planItem, (T) planItem.getPlanItemDefinition());
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -908,10 +908,8 @@ protected void navigatePlanItemInstances(Map<String, List<PlanItemInstanceEntity
task.setScopeDefinitionId(caseDefinition.getId());
PlanItemDefinition originalTaskDef = originalCmmnModel.findPlanItemDefinition(task.getTaskDefinitionKey());
PlanItemDefinition targetTaskDef = targetCmmnModel.findPlanItemDefinition(task.getTaskDefinitionKey());
if (originalTaskDef != null && targetTaskDef != null && originalTaskDef instanceof HumanTask && targetTaskDef instanceof HumanTask) {
HumanTask originalHumanTask = (HumanTask) originalTaskDef;
HumanTask targetHumanTask = (HumanTask) targetTaskDef;

if (originalTaskDef != null && targetTaskDef != null && originalTaskDef instanceof HumanTask originalHumanTask && targetTaskDef instanceof HumanTask targetHumanTask) {

if (taskPropertyValueIsDifferent(originalHumanTask.getName(), targetHumanTask.getName())) {
task.setName(targetHumanTask.getName());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,10 @@ public String getElementName() {

@Override
public void parseChildElement(XMLStreamReader xtr, DmnElement parentElement, Decision decision) throws Exception {
if (!(parentElement instanceof ItemDefinition)) {
if (!(parentElement instanceof ItemDefinition itemDefinition)) {
return;
}

ItemDefinition itemDefinition = (ItemDefinition) parentElement;
UnaryTests allowedValues = new UnaryTests();

boolean readyWithAllowedValues = false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ public AbstractFlowableEngineEventListener(Set<FlowableEngineEventType> types) {

@Override
public void onEvent(FlowableEvent flowableEvent) {
if (flowableEvent instanceof FlowableEngineEvent) {
FlowableEngineEvent flowableEngineEvent = (FlowableEngineEvent) flowableEvent;
if (flowableEvent instanceof FlowableEngineEvent flowableEngineEvent) {
FlowableEngineEventType engineEventType = (FlowableEngineEventType) flowableEvent.getType();

if (types == null || types.contains(engineEventType)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -372,8 +372,7 @@ protected ActivityInstanceEntity createActivityInstanceEntity(ExecutionEntity ex
activityInstanceEntity.setActivityId(execution.getActivityId());
} else {
// sequence flow activity id can be null
if (execution.getCurrentFlowElement() instanceof SequenceFlow) {
SequenceFlow currentFlowElement = (SequenceFlow) execution.getCurrentFlowElement();
if (execution.getCurrentFlowElement() instanceof SequenceFlow currentFlowElement) {
activityInstanceEntity.setActivityId(getArtificialSequenceFlowId(currentFlowElement));
}
}
Expand Down