Skip to content

Commit a64027f

Browse files
Rename java -> func / standard -> spec (#660)
Signed-off-by: Ricardo Zanini <[email protected]>
1 parent 5f82255 commit a64027f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+151
-151
lines changed

experimental/lambda/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</dependency>
2020
<dependency>
2121
<groupId>io.serverlessworkflow</groupId>
22-
<artifactId>serverlessworkflow-fluent-java</artifactId>
22+
<artifactId>serverlessworkflow-fluent-func</artifactId>
2323
</dependency>
2424
<dependency>
2525
<groupId>org.junit.jupiter</groupId>

experimental/lambda/src/test/java/io/serverless/workflow/impl/FluentDSLCallTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import io.serverlessworkflow.api.types.FlowDirectiveEnum;
2121
import io.serverlessworkflow.api.types.Workflow;
22-
import io.serverlessworkflow.fluent.java.JavaWorkflowBuilder;
22+
import io.serverlessworkflow.fluent.func.FuncWorkflowBuilder;
2323
import io.serverlessworkflow.impl.WorkflowApplication;
2424
import io.serverlessworkflow.impl.WorkflowDefinition;
2525
import java.util.Collection;
@@ -33,7 +33,7 @@ public class FluentDSLCallTest {
3333
void testJavaFunction() throws InterruptedException, ExecutionException {
3434
try (WorkflowApplication app = WorkflowApplication.builder().build()) {
3535
final Workflow workflow =
36-
JavaWorkflowBuilder.workflow("testJavaCall")
36+
FuncWorkflowBuilder.workflow("testJavaCall")
3737
.tasks(tasks -> tasks.callFn(f -> f.fn(JavaFunctions::getName)))
3838
.build();
3939
assertThat(
@@ -51,7 +51,7 @@ void testJavaFunction() throws InterruptedException, ExecutionException {
5151
void testForLoop() throws InterruptedException, ExecutionException {
5252
try (WorkflowApplication app = WorkflowApplication.builder().build()) {
5353
Workflow workflow =
54-
JavaWorkflowBuilder.workflow()
54+
FuncWorkflowBuilder.workflow()
5555
.tasks(
5656
t ->
5757
t.forFn(
@@ -76,7 +76,7 @@ void testForLoop() throws InterruptedException, ExecutionException {
7676
void testSwitch() throws InterruptedException, ExecutionException {
7777
try (WorkflowApplication app = WorkflowApplication.builder().build()) {
7878
Workflow workflow =
79-
JavaWorkflowBuilder.workflow()
79+
FuncWorkflowBuilder.workflow()
8080
.tasks(
8181
tasks ->
8282
tasks

experimental/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</dependency>
3333
<dependency>
3434
<groupId>io.serverlessworkflow</groupId>
35-
<artifactId>serverlessworkflow-fluent-java</artifactId>
35+
<artifactId>serverlessworkflow-fluent-func</artifactId>
3636
<version>${project.version}</version>
3737
</dependency>
3838
</dependencies>

fluent/java/pom.xml renamed to fluent/func/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<version>8.0.0-SNAPSHOT</version>
1010
</parent>
1111

12-
<name>Serverless Workflow :: Fluent :: Java</name>
13-
<artifactId>serverlessworkflow-fluent-java</artifactId>
12+
<name>Serverless Workflow :: Fluent :: Functional</name>
13+
<artifactId>serverlessworkflow-fluent-func</artifactId>
1414

1515
<properties>
1616
<maven.compiler.source>17</maven.compiler.source>
@@ -29,7 +29,7 @@
2929
</dependency>
3030
<dependency>
3131
<groupId>io.serverlessworkflow</groupId>
32-
<artifactId>serverlessworkflow-fluent-standard</artifactId>
32+
<artifactId>serverlessworkflow-fluent-spec</artifactId>
3333
</dependency>
3434

3535
<dependency>

fluent/java/src/main/java/io/serverlessworkflow/fluent/java/CallTaskJavaBuilder.java renamed to fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncCallTaskBuilder.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,29 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.serverlessworkflow.fluent.java;
16+
package io.serverlessworkflow.fluent.func;
1717

1818
import io.serverlessworkflow.api.types.CallJava;
1919
import io.serverlessworkflow.api.types.CallTaskJava;
20-
import io.serverlessworkflow.fluent.standard.TaskBaseBuilder;
20+
import io.serverlessworkflow.fluent.spec.TaskBaseBuilder;
2121
import java.util.function.Function;
2222

23-
public class CallTaskJavaBuilder extends TaskBaseBuilder<CallTaskJavaBuilder>
24-
implements JavaTransformationHandlers<CallTaskJavaBuilder> {
23+
public class FuncCallTaskBuilder extends TaskBaseBuilder<FuncCallTaskBuilder>
24+
implements FuncTransformations<FuncCallTaskBuilder> {
2525

2626
private CallTaskJava callTaskJava;
2727

28-
CallTaskJavaBuilder() {
28+
FuncCallTaskBuilder() {
2929
callTaskJava = new CallTaskJava(new CallJava() {});
3030
super.setTask(callTaskJava.getCallJava());
3131
}
3232

3333
@Override
34-
protected CallTaskJavaBuilder self() {
34+
protected FuncCallTaskBuilder self() {
3535
return this;
3636
}
3737

38-
public <T, V> CallTaskJavaBuilder fn(Function<T, V> function) {
38+
public <T, V> FuncCallTaskBuilder fn(Function<T, V> function) {
3939
this.callTaskJava = new CallTaskJava(CallJava.function(function));
4040
super.setTask(this.callTaskJava.getCallJava());
4141
return this;

fluent/java/src/main/java/io/serverlessworkflow/fluent/java/DoTaskJavaBuilder.java renamed to fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncDoTaskBuilder.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,49 +13,49 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.serverlessworkflow.fluent.java;
16+
package io.serverlessworkflow.fluent.func;
1717

18-
import io.serverlessworkflow.fluent.standard.BaseDoTaskBuilder;
18+
import io.serverlessworkflow.fluent.spec.BaseDoTaskBuilder;
1919
import java.util.function.Consumer;
2020

21-
public class DoTaskJavaBuilder extends BaseDoTaskBuilder<DoTaskJavaBuilder, TaskItemListJavaBuilder>
22-
implements JavaTransformationHandlers<DoTaskJavaBuilder> {
21+
public class FuncDoTaskBuilder extends BaseDoTaskBuilder<FuncDoTaskBuilder, FuncTaskItemListBuilder>
22+
implements FuncTransformations<FuncDoTaskBuilder> {
2323

24-
DoTaskJavaBuilder() {
25-
super(new TaskItemListJavaBuilder());
24+
FuncDoTaskBuilder() {
25+
super(new FuncTaskItemListBuilder());
2626
}
2727

2828
@Override
29-
protected DoTaskJavaBuilder self() {
29+
protected FuncDoTaskBuilder self() {
3030
return this;
3131
}
3232

33-
public DoTaskJavaBuilder callFn(String name, Consumer<CallTaskJavaBuilder> consumer) {
33+
public FuncDoTaskBuilder callFn(String name, Consumer<FuncCallTaskBuilder> consumer) {
3434
this.innerListBuilder().callJava(name, consumer);
3535
return this;
3636
}
3737

38-
public DoTaskJavaBuilder callFn(Consumer<CallTaskJavaBuilder> consumer) {
38+
public FuncDoTaskBuilder callFn(Consumer<FuncCallTaskBuilder> consumer) {
3939
this.innerListBuilder().callJava(consumer);
4040
return this;
4141
}
4242

43-
public DoTaskJavaBuilder forFn(String name, Consumer<ForTaskJavaBuilder> consumer) {
43+
public FuncDoTaskBuilder forFn(String name, Consumer<FuncForTaskBuilder> consumer) {
4444
this.innerListBuilder().forFn(name, consumer);
4545
return this;
4646
}
4747

48-
public DoTaskJavaBuilder forFn(Consumer<ForTaskJavaBuilder> consumer) {
48+
public FuncDoTaskBuilder forFn(Consumer<FuncForTaskBuilder> consumer) {
4949
this.innerListBuilder().forFn(consumer);
5050
return this;
5151
}
5252

53-
public DoTaskJavaBuilder switchFn(String name, Consumer<SwitchTaskJavaBuilder> consumer) {
53+
public FuncDoTaskBuilder switchFn(String name, Consumer<FuncSwitchTaskBuilder> consumer) {
5454
this.innerListBuilder().switchFn(name, consumer);
5555
return this;
5656
}
5757

58-
public DoTaskJavaBuilder switchFn(Consumer<SwitchTaskJavaBuilder> consumer) {
58+
public FuncDoTaskBuilder switchFn(Consumer<FuncSwitchTaskBuilder> consumer) {
5959
this.innerListBuilder().switchFn(consumer);
6060
return this;
6161
}

fluent/java/src/main/java/io/serverlessworkflow/fluent/java/ForTaskJavaBuilder.java renamed to fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncForTaskBuilder.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.serverlessworkflow.fluent.java;
16+
package io.serverlessworkflow.fluent.func;
1717

1818
import io.serverlessworkflow.api.types.CallJava;
1919
import io.serverlessworkflow.api.types.CallTaskJava;
2020
import io.serverlessworkflow.api.types.ForTaskConfiguration;
2121
import io.serverlessworkflow.api.types.ForTaskFunction;
2222
import io.serverlessworkflow.api.types.Task;
2323
import io.serverlessworkflow.api.types.TaskItem;
24-
import io.serverlessworkflow.fluent.standard.TaskBaseBuilder;
24+
import io.serverlessworkflow.fluent.spec.TaskBaseBuilder;
2525
import io.serverlessworkflow.impl.expressions.LoopFunction;
2626
import io.serverlessworkflow.impl.expressions.LoopPredicate;
2727
import io.serverlessworkflow.impl.expressions.LoopPredicateIndex;
@@ -32,40 +32,40 @@
3232
import java.util.function.Consumer;
3333
import java.util.function.Function;
3434

35-
public class ForTaskJavaBuilder extends TaskBaseBuilder<ForTaskJavaBuilder>
36-
implements JavaTransformationHandlers<ForTaskJavaBuilder> {
35+
public class FuncForTaskBuilder extends TaskBaseBuilder<FuncForTaskBuilder>
36+
implements FuncTransformations<FuncForTaskBuilder> {
3737

3838
private final ForTaskFunction forTaskFunction;
3939
private final List<TaskItem> items;
4040

41-
ForTaskJavaBuilder() {
41+
FuncForTaskBuilder() {
4242
this.forTaskFunction = new ForTaskFunction();
4343
this.forTaskFunction.withFor(new ForTaskConfiguration());
4444
this.items = new ArrayList<>();
4545
super.setTask(forTaskFunction);
4646
}
4747

4848
@Override
49-
protected ForTaskJavaBuilder self() {
49+
protected FuncForTaskBuilder self() {
5050
return this;
5151
}
5252

53-
public <T, V> ForTaskJavaBuilder whileC(LoopPredicate<T, V> predicate) {
53+
public <T, V> FuncForTaskBuilder whileC(LoopPredicate<T, V> predicate) {
5454
this.forTaskFunction.withWhile(predicate);
5555
return this;
5656
}
5757

58-
public <T, V> ForTaskJavaBuilder whileC(LoopPredicateIndex<T, V> predicate) {
58+
public <T, V> FuncForTaskBuilder whileC(LoopPredicateIndex<T, V> predicate) {
5959
this.forTaskFunction.withWhile(predicate);
6060
return this;
6161
}
6262

63-
public <T> ForTaskJavaBuilder collection(Function<T, Collection<?>> collectionF) {
63+
public <T> FuncForTaskBuilder collection(Function<T, Collection<?>> collectionF) {
6464
this.forTaskFunction.withCollection(collectionF);
6565
return this;
6666
}
6767

68-
public <T, V, R> ForTaskJavaBuilder tasks(String name, LoopFunction<T, V, R> function) {
68+
public <T, V, R> FuncForTaskBuilder tasks(String name, LoopFunction<T, V, R> function) {
6969
this.items.add(
7070
new TaskItem(
7171
name,
@@ -77,12 +77,12 @@ public <T, V, R> ForTaskJavaBuilder tasks(String name, LoopFunction<T, V, R> fun
7777
return this;
7878
}
7979

80-
public <T, V, R> ForTaskJavaBuilder tasks(LoopFunction<T, V, R> function) {
80+
public <T, V, R> FuncForTaskBuilder tasks(LoopFunction<T, V, R> function) {
8181
return this.tasks(UUID.randomUUID().toString(), function);
8282
}
8383

84-
public ForTaskJavaBuilder tasks(Consumer<TaskItemListJavaBuilder> consumer) {
85-
final TaskItemListJavaBuilder builder = new TaskItemListJavaBuilder();
84+
public FuncForTaskBuilder tasks(Consumer<FuncTaskItemListBuilder> consumer) {
85+
final FuncTaskItemListBuilder builder = new FuncTaskItemListBuilder();
8686
consumer.accept(builder);
8787
this.items.addAll(builder.build());
8888
return this;

fluent/java/src/main/java/io/serverlessworkflow/fluent/java/SwitchTaskJavaBuilder.java renamed to fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncSwitchTaskBuilder.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,43 +13,43 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.serverlessworkflow.fluent.java;
16+
package io.serverlessworkflow.fluent.func;
1717

1818
import io.serverlessworkflow.api.types.FlowDirective;
1919
import io.serverlessworkflow.api.types.FlowDirectiveEnum;
2020
import io.serverlessworkflow.api.types.SwitchCase;
2121
import io.serverlessworkflow.api.types.SwitchCaseFunction;
2222
import io.serverlessworkflow.api.types.SwitchItem;
2323
import io.serverlessworkflow.api.types.SwitchTask;
24-
import io.serverlessworkflow.fluent.standard.TaskBaseBuilder;
24+
import io.serverlessworkflow.fluent.spec.TaskBaseBuilder;
2525
import java.util.ArrayList;
2626
import java.util.List;
2727
import java.util.UUID;
2828
import java.util.function.Consumer;
2929
import java.util.function.Predicate;
3030

31-
public class SwitchTaskJavaBuilder extends TaskBaseBuilder<SwitchTaskJavaBuilder>
32-
implements JavaTransformationHandlers<SwitchTaskJavaBuilder> {
31+
public class FuncSwitchTaskBuilder extends TaskBaseBuilder<FuncSwitchTaskBuilder>
32+
implements FuncTransformations<FuncSwitchTaskBuilder> {
3333

3434
private final SwitchTask switchTask;
3535
private final List<SwitchItem> switchItems;
3636

37-
SwitchTaskJavaBuilder() {
37+
FuncSwitchTaskBuilder() {
3838
this.switchTask = new SwitchTask();
3939
this.switchItems = new ArrayList<>();
4040
super.setTask(switchTask);
4141
}
4242

4343
@Override
44-
protected SwitchTaskJavaBuilder self() {
44+
protected FuncSwitchTaskBuilder self() {
4545
return this;
4646
}
4747

48-
public SwitchTaskJavaBuilder items(Consumer<SwitchCaseJavaBuilder> consumer) {
48+
public FuncSwitchTaskBuilder items(Consumer<SwitchCaseJavaBuilder> consumer) {
4949
return this.items(UUID.randomUUID().toString(), consumer);
5050
}
5151

52-
public SwitchTaskJavaBuilder items(String name, Consumer<SwitchCaseJavaBuilder> consumer) {
52+
public FuncSwitchTaskBuilder items(String name, Consumer<SwitchCaseJavaBuilder> consumer) {
5353
final SwitchCaseJavaBuilder switchCase = new SwitchCaseJavaBuilder();
5454
consumer.accept(switchCase);
5555
this.switchItems.add(new SwitchItem(name, switchCase.build()));

fluent/java/src/main/java/io/serverlessworkflow/fluent/java/TaskItemListJavaBuilder.java renamed to fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncTaskItemListBuilder.java

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,61 +13,61 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.serverlessworkflow.fluent.java;
16+
package io.serverlessworkflow.fluent.func;
1717

1818
import io.serverlessworkflow.api.types.Task;
1919
import io.serverlessworkflow.api.types.TaskItem;
20-
import io.serverlessworkflow.fluent.standard.BaseTaskItemListBuilder;
20+
import io.serverlessworkflow.fluent.spec.BaseTaskItemListBuilder;
2121
import java.util.UUID;
2222
import java.util.function.Consumer;
2323

24-
public class TaskItemListJavaBuilder extends BaseTaskItemListBuilder<TaskItemListJavaBuilder> {
24+
public class FuncTaskItemListBuilder extends BaseTaskItemListBuilder<FuncTaskItemListBuilder> {
2525

26-
TaskItemListJavaBuilder() {
26+
FuncTaskItemListBuilder() {
2727
super();
2828
}
2929

3030
@Override
31-
protected TaskItemListJavaBuilder self() {
31+
protected FuncTaskItemListBuilder self() {
3232
return this;
3333
}
3434

3535
@Override
36-
protected TaskItemListJavaBuilder newItemListBuilder() {
37-
return new TaskItemListJavaBuilder();
36+
protected FuncTaskItemListBuilder newItemListBuilder() {
37+
return new FuncTaskItemListBuilder();
3838
}
3939

40-
public TaskItemListJavaBuilder callJava(String name, Consumer<CallTaskJavaBuilder> consumer) {
40+
public FuncTaskItemListBuilder callJava(String name, Consumer<FuncCallTaskBuilder> consumer) {
4141
this.requireNameAndConfig(name, consumer);
42-
final CallTaskJavaBuilder callTaskJavaBuilder = new CallTaskJavaBuilder();
42+
final FuncCallTaskBuilder callTaskJavaBuilder = new FuncCallTaskBuilder();
4343
consumer.accept(callTaskJavaBuilder);
4444
return addTaskItem(new TaskItem(name, new Task().withCallTask(callTaskJavaBuilder.build())));
4545
}
4646

47-
public TaskItemListJavaBuilder callJava(Consumer<CallTaskJavaBuilder> consumer) {
47+
public FuncTaskItemListBuilder callJava(Consumer<FuncCallTaskBuilder> consumer) {
4848
return this.callJava(UUID.randomUUID().toString(), consumer);
4949
}
5050

51-
public TaskItemListJavaBuilder forFn(String name, Consumer<ForTaskJavaBuilder> consumer) {
51+
public FuncTaskItemListBuilder forFn(String name, Consumer<FuncForTaskBuilder> consumer) {
5252
this.requireNameAndConfig(name, consumer);
53-
final ForTaskJavaBuilder forTaskJavaBuilder = new ForTaskJavaBuilder();
53+
final FuncForTaskBuilder forTaskJavaBuilder = new FuncForTaskBuilder();
5454
consumer.accept(forTaskJavaBuilder);
5555
return this.addTaskItem(new TaskItem(name, new Task().withForTask(forTaskJavaBuilder.build())));
5656
}
5757

58-
public TaskItemListJavaBuilder forFn(Consumer<ForTaskJavaBuilder> consumer) {
58+
public FuncTaskItemListBuilder forFn(Consumer<FuncForTaskBuilder> consumer) {
5959
return this.forFn(UUID.randomUUID().toString(), consumer);
6060
}
6161

62-
public TaskItemListJavaBuilder switchFn(String name, Consumer<SwitchTaskJavaBuilder> consumer) {
62+
public FuncTaskItemListBuilder switchFn(String name, Consumer<FuncSwitchTaskBuilder> consumer) {
6363
this.requireNameAndConfig(name, consumer);
64-
final SwitchTaskJavaBuilder switchTaskJavaBuilder = new SwitchTaskJavaBuilder();
65-
consumer.accept(switchTaskJavaBuilder);
64+
final FuncSwitchTaskBuilder funcSwitchTaskBuilder = new FuncSwitchTaskBuilder();
65+
consumer.accept(funcSwitchTaskBuilder);
6666
return this.addTaskItem(
67-
new TaskItem(name, new Task().withSwitchTask(switchTaskJavaBuilder.build())));
67+
new TaskItem(name, new Task().withSwitchTask(funcSwitchTaskBuilder.build())));
6868
}
6969

70-
public TaskItemListJavaBuilder switchFn(Consumer<SwitchTaskJavaBuilder> consumer) {
70+
public FuncTaskItemListBuilder switchFn(Consumer<FuncSwitchTaskBuilder> consumer) {
7171
return this.switchFn(UUID.randomUUID().toString(), consumer);
7272
}
7373
}

0 commit comments

Comments
 (0)