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 @@ -39,7 +39,6 @@ protected JavaForExecutorBuilder(
WorkflowApplication application,
ResourceLoader resourceLoader) {
super(position, task, workflow, application, resourceLoader);
if (task instanceof ForTaskFunction taskFunctions) {}
}

protected Optional<WorkflowFilter> buildWhileFilter() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,24 @@
*/
package io.serverlessworkflow.impl.expressions.func;

import io.serverlessworkflow.api.types.TaskBase;
import io.serverlessworkflow.api.types.TaskMetadata;
import io.serverlessworkflow.impl.TaskContext;
import io.serverlessworkflow.impl.WorkflowContext;
import io.serverlessworkflow.impl.WorkflowFilter;
import io.serverlessworkflow.impl.WorkflowModel;
import io.serverlessworkflow.impl.WorkflowModelFactory;
import io.serverlessworkflow.impl.expressions.Expression;
import io.serverlessworkflow.impl.expressions.ExpressionFactory;
import java.util.Optional;
import java.util.function.BiFunction;
import java.util.function.BiPredicate;
import java.util.function.Function;
import java.util.function.Predicate;

public class JavaExpressionFactory implements ExpressionFactory {

public static final String IF_PREDICATE = "if_predicate";
private final WorkflowModelFactory modelFactory = new JavaModelFactory();
private final Expression dummyExpression =
new Expression() {
Expand All @@ -49,7 +53,7 @@ public WorkflowFilter buildFilter(String expr, Object value) {
if (value instanceof Function func) {
return (w, t, n) -> modelFactory.fromAny(func.apply(n.asJavaObject()));
} else if (value instanceof Predicate pred) {
return (w, t, n) -> modelFactory.from(pred.test(n.asJavaObject()));
return fromPredicate(pred);
} else if (value instanceof BiPredicate pred) {
return (w, t, n) -> modelFactory.from(pred.test(w, t));
} else if (value instanceof BiFunction func) {
Expand All @@ -61,6 +65,20 @@ public WorkflowFilter buildFilter(String expr, Object value) {
}
}

@SuppressWarnings({"rawtypes", "unchecked"})
private WorkflowFilter fromPredicate(Predicate pred) {
return (w, t, n) -> modelFactory.from(pred.test(n.asJavaObject()));
}

@Override
public Optional<WorkflowFilter> buildIfFilter(TaskBase task) {
TaskMetadata metadata = task.getMetadata();
return metadata != null
&& metadata.getAdditionalProperties().get(IF_PREDICATE) instanceof Predicate pred
? Optional.of(fromPredicate(pred))
: ExpressionFactory.super.buildIfFilter(task);
}

@Override
public WorkflowModelFactory modelFactory() {
return modelFactory;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,19 @@
import io.serverlessworkflow.api.types.SwitchTask;
import io.serverlessworkflow.api.types.Task;
import io.serverlessworkflow.api.types.TaskItem;
import io.serverlessworkflow.api.types.TaskMetadata;
import io.serverlessworkflow.api.types.Workflow;
import io.serverlessworkflow.api.types.func.CallJava;
import io.serverlessworkflow.api.types.func.CallTaskJava;
import io.serverlessworkflow.api.types.func.ForTaskFunction;
import io.serverlessworkflow.api.types.func.SwitchCaseFunction;
import io.serverlessworkflow.impl.WorkflowApplication;
import io.serverlessworkflow.impl.WorkflowDefinition;
import io.serverlessworkflow.impl.expressions.func.JavaExpressionFactory;
import java.util.Collection;
import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.function.Predicate;
import org.junit.jupiter.api.Test;

class CallTest {
Expand Down Expand Up @@ -140,6 +143,34 @@ void testSwitch() throws InterruptedException, ExecutionException {
}
}

@Test
void testIf() throws InterruptedException, ExecutionException {
try (WorkflowApplication app = WorkflowApplication.builder().build()) {
Workflow workflow =
new Workflow()
.withDocument(
new Document().withNamespace("test").withName("testIf").withVersion("1.0"))
.withDo(
List.of(
new TaskItem(
"java",
new Task()
.withCallTask(
new CallTaskJava(
withPredicate(
CallJava.function(CallTest::zero), CallTest::isOdd))))));
WorkflowDefinition definition = app.workflowDefinition(workflow);
assertThat(definition.instance(3).start().get().asNumber().orElseThrow()).isEqualTo(0);
assertThat(definition.instance(4).start().get().asNumber().orElseThrow()).isEqualTo(4);
}
}

private <T> CallJava withPredicate(CallJava call, Predicate<T> pred) {
return (CallJava)
call.withMetadata(
new TaskMetadata().withAdditionalProperty(JavaExpressionFactory.IF_PREDICATE, pred));
}

public static boolean isEven(Object model, Integer number) {
return !isOdd(number);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,13 @@ public static Optional<WorkflowFilter> optionalFilter(WorkflowApplication app, S
return str != null ? Optional.of(buildWorkflowFilter(app, str)) : Optional.empty();
}

public static Optional<WorkflowFilter> optionalFilter(
WorkflowApplication app, Object obj, String str) {
return str != null || obj != null
? Optional.of(buildWorkflowFilter(app, str, obj))
: Optional.empty();
}

public static String toString(UriTemplate template) {
URI uri = template.getLiteralUri();
return uri != null ? uri.toString() : template.getLiteralUriTemplate();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
*/
package io.serverlessworkflow.impl.executors;

import static io.serverlessworkflow.impl.WorkflowUtils.*;
import static io.serverlessworkflow.impl.WorkflowUtils.buildWorkflowFilter;
import static io.serverlessworkflow.impl.WorkflowUtils.getSchemaValidator;

import io.serverlessworkflow.api.types.Export;
import io.serverlessworkflow.api.types.FlowDirective;
Expand Down Expand Up @@ -101,7 +102,7 @@ protected AbstractTaskExecutorBuilder(
this.contextSchemaValidator =
getSchemaValidator(application.validatorFactory(), resourceLoader, export.getSchema());
}
this.ifFilter = optionalFilter(application, task.getIf());
this.ifFilter = application.expressionFactory().buildIfFilter(task);
}

protected final TransitionInfoBuilder next(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@
*/
package io.serverlessworkflow.impl.expressions;

import io.serverlessworkflow.api.types.TaskBase;
import io.serverlessworkflow.impl.WorkflowFilter;
import io.serverlessworkflow.impl.WorkflowModelFactory;
import java.util.Optional;

public interface ExpressionFactory {
/**
Expand All @@ -29,4 +31,8 @@ public interface ExpressionFactory {
WorkflowFilter buildFilter(String expr, Object value);

WorkflowModelFactory modelFactory();

default Optional<WorkflowFilter> buildIfFilter(TaskBase task) {
return task.getIf() != null ? Optional.of(buildFilter(task.getIf(), null)) : Optional.empty();
}
}