feat: Implement correlation on event filter by matheusandre1 · Pull Request #1386 · serverlessworkflow/sdk-java

matheusandre1 · 2026-05-18T21:52:24Z

Many thanks for submitting your Pull Request ❤️!

What this PR does / why we need it: Closes: #1206

Special notes for reviewers:

Additional information (if needed):

Copilot

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

fjtirado · 2026-05-19T10:29:58Z

This one belongs to a different PR, isnt it

fjtirado

You need to separate the DSL gap PR you were working on from the Correlation one.

Copilot

Pull request overview

Copilot reviewed 10 out of 10 changed files in this pull request and generated 7 comments.

- Add CorrelationPredicate for evaluating correlation expressions - Add correlate support in AbstractEventFilterBuilder and AbstractEventFilterSpec - Update TypeEventRegistration and TypeEventRegistrationBuilder with correlation predicates - Implement correlation matching in AbstractTypeConsumer - Add CorrelationTest and listen-correlate.yaml - Add correlate tests in WorkflowBuilderTest and DSLTest Signed-off-by: Matheus André <matheusandr2@gmail.com>

matheusandre1 · 2026-05-19T18:05:38Z

@fjtirado I will send the other file separately after you review this one.

fjtirado · 2026-05-20T09:19:20Z

+    return correlationPredicates.isEmpty()
+        ? new TypeEventRegistrationBuilder(type, cePredicate)
+        : new TypeEventRegistrationBuilder(type, cePredicate, correlationPredicates);


Suggested change

return correlationPredicates.isEmpty()

? new TypeEventRegistrationBuilder(type, cePredicate)

: new TypeEventRegistrationBuilder(type, cePredicate, correlationPredicates);

return new TypeEventRegistrationBuilder(type, cePredicate, correlationPredicates);

fjtirado · 2026-05-20T09:21:30Z

+  }
+
+  public static CorrelationPredicate from(
+      String key, io.serverlessworkflow.api.types.CorrelateProperty prop, WorkflowApplication app) {


Use import rather than fully qualified name

fjtirado · 2026-05-20T09:25:10Z

This class should hava package protected scope and implement CloudEventPredicate

fjtirado · 2026-05-20T09:26:47Z

-        type, application.cloudEventPredicateFactory().build(application, properties));
+    CloudEventPredicate cePredicate =
+        application.cloudEventPredicateFactory().build(application, properties);
+    Collection<CorrelationPredicate> correlationPredicates =


Suggested change

Collection<CorrelationPredicate> correlationPredicates =

Collection<CloudEventPredicate> correlationPredicates =

fjtirado · 2026-05-20T09:27:58Z

+public record TypeEventRegistrationBuilder(
+    String type,
+    CloudEventPredicate cePredicate,
+    Collection<CorrelationPredicate> correlationPredicates)


Suggested change

Collection<CorrelationPredicate> correlationPredicates)

Collection<CloudEventPredicate> correlationPredicates)

fjtirado · 2026-05-20T09:30:48Z

+  public String key() {
+    return key;
+  }


This method is not used, in fact, I do not think you need the key as member

fjtirado · 2026-05-20T09:36:49Z

