Review comments

Signed-off-by: Francisco Javier Tirado Sarti <ftirados@ibm.com>

Author: fjtirado

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

@@ -40,28 +40,24 @@ public class RunShellExecutor implements CallableTask {
   public RunShellExecutor(
       WorkflowValueResolver<String> shellCommand,
       List<WorkflowValueResolver<String>> shellArguments,
-      Optional<WorkflowValueResolver<String>> shellDirectory,
       Optional<WorkflowValueResolver<Map<String, Object>>> shellEnv,
-      Optional<ProcessReturnType> returnType) {
+      Optional<ProcessReturnType> returnType,
+      Optional<WorkflowValueResolver<String>> shellDirectory) {
     this.shellCommand = shellCommand;
     this.shellArguments = shellArguments;
-    this.shellDirectory = shellDirectory;
     this.shellEnv = shellEnv;
     this.returnType = returnType;
+    this.shellDirectory = shellDirectory;
   }
 
   public RunShellExecutor(
-          WorkflowValueResolver<String> shellCommand,
-          List<WorkflowValueResolver<String>> shellArguments,
-          Optional<WorkflowValueResolver<Map<String, Object>>> shellEnv,
-          Optional<ProcessReturnType> returnType) {
-        this.shellCommand = shellCommand;
-        this.shellArguments = shellArguments;
-        this.shellDirectory = Optional.empty();
-        this.shellEnv = shellEnv;
-        this.returnType = returnType;
-      }  
-  
+      WorkflowValueResolver<String> shellCommand,
+      List<WorkflowValueResolver<String>> shellArguments,
+      Optional<WorkflowValueResolver<Map<String, Object>>> shellEnv,
+      Optional<ProcessReturnType> returnType) {
+    this(shellCommand, shellArguments, shellEnv, returnType, Optional.empty());
+  }
+
   @Override
   public CompletableFuture<WorkflowModel> apply(
       WorkflowContext workflowContext, TaskContext taskContext, WorkflowModel model) {

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

@@ -39,17 +39,15 @@ public CallableTask build(RunShell taskConfiguration, WorkflowDefinition definit
                 .map(s -> WorkflowUtils.buildStringFilter(definition.application(), s))
                 .toList()
             : List.of(),
-        shell.getDirectory() != null
-            ? Optional.of(
-                WorkflowUtils.buildStringFilter(definition.application(), shell.getDirectory()))
-            : Optional.empty(),
         shell.getEnvironment() != null
             ? Optional.of(
                 WorkflowUtils.buildMapResolver(
                     definition.application(), shell.getEnvironment().getAdditionalProperties()))
             : Optional.empty(),
-        taskConfiguration.isAwait()
-            ? Optional.of(taskConfiguration.getReturn())
+        taskConfiguration.isAwait() ? Optional.of(taskConfiguration.getReturn()) : Optional.empty(),
+        shell.getDirectory() != null
+            ? Optional.of(
+                WorkflowUtils.buildStringFilter(definition.application(), shell.getDirectory()))
             : Optional.empty());
   }