[Fix #1408] Do not rely on ServiceLoader instance creation (#1409)

Signed-off-by: fjtirado <ftirados@redhat.com>

Author: fjtirado

experimental/lambda/src/main/java/io/serverlessworkflow/impl/executors/func/JavaConsumerCallExecutorBuilder.java

@@ -19,32 +19,21 @@
 import io.serverlessworkflow.api.types.func.CallJava;
 import io.serverlessworkflow.impl.WorkflowDefinition;
 import io.serverlessworkflow.impl.WorkflowMutablePosition;
-import io.serverlessworkflow.impl.executors.CallableTask;
 import io.serverlessworkflow.impl.executors.CallableTaskBuilder;
-import java.util.Optional;
-import java.util.function.Consumer;
+import io.serverlessworkflow.impl.executors.CallableTaskFactory;
 
 public class JavaConsumerCallExecutorBuilder<T>
     implements CallableTaskBuilder<CallJava.CallJavaConsumer<T>> {
 
-  private Consumer<T> consumer;
-  private Optional<Class<T>> inputClass;
-
-  public void init(
+  public CallableTaskFactory init(
       CallJava.CallJavaConsumer<T> task,
       WorkflowDefinition definition,
       WorkflowMutablePosition position) {
-    consumer = task.consumer();
-    inputClass = task.inputClass();
+    return () -> new JavaConsumerCallExecutor<T>(task.inputClass(), task.consumer());
   }
 
   @Override
   public boolean accept(Class<? extends TaskBase> clazz) {
     return CallJava.CallJavaConsumer.class.isAssignableFrom(clazz);
   }
-
-  @Override
-  public CallableTask build() {
-    return new JavaConsumerCallExecutor<T>(inputClass, consumer);
-  }
 }

experimental/lambda/src/main/java/io/serverlessworkflow/impl/executors/func/JavaContextFunctionCallExecutorBuilder.java

@@ -18,37 +18,26 @@
 import io.serverlessworkflow.api.types.TaskBase;
 import io.serverlessworkflow.api.types.func.CallJava;
 import io.serverlessworkflow.api.types.func.CallJava.CallJavaContextFunction;
-import io.serverlessworkflow.api.types.func.ContextFunction;
 import io.serverlessworkflow.impl.WorkflowDefinition;
 import io.serverlessworkflow.impl.WorkflowMutablePosition;
-import io.serverlessworkflow.impl.executors.CallableTask;
 import io.serverlessworkflow.impl.executors.CallableTaskBuilder;
-import java.util.Optional;
+import io.serverlessworkflow.impl.executors.CallableTaskFactory;
 
 public class JavaContextFunctionCallExecutorBuilder<T, V>
     implements CallableTaskBuilder<CallJava.CallJavaContextFunction<T, V>> {
 
-  protected ContextFunction<T, V> function;
-  protected Optional<Class<T>> inputClass;
-  protected Optional<Class<V>> outputClass;
-
   @Override
   public boolean accept(Class<? extends TaskBase> clazz) {
     return CallJava.CallJavaContextFunction.class.isAssignableFrom(clazz);
   }
 
   @Override
-  public void init(
+  public CallableTaskFactory init(
       CallJavaContextFunction<T, V> task,
       WorkflowDefinition definition,
       WorkflowMutablePosition position) {
-    this.function = task.function();
-    this.inputClass = task.inputClass();
-    this.outputClass = task.outputClass();
-  }
-
-  @Override
-  public CallableTask build() {
-    return new JavaContextFunctionCallExecutor<T, V>(inputClass, outputClass, function);
+    return () ->
+        new JavaContextFunctionCallExecutor<T, V>(
+            task.inputClass(), task.outputClass(), task.function());
   }
 }

experimental/lambda/src/main/java/io/serverlessworkflow/impl/executors/func/JavaFilterFunctionCallExecutorBuilder.java

@@ -18,37 +18,26 @@
 import io.serverlessworkflow.api.types.TaskBase;
 import io.serverlessworkflow.api.types.func.CallJava;
 import io.serverlessworkflow.api.types.func.CallJava.CallJavaFilterFunction;
-import io.serverlessworkflow.api.types.func.FilterFunction;
 import io.serverlessworkflow.impl.WorkflowDefinition;
 import io.serverlessworkflow.impl.WorkflowMutablePosition;
-import io.serverlessworkflow.impl.executors.CallableTask;
 import io.serverlessworkflow.impl.executors.CallableTaskBuilder;
-import java.util.Optional;
+import io.serverlessworkflow.impl.executors.CallableTaskFactory;
 
 public class JavaFilterFunctionCallExecutorBuilder<T, V>
     implements CallableTaskBuilder<CallJava.CallJavaFilterFunction<T, V>> {
 
-  private FilterFunction<T, V> function;
-  private Optional<Class<T>> inputClass;
-  private Optional<Class<V>> outputClass;
-
   @Override
   public boolean accept(Class<? extends TaskBase> clazz) {
     return CallJava.CallJavaFilterFunction.class.isAssignableFrom(clazz);
   }
 
   @Override
-  public void init(
+  public CallableTaskFactory init(
       CallJavaFilterFunction<T, V> task,
       WorkflowDefinition definition,
       WorkflowMutablePosition position) {
-    this.function = task.function();
-    this.inputClass = task.inputClass();
-    this.outputClass = task.outputClass();
-  }
-
-  @Override
-  public CallableTask build() {
-    return new JavaFilterFunctionCallExecutor<>(inputClass, outputClass, function);
+    return () ->
+        new JavaFilterFunctionCallExecutor<>(
+            task.inputClass(), task.outputClass(), task.function());
   }
 }

experimental/lambda/src/main/java/io/serverlessworkflow/impl/executors/func/JavaFunctionCallExecutorBuilder.java

@@ -20,35 +20,23 @@
 import io.serverlessworkflow.api.types.func.CallJava.CallJavaFunction;
 import io.serverlessworkflow.impl.WorkflowDefinition;
 import io.serverlessworkflow.impl.WorkflowMutablePosition;
-import io.serverlessworkflow.impl.executors.CallableTask;
 import io.serverlessworkflow.impl.executors.CallableTaskBuilder;
-import java.util.Optional;
-import java.util.function.Function;
+import io.serverlessworkflow.impl.executors.CallableTaskFactory;
 
 public class JavaFunctionCallExecutorBuilder<T, V>
     implements CallableTaskBuilder<CallJava.CallJavaFunction<T, V>> {
 
-  protected Function<T, V> function;
-  protected Optional<Class<T>> inputClass;
-  protected Optional<Class<V>> outputClass;
-
   @Override
   public boolean accept(Class<? extends TaskBase> clazz) {
     return CallJava.CallJavaFunction.class.isAssignableFrom(clazz);
   }
 
   @Override
-  public void init(
+  public CallableTaskFactory init(
       CallJavaFunction<T, V> task,
       WorkflowDefinition definition,
       WorkflowMutablePosition position) {
-    function = task.function();
-    inputClass = task.inputClass();
-    outputClass = task.outputClass();
-  }
-
-  @Override
-  public CallableTask build() {
-    return new JavaFunctionCallExecutor<>(inputClass, outputClass, function);
+    return () ->
+        new JavaFunctionCallExecutor<>(task.inputClass(), task.outputClass(), task.function());
   }
 }

experimental/lambda/src/main/java/io/serverlessworkflow/impl/executors/func/JavaLoopFunctionCallExecutorBuilder.java

@@ -18,32 +18,22 @@
 import io.serverlessworkflow.api.types.TaskBase;
 import io.serverlessworkflow.api.types.func.CallJava;
 import io.serverlessworkflow.api.types.func.CallJava.CallJavaLoopFunction;
-import io.serverlessworkflow.api.types.func.LoopFunction;
 import io.serverlessworkflow.impl.WorkflowDefinition;
 import io.serverlessworkflow.impl.WorkflowMutablePosition;
-import io.serverlessworkflow.impl.executors.CallableTask;
 import io.serverlessworkflow.impl.executors.CallableTaskBuilder;
+import io.serverlessworkflow.impl.executors.CallableTaskFactory;
 
 public class JavaLoopFunctionCallExecutorBuilder
     implements CallableTaskBuilder<CallJava.CallJavaLoopFunction> {
 
-  private LoopFunction function;
-  private String varName;
-
   @Override
   public boolean accept(Class<? extends TaskBase> clazz) {
     return CallJava.CallJavaLoopFunction.class.isAssignableFrom(clazz);
   }
 
   @Override
-  public void init(
+  public CallableTaskFactory init(
       CallJavaLoopFunction task, WorkflowDefinition definition, WorkflowMutablePosition position) {
-    function = task.function();
-    varName = task.varName();
-  }
-
-  @Override
-  public CallableTask build() {
-    return new JavaLoopFunctionCallExecutor<>(function, varName);
+    return () -> new JavaLoopFunctionCallExecutor<>(task.function(), task.varName());
   }
 }

experimental/lambda/src/main/java/io/serverlessworkflow/impl/executors/func/JavaLoopFunctionIndexCallExecutorBuilder.java

@@ -18,36 +18,25 @@
 import io.serverlessworkflow.api.types.TaskBase;
 import io.serverlessworkflow.api.types.func.CallJava;
 import io.serverlessworkflow.api.types.func.CallJava.CallJavaLoopFunctionIndex;
-import io.serverlessworkflow.api.types.func.LoopFunctionIndex;
 import io.serverlessworkflow.impl.WorkflowDefinition;
 import io.serverlessworkflow.impl.WorkflowMutablePosition;
-import io.serverlessworkflow.impl.executors.CallableTask;
 import io.serverlessworkflow.impl.executors.CallableTaskBuilder;
+import io.serverlessworkflow.impl.executors.CallableTaskFactory;
 
 public class JavaLoopFunctionIndexCallExecutorBuilder
     implements CallableTaskBuilder<CallJava.CallJavaLoopFunctionIndex> {
 
-  private LoopFunctionIndex function;
-  private String varName;
-  private String indexName;
-
   @Override
   public boolean accept(Class<? extends TaskBase> clazz) {
     return CallJava.CallJavaLoopFunctionIndex.class.isAssignableFrom(clazz);
   }
 
   @Override
-  public void init(
+  public CallableTaskFactory init(
       CallJavaLoopFunctionIndex task,
       WorkflowDefinition definition,
       WorkflowMutablePosition position) {
-    function = task.function();
-    varName = task.varName();
-    indexName = task.indexName();
-  }
-
-  @Override
-  public CallableTask build() {
-    return new JavaLoopFunctionIndexCallExecutor<>(function, varName, indexName);
+    return () ->
+        new JavaLoopFunctionIndexCallExecutor<>(task.function(), task.varName(), task.indexName());
   }
 }

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

@@ -33,11 +33,8 @@
 
 public class CallFunctionExecutorBuilder implements CallableTaskBuilder<CallFunction> {
 
-  private TaskExecutorBuilder<? extends TaskBase> executorBuilder;
-  private WorkflowValueResolver<Map<String, Object>> args;
-
   @Override
-  public void init(
+  public CallableTaskFactory init(
       CallFunction task, WorkflowDefinition definition, WorkflowMutablePosition position) {
     String functionName = task.getCall();
     Use use = definition.workflow().getUse();
@@ -81,14 +78,15 @@ catalogEndpoint, pathFromFunctionName(functionName.substring(0, indexOf))),
       function =
           definition.resourceLoader().loadURI(URI.create(functionName), h -> from(definition, h));
     }
-    executorBuilder =
+    TaskExecutorBuilder<? extends TaskBase> executorBuilder =
         definition.application().taskFactory().getTaskExecutor(position, function, definition);
     FunctionArguments functionArgs = task.getWith();
-    args =
+    WorkflowValueResolver<?> args =
         functionArgs != null
             ? WorkflowUtils.buildMapResolver(
                 definition.application(), functionArgs.getAdditionalProperties())
             : (w, t, m) -> Map.of();
+    return () -> this.build(executorBuilder, args);
   }
 
   private String pathFromFunctionName(String functionName) {
@@ -122,8 +120,8 @@ public boolean accept(Class<? extends TaskBase> clazz) {
     return clazz.equals(CallFunction.class);
   }
 
-  @Override
-  public CallableTask build() {
+  private CallableTask build(
+      TaskExecutorBuilder<? extends TaskBase> executorBuilder, WorkflowValueResolver<?> args) {
     TaskExecutor<? extends TaskBase> executor = executorBuilder.build();
     return (w, t, m) ->
         executor

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

@@ -30,7 +30,7 @@ public class CallTaskExecutor<T extends TaskBase> extends RegularTaskExecutor<T>
 
   public static class CallTaskExecutorBuilder<T extends TaskBase>
       extends RegularTaskExecutorBuilder<T> {
-    private CallableTaskBuilder<T> callableBuilder;
+    private CallableTaskFactory callableFactory;
     private List<CallableTaskProxyBuilder> callableProxyBuilders;
     private CallableTask callable;
 
@@ -44,13 +44,12 @@ protected CallTaskExecutorBuilder(
           definition.application().callableProxyBuilders().stream()
               .filter(t -> t.accept(task))
               .toList();
-      callableBuilder.init(task, definition, position);
-      this.callableBuilder = callableBuilder;
+      this.callableFactory = callableBuilder.init(task, definition, position);
     }
 
     @Override
     public CallTaskExecutor<T> buildInstance() {
-      this.callable = callableBuilder.build();
+      this.callable = callableFactory.get();
       for (CallableTaskProxyBuilder callableBuilder : callableProxyBuilders) {
         this.callable = callableBuilder.build(callable);
       }

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

@@ -24,7 +24,5 @@ public interface CallableTaskBuilder<T extends TaskBase> extends ServicePriority
 
   boolean accept(Class<? extends TaskBase> clazz);
 
-  void init(T task, WorkflowDefinition definition, WorkflowMutablePosition position);
-
-  CallableTask build();
+  CallableTaskFactory init(T task, WorkflowDefinition definition, WorkflowMutablePosition position);
 }

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

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2020-Present The Serverless Workflow Specification Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.serverlessworkflow.impl.executors;
+
+import java.util.function.Supplier;
+
+@FunctionalInterface
+public interface CallableTaskFactory extends Supplier<CallableTask> {}