Skip to content

Commit c8100c0

Browse files
authored
Minor format (#995)
Signed-off-by: fjtirado <ftirados@redhat.com>
1 parent d6e4f07 commit c8100c0

File tree

3 files changed

+23
-19
lines changed

3 files changed

+23
-19
lines changed

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import io.serverlessworkflow.impl.WorkflowContext;
2323
import io.serverlessworkflow.impl.WorkflowDefinition;
2424
import io.serverlessworkflow.impl.WorkflowModel;
25-
import io.serverlessworkflow.impl.WorkflowModelFactory;
2625
import io.serverlessworkflow.impl.executors.CallableTask;
2726
import java.util.Optional;
2827
import java.util.concurrent.CompletableFuture;
@@ -31,7 +30,7 @@ public class JavaContextFunctionCallExecutor<T, V>
3130
implements CallableTask<CallJava.CallJavaContextFunction<T, V>> {
3231

3332
private JavaContextFunction<T, V> function;
34-
private Optional<Class<T>> inputClass = Optional.empty();
33+
private Optional<Class<T>> inputClass;
3534

3635
@Override
3736
public void init(CallJava.CallJavaContextFunction<T, V> task, WorkflowDefinition definition) {
@@ -42,10 +41,13 @@ public void init(CallJava.CallJavaContextFunction<T, V> task, WorkflowDefinition
4241
@Override
4342
public CompletableFuture<WorkflowModel> apply(
4443
WorkflowContext workflowContext, TaskContext taskContext, WorkflowModel input) {
45-
WorkflowModelFactory mf = workflowContext.definition().application().modelFactory();
46-
T typedIn = JavaFuncUtils.convertT(input, inputClass);
47-
V out = function.apply(typedIn, workflowContext);
48-
return CompletableFuture.completedFuture(mf.fromAny(input, out));
44+
return CompletableFuture.completedFuture(
45+
workflowContext
46+
.definition()
47+
.application()
48+
.modelFactory()
49+
.fromAny(
50+
input, function.apply(JavaFuncUtils.convertT(input, inputClass), workflowContext)));
4951
}
5052

5153
@Override

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import io.serverlessworkflow.impl.WorkflowContext;
2323
import io.serverlessworkflow.impl.WorkflowDefinition;
2424
import io.serverlessworkflow.impl.WorkflowModel;
25-
import io.serverlessworkflow.impl.WorkflowModelFactory;
2625
import io.serverlessworkflow.impl.executors.CallableTask;
2726
import java.util.Optional;
2827
import java.util.concurrent.CompletableFuture;
@@ -31,7 +30,7 @@ public class JavaFilterFunctionCallExecutor<T, V>
3130
implements CallableTask<CallJava.CallJavaFilterFunction<T, V>> {
3231

3332
private JavaFilterFunction<T, V> function;
34-
private Optional<Class<T>> inputClass = Optional.empty();
33+
private Optional<Class<T>> inputClass;
3534

3635
@Override
3736
public void init(CallJava.CallJavaFilterFunction<T, V> task, WorkflowDefinition definition) {
@@ -42,10 +41,15 @@ public void init(CallJava.CallJavaFilterFunction<T, V> task, WorkflowDefinition
4241
@Override
4342
public CompletableFuture<WorkflowModel> apply(
4443
WorkflowContext workflowContext, TaskContext taskContext, WorkflowModel input) {
45-
WorkflowModelFactory mf = workflowContext.definition().application().modelFactory();
46-
T typedIn = JavaFuncUtils.convertT(input, inputClass);
47-
V out = function.apply(typedIn, workflowContext, taskContext);
48-
return CompletableFuture.completedFuture(mf.fromAny(input, out));
44+
return CompletableFuture.completedFuture(
45+
workflowContext
46+
.definition()
47+
.application()
48+
.modelFactory()
49+
.fromAny(
50+
input,
51+
function.apply(
52+
JavaFuncUtils.convertT(input, inputClass), workflowContext, taskContext)));
4953
}
5054

5155
@Override

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import io.serverlessworkflow.impl.WorkflowContext;
2222
import io.serverlessworkflow.impl.WorkflowDefinition;
2323
import io.serverlessworkflow.impl.WorkflowModel;
24-
import io.serverlessworkflow.impl.WorkflowModelFactory;
2524
import io.serverlessworkflow.impl.executors.CallableTask;
2625
import java.util.Optional;
2726
import java.util.concurrent.CompletableFuture;
@@ -33,10 +32,6 @@ public class JavaFunctionCallExecutor<T, V>
3332
private Function<T, V> function;
3433
private Optional<Class<T>> inputClass;
3534

36-
static String fromInt(Integer integer) {
37-
return Integer.toString(integer);
38-
}
39-
4035
public void init(CallJava.CallJavaFunction<T, V> task, WorkflowDefinition definition) {
4136
function = task.function();
4237
inputClass = task.inputClass();
@@ -45,9 +40,12 @@ public void init(CallJava.CallJavaFunction<T, V> task, WorkflowDefinition defini
4540
@Override
4641
public CompletableFuture<WorkflowModel> apply(
4742
WorkflowContext workflowContext, TaskContext taskContext, WorkflowModel input) {
48-
WorkflowModelFactory modelFactory = workflowContext.definition().application().modelFactory();
4943
return CompletableFuture.completedFuture(
50-
modelFactory.fromAny(input, function.apply(JavaFuncUtils.convertT(input, inputClass))));
44+
workflowContext
45+
.definition()
46+
.application()
47+
.modelFactory()
48+
.fromAny(input, function.apply(JavaFuncUtils.convertT(input, inputClass))));
5149
}
5250

5351
@Override

0 commit comments

Comments
 (0)