Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import io.serverlessworkflow.impl.WorkflowContext;
import io.serverlessworkflow.impl.WorkflowDefinition;
import io.serverlessworkflow.impl.WorkflowModel;
import io.serverlessworkflow.impl.WorkflowModelFactory;
import io.serverlessworkflow.impl.executors.CallableTask;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
Expand All @@ -31,7 +30,7 @@ public class JavaContextFunctionCallExecutor<T, V>
implements CallableTask<CallJava.CallJavaContextFunction<T, V>> {

private JavaContextFunction<T, V> function;
private Optional<Class<T>> inputClass = Optional.empty();
private Optional<Class<T>> inputClass;

@Override
public void init(CallJava.CallJavaContextFunction<T, V> task, WorkflowDefinition definition) {
Expand All @@ -42,10 +41,13 @@ public void init(CallJava.CallJavaContextFunction<T, V> task, WorkflowDefinition
@Override
public CompletableFuture<WorkflowModel> apply(
WorkflowContext workflowContext, TaskContext taskContext, WorkflowModel input) {
WorkflowModelFactory mf = workflowContext.definition().application().modelFactory();
T typedIn = JavaFuncUtils.convertT(input, inputClass);
V out = function.apply(typedIn, workflowContext);
return CompletableFuture.completedFuture(mf.fromAny(input, out));
return CompletableFuture.completedFuture(
workflowContext
.definition()
.application()
.modelFactory()
.fromAny(
input, function.apply(JavaFuncUtils.convertT(input, inputClass), workflowContext)));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import io.serverlessworkflow.impl.WorkflowContext;
import io.serverlessworkflow.impl.WorkflowDefinition;
import io.serverlessworkflow.impl.WorkflowModel;
import io.serverlessworkflow.impl.WorkflowModelFactory;
import io.serverlessworkflow.impl.executors.CallableTask;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
Expand All @@ -31,7 +30,7 @@ public class JavaFilterFunctionCallExecutor<T, V>
implements CallableTask<CallJava.CallJavaFilterFunction<T, V>> {

private JavaFilterFunction<T, V> function;
private Optional<Class<T>> inputClass = Optional.empty();
private Optional<Class<T>> inputClass;

@Override
public void init(CallJava.CallJavaFilterFunction<T, V> task, WorkflowDefinition definition) {
Expand All @@ -42,10 +41,15 @@ public void init(CallJava.CallJavaFilterFunction<T, V> task, WorkflowDefinition
@Override
public CompletableFuture<WorkflowModel> apply(
WorkflowContext workflowContext, TaskContext taskContext, WorkflowModel input) {
WorkflowModelFactory mf = workflowContext.definition().application().modelFactory();
T typedIn = JavaFuncUtils.convertT(input, inputClass);
V out = function.apply(typedIn, workflowContext, taskContext);
return CompletableFuture.completedFuture(mf.fromAny(input, out));
return CompletableFuture.completedFuture(
workflowContext
.definition()
.application()
.modelFactory()
.fromAny(
input,
function.apply(
JavaFuncUtils.convertT(input, inputClass), workflowContext, taskContext)));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import io.serverlessworkflow.impl.WorkflowContext;
import io.serverlessworkflow.impl.WorkflowDefinition;
import io.serverlessworkflow.impl.WorkflowModel;
import io.serverlessworkflow.impl.WorkflowModelFactory;
import io.serverlessworkflow.impl.executors.CallableTask;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
Expand All @@ -33,10 +32,6 @@ public class JavaFunctionCallExecutor<T, V>
private Function<T, V> function;
private Optional<Class<T>> inputClass;

static String fromInt(Integer integer) {
return Integer.toString(integer);
}

public void init(CallJava.CallJavaFunction<T, V> task, WorkflowDefinition definition) {
function = task.function();
inputClass = task.inputClass();
Expand All @@ -45,9 +40,12 @@ public void init(CallJava.CallJavaFunction<T, V> task, WorkflowDefinition defini
@Override
public CompletableFuture<WorkflowModel> apply(
WorkflowContext workflowContext, TaskContext taskContext, WorkflowModel input) {
WorkflowModelFactory modelFactory = workflowContext.definition().application().modelFactory();
return CompletableFuture.completedFuture(
modelFactory.fromAny(input, function.apply(JavaFuncUtils.convertT(input, inputClass))));
workflowContext
.definition()
.application()
.modelFactory()
.fromAny(input, function.apply(JavaFuncUtils.convertT(input, inputClass))));
}

@Override
Expand Down