Skip to content

Commit ad61e7f

Browse files
fjtiradofjtirado
committed
[Fix #1406] Review comments
Signed-off-by: fjtirado <ftirados@redhat.com>
1 parent 0e2823e commit ad61e7f

9 files changed

Lines changed: 49 additions & 47 deletions

File tree

‎impl/core/src/main/java/io/serverlessworkflow/impl/lifecycle/ce/InputOutputLifeCycleCloudEventFactory.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,21 @@ public class InputOutputLifeCycleCloudEventFactory extends DefaultLifeCycleCloud
2424

2525
@Override
2626
public WorkflowCompletedCEData build(WorkflowCompletedEvent ev) {
27-
return new WorkflowCompletedCEDataWOutput(ev);
27+
return new WorkflowCompletedCEDataWithOutput(ev);
2828
}
2929

3030
@Override
3131
public WorkflowStartedCEData build(WorkflowStartedEvent ev) {
32-
return new WorkflowStartedCEDataWInput(ev);
32+
return new WorkflowStartedCEDataWithInput(ev);
3333
}
3434

3535
@Override
3636
public TaskCompletedCEData build(TaskCompletedEvent ev) {
37-
return new TaskCompletedCEDataWOutput(ev);
37+
return new TaskCompletedCEDataWithOutput(ev);
3838
}
3939

4040
@Override
4141
public TaskStartedCEData build(TaskStartedEvent ev) {
42-
return new TaskStartedCEDataWInput(ev);
42+
return new TaskStartedCEDataWithInput(ev);
4343
}
4444
}

impl/core/src/main/java/io/serverlessworkflow/impl/lifecycle/ce/TaskCompletedCEDataWOutput.java renamed to impl/core/src/main/java/io/serverlessworkflow/impl/lifecycle/ce/TaskCompletedCEDataWithOutput.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717

1818
import io.serverlessworkflow.impl.lifecycle.TaskCompletedEvent;
1919

