tasks = DSL.tasks(steps);
return f -> f.compete(false).branches(tasks);
}
+
+ /**
+ * Shortcut to configure a timeout in days.
+ *
+ * Example: {@code timeout(timeoutDays(2))}
+ *
+ * @param days timeout duration in days
+ * @return a consumer configuring {@link TimeoutBuilder}
+ */
+ public static Consumer timeoutDays(int days) {
+ return t -> t.duration(d -> d.days(days));
+ }
+
+ /**
+ * Shortcut to configure a timeout in hours.
+ *
+ * Example: {@code timeout(timeoutHours(1))}
+ *
+ * @param hours timeout duration in hours
+ * @return a consumer configuring {@link TimeoutBuilder}
+ */
+ public static Consumer timeoutHours(int hours) {
+ return t -> t.duration(d -> d.hours(hours));
+ }
+
+ /**
+ * Shortcut to configure a timeout in minutes.
+ *
+ * Example: {@code timeout(timeoutMinutes(15))}
+ *
+ * @param minutes timeout duration in minutes
+ * @return a consumer configuring {@link TimeoutBuilder}
+ */
+ public static Consumer timeoutMinutes(int minutes) {
+ return t -> t.duration(d -> d.minutes(minutes));
+ }
+
+ /**
+ * Shortcut to configure a timeout in seconds.
+ *
+ * Example: {@code timeout(timeoutSeconds(30))}
+ *
+ * @param seconds timeout duration in seconds
+ * @return a consumer configuring {@link TimeoutBuilder}
+ */
+ public static Consumer timeoutSeconds(int seconds) {
+ return t -> t.duration(d -> d.seconds(seconds));
+ }
+
+ /**
+ * Shortcut to configure a timeout in milliseconds.
+ *
+ * Example: {@code timeout(timeoutMillis(500))}
+ *
+ * @param milliseconds timeout duration in milliseconds
+ * @return a consumer configuring {@link TimeoutBuilder}
+ */
+ public static Consumer timeoutMillis(int milliseconds) {
+ return t -> t.duration(d -> d.milliseconds(milliseconds));
+ }
+
+ // ---- Schedules ----//
+
+ /**
+ * Shortcut to configure a schedule using an 'every' inline duration.
+ *
+ * Example: {@code schedule(every(timeoutMinutes(15)))}
+ *
+ * @param duration consumer configuring the timeout (e.g., from {@link #timeoutMinutes(int)})
+ * @return a consumer configuring {@link ScheduleBuilder}
+ */
+ public static Consumer every(Consumer duration) {
+ return s -> s.every(duration);
+ }
+
+ /**
+ * Shortcut to configure a schedule using an 'every' duration expression.
+ *
+ * Example: {@code schedule(every("PT15M"))}
+ *
+ * @param durationExpression duration string expression
+ * @return a consumer configuring {@link ScheduleBuilder}
+ */
+ public static Consumer every(String durationExpression) {
+ return s -> s.every(durationExpression);
+ }
+
+ /**
+ * Shortcut to configure a schedule using a CRON expression.
+ *
+ * Example: {@code schedule(cron("0 0 * * *"))}
+ *
+ * @param cron cron string expression
+ * @return a consumer configuring {@link ScheduleBuilder}
+ */
+ public static Consumer cron(String cron) {
+ return s -> s.cron(cron);
+ }
+
+ /**
+ * Shortcut to configure a schedule using an 'after' inline duration.
+ *
+ * Example: {@code schedule(after(timeoutHours(1)))}
+ *
+ * @param duration consumer configuring the timeout (e.g., from {@link #timeoutHours(int)})
+ * @return a consumer configuring {@link ScheduleBuilder}
+ */
+ public static Consumer after(Consumer duration) {
+ return s -> s.after(duration);
+ }
+
+ /**
+ * Shortcut to configure a schedule using an 'after' duration expression.
+ *
+ * Example: {@code schedule(after("PT1H"))}
+ *
+ * @param durationExpression duration string expression
+ * @return a consumer configuring {@link ScheduleBuilder}
+ */
+ public static Consumer after(String durationExpression) {
+ return s -> s.after(durationExpression);
+ }
+
+ /**
+ * Shortcut to configure a schedule using an 'on' event consumption strategy.
+ *
+ * Example: {@code schedule(on(one("my.event")))}
+ *
+ * @param strategy consumer configuring the event strategy
+ * @return a consumer configuring {@link ScheduleBuilder}
+ */
+ public static Consumer on(
+ Consumer> strategy) {
+ return s -> s.on(strategy);
+ }
+
+ /**
+ * Creates a 'one' event consumption strategy using a specific event type string.
+ *
+ * @param eventType the event type
+ * @return a consumer configuring the event strategy builder
+ */
+ public static Consumer> one(String eventType) {
+ return one(event().type(eventType));
+ }
+
+ /**
+ * Creates a 'one' event consumption strategy.
+ *
+ * @param filter consumer configuring the event filter
+ * @return a consumer configuring the event strategy builder
+ */
+ @SuppressWarnings({"unchecked", "rawtypes"})
+ public static Consumer> one(
+ Consumer filter) {
+ return b -> ((AbstractEventConsumptionStrategyBuilder) b).one(filter);
+ }
+
+ /**
+ * Creates an 'all' event consumption strategy.
+ *
+ * @param filters consumers configuring the event filters
+ * @return a consumer configuring the event strategy builder
+ */
+ @SafeVarargs
+ @SuppressWarnings({"unchecked", "rawtypes"})
+ public static Consumer> all(
+ Consumer... filters) {
+ return b -> ((AbstractEventConsumptionStrategyBuilder) b).all(filters);
+ }
+
+ /**
+ * Creates an 'any' event consumption strategy.
+ *
+ * @param filters consumers configuring the event filters
+ * @return a consumer configuring the event strategy builder
+ */
+ @SafeVarargs
+ @SuppressWarnings({"unchecked", "rawtypes"})
+ public static Consumer> any(
+ Consumer... filters) {
+ return b -> ((AbstractEventConsumptionStrategyBuilder) b).any(filters);
+ }
}
diff --git a/fluent/spec/src/test/java/io/serverlessworkflow/fluent/spec/ScheduleBuilderTest.java b/fluent/spec/src/test/java/io/serverlessworkflow/fluent/spec/ScheduleBuilderTest.java
new file mode 100644
index 00000000..1c84608d
--- /dev/null
+++ b/fluent/spec/src/test/java/io/serverlessworkflow/fluent/spec/ScheduleBuilderTest.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2020-Present The Serverless Workflow Specification Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.serverlessworkflow.fluent.spec;
+
+import static io.serverlessworkflow.fluent.spec.dsl.DSL.timeoutMinutes;
+import static io.serverlessworkflow.fluent.spec.dsl.DSL.timeoutSeconds;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import io.serverlessworkflow.api.types.Schedule;
+import org.junit.jupiter.api.Test;
+
+public class ScheduleBuilderTest {
+
+ @Test
+ public void when_every_is_set_with_expression() {
+ Schedule schedule = new ScheduleBuilder().every("PT15M").build();
+
+ assertThat(schedule.getEvery()).isNotNull();
+ assertThat(schedule.getEvery().getDurationLiteral()).isEqualTo("PT15M");
+ assertThat(schedule.getEvery().getDurationInline()).isNull();
+ }
+
+ @Test
+ public void when_every_is_set_with_inline_shortcut() {
+ Schedule schedule = new ScheduleBuilder().every(timeoutMinutes(15)).build();
+
+ assertThat(schedule.getEvery()).isNotNull();
+ assertThat(schedule.getEvery().getDurationExpression()).isNull();
+ assertThat(schedule.getEvery().getDurationInline().getMinutes()).isEqualTo(15);
+ }
+
+ @Test
+ public void when_cron_is_set() {
+ Schedule schedule = new ScheduleBuilder().cron("0 0 * * *").build();
+
+ assertThat(schedule.getCron()).isEqualTo("0 0 * * *");
+ assertThat(schedule.getEvery()).isNull();
+ }
+
+ @Test
+ public void when_after_is_set_with_inline_shortcut() {
+ Schedule schedule = new ScheduleBuilder().after(timeoutSeconds(30)).build();
+
+ assertThat(schedule.getAfter()).isNotNull();
+ assertThat(schedule.getAfter().getDurationInline().getSeconds()).isEqualTo(30);
+ }
+
+ @Test
+ public void when_multiple_properties_set_throws_exception() {
+ assertThatThrownBy(() -> new ScheduleBuilder().every("PT1M").cron("0 * * * *"))
+ .isInstanceOf(IllegalStateException.class)
+ .hasMessageContaining("Schedule already configured with 'every'. Cannot set 'cron'.");
+
+ assertThatThrownBy(() -> new ScheduleBuilder().cron("0 * * * *").after("PT1M"))
+ .isInstanceOf(IllegalStateException.class)
+ .hasMessageContaining("Schedule already configured with 'cron'. Cannot set 'after'.");
+ }
+
+ @Test
+ public void when_no_property_is_set_throws_exception() {
+ assertThatThrownBy(() -> new ScheduleBuilder().build())
+ .isInstanceOf(IllegalStateException.class)
+ .hasMessageContaining("A schedule must have exactly one property set");
+ }
+
+ @Test
+ public void when_inline_and_expression_mix_throws_exception() {
+ assertThatThrownBy(() -> new ScheduleBuilder().every("PT15M").every(timeoutMinutes(15)))
+ .isInstanceOf(IllegalStateException.class)
+ .hasMessageContaining("Duration expression already set for 'every'");
+ }
+}
diff --git a/fluent/spec/src/test/java/io/serverlessworkflow/fluent/spec/dsl/DSLScheduleTest.java b/fluent/spec/src/test/java/io/serverlessworkflow/fluent/spec/dsl/DSLScheduleTest.java
new file mode 100644
index 00000000..219dedb6
--- /dev/null
+++ b/fluent/spec/src/test/java/io/serverlessworkflow/fluent/spec/dsl/DSLScheduleTest.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2020-Present The Serverless Workflow Specification Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.serverlessworkflow.fluent.spec.dsl;
+
+import static io.serverlessworkflow.fluent.spec.dsl.DSL.after;
+import static io.serverlessworkflow.fluent.spec.dsl.DSL.cron;
+import static io.serverlessworkflow.fluent.spec.dsl.DSL.event;
+import static io.serverlessworkflow.fluent.spec.dsl.DSL.every;
+import static io.serverlessworkflow.fluent.spec.dsl.DSL.on;
+import static io.serverlessworkflow.fluent.spec.dsl.DSL.one;
+import static io.serverlessworkflow.fluent.spec.dsl.DSL.timeoutHours;
+import static io.serverlessworkflow.fluent.spec.dsl.DSL.timeoutMinutes;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.serverlessworkflow.api.types.Workflow;
+import io.serverlessworkflow.fluent.spec.WorkflowBuilder;
+import org.junit.jupiter.api.Test;
+
+public class DSLScheduleTest {
+
+ @Test
+ public void when_workflow_schedule_every_expression() {
+ Workflow wf =
+ WorkflowBuilder.workflow("scheduledFlow", "myNs", "1.0.0").schedule(every("PT15M")).build();
+
+ assertThat(wf.getSchedule()).isNotNull();
+ assertThat(wf.getSchedule().getEvery()).isNotNull();
+ assertThat(wf.getSchedule().getEvery().getDurationLiteral()).isEqualTo("PT15M");
+ assertThat(wf.getSchedule().getEvery().getDurationInline()).isNull();
+ }
+
+ @Test
+ public void when_workflow_schedule_every_inline_shortcut() {
+ Workflow wf =
+ WorkflowBuilder.workflow("scheduledFlow", "myNs", "1.0.0")
+ .schedule(every(timeoutMinutes(15)))
+ .build();
+
+ assertThat(wf.getSchedule()).isNotNull();
+ assertThat(wf.getSchedule().getEvery()).isNotNull();
+ assertThat(wf.getSchedule().getEvery().getDurationExpression()).isNull();
+ assertThat(wf.getSchedule().getEvery().getDurationInline().getMinutes()).isEqualTo(15);
+ }
+
+ @Test
+ public void when_workflow_schedule_cron() {
+ Workflow wf =
+ WorkflowBuilder.workflow("scheduledFlow", "myNs", "1.0.0")
+ .schedule(cron("0 0 * * *"))
+ .build();
+
+ assertThat(wf.getSchedule()).isNotNull();
+ assertThat(wf.getSchedule().getCron()).isEqualTo("0 0 * * *");
+ assertThat(wf.getSchedule().getEvery()).isNull();
+ }
+
+ @Test
+ public void when_workflow_schedule_after_expression() {
+ Workflow wf =
+ WorkflowBuilder.workflow("scheduledFlow", "myNs", "1.0.0").schedule(after("PT1H")).build();
+
+ assertThat(wf.getSchedule()).isNotNull();
+ assertThat(wf.getSchedule().getAfter()).isNotNull();
+ assertThat(wf.getSchedule().getAfter().getDurationLiteral()).isEqualTo("PT1H");
+ }
+
+ @Test
+ public void when_workflow_schedule_after_inline_shortcut() {
+ Workflow wf =
+ WorkflowBuilder.workflow("scheduledFlow", "myNs", "1.0.0")
+ .schedule(after(timeoutHours(1)))
+ .build();
+
+ assertThat(wf.getSchedule()).isNotNull();
+ assertThat(wf.getSchedule().getAfter()).isNotNull();
+ assertThat(wf.getSchedule().getAfter().getDurationInline().getHours()).isEqualTo(1);
+ }
+
+ @Test
+ public void when_workflow_schedule_on_event() {
+ Workflow wf =
+ WorkflowBuilder.workflow("scheduledFlow", "myNs", "1.0.0")
+ .schedule(on(one(event().type("org.acme.startup"))))
+ .build();
+
+ assertThat(wf.getSchedule()).isNotNull();
+ assertThat(wf.getSchedule().getOn()).isNotNull();
+ assertThat(wf.getSchedule().getOn().getOneEventConsumptionStrategy()).isNotNull();
+ assertThat(
+ wf.getSchedule().getOn().getOneEventConsumptionStrategy().getOne().getWith().getType())
+ .isEqualTo("org.acme.startup");
+ }
+}
diff --git a/fluent/spec/src/test/java/io/serverlessworkflow/fluent/spec/dsl/DSLTimeoutTest.java b/fluent/spec/src/test/java/io/serverlessworkflow/fluent/spec/dsl/DSLTimeoutTest.java
new file mode 100644
index 00000000..cd93a2c2
--- /dev/null
+++ b/fluent/spec/src/test/java/io/serverlessworkflow/fluent/spec/dsl/DSLTimeoutTest.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2020-Present The Serverless Workflow Specification Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.serverlessworkflow.fluent.spec.dsl;
+
+import static io.serverlessworkflow.fluent.spec.dsl.DSL.call;
+import static io.serverlessworkflow.fluent.spec.dsl.DSL.timeoutMinutes;
+import static io.serverlessworkflow.fluent.spec.dsl.DSL.timeoutSeconds;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import io.serverlessworkflow.api.types.DurationInline;
+import io.serverlessworkflow.api.types.Workflow;
+import io.serverlessworkflow.fluent.spec.WorkflowBuilder;
+import io.serverlessworkflow.fluent.spec.configurers.CallHttpConfigurer;
+import org.junit.jupiter.api.Test;
+
+public class DSLTimeoutTest {
+
+ @Test
+ public void when_workflow_timeout_with_expression() {
+ Workflow wf = WorkflowBuilder.workflow("timeoutFlow", "myNs", "1.0.0").timeout("PT15M").build();
+
+ assertThat(wf.getTimeout()).isNotNull();
+
+ var after = wf.getTimeout().getTimeoutDefinition().getAfter();
+ assertThat(after).isNotNull();
+ assertThat(after.getDurationExpression()).isEqualTo("PT15M");
+ assertThat(after.getDurationInline()).isNull();
+ }
+
+ @Test
+ public void when_workflow_timeout_with_inline_shortcuts() {
+ Workflow wf =
+ WorkflowBuilder.workflow("timeoutFlow", "myNs", "1.0.0")
+ .timeout(timeoutMinutes(15))
+ .build();
+
+ var after = wf.getTimeout().getTimeoutDefinition().getAfter();
+ assertThat(after).isNotNull();
+ assertThat(after.getDurationExpression()).isNull();
+
+ DurationInline inline = after.getDurationInline();
+ assertThat(inline).isNotNull();
+ assertThat(inline.getMinutes()).isEqualTo(15);
+ }
+
+ @Test
+ public void when_task_timeout_with_inline_shortcuts() {
+ Workflow wf =
+ WorkflowBuilder.workflow("taskTimeoutFlow", "myNs", "1.0.0")
+ .tasks(
+ call(
+ (CallHttpConfigurer)
+ c -> c.endpoint("https://api.example.com").timeout(timeoutSeconds(30))))
+ .build();
+
+ // Assuming task timeout is accessible directly on the TaskBase properties
+ var taskTimeout = wf.getDo().get(0).getTask().getCallTask().getCallHTTP().getTimeout();
+ assertThat(taskTimeout).isNotNull();
+
+ var after = taskTimeout.getTaskTimeoutDefinition().getAfter();
+ assertThat(after).isNotNull();
+
+ DurationInline inline = after.getDurationInline();
+ assertThat(inline).isNotNull();
+ assertThat(inline.getSeconds()).isEqualTo(30);
+ }
+
+ @Test
+ public void when_task_timeout_with_composite_inline_duration() {
+ Workflow wf =
+ WorkflowBuilder.workflow("compositeTimeoutFlow", "myNs", "1.0.0")
+ .tasks(
+ call(
+ (CallHttpConfigurer)
+ c ->
+ c.endpoint("https://api.example.com")
+ .timeout(t -> t.duration(d -> d.minutes(5).seconds(30)))))
+ .build();
+
+ var after =
+ wf.getDo()
+ .get(0)
+ .getTask()
+ .getCallTask()
+ .getCallHTTP()
+ .getTimeout()
+ .getTaskTimeoutDefinition()
+ .getAfter();
+
+ DurationInline inline = after.getDurationInline();
+ assertThat(inline).isNotNull();
+ assertThat(inline.getMinutes()).isEqualTo(5);
+ assertThat(inline.getSeconds()).isEqualTo(30);
+ }
+
+ @Test
+ public void when_all_timeout_shortcuts_are_applied() {
+ // Just verifying the shortcuts correctly map to the respective inline properties
+ Workflow wf =
+ WorkflowBuilder.workflow("flow", "ns", "1")
+ .timeout(
+ t -> t.duration(d -> d.days(1).hours(2).minutes(3).seconds(4).milliseconds(500)))
+ .build();
+
+ DurationInline inline = wf.getTimeout().getTimeoutDefinition().getAfter().getDurationInline();
+ assertThat(inline.getDays()).isEqualTo(1);
+ assertThat(inline.getHours()).isEqualTo(2);
+ assertThat(inline.getMinutes()).isEqualTo(3);
+ assertThat(inline.getSeconds()).isEqualTo(4);
+ assertThat(inline.getMilliseconds()).isEqualTo(500);
+ }
+
+ @Test
+ public void when_mixing_expression_and_inline_throws_exception() {
+ assertThatThrownBy(
+ () ->
+ WorkflowBuilder.workflow("failFlow", "myNs", "1.0.0")
+ .timeout(t -> t.duration("PT15M").duration(d -> d.minutes(15))))
+ .isInstanceOf(IllegalStateException.class)
+ .hasMessageContaining("Duration expression already set");
+
+ assertThatThrownBy(
+ () ->
+ WorkflowBuilder.workflow("failFlow", "myNs", "1.0.0")
+ .timeout(t -> t.duration(d -> d.minutes(15)).duration("PT15M")))
+ .isInstanceOf(IllegalStateException.class)
+ .hasMessageContaining("Duration already specified");
+ }
+}
diff --git a/impl/persistence/pom.xml b/impl/persistence/pom.xml
index 85cdea06..1dbe8e3b 100644
--- a/impl/persistence/pom.xml
+++ b/impl/persistence/pom.xml
@@ -6,7 +6,7 @@
8.0.0-SNAPSHOT
serverlessworkflow-persistence
- Serverless Workflow :: Implementation:: Persistence
+ Serverless Workflow :: Impl :: Persistence
pom
mvstore