Skip to content

templates: type the correlateMessageEvent catch in Abort and Wait, and the no-subscription miss behind it (#7230) #7308

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

Merged
delchev merged 2 commits into from
Sep 11, 2026
+17 −3
Merged

templates: type the correlateMessageEvent catch in Abort and Wait, and the no-subscription miss behind it (#7230) #7308

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b4fee1
templates: type the correlateMessageEvent catch in Abort and Wait, an…
delchev Sep 10, 2026
c84ebbf
Merge origin/master into issue-7230-typed-correlate-catch
delchev Sep 11, 2026
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
20 changes: 17 additions & 3 deletions ...ntegrations/src/main/java/org/eclipse/dirigible/integration/tests/api/IntentEngineIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1574,8 +1574,15 @@ void wait_step_and_boundary_timers_emit_catch_event_timers_and_correlating_glue(
wait.contains("ProcessStamps.idFor(carrier.ProcessIds, \"CaseHandling\")")
&& wait.contains("Process.correlateMessageEvent(instance, \"CaseHandlingAwaitReply\""),
"the listener should correlate the catch event's message on THIS process's stamped instance (#6862)");
assertTrue(wait.contains("catch (RuntimeException"),
"correlation must be fail-soft - an instance not parked on the message is a no-op");
// Fail-soft, but not blind (#7230): only the platform's IllegalArgumentException - not parked,
// or already ended - is the expected no-op; every other failure leaves an instance that IS
// parked here parked forever, and is logged with its throwable.
assertTrue(wait.contains("catch (IllegalArgumentException notParked)") && wait.contains("LOG.debug("),
"the not-parked miss should be caught by its own type, not by a blanket RuntimeException");
assertTrue(wait.contains("catch (RuntimeException failed)") && wait.contains("LOG.warn(\"Could not resume")
&& wait.contains("failed);"), "any other correlation failure should be logged with the throwable");
assertFalse(wait.contains("catch (RuntimeException notParked)"),
"the empty catch that treated every failure as not-parked should be gone");
String loader = codeOf("gen/events/services/LoadCaseHandlingWorkExpire.java");
assertTrue(loader.contains("class LoadCaseHandlingWorkExpire implements JavaDelegate"),
"the expire date loader should be a Flowable JavaDelegate");
Expand Down Expand Up @@ -1940,7 +1947,14 @@ void abort_on_emits_an_interrupting_event_subprocess_and_correlating_glue() {
abort.contains("ProcessStamps.idFor(entity.ProcessIds, \"OrderApproval\")")
&& abort.contains("Process.correlateMessageEvent(instance, \"OrderApprovalAbort\""),
"the abort listener should abort ITS OWN instance, not whichever flow stamped the record last (#6862)");
assertTrue(abort.contains("catch (RuntimeException"), "correlation must be fail-soft");
// Fail-soft, but not blind (#7230): the not-in-scope miss is typed and quiet, anything else is
// a flow still running over a record whose status says it is over - logged with its throwable.
assertTrue(abort.contains("catch (IllegalArgumentException notAborting)") && abort.contains("LOG.debug("),
"the not-in-abort-scope miss should be caught by its own type, not by a blanket RuntimeException");
assertTrue(abort.contains("catch (RuntimeException failed)") && abort.contains("LOG.warn(\"Could not abort")
&& abort.contains("failed);"), "any other correlation failure should be logged with the throwable");
assertFalse(abort.contains("catch (RuntimeException notAborting)"),
"the empty catch that treated every failure as not-aborting should be gone");
}

@Test
Expand Down
Loading