From cba4c6426008301564c9b3f6bb4c6d551526c623 Mon Sep 17 00:00:00 2001 From: dbm Date: Thu, 28 Aug 2025 16:07:54 -0400 Subject: [PATCH] Chore: use pattern variable --- .../AbstractEvaluationCriteriaOperation.java | 11 ++++------- .../operation/ActivatePlanItemInstanceOperation.java | 3 +-- .../parser/handler/AbstractPlanItemParseHandler.java | 3 +-- .../impl/runtime/AbstractCmmnDynamicStateManager.java | 6 ++---- .../dmn/converter/child/AllowedValuesParser.java | 3 +-- .../event/AbstractFlowableEngineEventListener.java | 3 +-- .../entity/ActivityInstanceEntityManagerImpl.java | 3 +-- 7 files changed, 11 insertions(+), 21 deletions(-) diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/agenda/operation/AbstractEvaluationCriteriaOperation.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/agenda/operation/AbstractEvaluationCriteriaOperation.java index 164e815a6ed..5092a64f71b 100644 --- a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/agenda/operation/AbstractEvaluationCriteriaOperation.java +++ b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/agenda/operation/AbstractEvaluationCriteriaOperation.java @@ -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)) { @@ -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); @@ -203,11 +202,10 @@ protected boolean evaluatePlanItemsCriteria(PlanItemInstanceContainer planItemIn List 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); @@ -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()); diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/agenda/operation/ActivatePlanItemInstanceOperation.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/agenda/operation/ActivatePlanItemInstanceOperation.java index 1587febf1a5..9e812534f8b 100644 --- a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/agenda/operation/ActivatePlanItemInstanceOperation.java +++ b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/agenda/operation/ActivatePlanItemInstanceOperation.java @@ -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; } diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/parser/handler/AbstractPlanItemParseHandler.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/parser/handler/AbstractPlanItemParseHandler.java index f5dd71c1254..2e74f918dc5 100644 --- a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/parser/handler/AbstractPlanItemParseHandler.java +++ b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/parser/handler/AbstractPlanItemParseHandler.java @@ -25,11 +25,10 @@ public abstract class AbstractPlanItemParseHandler 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()); } diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/runtime/AbstractCmmnDynamicStateManager.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/runtime/AbstractCmmnDynamicStateManager.java index 13d2fe3a322..2362a4acb5a 100644 --- a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/runtime/AbstractCmmnDynamicStateManager.java +++ b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/runtime/AbstractCmmnDynamicStateManager.java @@ -908,10 +908,8 @@ protected void navigatePlanItemInstances(Map 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)) { diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/persistence/entity/ActivityInstanceEntityManagerImpl.java b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/persistence/entity/ActivityInstanceEntityManagerImpl.java index ba2fbea346c..c5bef81135f 100644 --- a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/persistence/entity/ActivityInstanceEntityManagerImpl.java +++ b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/persistence/entity/ActivityInstanceEntityManagerImpl.java @@ -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)); } }