From 5f94850dbbb203c382b6cecd8662487e1a7bd664 Mon Sep 17 00:00:00 2001
From: fjtirado <ftirados@redhat.com>
Date: Fri, 8 May 2026 18:48:35 +0200
Subject: [PATCH] Envelope option were being ignored.

Due to a bug in the code, envelope option was unproperly ignored when
specified

Signed-off-by: fjtirado <ftirados@redhat.com>
---
 .../impl/executors/ListenExecutor.java          | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/impl/core/src/main/java/io/serverlessworkflow/impl/executors/ListenExecutor.java b/impl/core/src/main/java/io/serverlessworkflow/impl/executors/ListenExecutor.java
index 41a36b906..f09e5d10f 100644
--- a/impl/core/src/main/java/io/serverlessworkflow/impl/executors/ListenExecutor.java
+++ b/impl/core/src/main/java/io/serverlessworkflow/impl/executors/ListenExecutor.java
@@ -51,8 +51,7 @@ public static class ListenExecutorBuilder extends RegularTaskExecutorBuilder<Lis
 
     private EventRegistrationBuilderInfo registrationInfo;
     private TaskExecutor<?> loop;
-    private Function<CloudEvent, WorkflowModel> converter =
-        ce -> application.modelFactory().from(ce.getData());
+    private final Function<CloudEvent, WorkflowModel> converter;
 
     protected ListenExecutorBuilder(
         WorkflowMutablePosition position, ListenTask task, WorkflowDefinition definition) {
@@ -65,16 +64,10 @@ protected ListenExecutorBuilder(
         loop = TaskExecutorHelper.createExecutorList(position, forEach.getDo(), definition);
       }
       ListenAndReadAs readAs = listen.getRead();
-      if (readAs != null) {
-        switch (readAs) {
-          case ENVELOPE:
-            converter = ce -> application.modelFactory().from(ce);
-          default:
-          case DATA:
-            converter = ce -> application.modelFactory().from(ce.getData());
-            break;
-        }
-      }
+      converter =
+          readAs == ListenAndReadAs.ENVELOPE
+              ? application.modelFactory()::from
+              : ce -> application.modelFactory().from(ce.getData());
     }
 
     protected WorkflowPredicate buildUntilPredicate(Until until) {