20-
public class TaskCompletedCEDataWOutput extends TaskCompletedCEData {
20+
public class TaskCompletedCEDataWithOutput extends TaskCompletedCEData {
2121

2222
private Object output;
2323

24-
public TaskCompletedCEDataWOutput(TaskCompletedEvent ev) {
24+
public TaskCompletedCEDataWithOutput(TaskCompletedEvent ev) {
2525
super(ev);
2626
this.output = ev.taskContext().output();
2727
}
2828

29-
public TaskCompletedCEDataWOutput() {}
29+
public TaskCompletedCEDataWithOutput() {}
3030

3131
public Object output() {
3232
return output;

impl/core/src/main/java/io/serverlessworkflow/impl/lifecycle/ce/TaskStartedCEDataWInput.java renamed to impl/core/src/main/java/io/serverlessworkflow/impl/lifecycle/ce/TaskStartedCEDataWithInput.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717

1818
import io.serverlessworkflow.impl.lifecycle.TaskStartedEvent;
1919

20-
public class TaskStartedCEDataWInput extends TaskStartedCEData {
20+
public class TaskStartedCEDataWithInput extends TaskStartedCEData {
2121
private Object input;
2222

23-
public TaskStartedCEDataWInput(TaskStartedEvent ev) {
23+
public TaskStartedCEDataWithInput(TaskStartedEvent ev) {
2424
super(ev);
2525
this.input = ev.taskContext().input();
2626
}
2727

28-
public TaskStartedCEDataWInput() {}
28+
public TaskStartedCEDataWithInput() {}
2929

3030
public Object input() {
3131
return input;

impl/core/src/main/java/io/serverlessworkflow/impl/lifecycle/ce/WorkflowCompletedCEDataWOutput.java renamed to impl/core/src/main/java/io/serverlessworkflow/impl/lifecycle/ce/WorkflowCompletedCEDataWithOutput.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import io.serverlessworkflow.impl.lifecycle.WorkflowCompletedEvent;
1919

20-
public class WorkflowCompletedCEDataWOutput extends WorkflowCompletedCEData {
20+
public class WorkflowCompletedCEDataWithOutput extends WorkflowCompletedCEData {
2121

2222
private Object output;
2323

@@ -29,10 +29,10 @@ public Object getOutput() {
2929
return output;
3030
}
3131

32-
public WorkflowCompletedCEDataWOutput(WorkflowCompletedEvent ev) {
32+
public WorkflowCompletedCEDataWithOutput(WorkflowCompletedEvent ev) {
3333
super(ev);
3434
this.output = ev.output();
3535
}
3636

37-
public WorkflowCompletedCEDataWOutput() {}
37+
public WorkflowCompletedCEDataWithOutput() {}
3838
}

‎impl/core/src/main/java/io/serverlessworkflow/impl/lifecycle/ce/WorkflowLifeCycleCloudEventFactory.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,33 +34,33 @@
3434

3535
public interface WorkflowLifeCycleCloudEventFactory {
3636

37-
public CloudEvent build(CloudEventBuilder builder);
37+
CloudEvent build(CloudEventBuilder builder);
3838

39-
public TaskCompletedCEData build(TaskCompletedEvent ev);
39+
TaskCompletedCEData build(TaskCompletedEvent ev);
4040

41-
public TaskFailedCEData build(TaskFailedEvent ev);
41+
TaskFailedCEData build(TaskFailedEvent ev);
4242

43-
public TaskCancelledCEData build(TaskCancelledEvent ev);
43+
TaskCancelledCEData build(TaskCancelledEvent ev);
4444

45-
public TaskResumedCEData build(TaskResumedEvent ev);
45+
TaskResumedCEData build(TaskResumedEvent ev);
4646

47-
public TaskRetriedCEData build(TaskRetriedEvent ev);
47+
TaskRetriedCEData build(TaskRetriedEvent ev);
4848

49-
public TaskStartedCEData build(TaskStartedEvent ev);
49+
TaskStartedCEData build(TaskStartedEvent ev);
5050

51-
public TaskSuspendedCEData build(TaskSuspendedEvent ev);
51+
TaskSuspendedCEData build(TaskSuspendedEvent ev);
5252

53-
public WorkflowCancelledCEData build(WorkflowCancelledEvent ev);
53+
WorkflowCancelledCEData build(WorkflowCancelledEvent ev);
5454

55-
public WorkflowFailedCEData build(WorkflowFailedEvent ev);
55+
WorkflowFailedCEData build(WorkflowFailedEvent ev);
5656

57-
public WorkflowResumedCEData build(WorkflowResumedEvent ev);
57+
WorkflowResumedCEData build(WorkflowResumedEvent ev);
5858

59-
public WorkflowStartedCEData build(WorkflowStartedEvent ev);
59+
WorkflowStartedCEData build(WorkflowStartedEvent ev);
6060

61-
public WorkflowStatusCEDataEvent build(WorkflowStatusEvent ev);
61+
WorkflowStatusCEDataEvent build(WorkflowStatusEvent ev);
6262

63-
public WorkflowSuspendedCEData build(WorkflowSuspendedEvent ev);
63+
WorkflowSuspendedCEData build(WorkflowSuspendedEvent ev);
6464

65-
public WorkflowCompletedCEData build(WorkflowCompletedEvent event);
65+
WorkflowCompletedCEData build(WorkflowCompletedEvent event);
6666
}

impl/core/src/main/java/io/serverlessworkflow/impl/lifecycle/ce/WorkflowStartedCEDataWInput.java renamed to impl/core/src/main/java/io/serverlessworkflow/impl/lifecycle/ce/WorkflowStartedCEDataWithInput.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import io.serverlessworkflow.impl.lifecycle.WorkflowStartedEvent;
1919

20-
public class WorkflowStartedCEDataWInput extends WorkflowStartedCEData {
20+
public class WorkflowStartedCEDataWithInput extends WorkflowStartedCEData {
2121

2222
private Object input;
2323

@@ -29,10 +29,10 @@ public Object getInput() {
2929
return input;
3030
}
3131

32-
public WorkflowStartedCEDataWInput(WorkflowStartedEvent ev) {
32+
public WorkflowStartedCEDataWithInput(WorkflowStartedEvent ev) {
3333
super(ev);
3434
this.input = ev.workflowContext().instanceData().input();
3535
}
3636

37-
public WorkflowStartedCEDataWInput() {}
37+
public WorkflowStartedCEDataWithInput() {}
3838
}

‎impl/lifecycleevent/src/test/java/io/serverlessworkflow/impl/jackson/events/JacksonLifeCyclePublisherTest.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,20 +45,20 @@
4545
import io.serverlessworkflow.impl.lifecycle.WorkflowSuspendedEvent;
4646
import io.serverlessworkflow.impl.lifecycle.ce.TaskCancelledCEData;
4747
import io.serverlessworkflow.impl.lifecycle.ce.TaskCompletedCEData;
48-
import io.serverlessworkflow.impl.lifecycle.ce.TaskCompletedCEDataWOutput;
48+
import io.serverlessworkflow.impl.lifecycle.ce.TaskCompletedCEDataWithOutput;
4949
import io.serverlessworkflow.impl.lifecycle.ce.TaskFailedCEData;
5050
import io.serverlessworkflow.impl.lifecycle.ce.TaskResumedCEData;
5151
import io.serverlessworkflow.impl.lifecycle.ce.TaskRetriedCEData;
5252
import io.serverlessworkflow.impl.lifecycle.ce.TaskStartedCEData;
53-
import io.serverlessworkflow.impl.lifecycle.ce.TaskStartedCEDataWInput;
53+
import io.serverlessworkflow.impl.lifecycle.ce.TaskStartedCEDataWithInput;
5454
import io.serverlessworkflow.impl.lifecycle.ce.TaskSuspendedCEData;
5555
import io.serverlessworkflow.impl.lifecycle.ce.WorkflowCancelledCEData;
5656
import io.serverlessworkflow.impl.lifecycle.ce.WorkflowCompletedCEData;
57-
import io.serverlessworkflow.impl.lifecycle.ce.WorkflowCompletedCEDataWOutput;
57+
import io.serverlessworkflow.impl.lifecycle.ce.WorkflowCompletedCEDataWithOutput;
5858
import io.serverlessworkflow.impl.lifecycle.ce.WorkflowFailedCEData;
5959
import io.serverlessworkflow.impl.lifecycle.ce.WorkflowResumedCEData;
6060
import io.serverlessworkflow.impl.lifecycle.ce.WorkflowStartedCEData;
61-
import io.serverlessworkflow.impl.lifecycle.ce.WorkflowStartedCEDataWInput;
61+
import io.serverlessworkflow.impl.lifecycle.ce.WorkflowStartedCEDataWithInput;
6262
import io.serverlessworkflow.impl.lifecycle.ce.WorkflowStatusCEDataEvent;
6363
import io.serverlessworkflow.impl.lifecycle.ce.WorkflowSuspendedCEData;
6464
import io.serverlessworkflow.impl.model.jackson.JacksonModelFactory;
@@ -112,10 +112,11 @@ private static Stream<Arguments> provideParameters() {
112112
return Stream.of(
113113
Arguments.of(new TaskCompletedCEData(new TaskCompletedEvent(workflowContext, taskContext))),
114114
Arguments.of(
115-
new TaskCompletedCEDataWOutput(new TaskCompletedEvent(workflowContext, taskContext))),
115+
new TaskCompletedCEDataWithOutput(
116+
new TaskCompletedEvent(workflowContext, taskContext))),
116117
Arguments.of(new TaskStartedCEData(new TaskStartedEvent(workflowContext, taskContext))),
117118
Arguments.of(
118-
new TaskStartedCEDataWInput(new TaskStartedEvent(workflowContext, taskContext))),
119+
new TaskStartedCEDataWithInput(new TaskStartedEvent(workflowContext, taskContext))),
119120
Arguments.of(new TaskCancelledCEData(new TaskCancelledEvent(workflowContext, taskContext))),
120121
Arguments.of(new TaskResumedCEData(new TaskResumedEvent(workflowContext, taskContext))),
121122
Arguments.of(new TaskRetriedCEData(new TaskRetriedEvent(workflowContext, taskContext))),
@@ -125,11 +126,11 @@ private static Stream<Arguments> provideParameters() {
125126
new TaskFailedEvent(
126127
workflowContext, taskContext, new IllegalArgumentException("NOOOO!!!!")))),
127128
Arguments.of(new WorkflowStartedCEData(new WorkflowStartedEvent(workflowContext))),
128-
Arguments.of(new WorkflowStartedCEDataWInput(new WorkflowStartedEvent(workflowContext))),
129+
Arguments.of(new WorkflowStartedCEDataWithInput(new WorkflowStartedEvent(workflowContext))),
129130
Arguments.of(
130131
new WorkflowCompletedCEData(new WorkflowCompletedEvent(workflowContext, null))),
131132
Arguments.of(
132-
new WorkflowCompletedCEDataWOutput(
133+
new WorkflowCompletedCEDataWithOutput(
133134
new WorkflowCompletedEvent(
134135
workflowContext, factory.fromAny(Map.of("name", "Javierito"))))),
135136
Arguments.of(new WorkflowCancelledCEData(new WorkflowCancelledEvent(workflowContext))),

‎impl/test/src/test/java/io/serverlessworkflow/impl/test/LifeCycleEventsTest.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@
3636
import io.serverlessworkflow.impl.lifecycle.ce.AbstractLifeCyclePublisher;
3737
import io.serverlessworkflow.impl.lifecycle.ce.InputOutputLifeCycleCloudEventFactory;
3838
import io.serverlessworkflow.impl.lifecycle.ce.TaskCancelledCEData;
39-
import io.serverlessworkflow.impl.lifecycle.ce.TaskCompletedCEDataWOutput;
39+
import io.serverlessworkflow.impl.lifecycle.ce.TaskCompletedCEDataWithOutput;
4040
import io.serverlessworkflow.impl.lifecycle.ce.TaskStartedCEData;
4141
import io.serverlessworkflow.impl.lifecycle.ce.WorkflowCancelledCEData;
42-
import io.serverlessworkflow.impl.lifecycle.ce.WorkflowCompletedCEDataWOutput;
42+
import io.serverlessworkflow.impl.lifecycle.ce.WorkflowCompletedCEDataWithOutput;
4343
import io.serverlessworkflow.impl.lifecycle.ce.WorkflowFailedCEData;
4444
import io.serverlessworkflow.impl.lifecycle.ce.WorkflowResumedCEData;
4545
import io.serverlessworkflow.impl.lifecycle.ce.WorkflowStartedCEData;
@@ -109,11 +109,12 @@ void simpleWorkflow() throws IOException {
109109
assertPojoInCE("io.serverlessworkflow.workflow.started.v1", WorkflowStartedCEData.class);
110110
TaskStartedCEData taskStartedEvent =
111111
assertPojoInCE("io.serverlessworkflow.task.started.v1", TaskStartedCEData.class);
112-
TaskCompletedCEDataWOutput taskCompletedEvent =
113-
assertPojoInCE("io.serverlessworkflow.task.completed.v1", TaskCompletedCEDataWOutput.class);
114-
WorkflowCompletedCEDataWOutput workflowCompletedEvent =
112+
TaskCompletedCEDataWithOutput taskCompletedEvent =
115113
assertPojoInCE(
116-
"io.serverlessworkflow.workflow.completed.v1", WorkflowCompletedCEDataWOutput.class);
114+
"io.serverlessworkflow.task.completed.v1", TaskCompletedCEDataWithOutput.class);
115+
WorkflowCompletedCEDataWithOutput workflowCompletedEvent =
116+
assertPojoInCE(
117+
"io.serverlessworkflow.workflow.completed.v1", WorkflowCompletedCEDataWithOutput.class);
117118
assertThat(workflowCompletedEvent.output()).isEqualTo(model);
118119
assertThat(workflowStartedEvent.startedAt()).isBefore(workflowCompletedEvent.completedAt());
119120
assertThat(taskCompletedEvent.output()).isEqualTo(model);

‎impl/test/src/test/java/io/serverlessworkflow/impl/test/SchedulerTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void testAfter() throws IOException, InterruptedException, ExecutionException {
5252
assertThat(def.scheduledInstances()).isEmpty();
5353
await()
5454
.pollDelay(Duration.ofMillis(50))
55-
.atMost(Duration.ofMillis(200))
55+
.atMost(Duration.ofMillis(500))
5656
.until(() -> def.scheduledInstances().size() == 1);
5757
}
5858
}
@@ -63,7 +63,7 @@ void testEvery() throws IOException, InterruptedException, ExecutionException {
6363
appl.workflowDefinition(readWorkflowFromClasspath("workflows-samples/every-start.yaml"))) {
6464
await()
6565
.pollDelay(Duration.ofMillis(20))
66-
.atMost(Duration.ofMillis(200))
66+
.atMost(Duration.ofMillis(500))
6767
.until(() -> def.scheduledInstances().size() >= 5);
6868
}
6969
}

0 commit comments

Comments
 (0)