Skip to content

Commit 7589265

Browse files
longquanzhenglongquanzheng
authored
Fix domain for samples (#45)
1 parent 517bbd1 commit 7589265

23 files changed

+135
-28
lines changed

‎README.md

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,26 +52,32 @@ Run Cadence Server using Docker Compose:
5252
curl -O https://raw.githubusercontent.com/uber/cadence/master/docker/docker-compose.yml
5353
docker-compose up
5454

55-
If this does not work, see the instructions for running Cadence Server at https://github.com/uber/cadence/blob/master/README.md.
55+
If this does not work, see the instructions for running Cadence Server
56+
at https://github.com/uber/cadence/blob/master/README.md.
5657

5758
## Register the Domain
5859

59-
To register the *sample* domain, run the following command once before running any samples:
60+
To register the *samples-domain* domain, run the following command once before running any samples:
6061

6162
./gradlew -q execute -PmainClass=com.uber.cadence.samples.common.RegisterDomain
6263

64+
Or using Cadence CLI:
65+
66+
```
67+
cadence --domain samples-domain domain register
68+
```
69+
6370
## See Cadence UI
6471

6572
The Cadence Server running in a docker container includes a Web UI.
6673

6774
Connect to [http://localhost:8088](http://localhost:8088).
6875

69-
Enter the *sample* domain. You'll see a "No Results" page. After running any sample, change the
70-
filter in the
76+
Enter the *samples-domain* domain. You'll see a "No Results" page. After running any sample, change the filter in the
7177
top right corner from "Open" to "Closed" to see the list of the completed workflows.
7278

73-
Click on a *RUN ID* of a workflow to see more details about it. Try different view formats to get a different level
74-
of details about the execution history.
79+
Click on a *RUN ID* of a workflow to see more details about it. Try different view formats to get a different level of
80+
details about the execution history.
7581

7682
## Install Cadence CLI
7783

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

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

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

20+
import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
21+
2022
import com.uber.cadence.client.WorkflowClient;
23+
import com.uber.cadence.client.WorkflowClientOptions;
2124
import com.uber.cadence.client.WorkflowException;
2225
import com.uber.cadence.serviceclient.ClientOptions;
2326
import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
@@ -32,7 +35,9 @@ public class TripBookingSaga {
3235
public static void main(String[] args) {
3336
// Get a new client
3437
WorkflowClient workflowClient =
35-
WorkflowClient.newInstance(new WorkflowServiceTChannel(ClientOptions.defaultInstance()));
38+
WorkflowClient.newInstance(
39+
new WorkflowServiceTChannel(ClientOptions.defaultInstance()),
40+
WorkflowClientOptions.newBuilder().setDomain(DOMAIN).build());
3641
// Get worker to poll the common task list.
3742
WorkerFactory factory = WorkerFactory.newInstance(workflowClient);
3843
final Worker workerForCommonTaskList = factory.newWorker(TASK_LIST);

‎src/main/java/com/uber/cadence/samples/common/QueryWorkflowExecution.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,11 @@
1717

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

20+
import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
21+
2022
import com.uber.cadence.WorkflowExecution;
2123
import com.uber.cadence.client.WorkflowClient;
24+
import com.uber.cadence.client.WorkflowClientOptions;
2225
import com.uber.cadence.client.WorkflowStub;
2326
import com.uber.cadence.serviceclient.ClientOptions;
2427
import com.uber.cadence.serviceclient.IWorkflowService;
@@ -52,7 +55,9 @@ public static void main(String[] args) throws Exception {
5255
String runId = args[1];
5356
workflowExecution.setRunId(runId);
5457
}
55-
WorkflowClient client = WorkflowClient.newInstance(cadenceService);
58+
WorkflowClient client =
59+
WorkflowClient.newInstance(
60+
cadenceService, WorkflowClientOptions.newBuilder().setDomain(DOMAIN).build());
5661
WorkflowStub workflow = client.newUntypedWorkflowStub(workflowExecution, Optional.empty());
5762
String result = workflow.query(queryType, String.class);
5863

‎src/main/java/com/uber/cadence/samples/common/SampleConstants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@
1818
package com.uber.cadence.samples.common;
1919

2020
public class SampleConstants {
21-
public static final String DOMAIN = "sample";
21+
public static final String DOMAIN = "samples-domain";
2222
}

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

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

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

20+
import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
21+
2022
import com.uber.cadence.client.WorkflowClient;
23+
import com.uber.cadence.client.WorkflowClientOptions;
2124
import com.uber.cadence.serviceclient.ClientOptions;
2225
import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
2326
import java.net.URL;
@@ -28,7 +31,9 @@ public class FileProcessingStarter {
2831
public static void main(String[] args) throws Exception {
2932
// Get a new client
3033
WorkflowClient workflowClient =
31-
WorkflowClient.newInstance(new WorkflowServiceTChannel(ClientOptions.defaultInstance()));
34+
WorkflowClient.newInstance(
35+
new WorkflowServiceTChannel(ClientOptions.defaultInstance()),
36+
WorkflowClientOptions.newBuilder().setDomain(DOMAIN).build());
3237
FileProcessingWorkflow workflow = workflowClient.newWorkflowStub(FileProcessingWorkflow.class);
3338

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

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

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

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

20+
import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
21+
2022
import com.uber.cadence.client.WorkflowClient;
23+
import com.uber.cadence.client.WorkflowClientOptions;
2124
import com.uber.cadence.serviceclient.ClientOptions;
2225
import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
2326
import com.uber.cadence.worker.Worker;
@@ -41,7 +44,9 @@ public static void main(String[] args) {
4144

4245
// Get a new client
4346
WorkflowClient workflowClient =
44-
WorkflowClient.newInstance(new WorkflowServiceTChannel(ClientOptions.defaultInstance()));
47+
WorkflowClient.newInstance(
48+
new WorkflowServiceTChannel(ClientOptions.defaultInstance()),
49+
WorkflowClientOptions.newBuilder().setDomain(DOMAIN).build());
4550
// Get worker to poll the common task list.
4651
WorkerFactory factory = WorkerFactory.newInstance(workflowClient);
4752
final Worker workerForCommonTaskList = factory.newWorker(TASK_LIST);

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,11 @@
1717

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

20+
import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
21+
2022
import com.uber.cadence.activity.ActivityMethod;
2123
import com.uber.cadence.client.WorkflowClient;
24+
import com.uber.cadence.client.WorkflowClientOptions;
2225
import com.uber.cadence.serviceclient.ClientOptions;
2326
import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
2427
import com.uber.cadence.worker.Worker;
@@ -77,7 +80,9 @@ public static void main(String[] args) {
7780
// NOTE: to set a different options, you can do like this:
7881
// ClientOptions.newBuilder().setRpcTimeout(5 * 1000).build();
7982
WorkflowClient workflowClient =
80-
WorkflowClient.newInstance(new WorkflowServiceTChannel(ClientOptions.defaultInstance()));
83+
WorkflowClient.newInstance(
84+
new WorkflowServiceTChannel(ClientOptions.defaultInstance()),
85+
WorkflowClientOptions.newBuilder().setDomain(DOMAIN).build());
8186
// Get worker to poll the task list.
8287
WorkerFactory factory = WorkerFactory.newInstance(workflowClient);
8388
Worker worker = factory.newWorker(TASK_LIST);

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,11 @@
1717

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

20+
import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
21+
2022
import com.uber.cadence.activity.ActivityOptions;
2123
import com.uber.cadence.client.WorkflowClient;
24+
import com.uber.cadence.client.WorkflowClientOptions;
2225
import com.uber.cadence.client.WorkflowOptions;
2326
import com.uber.cadence.common.RetryOptions;
2427
import com.uber.cadence.serviceclient.ClientOptions;
@@ -104,7 +107,9 @@ public static void main(String[] args) {
104107
// NOTE: to set a different options, you can do like this:
105108
// ClientOptions.newBuilder().setRpcTimeout(5 * 1000).build();
106109
WorkflowClient workflowClient =
107-
WorkflowClient.newInstance(new WorkflowServiceTChannel(ClientOptions.defaultInstance()));
110+
WorkflowClient.newInstance(
111+
new WorkflowServiceTChannel(ClientOptions.defaultInstance()),
112+
WorkflowClientOptions.newBuilder().setDomain(DOMAIN).build());
108113
// Get worker to poll the task list.
109114
WorkerFactory factory = WorkerFactory.newInstance(workflowClient);
110115
Worker worker = factory.newWorker(TASK_LIST);

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,11 @@
1717

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

20+
import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
21+
2022
import com.uber.cadence.activity.ActivityMethod;
2123
import com.uber.cadence.client.WorkflowClient;
24+
import com.uber.cadence.client.WorkflowClientOptions;
2225
import com.uber.cadence.serviceclient.ClientOptions;
2326
import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
2427
import com.uber.cadence.worker.Worker;
@@ -84,7 +87,9 @@ public static void main(String[] args) {
8487
// NOTE: to set a different options, you can do like this:
8588
// ClientOptions.newBuilder().setRpcTimeout(5 * 1000).build();
8689
WorkflowClient workflowClient =
87-
WorkflowClient.newInstance(new WorkflowServiceTChannel(ClientOptions.defaultInstance()));
90+
WorkflowClient.newInstance(
91+
new WorkflowServiceTChannel(ClientOptions.defaultInstance()),
92+
WorkflowClientOptions.newBuilder().setDomain(DOMAIN).build());
8893
// Get worker to poll the task list.
8994
WorkerFactory factory = WorkerFactory.newInstance(workflowClient);
9095
Worker worker = factory.newWorker(TASK_LIST);

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,13 @@
1717

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

20+
import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
21+
2022
import com.uber.cadence.activity.Activity;
2123
import com.uber.cadence.activity.ActivityMethod;
2224
import com.uber.cadence.client.ActivityCompletionClient;
2325
import com.uber.cadence.client.WorkflowClient;
26+
import com.uber.cadence.client.WorkflowClientOptions;
2427
import com.uber.cadence.serviceclient.ClientOptions;
2528
import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
2629
import com.uber.cadence.worker.Worker;
@@ -106,7 +109,9 @@ public static void main(String[] args) throws ExecutionException, InterruptedExc
106109
// NOTE: to set a different options, you can do like this:
107110
// ClientOptions.newBuilder().setRpcTimeout(5 * 1000).build();
108111
WorkflowClient workflowClient =
109-
WorkflowClient.newInstance(new WorkflowServiceTChannel(ClientOptions.defaultInstance()));
112+
WorkflowClient.newInstance(
113+
new WorkflowServiceTChannel(ClientOptions.defaultInstance()),
114+
WorkflowClientOptions.newBuilder().setDomain(DOMAIN).build());
110115
// Get worker to poll the task list.
111116
WorkerFactory factory = WorkerFactory.newInstance(workflowClient);
112117
Worker worker = factory.newWorker(TASK_LIST);

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,11 @@
1717

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

20+
import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
21+
2022
import com.uber.cadence.activity.ActivityOptions;
2123
import com.uber.cadence.client.WorkflowClient;
24+
import com.uber.cadence.client.WorkflowClientOptions;
2225
import com.uber.cadence.client.WorkflowOptions;
2326
import com.uber.cadence.serviceclient.ClientOptions;
2427
import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
@@ -105,7 +108,9 @@ public static void main(String[] args) {
105108
// NOTE: to set a different options, you can do like this:
106109
// ClientOptions.newBuilder().setRpcTimeout(5 * 1000).build();
107110
WorkflowClient workflowClient =
108-
WorkflowClient.newInstance(new WorkflowServiceTChannel(ClientOptions.defaultInstance()));
111+
WorkflowClient.newInstance(
112+
new WorkflowServiceTChannel(ClientOptions.defaultInstance()),
113+
WorkflowClientOptions.newBuilder().setDomain(DOMAIN).build());
109114
// Get worker to poll the task list.
110115
WorkerFactory factory = WorkerFactory.newInstance(workflowClient);
111116
Worker worker = factory.newWorker(TASK_LIST);

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,11 @@
1717

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

20+
import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
21+
2022
import com.uber.cadence.WorkflowExecution;
2123
import com.uber.cadence.client.WorkflowClient;
24+
import com.uber.cadence.client.WorkflowClientOptions;
2225
import com.uber.cadence.serviceclient.ClientOptions;
2326
import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
2427
import com.uber.cadence.worker.Worker;
@@ -92,7 +95,9 @@ public static void main(String[] args) {
9295
// NOTE: to set a different options, you can do like this:
9396
// ClientOptions.newBuilder().setRpcTimeout(5 * 1000).build();
9497
WorkflowClient workflowClient =
95-
WorkflowClient.newInstance(new WorkflowServiceTChannel(ClientOptions.defaultInstance()));
98+
WorkflowClient.newInstance(
99+
new WorkflowServiceTChannel(ClientOptions.defaultInstance()),
100+
WorkflowClientOptions.newBuilder().setDomain(DOMAIN).build());
96101
// Get worker to poll the task list.
97102
WorkerFactory factory = WorkerFactory.newInstance(workflowClient);
98103
Worker worker = factory.newWorker(TASK_LIST);

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import com.uber.cadence.activity.Activity;
2626
import com.uber.cadence.activity.ActivityOptions;
2727
import com.uber.cadence.client.WorkflowClient;
28+
import com.uber.cadence.client.WorkflowClientOptions;
2829
import com.uber.cadence.common.CronSchedule;
2930
import com.uber.cadence.serviceclient.ClientOptions;
3031
import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
@@ -89,7 +90,9 @@ public static void main(String[] args) throws InterruptedException {
8990
// Get a new client
9091
// NOTE: to set a different options, you can do like this:
9192
// ClientOptions.newBuilder().setRpcTimeout(5 * 1000).build();
92-
WorkflowClient workflowClient = WorkflowClient.newInstance(cadenceService);
93+
WorkflowClient workflowClient =
94+
WorkflowClient.newInstance(
95+
cadenceService, WorkflowClientOptions.newBuilder().setDomain(DOMAIN).build());
9396
// Get worker to poll the task list.
9497
WorkerFactory factory = WorkerFactory.newInstance(workflowClient);
9598
Worker worker = factory.newWorker(TASK_LIST);

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

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

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

20+
import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
21+
2022
import com.google.common.base.Throwables;
2123
import com.uber.cadence.activity.ActivityOptions;
2224
import com.uber.cadence.client.WorkflowClient;
25+
import com.uber.cadence.client.WorkflowClientOptions;
2326
import com.uber.cadence.client.WorkflowException;
2427
import com.uber.cadence.client.WorkflowOptions;
2528
import com.uber.cadence.serviceclient.ClientOptions;
@@ -164,7 +167,9 @@ public static void main(String[] args) {
164167
// NOTE: to set a different options, you can do like this:
165168
// ClientOptions.newBuilder().setRpcTimeout(5 * 1000).build();
166169
WorkflowClient workflowClient =
167-
WorkflowClient.newInstance(new WorkflowServiceTChannel(ClientOptions.defaultInstance()));
170+
WorkflowClient.newInstance(
171+
new WorkflowServiceTChannel(ClientOptions.defaultInstance()),
172+
WorkflowClientOptions.newBuilder().setDomain(DOMAIN).build());
168173
// Get worker to poll the task list.
169174
WorkerFactory factory = WorkerFactory.newInstance(workflowClient);
170175
Worker worker = factory.newWorker(TASK_LIST);

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,11 @@
1717

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

20+
import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
21+
2022
import com.uber.cadence.activity.ActivityMethod;
2123
import com.uber.cadence.client.WorkflowClient;
24+
import com.uber.cadence.client.WorkflowClientOptions;
2225
import com.uber.cadence.serviceclient.ClientOptions;
2326
import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
2427
import com.uber.cadence.worker.Worker;
@@ -77,7 +80,9 @@ public static void main(String[] args) {
7780
// NOTE: to set a different options, you can do like this:
7881
// ClientOptions.newBuilder().setRpcTimeout(5 * 1000).build();
7982
WorkflowClient workflowClient =
80-
WorkflowClient.newInstance(new WorkflowServiceTChannel(ClientOptions.defaultInstance()));
83+
WorkflowClient.newInstance(
84+
new WorkflowServiceTChannel(ClientOptions.defaultInstance()),
85+
WorkflowClientOptions.newBuilder().setDomain(DOMAIN).build());
8186
// Get worker to poll the task list.
8287
WorkerFactory factory = WorkerFactory.newInstance(workflowClient);
8388
Worker worker = factory.newWorker(TASK_LIST);

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,11 @@
1717

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

20+
import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
21+
2022
import com.uber.cadence.activity.ActivityMethod;
2123
import com.uber.cadence.client.WorkflowClient;
24+
import com.uber.cadence.client.WorkflowClientOptions;
2225
import com.uber.cadence.serviceclient.ClientOptions;
2326
import com.uber.cadence.serviceclient.IWorkflowService;
2427
import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
@@ -97,7 +100,9 @@ public static void main(String[] args) throws IOException {
97100
ClientOptions.newBuilder().setMetricsScope(createMetricScope()).build();
98101
// final ClientOptions clientOptions = ClientOptions.newBuilder().build();
99102
IWorkflowService service = new WorkflowServiceTChannel(clientOptions);
100-
final WorkflowClient workflowClient = WorkflowClient.newInstance(service);
103+
final WorkflowClient workflowClient =
104+
WorkflowClient.newInstance(
105+
service, WorkflowClientOptions.newBuilder().setDomain(DOMAIN).build());
101106
// Start a worker that hosts both workflow and activity implementations.
102107
WorkerFactory factory = WorkerFactory.newInstance(workflowClient);
103108
Worker worker = factory.newWorker(TASK_LIST, WorkerOptions.defaultInstance());

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,16 @@
1717

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

20+
import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
21+
2022
import com.google.common.base.Throwables;
2123
import com.uber.cadence.WorkflowExecution;
2224
import com.uber.cadence.WorkflowIdReusePolicy;
2325
import com.uber.cadence.activity.Activity;
2426
import com.uber.cadence.activity.ActivityOptions;
2527
import com.uber.cadence.client.DuplicateWorkflowException;
2628
import com.uber.cadence.client.WorkflowClient;
29+
import com.uber.cadence.client.WorkflowClientOptions;
2730
import com.uber.cadence.client.WorkflowException;
2831
import com.uber.cadence.client.WorkflowStub;
2932
import com.uber.cadence.serviceclient.ClientOptions;
@@ -122,7 +125,9 @@ public static void main(String[] args) throws InterruptedException {
122125
// NOTE: to set a different options, you can do like this:
123126
// ClientOptions.newBuilder().setRpcTimeout(5 * 1000).build();
124127
WorkflowClient workflowClient =
125-
WorkflowClient.newInstance(new WorkflowServiceTChannel(ClientOptions.defaultInstance()));
128+
WorkflowClient.newInstance(
129+
new WorkflowServiceTChannel(ClientOptions.defaultInstance()),
130+
WorkflowClientOptions.newBuilder().setDomain(DOMAIN).build());
126131
// Get worker to poll the task list.
127132
WorkerFactory factory = WorkerFactory.newInstance(workflowClient);
128133
Worker worker = factory.newWorker(TASK_LIST);

0 commit comments

Comments
 (0)