Skip to content

Commit da21545

Browse files
author
Tihomir Surdilovic
authored
Merge pull request #60 from tsurdilo/updatescheduledef
update schedule def
2 parents 9394b72 + 13cf7a8 commit da21545

File tree

13 files changed

+27
-118
lines changed

13 files changed

+27
-118
lines changed

‎api/src/main/java/io/serverlessworkflow/api/deserializers/ScheduleDeserializer.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,6 @@ public Schedule deserialize(JsonParser jp,
7070
schedule.setCron(mapper.treeToValue(node.get("cron"), Cron.class));
7171
}
7272

73-
if(node.get("directInvoke") != null) {
74-
schedule.setDirectInvoke(mapper.treeToValue(node.get("directInvoke"), Schedule.DirectInvoke.class));
75-
}
76-
7773
if(node.get("timezone") != null) {
7874
schedule.setTimezone(node.get("timezone").asText());
7975
}

‎api/src/main/java/io/serverlessworkflow/api/deserializers/ScheduleDirectInvokeDeserializer.java

Lines changed: 0 additions & 71 deletions
This file was deleted.

‎api/src/main/java/io/serverlessworkflow/api/mapper/WorkflowModule.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ private void addDefaultDeserializers() {
9292
new DefaultStateTypeDeserializer(workflowPropertySource));
9393
addDeserializer(EventDefinition.Kind.class, new EventDefinitionKindDeserializer(workflowPropertySource));
9494
addDeserializer(ParallelState.CompletionType.class, new ParallelStateCompletionTypeDeserializer(workflowPropertySource));
95-
addDeserializer(Schedule.DirectInvoke.class, new ScheduleDirectInvokeDeserializer(workflowPropertySource));
9695
addDeserializer(Retries.class, new RetriesDeserializer(workflowPropertySource));
9796
addDeserializer(Functions.class, new FunctionsDeserializer(workflowPropertySource));
9897
addDeserializer(Events.class, new EventsDeserializer(workflowPropertySource));

