Review comments

Signed-off-by: Matheus André <matheusandr2@gmail.com>

Author: fjtirado

impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowMutableInstance.java

@@ -355,10 +355,6 @@ public <T> T addMetadataIfAbsent(String key, Supplier<T> supplier) {
     return (T) additionalObjects.computeIfAbsent(key, k -> supplier.get());
   }
 
-  public Object computeCorrelationValue(String key, Object value) {
-    return additionalObjects.computeIfAbsent(key, k -> value);
-  }
-
   @Override
   public <T> Optional<T> findMetadata(String key, Class<T> objectClass) {
     Object value = additionalObjects.get(key);

impl/core/src/main/java/io/serverlessworkflow/impl/events/AbstractTypeConsumer.java

@@ -24,7 +24,6 @@
 import io.serverlessworkflow.impl.WorkflowApplication;
 import io.serverlessworkflow.impl.WorkflowContext;
 import io.serverlessworkflow.impl.WorkflowModel;
-import io.serverlessworkflow.impl.WorkflowModelFactory;
 import java.util.AbstractCollection;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -61,8 +60,7 @@ public TypeEventRegistrationBuilder listen(
         application.cloudEventPredicateFactory().build(application, properties);
     Collection<CloudEventPredicate> correlationPredicates =
         buildCorrelationPredicates(register.getCorrelate(), application);
-    return new TypeEventRegistrationBuilder(
-        type, cePredicate, correlationPredicates, application.modelFactory());
+    return new TypeEventRegistrationBuilder(type, cePredicate, correlationPredicates);
   }
 
   private Collection<CloudEventPredicate> buildCorrelationPredicates(
@@ -83,27 +81,21 @@ private Collection<CloudEventPredicate> buildCorrelationPredicates(
 
   @Override
   public Collection<TypeEventRegistrationBuilder> listenToAll(WorkflowApplication application) {
-    return List.of(
-        new TypeEventRegistrationBuilder(null, null, List.of(), application.modelFactory()));
+    return List.of(new TypeEventRegistrationBuilder(null, null, List.of()));
   }
 
   private static class CloudEventConsumer extends AbstractCollection<TypeEventRegistration>
       implements Consumer<CloudEvent> {
-    private final WorkflowModelFactory modelFactory;
     private Collection<TypeEventRegistration> registrations = new CopyOnWriteArrayList<>();
 
-    CloudEventConsumer(WorkflowModelFactory modelFactory) {
-      this.modelFactory = modelFactory;
-    }
-
     @Override
     public void accept(CloudEvent ce) {
       logger.debug("Received cloud event {}", ce);
       for (TypeEventRegistration registration : registrations) {
-        if (registration.predicate().test(ce, registration.workflow(), registration.task())) {
-          if (!testCorrelation(ce, registration)) {
-            continue;
-          }
+        boolean predicateMatch =
+            registration.predicate() == null
+                || registration.predicate().test(ce, registration.workflow(), registration.task());
+        if (predicateMatch && testCorrelation(ce, registration)) {
           registration.consumer().accept(ce);
         }
       }
@@ -118,7 +110,7 @@ private boolean testCorrelation(CloudEvent ce, TypeEventRegistration registratio
       for (CloudEventPredicate pred : predicates) {
         if (pred instanceof ModelAwareCloudEventPredicate ma) {
           if (eventModel == null) {
-            eventModel = modelFactory.from(ce);
+            eventModel = registration.workflow().definition().application().modelFactory().from(ce);
           }
           if (!ma.test(eventModel, registration.workflow(), registration.task())) {
             return false;
@@ -175,7 +167,7 @@ public TypeEventRegistration register(
           .computeIfAbsent(
               registration.type(),
               k -> {
-                CloudEventConsumer consumer = new CloudEventConsumer(builder.modelFactory());
+                CloudEventConsumer consumer = new CloudEventConsumer();
                 register(k, consumer);
                 return consumer;
               })

impl/core/src/main/java/io/serverlessworkflow/impl/events/CorrelationPredicate.java

@@ -75,7 +75,7 @@ public boolean test(WorkflowModel eventModel, WorkflowContext workflow, TaskCont
 
     if (expectResolver == null) {
       String stateKey = correlationStateKey(task);
-      Object firstValue = workflow.instance().computeCorrelationValue(stateKey, eventValue);
+      Object firstValue = workflow.instance().addMetadataIfAbsent(stateKey, () -> eventValue);
       boolean result = Objects.equals(eventValue, firstValue);
       logger.debug(
           "Correlation no expect, eventValue='{}', firstValue='{}', match={}",

impl/core/src/main/java/io/serverlessworkflow/impl/events/TypeEventRegistrationBuilder.java

@@ -15,18 +15,16 @@
  */
 package io.serverlessworkflow.impl.events;
 
-import io.serverlessworkflow.impl.WorkflowModelFactory;
 import java.util.Collection;
 import java.util.Collections;
 
 public record TypeEventRegistrationBuilder(
     String type,
     CloudEventPredicate cePredicate,
-    Collection<CloudEventPredicate> correlationPredicates,
-    WorkflowModelFactory modelFactory)
+    Collection<CloudEventPredicate> correlationPredicates)
     implements EventRegistrationBuilder {
 
   public TypeEventRegistrationBuilder(String type, CloudEventPredicate cePredicate) {
-    this(type, cePredicate, Collections.emptyList(), null);
+    this(type, cePredicate, Collections.emptyList());
   }
 }