Skip to content

Commit 9dcbbd2

Browse files
committed
Consider co-pilot comments
Signed-off-by: Ricardo Zanini <ricardozanini@gmail.com>
1 parent 16c471c commit 9dcbbd2

2 files changed

Lines changed: 10 additions & 30 deletions

File tree

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ public static class WaitExecutorBuilder extends RegularTaskExecutorBuilder<WaitT
4242
protected WaitExecutorBuilder(
4343
WorkflowMutablePosition position, WaitTask task, WorkflowDefinition definition) {
4444
super(position, task, definition);
45-
if (task.getWait().getDurationExpression() == null) {
46-
this.duration =
47-
task.getWait().getDurationInline() != null
48-
? toDuration(task.getWait().getDurationInline())
49-
: parseDurationLiteral(task.getWait().getDurationLiteral());
50-
} else {
45+
if (WorkflowUtils.isValid(task.getWait().getDurationExpression())) {
5146
this.durationExpressionFilter =
5247
WorkflowUtils.buildWorkflowFilter(application, task.getWait().getDurationExpression());
48+
} else {
49+
this.duration =
50+
WorkflowUtils.isValid(task.getWait().getDurationLiteral())
51+
? parseDurationLiteral(task.getWait().getDurationLiteral())
52+
: toDuration(task.getWait().getDurationInline());
5353
}
5454
}
5555

impl/test/src/test/java/io/serverlessworkflow/impl/test/WaitExecutorTest.java

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static org.assertj.core.api.Assertions.assertThatThrownBy;
2121
import static org.awaitility.Awaitility.await;
2222

23+
import io.serverlessworkflow.api.types.TimeoutAfter;
2324
import io.serverlessworkflow.api.types.Workflow;
2425
import io.serverlessworkflow.fluent.spec.WorkflowBuilder;
2526
import io.serverlessworkflow.fluent.spec.dsl.DSL;
@@ -106,22 +107,7 @@ void testWaitWithDurationLiteralISO8601Seconds() {
106107
.tasks(
107108
list ->
108109
list.wait(
109-
w ->
110-
w.build()
111-
.setWait(
112-
new io.serverlessworkflow.api.types.TimeoutAfter()
113-
.withDurationLiteral("PT1S"))))
114-
.build();
115-
116-
long startTime = System.currentTimeMillis();
117-
WorkflowModel model = appl.workflowDefinition(workflow).instance(Map.of()).start().join();
118-
long elapsed = System.currentTimeMillis() - startTime;
119-
120-
assertThat(model).isNotNull();
121-
assertThat(elapsed).isGreaterThanOrEqualTo(1000);
122-
}
123-
WorkflowBuilder.workflow("wait-literal-seconds", "test", "0.1.0")
124-
.tasks(DSL.wait(Duration.parse("PT1S")))
110+
w -> w.build().setWait(new TimeoutAfter().withDurationExpression("PT1S"))))
125111
.build();
126112

127113
long startTime = System.currentTimeMillis();
@@ -141,10 +127,7 @@ void testWaitWithDurationLiteralISO8601Composite() {
141127
list ->
142128
list.wait(
143129
w ->
144-
w.build()
145-
.setWait(
146-
new io.serverlessworkflow.api.types.TimeoutAfter()
147-
.withDurationLiteral("PT1.5S"))))
130+
w.build().setWait(new TimeoutAfter().withDurationExpression("PT1.5S"))))
148131
.build();
149132

150133
long startTime = System.currentTimeMillis();
@@ -164,10 +147,7 @@ void testWaitWithDurationLiteralISO8601Milliseconds() {
164147
list ->
165148
list.wait(
166149
w ->
167-
w.build()
168-
.setWait(
169-
new io.serverlessworkflow.api.types.TimeoutAfter()
170-
.withDurationLiteral("PT0.1S"))))
150+
w.build().setWait(new TimeoutAfter().withDurationExpression("PT0.1S"))))
171151
.build();
172152

173153
long startTime = System.currentTimeMillis();

0 commit comments

Comments
 (0)