Skip to content

Commit 6a05a52

Browse files
mfateevmfateev
authored
Api updates (#23)
* Updated proto packages * Removed unthrown exceptions * Disabled test brokend due to mockito * Updated to new SDK and added runHello gradle task
1 parent 6969dde commit 6a05a52

13 files changed

Lines changed: 57 additions & 30 deletions

File tree

‎build.gradle‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ repositories {
3232
dependencies {
3333
implementation group: 'io.temporal', name: 'temporal-sdk', version: '0.26.0-SNAPSHOT'
3434
implementation group: 'commons-configuration', name: 'commons-configuration', version: '1.10'
35-
implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
35+
implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
3636

3737
testImplementation group: 'junit', name: 'junit', version: '4.13'
3838
testImplementation group: 'org.mockito', name: 'mockito-all', version: '1.10.19'
@@ -54,3 +54,28 @@ task execute(type: JavaExec) {
5454
license {
5555
header rootProject.file('license-header.txt')
5656
}
57+
58+
task runHello {
59+
doLast {
60+
// Cron and Periodic are not in the list as they take long time to stop
61+
["io.temporal.samples.hello.HelloActivity",
62+
"io.temporal.samples.hello.HelloActivityRetry",
63+
"io.temporal.samples.hello.HelloAsync",
64+
"io.temporal.samples.hello.HelloAsyncActivityCompletion",
65+
"io.temporal.samples.hello.HelloAsyncLambda",
66+
"io.temporal.samples.hello.HelloChild",
67+
"io.temporal.samples.hello.HelloException",
68+
"io.temporal.samples.hello.HelloPolymorphicActivity",
69+
"io.temporal.samples.hello.HelloQuery",
70+
"io.temporal.samples.hello.HelloSaga",
71+
"io.temporal.samples.hello.HelloSearchAttributes",
72+
"io.temporal.samples.hello.HelloSignal"
73+
].each { mainClass ->
74+
println mainClass
75+
javaexec {
76+
classpath = sourceSets.main.runtimeClasspath
77+
main = mainClass
78+
}
79+
}
80+
}
81+
}

‎src/main/java/io/temporal/samples/common/QueryWorkflowExecution.java‎

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

2020
package io.temporal.samples.common;
2121

22+
import io.temporal.api.common.v1.WorkflowExecution;
2223
import io.temporal.client.WorkflowClient;
2324
import io.temporal.client.WorkflowStub;
24-
import io.temporal.common.v1.WorkflowExecution;
2525
import io.temporal.serviceclient.WorkflowServiceStubs;
2626
import java.util.Optional;
2727

@@ -33,7 +33,7 @@
3333
*/
3434
public class QueryWorkflowExecution {
3535

36-
public static void main(String[] args) throws Exception {
36+
public static void main(String[] args) {
3737
if (args.length < 2 || args.length > 3) {
3838
System.err.println(
3939
"Usage: java "

‎src/main/java/io/temporal/samples/hello/HelloCron.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
import io.temporal.activity.Activity;
2323
import io.temporal.activity.ActivityInterface;
2424
import io.temporal.activity.ActivityOptions;
25+
import io.temporal.api.common.v1.WorkflowExecution;
2526
import io.temporal.client.WorkflowClient;
2627
import io.temporal.client.WorkflowExecutionAlreadyStarted;
2728
import io.temporal.client.WorkflowOptions;
28-
import io.temporal.common.v1.WorkflowExecution;
2929
import io.temporal.serviceclient.WorkflowServiceStubs;
3030
import io.temporal.worker.Worker;
3131
import io.temporal.worker.WorkerFactory;
@@ -81,7 +81,7 @@ public void greet(String greeting) {
8181
}
8282
}
8383

84-
public static void main(String[] args) throws InterruptedException {
84+
public static void main(String[] args) {
8585
// gRPC stubs wrapper that talks to the local docker instance of temporal service.
8686
WorkflowServiceStubs service = WorkflowServiceStubs.newInstance();
8787
// client that can be used to start and signal workflows

‎src/main/java/io/temporal/samples/hello/HelloPeriodic.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
import io.temporal.activity.Activity;
2424
import io.temporal.activity.ActivityInterface;
2525
import io.temporal.activity.ActivityOptions;
26+
import io.temporal.api.common.v1.WorkflowExecution;
2627
import io.temporal.client.WorkflowClient;
2728
import io.temporal.client.WorkflowException;
2829
import io.temporal.client.WorkflowExecutionAlreadyStarted;
2930
import io.temporal.client.WorkflowOptions;
3031
import io.temporal.client.WorkflowStub;
31-
import io.temporal.common.v1.WorkflowExecution;
3232
import io.temporal.serviceclient.WorkflowServiceStubs;
3333
import io.temporal.worker.Worker;
3434
import io.temporal.worker.WorkerFactory;

‎src/main/java/io/temporal/samples/hello/HelloSearchAttributes.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,24 @@
2222
import io.temporal.activity.ActivityInterface;
2323
import io.temporal.activity.ActivityMethod;
2424
import io.temporal.activity.ActivityOptions;
25+
import io.temporal.api.common.v1.Payload;
26+
import io.temporal.api.common.v1.SearchAttributes;
27+
import io.temporal.api.common.v1.WorkflowExecution;
28+
import io.temporal.api.workflowservice.v1.DescribeWorkflowExecutionRequest;
29+
import io.temporal.api.workflowservice.v1.DescribeWorkflowExecutionResponse;
2530
import io.temporal.client.WorkflowClient;
2631
import io.temporal.client.WorkflowOptions;
2732
import io.temporal.common.converter.DataConverter;
28-
import io.temporal.common.v1.Payload;
29-
import io.temporal.common.v1.SearchAttributes;
30-
import io.temporal.common.v1.WorkflowExecution;
3133
import io.temporal.serviceclient.WorkflowServiceStubs;
3234
import io.temporal.worker.Worker;
3335
import io.temporal.worker.WorkerFactory;
3436
import io.temporal.workflow.Workflow;
3537
import io.temporal.workflow.WorkflowInterface;
3638
import io.temporal.workflow.WorkflowMethod;
37-
import io.temporal.workflowservice.v1.DescribeWorkflowExecutionRequest;
38-
import io.temporal.workflowservice.v1.DescribeWorkflowExecutionResponse;
39-
import java.text.SimpleDateFormat;
4039
import java.time.Duration;
41-
import java.time.LocalDateTime;
4240
import java.time.ZoneId;
41+
import java.time.ZonedDateTime;
42+
import java.time.format.DateTimeFormatter;
4343
import java.util.HashMap;
4444
import java.util.Map;
4545
import java.util.UUID;
@@ -161,8 +161,8 @@ private static Map<String, Object> generateSearchAttributes() {
161161

162162
// CustomDatetimeField takes times encoded in the RFC 3339 format.
163163
private static String generateDateTimeFieldValue() {
164-
return new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX")
165-
.format(LocalDateTime.now(ZoneId.systemDefault()));
164+
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssXXX");
165+
return ZonedDateTime.now(ZoneId.systemDefault()).format(formatter);
166166
}
167167

168168
// example for extract value from search attributes

‎src/main/java/io/temporal/samples/updatabletimer/DynamicSleepWorkflowStarter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
import static io.temporal.samples.updatabletimer.DynamicSleepWorkflowWorker.DYNAMIC_SLEEP_WORKFLOW_ID;
2323
import static io.temporal.samples.updatabletimer.DynamicSleepWorkflowWorker.TASK_QUEUE;
2424

25+
import io.temporal.api.common.v1.WorkflowExecution;
26+
import io.temporal.api.enums.v1.WorkflowIdReusePolicy;
2527
import io.temporal.client.WorkflowClient;
2628
import io.temporal.client.WorkflowExecutionAlreadyStarted;
2729
import io.temporal.client.WorkflowOptions;
28-
import io.temporal.common.v1.WorkflowExecution;
29-
import io.temporal.enums.v1.WorkflowIdReusePolicy;
3030
import io.temporal.serviceclient.WorkflowServiceStubs;
3131
import org.slf4j.Logger;
3232
import org.slf4j.LoggerFactory;

‎src/test/java/io/temporal/samples/fileprocessing/FileProcessingTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
import static org.mockito.Matchers.anyObject;
2424
import static org.mockito.Mockito.*;
2525

26+
import io.temporal.api.enums.v1.TimeoutType;
2627
import io.temporal.client.WorkflowClient;
2728
import io.temporal.client.WorkflowOptions;
28-
import io.temporal.enums.v1.TimeoutType;
2929
import io.temporal.failure.TimeoutFailure;
3030
import io.temporal.samples.fileprocessing.StoreActivities.TaskQueueFileNamePair;
3131
import io.temporal.testing.TestWorkflowEnvironment;

‎src/test/java/io/temporal/samples/hello/HelloChildTest.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import java.util.concurrent.atomic.AtomicReference;
3636
import org.junit.After;
3737
import org.junit.Before;
38+
import org.junit.Ignore;
3839
import org.junit.Rule;
3940
import org.junit.Test;
4041
import org.junit.rules.TestWatcher;
@@ -89,11 +90,12 @@ public void testChild() {
8990
}
9091

9192
@Test
93+
@Ignore // TODO: Find out how to deal with cglib based mocks
9294
public void testMockedChild() {
9395
worker.registerWorkflowImplementationTypes(GreetingWorkflowImpl.class);
94-
// As new mock is created on each decision the only last one is useful to verify calls.
96+
// As new mock is created on each workflow task the only last one is useful to verify calls.
9597
AtomicReference<GreetingChild> lastChildMock = new AtomicReference<>();
96-
// Factory is called to create a new workflow object on each decision.
98+
// Factory is called to create a new workflow object on each workflow task.
9799
worker.addWorkflowImplementationFactory(
98100
GreetingChild.class,
99101
() -> {

‎src/test/java/io/temporal/samples/hello/HelloCronTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
import static org.mockito.Matchers.anyString;
2626
import static org.mockito.Mockito.*;
2727

28+
import io.temporal.api.common.v1.WorkflowExecution;
2829
import io.temporal.client.WorkflowClient;
2930
import io.temporal.client.WorkflowOptions;
30-
import io.temporal.common.v1.WorkflowExecution;
3131
import io.temporal.samples.hello.HelloCron.GreetingActivities;
3232
import io.temporal.samples.hello.HelloCron.GreetingWorkflow;
3333
import io.temporal.samples.hello.HelloCron.GreetingWorkflowImpl;

‎src/test/java/io/temporal/samples/hello/HelloExceptionTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
import static org.powermock.api.mockito.PowerMockito.mock;
2727
import static org.powermock.api.mockito.PowerMockito.when;
2828

29+
import io.temporal.api.enums.v1.TimeoutType;
2930
import io.temporal.client.WorkflowClient;
3031
import io.temporal.client.WorkflowException;
3132
import io.temporal.client.WorkflowOptions;
32-
import io.temporal.enums.v1.TimeoutType;
3333
import io.temporal.failure.ActivityFailure;
3434
import io.temporal.failure.ApplicationFailure;
3535
import io.temporal.failure.ChildWorkflowFailure;

0 commit comments

Comments
 (0)