[Fix #897] Fixing flaky test

Signed-off-by: fjtirado <[email protected]>

Author: fjtirado

impl/core/src/main/java/io/serverlessworkflow/impl/executors/RunScriptExecutor.java

@@ -39,12 +39,10 @@
 public class RunScriptExecutor implements RunnableTask<RunScript> {
 
   private Optional<WorkflowValueResolver<Map<String, Object>>> environmentExpr;
-
   private Optional<WorkflowValueResolver<Map<String, Object>>> argumentExpr;
-
   private WorkflowValueResolver<String> codeSupplier;
   private boolean isAwait;
-  private RunTaskConfiguration.ProcessReturnType returnType;
+  private Optional<RunTaskConfiguration.ProcessReturnType> returnType;
   private ScriptRunner taskRunner;
 
   @Override
@@ -65,7 +63,7 @@ public void init(RunScript taskConfiguration, WorkflowDefinition definition) {
 
     this.isAwait = taskConfiguration.isAwait();
 
-    this.returnType = taskConfiguration.getReturn();
+    this.returnType = Optional.ofNullable(taskConfiguration.getReturn());
 
     WorkflowApplication application = definition.application();
     this.environmentExpr =
@@ -102,22 +100,24 @@ public void init(RunScript taskConfiguration, WorkflowDefinition definition) {
   @Override
   public CompletableFuture<WorkflowModel> apply(
       WorkflowContext workflowContext, TaskContext taskContext, WorkflowModel input) {
-    return CompletableFuture.supplyAsync(
-        () ->
-            taskRunner.runScript(
-                new ScriptContext(
-                    argumentExpr
-                        .map(m -> m.apply(workflowContext, taskContext, input))
-                        .orElse(Map.of()),
-                    environmentExpr
-                        .map(m -> m.apply(workflowContext, taskContext, input))
-                        .orElse(Map.of()),
-                    codeSupplier.apply(workflowContext, taskContext, input),
-                    isAwait,
-                    returnType),
-                workflowContext,
-                taskContext,
-                input));
+    ScriptContext scriptContext =
+        new ScriptContext(
+            argumentExpr.map(m -> m.apply(workflowContext, taskContext, input)).orElse(Map.of()),
+            environmentExpr.map(m -> m.apply(workflowContext, taskContext, input)).orElse(Map.of()),
+            codeSupplier.apply(workflowContext, taskContext, input),
+            returnType);
+    if (isAwait) {
+      return CompletableFuture.supplyAsync(
+          () -> taskRunner.runScript(scriptContext, workflowContext, taskContext, input),
+          workflowContext.definition().application().executorService());
+    } else {
+      workflowContext
+          .definition()
+          .application()
+          .executorService()
+          .submit(() -> taskRunner.runScript(scriptContext, workflowContext, taskContext, input));
+      return CompletableFuture.completedFuture(input);
+    }
   }
 
   @Override

impl/core/src/main/java/io/serverlessworkflow/impl/scripts/ScriptContext.java

@@ -17,10 +17,10 @@
 
 import io.serverlessworkflow.api.types.RunTaskConfiguration;
 import java.util.Map;
+import java.util.Optional;
 
 public record ScriptContext(
     Map<String, Object> args,
     Map<String, Object> envs,
     String code,
-    boolean isAwait,
-    RunTaskConfiguration.ProcessReturnType returnType) {}
+    Optional<RunTaskConfiguration.ProcessReturnType> returnType) {}

impl/script-js/src/main/java/io/serverlessworkflow/impl/executors/script/js/JavaScriptScriptTaskRunner.java

@@ -55,7 +55,6 @@ public WorkflowModel runScript(
     WorkflowApplication application = workflowContext.definition().application();
     ByteArrayOutputStream stderr = new ByteArrayOutputStream();
     ByteArrayOutputStream stdout = new ByteArrayOutputStream();
-
     try (Context ctx =
         Context.newBuilder()
             .err(stderr)
@@ -71,29 +70,26 @@ public WorkflowModel runScript(
               (key, val) -> {
                 ctx.getBindings(identifier().getLang()).putMember(key, val);
               });
-
       configureProcessEnv(ctx, script.envs());
-
-      if (!script.isAwait()) {
-        application
-            .executorService()
-            .submit(
-                () -> {
-                  ctx.eval(identifier().getLang(), script.code());
-                });
-        return application.modelFactory().fromAny(input);
-      }
-
       ctx.eval(Source.create(identifier().getLang(), script.code()));
-
-      return modelFromOutput(
-          script.returnType(), application.modelFactory(), stdout, () -> stderr.toString());
+      return script
+          .returnType()
+          .map(
+              type ->
+                  modelFromOutput(
+                      type, application.modelFactory(), stdout, () -> stderr.toString()))
+          .orElse(input);
     } catch (PolyglotException e) {
       if (e.getExitStatus() != 0 || e.isSyntaxError()) {
         throw new WorkflowException(WorkflowError.runtime(taskContext, e).build());
       } else {
-        return modelFromOutput(
-            script.returnType(), application.modelFactory(), stdout, () -> buildStderr(e, stderr));
+        return script
+            .returnType()
+            .map(
+                type ->
+                    modelFromOutput(
+                        type, application.modelFactory(), stdout, () -> buildStderr(e, stderr)))
+            .orElse(input);
       }
     }
   }

impl/test/src/test/java/io/serverlessworkflow/impl/test/RunShellExecutorTest.java

@@ -21,8 +21,6 @@
 import io.serverlessworkflow.impl.WorkflowModel;
 import io.serverlessworkflow.impl.executors.ProcessResult;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.Map;
 import org.assertj.core.api.SoftAssertions;
 import org.junit.jupiter.api.Test;
@@ -127,15 +125,10 @@ void testAwaitBehavior() throws IOException {
             "workflows-samples/run-shell/echo-not-awaiting.yaml");
     try (WorkflowApplication appl = WorkflowApplication.builder().build()) {
       Map<String, String> inputMap = Map.of("full_name", "Matheus Cruz");
-
       WorkflowModel outputModel =
           appl.workflowDefinition(workflow).instance(inputMap).start().join();
-
-      String content = Files.readString(Path.of("/tmp/hello.txt"));
-
       SoftAssertions.assertSoftly(
           softly -> {
-            softly.assertThat(content).contains("hello world not awaiting (Matheus Cruz)");
             softly.assertThat(outputModel.asMap().get()).isEqualTo(inputMap);
           });
     }