‎api/src/main/java/io/serverlessworkflow/api/serializers/ScheduleSerializer.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ public void serialize(Schedule schedule,
4040

4141
if(schedule != null) {
4242
if(schedule.getCron() == null
43-
&& schedule.getDirectInvoke() == null
4443
&& (schedule.getTimezone() == null || schedule.getTimezone().isEmpty())
4544
&& schedule.getInterval() != null
4645
&& schedule.getInterval().length() > 0) {
@@ -56,10 +55,6 @@ public void serialize(Schedule schedule,
5655
gen.writeObjectField("cron", schedule.getCron());
5756
}
5857

59-
if (schedule.getDirectInvoke() != null) {
60-
gen.writeStringField("directInvoke", schedule.getDirectInvoke().value());
61-
}
62-
6358
if(schedule.getTimezone() != null && schedule.getTimezone().length() > 0) {
6459
gen.writeStringField("timezone", schedule.getTimezone());
6560
}

‎api/src/main/resources/schema/exectimeout/exectimeout.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"type": "object",
33
"javaType": "io.serverlessworkflow.api.exectimeout.ExecTimeout",
44
"properties": {
5-
"interval": {
5+
"duration": {
66
"type": "string",
7-
"description": "Timeout interval (ISO 8601 duration format)",
7+
"description": "Timeout duration (ISO 8601 duration format)",
88
"minLength": 1
99
},
1010
"interrupt": {
@@ -19,6 +19,6 @@
1919
}
2020
},
2121
"required": [
22-
"interval"
22+
"duration"
2323
]
2424
}

‎api/src/main/resources/schema/schedule/schedule.json

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,6 @@
1111
"description": "Schedule cron definition",
1212
"$ref": "../cron/crondef.json"
1313
},
14-
"directInvoke": {
15-
"description": "Define if workflow instances can be created outside of the defined interval/cron",
16-
"type": "string",
17-
"enum": [
18-
"allow",
19-
"deny"
20-
]
21-
},
2214
"timezone": {
2315
"type": "string",
2416
"description": "Timezone name used to evaluate the cron expression. Not used for interval as timezone can be specified there directly. If not specified, should default to local machine timezone."
@@ -27,14 +19,12 @@
2719
"oneOf": [
2820
{
2921
"required": [
30-
"interval",
31-
"directInvoke"
22+
"interval"
3223
]
3324
},
3425
{
3526
"required": [
36-
"cron",
37-
"directInvoke"
27+
"cron"
3828
]
3929
}
4030
]

‎api/src/test/java/io/serverlessworkflow/api/test/MarkupToWorkflowTest.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@ public void testSpecFreatureFunctionRef(String workflowLocation) {
8383
assertTrue(workflow.getStates().size() > 0);
8484

8585
assertNotNull(workflow.getFunctions());
86-
assertTrue(workflow.getFunctions().getFunctionDefs().size() == 1);
86+
assertEquals(1, workflow.getFunctions().getFunctionDefs().size());
8787

8888
assertNotNull(workflow.getRetries());
89-
assertTrue(workflow.getRetries().getRetryDefs().size() == 1);
89+
assertEquals(1, workflow.getRetries().getRetryDefs().size());
9090
}
9191

9292
@ParameterizedTest
@@ -101,10 +101,10 @@ public void testSpecFreatureEventRef(String workflowLocation) {
101101
assertTrue(workflow.getStates().size() > 0);
102102

103103
assertNotNull(workflow.getEvents());
104-
assertTrue(workflow.getEvents().getEventDefs().size() == 2);
104+
assertEquals(2, workflow.getEvents().getEventDefs().size());
105105

106106
assertNotNull(workflow.getRetries());
107-
assertTrue(workflow.getRetries().getRetryDefs().size() == 1);
107+
assertEquals(1, workflow.getRetries().getRetryDefs().size());
108108
}
109109

110110
@ParameterizedTest
@@ -118,7 +118,7 @@ public void testSpecFreatureCompensation(String workflowLocation) {
118118
assertNotNull(workflow.getStates());
119119

120120
assertNotNull(workflow.getStates());
121-
assertTrue(workflow.getStates().size() == 2);
121+
assertEquals(2, workflow.getStates().size());
122122

123123
State firstState = workflow.getStates().get(0);
124124
assertTrue(firstState instanceof EventState);
@@ -143,14 +143,14 @@ public void testFunctionTypes(String workflowLocation) {
143143
assertNotNull(workflow.getStates());
144144

145145
assertNotNull(workflow.getStates());
146-
assertTrue(workflow.getStates().size() == 1);
146+
assertEquals(1, workflow.getStates().size());
147147

148148
State state = workflow.getStates().get(0);
149149
assertTrue(state instanceof OperationState);
150150

151151
List<FunctionDefinition> functionDefs = workflow.getFunctions().getFunctionDefs();
152152
assertNotNull(functionDefs);
153-
assertTrue(functionDefs.size() == 2);
153+
assertEquals(2, functionDefs.size());
154154

155155
FunctionDefinition restFunc = functionDefs.get(0);
156156
assertEquals(restFunc.getType(), FunctionDefinition.Type.REST);
@@ -170,7 +170,7 @@ public void testTransitions(String workflowLocation) {
170170
assertNotNull(workflow.getStates());
171171

172172
assertNotNull(workflow.getStates());
173-
assertTrue(workflow.getStates().size() == 1);
173+
assertEquals(1, workflow.getStates().size());
174174

175175
State state = workflow.getStates().get(0);
176176
assertTrue(state instanceof SwitchState);
@@ -218,7 +218,7 @@ public void testFunctionRefs(String workflowLocation) {
218218
assertNotNull(workflow.getStates());
219219

220220
assertNotNull(workflow.getStates());
221-
assertTrue(workflow.getStates().size() == 1);
221+
assertEquals(1, workflow.getStates().size());
222222

223223
State state = workflow.getStates().get(0);
224224
assertTrue(state instanceof OperationState);
@@ -257,7 +257,7 @@ public void testKeepActiveExecTimeout(String workflowLocation) {
257257
assertNotNull(workflow.getExecTimeout());
258258

259259
ExecTimeout execTimeout = workflow.getExecTimeout();
260-
assertEquals("PT1H", execTimeout.getInterval());
260+
assertEquals("PT1H", execTimeout.getDuration());
261261
assertEquals("GenerateReport", execTimeout.getRunBefore());
262262
}
263263

@@ -272,7 +272,7 @@ public void testSubflowStateRepeat(String workflowLocation) {
272272
assertNotNull(workflow.getStates());
273273

274274
assertNotNull(workflow.getStates());
275-
assertTrue(workflow.getStates().size() == 2);
275+
assertEquals(2, workflow.getStates().size());
276276

277277
State state = workflow.getStates().get(1);
278278
assertTrue(state instanceof SubflowState);
@@ -297,7 +297,7 @@ public void testFunctionRefJsonParams(String workflowLocation) {
297297
assertNotNull(workflow.getStates());
298298

299299
assertNotNull(workflow.getStates());
300-
assertTrue(workflow.getStates().size() == 1);
300+
assertEquals(1, workflow.getStates().size());
301301
assertTrue(workflow.getStates().get(0) instanceof OperationState);
302302

303303
OperationState operationState = (OperationState) workflow.getStates().get(0);
@@ -328,7 +328,7 @@ public void testFunctionRefNoParams(String workflowLocation) {
328328
assertNotNull(workflow.getStates());
329329

330330
assertNotNull(workflow.getStates());
331-
assertTrue(workflow.getStates().size() == 1);
331+
assertEquals(1, workflow.getStates().size());
332332
assertTrue(workflow.getStates().get(0) instanceof OperationState);
333333

334334
OperationState operationState = (OperationState) workflow.getStates().get(0);
@@ -343,7 +343,7 @@ public void testFunctionRefNoParams(String workflowLocation) {
343343
JsonNode params = actions.get(0).getFunctionRef().getArguments();
344344
assertNull(params);
345345
JsonNode params2 = actions.get(1).getFunctionRef().getArguments();
346-
assertNull(params);
346+
assertNull(params2);
347347
}
348348

349349
@ParameterizedTest
@@ -363,7 +363,7 @@ public void testSimplifiedSchedule(String workflowLocation) {
363363
assertNotNull(workflow.getStates());
364364

365365
assertNotNull(workflow.getStates());
366-
assertTrue(workflow.getStates().size() == 1);
366+
assertEquals(1, workflow.getStates().size());
367367

368368
}
369369

@@ -384,7 +384,7 @@ public void testSimplifiedCron(String workflowLocation) {
384384
assertNotNull(workflow.getStates());
385385

386386
assertNotNull(workflow.getStates());
387-
assertTrue(workflow.getStates().size() == 2);
387+
assertEquals(2, workflow.getStates().size());
388388
}
389389

390390
@ParameterizedTest

‎api/src/test/resources/examples/roomreadings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"version": "1.0",
55
"start": "ConsumeReading",
66
"execTimeout": {
7-
"interval": "PT1H",
7+
"duration": "PT1H",
88
"runBefore": "GenerateReport"
99
},
1010
"keepActive": true,

‎api/src/test/resources/examples/roomreadings.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Room Temp and Humidity Workflow
33
version: '1.0'
44
start: ConsumeReading
55
execTimeout:
6-
interval: PT1H
6+
duration: PT1H
77
runBefore: GenerateReport
88
keepActive: true
99
states:

‎api/src/test/resources/features/keepactiveexectimeout.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"name": "Keep Active and Exec Timeout Test Workflow",
44
"version": "1.0",
55
"execTimeout": {
6-
"interval": "PT1H",
6+
"duration": "PT1H",
77
"runBefore": "GenerateReport"
88
},
99
"keepActive": true,

0 commit comments

Comments
 (0)