Skip to content

Commit 0f6bdcf

Browse files
longquanzhenglongquanzheng
committed
Fix all build
1 parent 7f72478 commit 0f6bdcf

19 files changed

+211
-141
lines changed

‎src/main/java/com/uber/cadence/samples/bookingsaga/TripBookingSaga.java

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

1818
package com.uber.cadence.samples.bookingsaga;
1919

20-
import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
21-
2220
import com.uber.cadence.client.WorkflowClient;
2321
import com.uber.cadence.client.WorkflowException;
22+
import com.uber.cadence.serviceclient.ClientOptions;
23+
import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
2424
import com.uber.cadence.worker.Worker;
25+
import com.uber.cadence.worker.WorkerFactory;
2526

2627
public class TripBookingSaga {
2728

2829
static final String TASK_LIST = "TripBooking";
2930

3031
@SuppressWarnings("CatchAndPrintStackTrace")
3132
public static void main(String[] args) {
33+
// Get a new client
34+
WorkflowClient workflowClient = WorkflowClient.newInstance(new WorkflowServiceTChannel(ClientOptions.defaultInstance()));
3235
// Get worker to poll the common task list.
33-
Worker.Factory factory = new Worker.Factory(DOMAIN);
36+
WorkerFactory factory = WorkerFactory.newInstance(workflowClient);
3437
final Worker workerForCommonTaskList = factory.newWorker(TASK_LIST);
3538
workerForCommonTaskList.registerWorkflowImplementationTypes(TripBookingWorkflowImpl.class);
3639
TripBookingActivities tripBookingActivities = new TripBookingActivitiesImpl();
@@ -40,8 +43,6 @@ public static void main(String[] args) {
4043
factory.start();
4144
System.out.println("Worker started for task list: " + TASK_LIST);
4245

43-
WorkflowClient workflowClient = WorkflowClient.newInstance(DOMAIN);
44-
4546
// now we can start running instances of our saga - its state will be persisted
4647
TripBookingWorkflow trip1 = workflowClient.newWorkflowStub(TripBookingWorkflow.class);
4748
try {

‎src/main/java/com/uber/cadence/samples/fileprocessing/FileProcessingStarter.java

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

1818
package com.uber.cadence.samples.fileprocessing;
1919

20-
import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
21-
2220
import com.uber.cadence.client.WorkflowClient;
21+
import com.uber.cadence.serviceclient.ClientOptions;
22+
import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
23+
2324
import java.net.URL;
2425

25-
/** Starts a file processing sample workflow. */
26+
/**
27+
* Starts a file processing sample workflow.
28+
*/
2629
public class FileProcessingStarter {
2730

2831
public static void main(String[] args) throws Exception {
29-
WorkflowClient workflowClient = WorkflowClient.newInstance(DOMAIN);
32+
// Get a new client
33+
WorkflowClient workflowClient = WorkflowClient.newInstance(new WorkflowServiceTChannel(ClientOptions.defaultInstance()));
3034
FileProcessingWorkflow workflow = workflowClient.newWorkflowStub(FileProcessingWorkflow.class);
3135

3236
System.out.println("Executing FileProcessingWorkflow");

‎src/main/java/com/uber/cadence/samples/fileprocessing/FileProcessingWorker.java

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

1818
package com.uber.cadence.samples.fileprocessing;
1919

20-
import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
21-
20+
import com.uber.cadence.client.WorkflowClient;
21+
import com.uber.cadence.serviceclient.ClientOptions;
22+
import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
2223
import com.uber.cadence.worker.Worker;
24+
import com.uber.cadence.worker.WorkerFactory;
25+
2326
import java.lang.management.ManagementFactory;
2427

2528
/**
@@ -37,8 +40,10 @@ public static void main(String[] args) {
3740

3841
String hostSpecifiTaskList = ManagementFactory.getRuntimeMXBean().getName();
3942

43+
// Get a new client
44+
WorkflowClient workflowClient = WorkflowClient.newInstance(new WorkflowServiceTChannel(ClientOptions.defaultInstance()));
4045
// Get worker to poll the common task list.
41-
Worker.Factory factory = new Worker.Factory(DOMAIN);
46+
WorkerFactory factory = WorkerFactory.newInstance(workflowClient);
4247
final Worker workerForCommonTaskList = factory.newWorker(TASK_LIST);
4348
workerForCommonTaskList.registerWorkflowImplementationTypes(FileProcessingWorkflowImpl.class);
4449
StoreActivitiesImpl storeActivityImpl = new StoreActivitiesImpl(hostSpecifiTaskList);

‎src/main/java/com/uber/cadence/samples/hello/HelloActivity.java

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,12 @@
1717

1818
package com.uber.cadence.samples.hello;
1919

20-
import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
21-
22-
import com.google.common.base.Strings;
2320
import com.uber.cadence.activity.ActivityMethod;
2421
import com.uber.cadence.client.WorkflowClient;
25-
import com.uber.cadence.serviceclient.IWorkflowService;
22+
import com.uber.cadence.serviceclient.ClientOptions;
2623
import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
2724
import com.uber.cadence.worker.Worker;
25+
import com.uber.cadence.worker.WorkerFactory;
2826
import com.uber.cadence.workflow.Workflow;
2927
import com.uber.cadence.workflow.WorkflowMethod;
3028

@@ -75,19 +73,12 @@ public String composeGreeting(String greeting, String name) {
7573
}
7674

7775
public static void main(String[] args) {
78-
// Start a worker that hosts both workflow and activity implementations.
79-
final WorkflowServiceTChannel.ClientOptions.Builder builder =
80-
new WorkflowServiceTChannel.ClientOptions.Builder();
81-
// Use 5 seconds as RPC timeout
82-
builder.setRpcTimeout(5 * 1000);
83-
IWorkflowService wfService =
84-
new WorkflowServiceTChannel(
85-
Strings.isNullOrEmpty(System.getenv("CADENCE_SEEDS"))
86-
? "127.0.0.1"
87-
: System.getenv("CADENCE_SEEDS"),
88-
7933,
89-
builder.build());
90-
Worker.Factory factory = new Worker.Factory(wfService, DOMAIN);
76+
// Get a new client
77+
// NOTE: to set a different options, you can do like this:
78+
// ClientOptions.newBuilder().setRpcTimeout(5 * 1000).build();
79+
WorkflowClient workflowClient = WorkflowClient.newInstance(new WorkflowServiceTChannel(ClientOptions.defaultInstance()));
80+
// Get worker to poll the task list.
81+
WorkerFactory factory = WorkerFactory.newInstance(workflowClient);
9182
Worker worker = factory.newWorker(TASK_LIST);
9283
// Workflows are stateful. So you need a type to create instances.
9384
worker.registerWorkflowImplementationTypes(GreetingWorkflowImpl.class);
@@ -96,8 +87,6 @@ public static void main(String[] args) {
9687
// Start listening to the workflow and activity task lists.
9788
factory.start();
9889

99-
// Start a workflow execution. Usually this is done from another program.
100-
WorkflowClient workflowClient = WorkflowClient.newInstance(DOMAIN);
10190
// Get a workflow stub using the same task list the worker uses.
10291
GreetingWorkflow workflow = workflowClient.newWorkflowStub(GreetingWorkflow.class);
10392
// Execute a workflow waiting for it to complete.

‎src/main/java/com/uber/cadence/samples/hello/HelloActivityRetry.java

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

1818
package com.uber.cadence.samples.hello;
1919

20-
import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
21-
2220
import com.uber.cadence.activity.ActivityOptions;
2321
import com.uber.cadence.client.WorkflowClient;
2422
import com.uber.cadence.client.WorkflowOptions;
2523
import com.uber.cadence.common.RetryOptions;
24+
import com.uber.cadence.serviceclient.ClientOptions;
25+
import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
2626
import com.uber.cadence.worker.Worker;
27+
import com.uber.cadence.worker.WorkerFactory;
2728
import com.uber.cadence.workflow.Functions;
2829
import com.uber.cadence.workflow.Workflow;
2930
import com.uber.cadence.workflow.WorkflowMethod;
31+
3032
import java.time.Duration;
3133

3234
/**
@@ -99,8 +101,12 @@ public synchronized String composeGreeting(String greeting, String name) {
99101
}
100102

101103
public static void main(String[] args) {
102-
// Start a worker that hosts both workflow and activity implementations.
103-
Worker.Factory factory = new Worker.Factory(DOMAIN);
104+
// Get a new client
105+
// NOTE: to set a different options, you can do like this:
106+
// ClientOptions.newBuilder().setRpcTimeout(5 * 1000).build();
107+
WorkflowClient workflowClient = WorkflowClient.newInstance(new WorkflowServiceTChannel(ClientOptions.defaultInstance()));
108+
// Get worker to poll the task list.
109+
WorkerFactory factory = WorkerFactory.newInstance(workflowClient);
104110
Worker worker = factory.newWorker(TASK_LIST);
105111
// Workflows are stateful. So you need a type to create instances.
106112
worker.registerWorkflowImplementationTypes(GreetingWorkflowImpl.class);
@@ -109,8 +115,6 @@ public static void main(String[] args) {
109115
// Start listening to the workflow and activity task lists.
110116
factory.start();
111117

112-
// Start a workflow execution. Usually this is done from another program.
113-
WorkflowClient workflowClient = WorkflowClient.newInstance(DOMAIN);
114118
// Get a workflow stub using the same task list the worker uses.
115119
WorkflowOptions workflowOptions =
116120
new WorkflowOptions.Builder()

‎src/main/java/com/uber/cadence/samples/hello/HelloAsync.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@
1717

1818
package com.uber.cadence.samples.hello;
1919

20-
import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
21-
2220
import com.uber.cadence.activity.ActivityMethod;
2321
import com.uber.cadence.client.WorkflowClient;
22+
import com.uber.cadence.serviceclient.ClientOptions;
23+
import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
2424
import com.uber.cadence.worker.Worker;
25+
import com.uber.cadence.worker.WorkerFactory;
2526
import com.uber.cadence.workflow.Async;
2627
import com.uber.cadence.workflow.Functions.Func;
2728
import com.uber.cadence.workflow.Promise;
@@ -79,8 +80,12 @@ public String composeGreeting(String greeting, String name) {
7980
}
8081

8182
public static void main(String[] args) {
82-
// Start a worker that hosts both workflow and activity implementations.
83-
Worker.Factory factory = new Worker.Factory(DOMAIN);
83+
// Get a new client
84+
// NOTE: to set a different options, you can do like this:
85+
// ClientOptions.newBuilder().setRpcTimeout(5 * 1000).build();
86+
WorkflowClient workflowClient = WorkflowClient.newInstance(new WorkflowServiceTChannel(ClientOptions.defaultInstance()));
87+
// Get worker to poll the task list.
88+
WorkerFactory factory = WorkerFactory.newInstance(workflowClient);
8489
Worker worker = factory.newWorker(TASK_LIST);
8590
// Workflows are stateful. So you need a type to create instances.
8691
worker.registerWorkflowImplementationTypes(GreetingWorkflowImpl.class);
@@ -89,8 +94,6 @@ public static void main(String[] args) {
8994
// Start listening to the workflow and activity task lists.
9095
factory.start();
9196

92-
// Start a workflow execution. Usually this is done from another program.
93-
WorkflowClient workflowClient = WorkflowClient.newInstance(DOMAIN);
9497
// Get a workflow stub using the same task list the worker uses.
9598
GreetingWorkflow workflow = workflowClient.newWorkflowStub(GreetingWorkflow.class);
9699
// Execute a workflow waiting for it to complete.

‎src/main/java/com/uber/cadence/samples/hello/HelloAsyncActivityCompletion.java

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

1818
package com.uber.cadence.samples.hello;
1919

20-
import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
21-
2220
import com.uber.cadence.activity.Activity;
2321
import com.uber.cadence.activity.ActivityMethod;
2422
import com.uber.cadence.client.ActivityCompletionClient;
2523
import com.uber.cadence.client.WorkflowClient;
24+
import com.uber.cadence.serviceclient.ClientOptions;
25+
import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
2626
import com.uber.cadence.worker.Worker;
27+
import com.uber.cadence.worker.WorkerFactory;
2728
import com.uber.cadence.workflow.Workflow;
2829
import com.uber.cadence.workflow.WorkflowMethod;
30+
2931
import java.util.concurrent.CompletableFuture;
3032
import java.util.concurrent.ExecutionException;
3133
import java.util.concurrent.ForkJoinPool;
@@ -101,11 +103,12 @@ private void composeGreetingAsync(byte[] taskToken, String greeting, String name
101103
}
102104

103105
public static void main(String[] args) throws ExecutionException, InterruptedException {
104-
// Start a workflow execution. Usually this is done from another program.
105-
WorkflowClient workflowClient = WorkflowClient.newInstance(DOMAIN);
106-
107-
// Start a worker that hosts both workflow and activity implementations.
108-
Worker.Factory factory = new Worker.Factory(DOMAIN);
106+
// Get a new client
107+
// NOTE: to set a different options, you can do like this:
108+
// ClientOptions.newBuilder().setRpcTimeout(5 * 1000).build();
109+
WorkflowClient workflowClient = WorkflowClient.newInstance(new WorkflowServiceTChannel(ClientOptions.defaultInstance()));
110+
// Get worker to poll the task list.
111+
WorkerFactory factory = WorkerFactory.newInstance(workflowClient);
109112
Worker worker = factory.newWorker(TASK_LIST);
110113
// Workflows are stateful. So you need a type to create instances.
111114
worker.registerWorkflowImplementationTypes(GreetingWorkflowImpl.class);

‎src/main/java/com/uber/cadence/samples/hello/HelloAsyncLambda.java

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

1818
package com.uber.cadence.samples.hello;
1919

20-
import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
21-
2220
import com.uber.cadence.activity.ActivityOptions;
2321
import com.uber.cadence.client.WorkflowClient;
2422
import com.uber.cadence.client.WorkflowOptions;
23+
import com.uber.cadence.serviceclient.ClientOptions;
24+
import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
2525
import com.uber.cadence.worker.Worker;
26+
import com.uber.cadence.worker.WorkerFactory;
2627
import com.uber.cadence.workflow.Async;
2728
import com.uber.cadence.workflow.Promise;
2829
import com.uber.cadence.workflow.Workflow;
2930
import com.uber.cadence.workflow.WorkflowMethod;
31+
3032
import java.time.Duration;
3133

3234
/**
@@ -100,8 +102,12 @@ public String composeGreeting(String greeting, String name) {
100102
}
101103

102104
public static void main(String[] args) {
103-
// Start a worker that hosts both workflow and activity implementations.
104-
Worker.Factory factory = new Worker.Factory(DOMAIN);
105+
// Get a new client
106+
// NOTE: to set a different options, you can do like this:
107+
// ClientOptions.newBuilder().setRpcTimeout(5 * 1000).build();
108+
WorkflowClient workflowClient = WorkflowClient.newInstance(new WorkflowServiceTChannel(ClientOptions.defaultInstance()));
109+
// Get worker to poll the task list.
110+
WorkerFactory factory = WorkerFactory.newInstance(workflowClient);
105111
Worker worker = factory.newWorker(TASK_LIST);
106112
// Workflows are stateful. So you need a type to create instances.
107113
worker.registerWorkflowImplementationTypes(GreetingWorkflowImpl.class);
@@ -110,8 +116,6 @@ public static void main(String[] args) {
110116
// Start listening to the workflow and activity task lists.
111117
factory.start();
112118

113-
// Start a workflow execution. Usually this is done from another program.
114-
WorkflowClient workflowClient = WorkflowClient.newInstance(DOMAIN);
115119
// Get a workflow stub using the same task list the worker uses.
116120
WorkflowOptions workflowOptions =
117121
new WorkflowOptions.Builder()

‎src/main/java/com/uber/cadence/samples/hello/HelloChild.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@
1717

1818
package com.uber.cadence.samples.hello;
1919

20-
import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
21-
2220
import com.uber.cadence.WorkflowExecution;
2321
import com.uber.cadence.client.WorkflowClient;
22+
import com.uber.cadence.serviceclient.ClientOptions;
23+
import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
2424
import com.uber.cadence.worker.Worker;
25+
import com.uber.cadence.worker.WorkerFactory;
2526
import com.uber.cadence.workflow.Async;
2627
import com.uber.cadence.workflow.Promise;
2728
import com.uber.cadence.workflow.Workflow;
@@ -87,15 +88,17 @@ public String composeGreeting(String greeting, String name) {
8788
}
8889

8990
public static void main(String[] args) {
90-
// Start a worker that hosts both parent and child workflow implementations.
91-
Worker.Factory factory = new Worker.Factory(DOMAIN);
91+
// Get a new client
92+
// NOTE: to set a different options, you can do like this:
93+
// ClientOptions.newBuilder().setRpcTimeout(5 * 1000).build();
94+
WorkflowClient workflowClient = WorkflowClient.newInstance(new WorkflowServiceTChannel(ClientOptions.defaultInstance()));
95+
// Get worker to poll the task list.
96+
WorkerFactory factory = WorkerFactory.newInstance(workflowClient);
9297
Worker worker = factory.newWorker(TASK_LIST);
9398
worker.registerWorkflowImplementationTypes(GreetingWorkflowImpl.class, GreetingChildImpl.class);
9499
// Start listening to the workflow task list.
95100
factory.start();
96101

97-
// Start a workflow execution. Usually this is done from another program.
98-
WorkflowClient workflowClient = WorkflowClient.newInstance(DOMAIN);
99102
// Get a workflow stub using the same task list the worker uses.
100103
GreetingWorkflow workflow = workflowClient.newWorkflowStub(GreetingWorkflow.class);
101104
// Execute a workflow waiting for it to complete.

0 commit comments

Comments
 (0)