Skip to content

Commit e3269cb

Browse files
timl3136timl3136
committed
fix idl merge issues
1 parent de06cd9 commit e3269cb

File tree

7 files changed

+69
-56
lines changed

7 files changed

+69
-56
lines changed

‎src/main/java/com/uber/cadence/client/WorkflowOptions.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import com.cronutils.model.definition.CronDefinitionBuilder;
2626
import com.cronutils.parser.CronParser;
2727
import com.google.common.base.Strings;
28+
import com.uber.cadence.CronOverlapPolicy;
2829
import com.uber.cadence.WorkflowIdReusePolicy;
2930
import com.uber.cadence.common.CronSchedule;
3031
import com.uber.cadence.common.MethodRetry;
@@ -64,7 +65,7 @@ public static WorkflowOptions merge(
6465
.setRetryOptions(RetryOptions.merge(methodRetry, o.getRetryOptions()))
6566
.setCronSchedule(OptionsUtils.merge(cronAnnotation, o.getCronSchedule(), String.class))
6667
.setMemo(o.getMemo())
67-
.setCronOverlapPolicy(o.cronOverlapPolicy)
68+
.setCronOverlapPolicy(o.getCronOverlapPolicy())
6869
.setSearchAttributes(o.getSearchAttributes())
6970
.setContextPropagators(o.getContextPropagators())
7071
.setDelayStart(o.delayStart)
@@ -87,7 +88,7 @@ public static final class Builder {
8788

8889
private String cronSchedule;
8990

90-
private int cronOverlapPolicy;
91+
private CronOverlapPolicy cronOverlapPolicy;
9192

9293
private Map<String, Object> memo;
9394

@@ -198,7 +199,7 @@ public Builder setCronSchedule(String cronSchedule) {
198199
return this;
199200
}
200201

201-
public Builder setCronOverlapPolicy(int cronOverlapPolicy) {
202+
public Builder setCronOverlapPolicy(CronOverlapPolicy cronOverlapPolicy) {
202203
this.cronOverlapPolicy = cronOverlapPolicy;
203204
return this;
204205
}
@@ -319,7 +320,7 @@ public WorkflowOptions validateBuildWithDefaults() {
319320

320321
private String cronSchedule;
321322

322-
private int cronOverlapPolicy;
323+
private CronOverlapPolicy cronOverlapPolicy;
323324

324325
private Map<String, Object> memo;
325326

@@ -341,7 +342,7 @@ private WorkflowOptions(
341342
Map<String, Object> searchAttributes,
342343
List<ContextPropagator> contextPropagators,
343344
Duration delayStart,
344-
int cronOverlapPolicy) {
345+
CronOverlapPolicy cronOverlapPolicy) {
345346
this.workflowId = workflowId;
346347
this.workflowIdReusePolicy = workflowIdReusePolicy;
347348
this.executionStartToCloseTimeout = executionStartToCloseTimeout;
@@ -384,7 +385,7 @@ public String getCronSchedule() {
384385
return cronSchedule;
385386
}
386387

387-
public int getCronOverlapPolicy() {
388+
public CronOverlapPolicy getCronOverlapPolicy() {
388389
return cronOverlapPolicy;
389390
}
390391

‎src/main/java/com/uber/cadence/internal/common/StartWorkflowExecutionParameters.java‎

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

1818
package com.uber.cadence.internal.common;
1919

20+
import com.uber.cadence.CronOverlapPolicy;
2021
import com.uber.cadence.WorkflowIdReusePolicy;
2122
import com.uber.cadence.WorkflowType;
2223
import com.uber.cadence.client.WorkflowOptions;
@@ -56,7 +57,7 @@ public final class StartWorkflowExecutionParameters {
5657

5758
private Duration delayStart;
5859

59-
private int cronOverlapPolicy;
60+
private CronOverlapPolicy cronOverlapPolicy;
6061

6162
/**
6263
* Returns the value of the WorkflowId property for this object.
@@ -319,14 +320,20 @@ public Duration getDelayStart() {
319320
return delayStart;
320321
}
321322

322-
public int getCronOverlapPolicy() {
323+
public CronOverlapPolicy getCronOverlapPolicy() {
323324
return cronOverlapPolicy;
324325
}
325326

326-
public void setCronOverlapPolicy(int cronOverlapPolicy) {
327+
public void setCronOverlapPolicy(CronOverlapPolicy cronOverlapPolicy) {
327328
this.cronOverlapPolicy = cronOverlapPolicy;
328329
}
329330

331+
public StartWorkflowExecutionParameters withCronOverlapPolicy(
332+
CronOverlapPolicy cronOverlapPolicy) {
333+
this.cronOverlapPolicy = cronOverlapPolicy;
334+
return this;
335+
}
336+
330337
public StartWorkflowExecutionParameters withRetryParameters(RetryParameters retryParameters) {
331338
this.retryParameters = retryParameters;
332339
return this;

‎src/main/java/com/uber/cadence/internal/replay/StartChildWorkflowExecutionParameters.java‎

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

1818
package com.uber.cadence.internal.replay;
1919

20+
import com.uber.cadence.CronOverlapPolicy;
2021
import com.uber.cadence.ParentClosePolicy;
2122
import com.uber.cadence.WorkflowIdReusePolicy;
2223
import com.uber.cadence.WorkflowType;
@@ -51,7 +52,7 @@ public static final class Builder {
5152

5253
private String cronSchedule;
5354

54-
private int cronOverlapPolicy;
55+
private CronOverlapPolicy cronOverlapPolicy;
5556

5657
private Map<String, Object> memo;
5758

@@ -117,7 +118,7 @@ public Builder setCronSchedule(String cronSchedule) {
117118
return this;
118119
}
119120

120-
public Builder setCronOverlapPolicy(int cronOverlapPolicy) {
121+
public Builder setCronOverlapPolicy(CronOverlapPolicy cronOverlapPolicy) {
121122
this.cronOverlapPolicy = cronOverlapPolicy;
122123
return this;
123124
}
@@ -185,7 +186,7 @@ public StartChildWorkflowExecutionParameters build() {
185186

186187
private final String cronSchedule;
187188

188-
private final int cronOverlapPolicy;
189+
private final CronOverlapPolicy cronOverlapPolicy;
189190

190191
private Map<String, Object> memo;
191192

@@ -207,7 +208,7 @@ private StartChildWorkflowExecutionParameters(
207208
WorkflowIdReusePolicy workflowIdReusePolicy,
208209
RetryParameters retryParameters,
209210
String cronSchedule,
210-
int cronOverlapPolicy,
211+
CronOverlapPolicy cronOverlapPolicy,
211212
Map<String, Object> memo,
212213
Map<String, Object> searchAttributes,
213214
Map<String, byte[]> context,
@@ -274,7 +275,7 @@ public String getCronSchedule() {
274275
return cronSchedule;
275276
}
276277

277-
public int getCronOverlapPolicy() {
278+
public CronOverlapPolicy getCronOverlapPolicy() {
278279
return cronOverlapPolicy;
279280
}
280281

‎src/main/java/com/uber/cadence/workflow/ChildWorkflowOptions.java‎

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

2020
import static com.uber.cadence.internal.common.OptionsUtils.roundUpToSeconds;
2121

22+
import com.uber.cadence.CronOverlapPolicy;
2223
import com.uber.cadence.ParentClosePolicy;
2324
import com.uber.cadence.WorkflowIdReusePolicy;
2425
import com.uber.cadence.common.CronSchedule;
@@ -82,7 +83,7 @@ public static final class Builder {
8283

8384
private String cronSchedule;
8485

85-
private int cronOverlapPolicy;
86+
private CronOverlapPolicy cronOverlapPolicy;
8687

8788
private ParentClosePolicy parentClosePolicy;
8889

@@ -203,7 +204,7 @@ public Builder setCronSchedule(String cronSchedule) {
203204
return this;
204205
}
205206

206-
public Builder setCronOverlapPolicy(int cronOverlapPolicy) {
207+
public Builder setCronOverlapPolicy(CronOverlapPolicy cronOverlapPolicy) {
207208
this.cronOverlapPolicy = cronOverlapPolicy;
208209
return this;
209210
}
@@ -283,7 +284,7 @@ public ChildWorkflowOptions validateAndBuildWithDefaults() {
283284

284285
private final String cronSchedule;
285286

286-
private final int cronOverlapPolicy;
287+
private final CronOverlapPolicy cronOverlapPolicy;
287288

288289
private final ParentClosePolicy parentClosePolicy;
289290

@@ -302,7 +303,7 @@ private ChildWorkflowOptions(
302303
String taskList,
303304
RetryOptions retryOptions,
304305
String cronSchedule,
305-
int cronOverlapPolicy,
306+
CronOverlapPolicy cronOverlapPolicy,
306307
ParentClosePolicy parentClosePolicy,
307308
Map<String, Object> memo,
308309
Map<String, Object> searchAttributes,
@@ -354,7 +355,7 @@ public String getCronSchedule() {
354355
return cronSchedule;
355356
}
356357

357-
public int getCronOverlapPolicy() {
358+
public CronOverlapPolicy getCronOverlapPolicy() {
358359
return cronOverlapPolicy;
359360
}
360361

‎src/test/java/com/uber/cadence/client/WorkflowOptionsTest.java‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import static org.junit.Assert.assertNotEquals;
2222
import static org.junit.Assert.assertTrue;
2323

24+
import com.uber.cadence.CronOverlapPolicy;
2425
import com.uber.cadence.WorkflowIdReusePolicy;
2526
import com.uber.cadence.common.CronSchedule;
2627
import com.uber.cadence.common.MethodRetry;
@@ -48,7 +49,7 @@ public void testOnlyOptionsAndEmptyAnnotationsPresent() throws NoSuchMethodExcep
4849
.setExecutionStartToCloseTimeout(Duration.ofSeconds(321))
4950
.setTaskStartToCloseTimeout(Duration.ofSeconds(13))
5051
.setWorkflowIdReusePolicy(WorkflowIdReusePolicy.RejectDuplicate)
51-
.setCronOverlapPolicy(2)
52+
.setCronOverlapPolicy(CronOverlapPolicy.BUFFERONE)
5253
.setMemo(getTestMemo())
5354
.setSearchAttributes(getTestSearchAttributes())
5455
.build();
@@ -57,7 +58,7 @@ public void testOnlyOptionsAndEmptyAnnotationsPresent() throws NoSuchMethodExcep
5758
.getMethod("defaultWorkflowOptions")
5859
.getAnnotation(WorkflowMethod.class);
5960
Assert.assertEquals(o, WorkflowOptions.merge(a, null, null, o));
60-
Assert.assertEquals(2, o.getCronOverlapPolicy());
61+
Assert.assertEquals(CronOverlapPolicy.BUFFERONE, o.getCronOverlapPolicy());
6162
}
6263

6364
@WorkflowMethod(
@@ -204,10 +205,10 @@ public void testCronOverlapPolicy() {
204205
new WorkflowOptions.Builder()
205206
.setTaskList("test-task-list")
206207
.setExecutionStartToCloseTimeout(Duration.ofSeconds(10))
207-
.setCronOverlapPolicy(2)
208+
.setCronOverlapPolicy(CronOverlapPolicy.BUFFERONE)
208209
.build();
209210

210-
assertEquals(2, options.getCronOverlapPolicy());
211+
assertEquals(CronOverlapPolicy.BUFFERONE, options.getCronOverlapPolicy());
211212
}
212213

213214
@Test
@@ -216,21 +217,21 @@ public void testCronOverlapPolicyInMerge() {
216217
new WorkflowOptions.Builder()
217218
.setTaskList("test-task-list")
218219
.setExecutionStartToCloseTimeout(Duration.ofSeconds(10))
219-
.setCronOverlapPolicy(1)
220+
.setCronOverlapPolicy(CronOverlapPolicy.SKIPPED)
220221
.build();
221222

222223
WorkflowOptions override =
223224
new WorkflowOptions.Builder()
224225
.setTaskList("test-task-list")
225226
.setExecutionStartToCloseTimeout(Duration.ofSeconds(10))
226-
.setCronOverlapPolicy(3)
227+
.setCronOverlapPolicy(CronOverlapPolicy.BUFFERONE)
227228
.build();
228229

229230
WorkflowOptions merged = WorkflowOptions.merge(null, null, null, override);
230-
assertEquals(3, merged.getCronOverlapPolicy());
231+
assertEquals(CronOverlapPolicy.BUFFERONE, merged.getCronOverlapPolicy());
231232

232233
WorkflowOptions mergedWithBase = WorkflowOptions.merge(null, null, null, base);
233-
assertEquals(1, mergedWithBase.getCronOverlapPolicy());
234+
assertEquals(CronOverlapPolicy.SKIPPED, mergedWithBase.getCronOverlapPolicy());
234235
}
235236

236237
@Test
@@ -239,21 +240,21 @@ public void testCronOverlapPolicyEqualsAndHashCode() {
239240
new WorkflowOptions.Builder()
240241
.setTaskList("test-task-list")
241242
.setExecutionStartToCloseTimeout(Duration.ofSeconds(10))
242-
.setCronOverlapPolicy(2)
243+
.setCronOverlapPolicy(CronOverlapPolicy.BUFFERONE)
243244
.build();
244245

245246
WorkflowOptions options2 =
246247
new WorkflowOptions.Builder()
247248
.setTaskList("test-task-list")
248249
.setExecutionStartToCloseTimeout(Duration.ofSeconds(10))
249-
.setCronOverlapPolicy(2)
250+
.setCronOverlapPolicy(CronOverlapPolicy.BUFFERONE)
250251
.build();
251252

252253
WorkflowOptions options3 =
253254
new WorkflowOptions.Builder()
254255
.setTaskList("test-task-list")
255256
.setExecutionStartToCloseTimeout(Duration.ofSeconds(10))
256-
.setCronOverlapPolicy(3)
257+
.setCronOverlapPolicy(CronOverlapPolicy.SKIPPED)
257258
.build();
258259

259260
assertEquals(options1, options2);
@@ -268,11 +269,11 @@ public void testCronOverlapPolicyToString() {
268269
new WorkflowOptions.Builder()
269270
.setTaskList("test-task-list")
270271
.setExecutionStartToCloseTimeout(Duration.ofSeconds(10))
271-
.setCronOverlapPolicy(2)
272+
.setCronOverlapPolicy(CronOverlapPolicy.BUFFERONE)
272273
.build();
273274

274275
String toString = options.toString();
275-
assertTrue(toString.contains("cronOverlapPolicy=2"));
276+
assertTrue(toString.contains("cronOverlapPolicy=BUFFERONE"));
276277
}
277278

278279
@Test
@@ -281,7 +282,7 @@ public void testCronOverlapPolicyCopy() {
281282
new WorkflowOptions.Builder()
282283
.setTaskList("test-task-list")
283284
.setExecutionStartToCloseTimeout(Duration.ofSeconds(10))
284-
.setCronOverlapPolicy(2)
285+
.setCronOverlapPolicy(CronOverlapPolicy.BUFFERONE)
285286
.build();
286287

287288
WorkflowOptions copy = new WorkflowOptions.Builder(original).build();

0 commit comments

Comments
 (0)