Skip to content

fix issue 3921 #4109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

fix issue 3921 #4109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
54024ad
fix issue 3921
OmarAlsawaf Aug 26, 2025
cfde03e
fix issue-3921
OmarAlsawaf Aug 26, 2025
e660567
reorganizing imports
OmarAlsawaf Aug 26, 2025
5041406
auto configuring imports
OmarAlsawaf Aug 26, 2025
c282e6f
Merge branch 'flowable:main' into issues-3921
OmarAlsawaf Sep 1, 2025
7d76e2b
extending issues-3921 fix to migration secnario
OmarAlsawaf Sep 1, 2025
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
2 changes: 1 addition & 1 deletion ...le-engine/src/main/java/org/flowable/engine/impl/dynamic/AbstractDynamicStateManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1607,7 +1607,7 @@ protected void processCreatedEventSubProcess(EventSubProcess eventSubProcess, Ex
BpmnModel bpmnModel = ProcessDefinitionUtil.getBpmnModel(eventSubProcessExecution.getProcessDefinitionId());
Signal signal = bpmnModel.getSignal(signalEventDefinition.getSignalRef());
if (signal != null) {
signalEventDefinition.setSignalRef(signal.getName());
signalEventDefinition.setSignalRef(signal.getId());
}

ExecutionEntity signalExecution = processEngineConfiguration.getExecutionEntityManager().createChildExecution(eventSubProcessExecution.getParent());
Expand Down
2 changes: 1 addition & 1 deletion ...es/flowable-engine/src/main/java/org/flowable/engine/impl/util/ProcessInstanceHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ protected void handleSignalEventSubscription(EventDefinition eventDefinition, St
BpmnModel bpmnModel = ProcessDefinitionUtil.getBpmnModel(parentExecution.getProcessDefinitionId());
Signal signal = bpmnModel.getSignal(signalEventDefinition.getSignalRef());
if (signal != null) {
signalEventDefinition.setSignalRef(signal.getName());
signalEventDefinition.setSignalRef(signal.getId());
}

ExecutionEntity signalExecution = processEngineConfiguration.getExecutionEntityManager().createChildExecution(parentExecution);
Expand Down
35 changes: 35 additions & 0 deletions ...owable/engine/test/api/runtime/migration/ProcessInstanceMigrationEventSubProcessTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,41 @@ protected void tearDown() {
deleteDeployments();
}

@Test
public void testSignalScope_WhenSignalIdNotEqualSignalName_GivenMultiInstanceMigration(){
//create process Definition
ProcessDefinition originalProcessDef = deployProcessDefinition("mainProcessDeployment",
"org/flowable/engine/test/api/runtime/migration/originalProcess.bpmn");

ProcessDefinition migrationProcessDef = deployProcessDefinition("mainProcessDeployment",
"org/flowable/engine/test/api/runtime/migration/migrationProcess.bpmn");

//create multi-proc instances
ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(originalProcessDef.getKey());
ProcessInstance processInstance2 = runtimeService.startProcessInstanceByKey(originalProcessDef.getKey());

//choose a migration state
ProcessInstanceMigrationBuilder processInstanceMigrationBuilder = processMigrationService.createProcessInstanceMigrationBuilder()
.migrateToProcessDefinition(migrationProcessDef.getId())
.addActivityMigrationMapping(ActivityMigrationMapping.createMappingFor("userTask", "userTask"))
.addActivityMigrationMapping(ActivityMigrationMapping.createMappingFor("sendSignalTask", "subProcessTask"));


ProcessInstanceMigrationValidationResult processInstanceMigrationValidationResult = processInstanceMigrationBuilder
.validateMigration(processInstance.getId());

assertThat(processInstanceMigrationValidationResult.isMigrationValid()).isTrue();

//migration
processInstanceMigrationBuilder.migrate(processInstance.getId());
processInstanceMigrationBuilder.migrate(processInstance2.getId());

List<EventSubscription> currentSubscriptionList = runtimeService.createEventSubscriptionQuery().list();
assertThat(currentSubscriptionList).extracting(EventSubscription::getConfiguration).doesNotContainNull();


}

@Test
public void testMigrateSimpleActivityToActivityInsideSignalEventSubProcessInNewDefinition() {
ProcessDefinition procDefOneTask = deployProcessDefinition("my deploy",
Expand Down
32 changes: 32 additions & 0 deletions ...able-engine/src/test/java/org/flowable/engine/test/bpmn/event/signal/SignalEventTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import static org.assertj.core.api.Assertions.tuple;
import static org.assertj.core.data.MapEntry.entry;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
Expand All @@ -43,12 +44,43 @@
import org.flowable.validation.validator.Problems;
import org.junit.jupiter.api.Test;




/**
* @author Tijs Rademakers
* @author Joram Barrez
*/
public class SignalEventTest extends PluggableFlowableTestCase {


@Test
@Deployment(resources = {"org/flowable/engine/test/bpmn/event/signal/mainProcessV2.bpmn"})
public void testSignalScope_WhenSignalIdNotEqualSignalName_GivenMultipleProcessInstances() {

List<ProcessInstance> processInstances = new ArrayList<>();
processInstances.add(runtimeService.startProcessInstanceByKey("mainProcess"));
processInstances.add(runtimeService.startProcessInstanceByKey("mainProcess"));
processInstances.add(runtimeService.startProcessInstanceByKey("mainProcess"));

List<EventSubscription> currentSubscriptionList = runtimeService.createEventSubscriptionQuery().list();

assertThat(currentSubscriptionList).hasSize(processInstances.size());
assertThat(currentSubscriptionList).extracting(EventSubscription::getConfiguration).doesNotContainNull();
}

@Test
@Deployment(resources = {"org/flowable/engine/test/bpmn/event/signal/mainProcessV2.bpmn"})
public void testSignalScope_WhenSignalIdNotEqualSignalName_GivenSingleProcessInstance() {

ProcessInstance processInstances = runtimeService.startProcessInstanceByKey("mainProcess");

List<EventSubscription> currentSubscriptionList = runtimeService.createEventSubscriptionQuery().list();

assertThat(currentSubscriptionList).hasSize(1);
assertThat(currentSubscriptionList).extracting(EventSubscription::getConfiguration).doesNotContainNull();
}

@Test
@Deployment(resources = { "org/flowable/engine/test/bpmn/event/signal/SignalEventTests.catchAlertSignal.bpmn20.xml",
"org/flowable/engine/test/bpmn/event/signal/SignalEventTests.throwAlertSignal.bpmn20.xml" })
Expand Down
163 changes: 163 additions & 0 deletions ...e/src/test/resources/org/flowable/engine/test/api/runtime/migration/migrationProcess.bpmn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,163 @@
<?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:flowable="http://flowable.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" xmlns:design="http://flowable.org/design" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://flowable.org/test" exporter="Flowable Design" design:palette="flowable-work-process-palette">
<signal id="mainProcessGlobalSignal" name="mainProcessGlobalSignalName" flowable:scope="global"></signal>
<process id="mainProcess" name="mainProcess" isExecutable="true" flowable:candidateStarterGroups="flowableUser">
<extensionElements>
<design:stencilid><![CDATA[BPMNDiagram]]></design:stencilid>
<design:creationdate><![CDATA[2025-08-12T09:27:27.224Z]]></design:creationdate>
<design:modificationdate><![CDATA[2025-09-01T15:31:28.662Z]]></design:modificationdate>
</extensionElements>
<subProcess id="EventSubprocess_7" name="Event-subprocess" triggeredByEvent="true">
<extensionElements>
<design:stencilid><![CDATA[EventSubprocess]]></design:stencilid>
</extensionElements>
<userTask id="subProcessTask" name="subProcessStarted" flowable:assignee="${initiator}" flowable:formFieldValidation="false">
<extensionElements>
<flowable:task-candidates-type><![CDATA[all]]></flowable:task-candidates-type>
<design:stencilid><![CDATA[FormTask]]></design:stencilid>
<design:stencilsuperid><![CDATA[Task]]></design:stencilsuperid>
</extensionElements>
</userTask>
<startEvent id="StartSignalEvent_8" isInterrupting="false">
<extensionElements>
<flowable:work-form-field-validation><![CDATA[false]]></flowable:work-form-field-validation>
<design:stencilid><![CDATA[StartSignalEvent]]></design:stencilid>
</extensionElements>
<signalEventDefinition signalRef="mainProcessGlobalSignal"></signalEventDefinition>
</startEvent>
<endEvent id="EndNoneEvent_11">
<extensionElements>
<design:stencilid><![CDATA[EndNoneEvent]]></design:stencilid>
</extensionElements>
</endEvent>
<sequenceFlow id="SequenceFlow_12" sourceRef="subProcessTask" targetRef="EndNoneEvent_11">
<extensionElements>
<design:stencilid><![CDATA[SequenceFlow]]></design:stencilid>
</extensionElements>
</sequenceFlow>
<sequenceFlow id="SequenceFlow_10" sourceRef="StartSignalEvent_8" targetRef="subProcessTask">
<extensionElements>
<design:stencilid><![CDATA[SequenceFlow]]></design:stencilid>
</extensionElements>
</sequenceFlow>
</subProcess>
<userTask id="sendSignalTask" name="send signal" flowable:assignee="${initiator}" flowable:formFieldValidation="false">
<extensionElements>
<flowable:task-candidates-type><![CDATA[all]]></flowable:task-candidates-type>
<design:stencilid><![CDATA[FormTask]]></design:stencilid>
<design:stencilsuperid><![CDATA[Task]]></design:stencilsuperid>
</extensionElements>
</userTask>
<userTask id="userTask" name="User task" flowable:assignee="${initiator}" flowable:formFieldValidation="false">
<extensionElements>
<flowable:task-candidates-type><![CDATA[all]]></flowable:task-candidates-type>
<design:stencilid><![CDATA[FormTask]]></design:stencilid>
<design:stencilsuperid><![CDATA[Task]]></design:stencilsuperid>
</extensionElements>
</userTask>
<startEvent id="startnoneevent1" flowable:initiator="initiator" flowable:formFieldValidation="false">
<extensionElements>
<flowable:work-form-field-validation><![CDATA[false]]></flowable:work-form-field-validation>
<design:stencilid><![CDATA[StartNoneEvent]]></design:stencilid>
</extensionElements>
</startEvent>
<intermediateThrowEvent id="IntermediateSignalEventThrowing_3">
<extensionElements>
<design:stencilid><![CDATA[IntermediateSignalEventThrowing]]></design:stencilid>
</extensionElements>
<signalEventDefinition signalRef="mainProcessGlobalSignal"></signalEventDefinition>
</intermediateThrowEvent>
<endEvent id="EndNoneEvent_5">
<extensionElements>
<design:stencilid><![CDATA[EndNoneEvent]]></design:stencilid>
</extensionElements>
</endEvent>
<sequenceFlow id="SequenceFlow_4" sourceRef="sendSignalTask" targetRef="IntermediateSignalEventThrowing_3">
<extensionElements>
<design:stencilid><![CDATA[SequenceFlow]]></design:stencilid>
</extensionElements>
</sequenceFlow>
<sequenceFlow id="SequenceFlow_14" sourceRef="userTask" targetRef="EndNoneEvent_5">
<extensionElements>
<design:stencilid><![CDATA[SequenceFlow]]></design:stencilid>
</extensionElements>
</sequenceFlow>
<sequenceFlow id="SequenceFlow_2" sourceRef="startnoneevent1" targetRef="sendSignalTask">
<extensionElements>
<design:stencilid><![CDATA[SequenceFlow]]></design:stencilid>
</extensionElements>
</sequenceFlow>
<sequenceFlow id="SequenceFlow_13" sourceRef="startnoneevent1" targetRef="userTask">
<extensionElements>
<design:stencilid><![CDATA[SequenceFlow]]></design:stencilid>
</extensionElements>
</sequenceFlow>
<sequenceFlow id="SequenceFlow_6" sourceRef="IntermediateSignalEventThrowing_3" targetRef="EndNoneEvent_5">
<extensionElements>
<design:stencilid><![CDATA[SequenceFlow]]></design:stencilid>
</extensionElements>
</sequenceFlow>
</process>
<bpmndi:BPMNDiagram id="BPMNDiagram_mainProcess">
<bpmndi:BPMNPlane bpmnElement="mainProcess" id="BPMNPlane_mainProcess">
<bpmndi:BPMNShape bpmnElement="EventSubprocess_7" id="BPMNShape_EventSubprocess_7">
<omgdc:Bounds height="152.0" width="499.0" x="319.5" y="439.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="subProcessTask" id="BPMNShape_subProcessTask">
<omgdc:Bounds height="80.0" width="100.0" x="432.5" y="485.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="StartSignalEvent_8" id="BPMNShape_StartSignalEvent_8">
<omgdc:Bounds height="30.0" width="30.0" x="352.5" y="510.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="EndNoneEvent_11" id="BPMNShape_EndNoneEvent_11">
<omgdc:Bounds height="28.0" width="28.0" x="582.5" y="511.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="sendSignalTask" id="BPMNShape_sendSignalTask">
<omgdc:Bounds height="80.0" width="100.0" x="401.0" y="298.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="userTask" id="BPMNShape_userTask">
<omgdc:Bounds height="80.0" width="100.0" x="401.0" y="105.5"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="startnoneevent1" id="BPMNShape_startnoneevent1">
<omgdc:Bounds height="30.0" width="30.0" x="317.0" y="261.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="IntermediateSignalEventThrowing_3" id="BPMNShape_IntermediateSignalEventThrowing_3">
<omgdc:Bounds height="30.0" width="30.0" x="598.0" y="323.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="EndNoneEvent_5" id="BPMNShape_EndNoneEvent_5">
<omgdc:Bounds height="28.0" width="28.0" x="766.0" y="324.0"></omgdc:Bounds>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge bpmnElement="SequenceFlow_12" id="BPMNEdge_SequenceFlow_12" flowable:sourceDockerX="50.0" flowable:sourceDockerY="40.0" flowable:targetDockerX="14.0" flowable:targetDockerY="14.0">
<omgdi:waypoint x="532.5" y="525.0"></omgdi:waypoint>
<omgdi:waypoint x="582.5" y="525.0"></omgdi:waypoint>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="SequenceFlow_13" id="BPMNEdge_SequenceFlow_13" flowable:sourceDockerX="15.0" flowable:sourceDockerY="15.0" flowable:targetDockerX="50.0" flowable:targetDockerY="40.0">
<omgdi:waypoint x="332.0" y="261.0"></omgdi:waypoint>
<omgdi:waypoint x="332.0" y="145.5"></omgdi:waypoint>
<omgdi:waypoint x="401.0" y="145.5"></omgdi:waypoint>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="SequenceFlow_14" id="BPMNEdge_SequenceFlow_14" flowable:sourceDockerX="50.0" flowable:sourceDockerY="40.0" flowable:targetDockerX="14.0" flowable:targetDockerY="14.0">
<omgdi:waypoint x="501.0" y="145.5"></omgdi:waypoint>
<omgdi:waypoint x="780.0" y="145.5"></omgdi:waypoint>
<omgdi:waypoint x="780.0" y="324.0"></omgdi:waypoint>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="SequenceFlow_6" id="BPMNEdge_SequenceFlow_6" flowable:sourceDockerX="15.0" flowable:sourceDockerY="15.0" flowable:targetDockerX="14.0" flowable:targetDockerY="14.0">
<omgdi:waypoint x="628.0" y="338.0"></omgdi:waypoint>
<omgdi:waypoint x="766.0" y="338.0"></omgdi:waypoint>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="SequenceFlow_4" id="BPMNEdge_SequenceFlow_4" flowable:sourceDockerX="50.0" flowable:sourceDockerY="40.0" flowable:targetDockerX="15.0" flowable:targetDockerY="15.0">
<omgdi:waypoint x="501.0" y="338.0"></omgdi:waypoint>
<omgdi:waypoint x="598.0" y="338.0"></omgdi:waypoint>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="SequenceFlow_10" id="BPMNEdge_SequenceFlow_10" flowable:sourceDockerX="15.0" flowable:sourceDockerY="15.0" flowable:targetDockerX="50.0" flowable:targetDockerY="40.0">
<omgdi:waypoint x="382.5" y="525.0"></omgdi:waypoint>
<omgdi:waypoint x="432.5" y="525.0"></omgdi:waypoint>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="SequenceFlow_2" id="BPMNEdge_SequenceFlow_2" flowable:sourceDockerX="15.0" flowable:sourceDockerY="15.0" flowable:targetDockerX="50.0" flowable:targetDockerY="40.0">
<omgdi:waypoint x="332.0" y="291.0"></omgdi:waypoint>
<omgdi:waypoint x="332.0" y="338.0"></omgdi:waypoint>
<omgdi:waypoint x="401.0" y="338.0"></omgdi:waypoint>
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</definitions>
Loading