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 @@ -15,8 +15,6 @@
*/
package io.serverlessworkflow.fluent.func;

import io.serverlessworkflow.api.types.Set;
import io.serverlessworkflow.api.types.SetTask;
import io.serverlessworkflow.api.types.func.MapSetTaskConfiguration;
import io.serverlessworkflow.fluent.func.spi.ConditionalTaskBuilder;
import io.serverlessworkflow.fluent.spec.SetTaskBuilder;
Expand All @@ -25,23 +23,8 @@
public class FuncSetTaskBuilder extends SetTaskBuilder
implements ConditionalTaskBuilder<FuncSetTaskBuilder> {

private final SetTask task;

FuncSetTaskBuilder() {
this.task = new SetTask();
this.setTask(task);
}

public FuncSetTaskBuilder expr(Map<String, Object> map) {
if (this.task.getSet() == null) {
this.task.setSet(new Set());
}
this.task.getSet().withSetTaskConfiguration(new MapSetTaskConfiguration(map));
this.setTaskConfiguration = new MapSetTaskConfiguration(map);
return this;
}

@Override
public SetTask build() {
return this.task;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
import io.serverlessworkflow.impl.WorkflowApplication;
import io.serverlessworkflow.impl.WorkflowDefinition;
import io.serverlessworkflow.impl.WorkflowInstance;
import io.serverlessworkflow.impl.WorkflowModel;
import io.serverlessworkflow.impl.jackson.JsonUtils;
import java.util.Collection;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -131,4 +133,22 @@ void set_with_map() {
assertEquals(Map.of("message", "hello world!"), output);
}
}

@Test
void set_with_string() {
try (WorkflowApplication app = WorkflowApplication.builder().build()) {
Workflow workflow =
FuncWorkflowBuilder.workflow()
.tasks(f -> f.set(s -> s.expr("{message:\"hello world!\"}")))
.build();

WorkflowDefinition workflowDefinition = app.workflowDefinition(workflow);

WorkflowModel model = workflowDefinition.instance(Map.of()).start().join();

assertEquals(
JsonUtils.mapper().createObjectNode().put("message", "hello world!"),
model.asJavaObject());
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

public class SetTaskBuilder extends TaskBaseBuilder<SetTaskBuilder> {

private final SetTask task;
private final SetTaskConfiguration setTaskConfiguration;
protected final SetTask task;
protected SetTaskConfiguration setTaskConfiguration;

public SetTaskBuilder() {
this.task = new SetTask();
Expand All @@ -49,7 +49,6 @@ public SetTask build() {
if (this.task.getSet() == null) {
this.task.setSet(new Set().withSetTaskConfiguration(setTaskConfiguration));
}

return task;
}
}