+      WorkflowModel eventModel = null;
      for (TypeEventRegistration registration : registrations) {
        if (registration.predicate().test(ce, registration.workflow(), registration.task())) {
+          Collection<CorrelationPredicate> predicates = registration.correlationPredicates();
+          if (!predicates.isEmpty()) {
+            if (eventModel == null) {
+              eventModel = modelFactory.from(ce);
+            }
+            if (!testCorrelation(eventModel, registration)) {
+              continue;
+            }
+          }


Suggested change

WorkflowModel eventModel = null;

for (TypeEventRegistration registration : registrations) {

if (registration.predicate().test(ce, registration.workflow(), registration.task())) {

Collection<CorrelationPredicate> predicates = registration.correlationPredicates();

if (!predicates.isEmpty()) {

if (eventModel == null) {

eventModel = modelFactory.from(ce);

}

if (!testCorrelation(eventModel, registration)) {

continue;

}

}

WorkflowModel eventModel = null;

for (TypeEventRegistration registration : registrations) {

if (registration.predicate().test(ce, registration.workflow(), registration.task() && testCorrelation(ce,registration)) {

fjtirado · 2026-05-20T09:37:11Z

      }
    }

+    private boolean testCorrelation(WorkflowModel eventModel, TypeEventRegistration registration) {


Suggested change

private boolean testCorrelation(WorkflowModel eventModel, TypeEventRegistration registration) {

private boolean testCorrelation(CloudEvent ce, TypeEventRegistration registration) {

fjtirado · 2026-05-20T09:40:45Z

+    return new CorrelationPredicate(key, fromResolver, expectResolver);
+  }
+
+  public boolean test(WorkflowModel eventModel, WorkflowContext workflow, TaskContext task) {


Suggested change

public boolean test(WorkflowModel eventModel, WorkflowContext workflow, TaskContext task) {

public boolean test(CloudEvent cloudEvent, WorkflowContext workflow, TaskContext task) {

WorkflowModel eventModel = workflow.definition().application().modelFactory().from(ce);

fjtirado · 2026-05-20T09:42:15Z

+        return true;
+      }
+      for (CorrelationPredicate pred : predicates) {
+        if (!pred.test(eventModel, registration.workflow(), registration.task())) {


Suggested change

if (!pred.test(eventModel, registration.workflow(), registration.task())) {

if (!pred.test(ce, registration.workflow(), registration.task())) {

fjtirado · 2026-05-20T09:42:30Z

    }

+    private boolean testCorrelation(WorkflowModel eventModel, TypeEventRegistration registration) {
+      Collection<CorrelationPredicate> predicates = registration.correlationPredicates();


Suggested change

Collection<CorrelationPredicate> predicates = registration.correlationPredicates();

Collection<CloudEventPredicate> predicates = registration.correlationPredicates();

fjtirado

Looks good, but I think ColrreationPredicatre should be a CloudEventPredicate

matheusandre1 force-pushed the feature/issue1206 branch from a138648 to ba7cffc Compare May 18, 2026 21:52

matheusandre1 marked this pull request as ready for review May 18, 2026 21:56

matheusandre1 requested a review from fjtirado as a code owner May 18, 2026 21:56

Copilot AI review requested due to automatic review settings May 18, 2026 21:56

Copilot started reviewing on behalf of matheusandre1 May 18, 2026 21:56 View session

Copilot AI reviewed May 18, 2026

View reviewed changes

fjtirado reviewed May 19, 2026

View reviewed changes

Comment thread impl/core/src/main/java/io/serverlessworkflow/impl/events/DefaultCloudEventPredicate.java Outdated

fjtirado reviewed May 19, 2026

View reviewed changes

Comment thread fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/UseBuilder.java

fjtirado reviewed May 19, 2026

View reviewed changes

Comment thread impl/core/src/main/java/io/serverlessworkflow/impl/events/AbstractTypeConsumer.java Outdated

fjtirado requested changes May 19, 2026

View reviewed changes

matheusandre1 force-pushed the feature/issue1206 branch 2 times, most recently from d8d98e5 to 77143c1 Compare May 19, 2026 16:00

matheusandre1 marked this pull request as draft May 19, 2026 16:00

matheusandre1 marked this pull request as ready for review May 19, 2026 16:01

Copilot AI review requested due to automatic review settings May 19, 2026 16:01

matheusandre1 marked this pull request as draft May 19, 2026 16:01

Copilot AI reviewed May 19, 2026

View reviewed changes

Copilot started reviewing on behalf of matheusandre1 May 19, 2026 16:47 View session

matheusandre1 force-pushed the feature/issue1206 branch from 77143c1 to 17ca1de Compare May 19, 2026 17:53

fjtirado reviewed May 20, 2026

View reviewed changes

fjtirado self-requested a review May 20, 2026 09:48

	Collection<CorrelationPredicate> correlationPredicates =
	Collection<CloudEventPredicate> correlationPredicates =

	private boolean testCorrelation(WorkflowModel eventModel, TypeEventRegistration registration) {
	private boolean testCorrelation(CloudEvent ce, TypeEventRegistration registration) {

	public boolean test(WorkflowModel eventModel, WorkflowContext workflow, TaskContext task) {
	public boolean test(CloudEvent cloudEvent, WorkflowContext workflow, TaskContext task) {
	WorkflowModel eventModel = workflow.definition().application().modelFactory().from(ce);

	if (!pred.test(eventModel, registration.workflow(), registration.task())) {
	if (!pred.test(ce, registration.workflow(), registration.task())) {

	Collection<CorrelationPredicate> predicates = registration.correlationPredicates();
	Collection<CloudEventPredicate> predicates = registration.correlationPredicates();

Conversation

matheusandre1 commented May 18, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

fjtirado left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

matheusandre1 commented May 19, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

fjtirado May 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

fjtirado May 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

fjtirado May 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

fjtirado left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

fjtirado May 20, 2026 •

edited

Loading

fjtirado May 20, 2026 •

edited

Loading

fjtirado May 20, 2026 •

edited

Loading

fjtirado left a comment •

edited

Loading