Delegate IntermediateThrowEvent dispatch to EventDefinition parse handlers

Replace IntermediateThrowEventParseHandler's instanceof cascade with a
parseElement(eventDefinition) delegation. Signal and Escalation parse
handlers gain a ThrowEvent branch (Compensate already had one); the
None-throw path stays inline.

Author: filiphr

modules/flowable-engine/src/main/java/org/flowable/engine/impl/bpmn/parser/handler/EscalationEventDefinitionParseHandler.java

@@ -18,6 +18,7 @@
 import org.flowable.bpmn.model.EscalationEventDefinition;
 import org.flowable.bpmn.model.EventSubProcess;
 import org.flowable.bpmn.model.StartEvent;
+import org.flowable.bpmn.model.ThrowEvent;
 import org.flowable.engine.impl.bpmn.parser.BpmnParse;
 
 /**
@@ -42,6 +43,11 @@ protected void executeParse(BpmnParse bpmnParse, EscalationEventDefinition event
             boundaryEvent.setBehavior(bpmnParse.getActivityBehaviorFactory().createBoundaryEscalationEventActivityBehavior(boundaryEvent, 
                                 eventDefinition, escalation, boundaryEvent.isCancelActivity()));
 
+        } else if (bpmnParse.getCurrentFlowElement() instanceof ThrowEvent throwEvent) {
+            Escalation escalation = bpmnParse.getBpmnModel().getEscalation(eventDefinition.getEscalationCode());
+            throwEvent.setBehavior(bpmnParse.getActivityBehaviorFactory()
+                    .createIntermediateThrowEscalationEventActivityBehavior(throwEvent, eventDefinition, escalation));
+
         } else if (bpmnParse.getCurrentFlowElement() instanceof StartEvent startEvent
                 && startEvent.getSubProcess() instanceof EventSubProcess) {
             startEvent.setBehavior(bpmnParse.getActivityBehaviorFactory()

modules/flowable-engine/src/main/java/org/flowable/engine/impl/bpmn/parser/handler/IntermediateThrowEventParseHandler.java

@@ -1,9 +1,9 @@
 /* Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -13,10 +13,8 @@
 package org.flowable.engine.impl.bpmn.parser.handler;
 
 import org.flowable.bpmn.model.BaseElement;
-import org.flowable.bpmn.model.CompensateEventDefinition;
-import org.flowable.bpmn.model.EscalationEventDefinition;
 import org.flowable.bpmn.model.EventDefinition;
-import org.flowable.bpmn.model.SignalEventDefinition;
+import org.flowable.bpmn.model.EventDefinitionLocation;
 import org.flowable.bpmn.model.ThrowEvent;
 import org.flowable.engine.impl.bpmn.parser.BpmnParse;
 import org.slf4j.Logger;
@@ -36,27 +34,18 @@ public Class<? extends BaseElement> getHandledType() {
 
     @Override
     protected void executeParse(BpmnParse bpmnParse, ThrowEvent intermediateEvent) {
-
-        EventDefinition eventDefinition = null;
-        if (!intermediateEvent.getEventDefinitions().isEmpty()) {
-            eventDefinition = intermediateEvent.getEventDefinitions().get(0);
+        if (intermediateEvent.getEventDefinitions().isEmpty()) {
+            intermediateEvent.setBehavior(bpmnParse.getActivityBehaviorFactory().createIntermediateThrowNoneEventActivityBehavior(intermediateEvent));
+            return;
         }
 
-        if (eventDefinition instanceof SignalEventDefinition signalEventDefinition) {
-            intermediateEvent.setBehavior(bpmnParse.getActivityBehaviorFactory().createIntermediateThrowSignalEventActivityBehavior(intermediateEvent, signalEventDefinition,
-                    bpmnParse.getBpmnModel().getSignal(signalEventDefinition.getSignalRef())));
-            
-        } else if (eventDefinition instanceof EscalationEventDefinition escalationEventDefinition) {
-            intermediateEvent.setBehavior(bpmnParse.getActivityBehaviorFactory().createIntermediateThrowEscalationEventActivityBehavior(intermediateEvent, escalationEventDefinition,
-                    bpmnParse.getBpmnModel().getEscalation(escalationEventDefinition.getEscalationCode())));
-
-        } else if (eventDefinition instanceof CompensateEventDefinition compensateEventDefinition) {
-            intermediateEvent.setBehavior(bpmnParse.getActivityBehaviorFactory().createIntermediateThrowCompensationEventActivityBehavior(intermediateEvent, compensateEventDefinition));
-
-        } else if (eventDefinition == null) {
-            intermediateEvent.setBehavior(bpmnParse.getActivityBehaviorFactory().createIntermediateThrowNoneEventActivityBehavior(intermediateEvent));
-        } else {
-            LOGGER.warn("Unsupported intermediate throw event type for throw event {}", intermediateEvent.getId());
+        EventDefinition eventDefinition = intermediateEvent.getEventDefinitions().get(0);
+        if (!eventDefinition.getSupportedLocations().contains(EventDefinitionLocation.INTERMEDIATE_THROW_EVENT)) {
+            LOGGER.warn("EventDefinition {} is not supported on intermediate throw event {}",
+                    eventDefinition.getClass().getSimpleName(), intermediateEvent.getId());
+            return;
         }
+
+        bpmnParse.getBpmnParserHandlers().parseElement(bpmnParse, eventDefinition);
     }
 }

modules/flowable-engine/src/main/java/org/flowable/engine/impl/bpmn/parser/handler/SignalEventDefinitionParseHandler.java

@@ -19,6 +19,7 @@
 import org.flowable.bpmn.model.Signal;
 import org.flowable.bpmn.model.SignalEventDefinition;
 import org.flowable.bpmn.model.StartEvent;
+import org.flowable.bpmn.model.ThrowEvent;
 import org.flowable.engine.impl.bpmn.parser.BpmnParse;
 
 /**
@@ -43,6 +44,10 @@ protected void executeParse(BpmnParse bpmnParse, SignalEventDefinition signalDef
         } else if (bpmnParse.getCurrentFlowElement() instanceof BoundaryEvent boundaryEvent) {
             boundaryEvent.setBehavior(bpmnParse.getActivityBehaviorFactory().createBoundarySignalEventActivityBehavior(boundaryEvent, signalDefinition, signal, boundaryEvent.isCancelActivity()));
 
+        } else if (bpmnParse.getCurrentFlowElement() instanceof ThrowEvent throwEvent) {
+            throwEvent.setBehavior(bpmnParse.getActivityBehaviorFactory()
+                    .createIntermediateThrowSignalEventActivityBehavior(throwEvent, signalDefinition, signal));
+
         } else if (bpmnParse.getCurrentFlowElement() instanceof StartEvent startEvent) {
             if (startEvent.getSubProcess() instanceof EventSubProcess) {
                 startEvent.setBehavior(bpmnParse.getActivityBehaviorFactory()