Skip to content

Commit b8581c1

Browse files
mindaugasbarcauskasmindaugasbarcauskas
committed
Updating samples to use grpc service.
1 parent cdd43b6 commit b8581c1

23 files changed

+71
-30
lines changed

‎build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ repositories {
3636
dependencies {
3737
errorproneJavac("com.google.errorprone:javac:9+181-r4173-1")
3838
errorprone("com.google.errorprone:error_prone_core:2.4.0")
39-
compile group: 'com.uber.cadence', name: 'cadence-client', version: '3.5.0'
39+
compile group: 'com.uber.cadence', name: 'cadence-client', version: '3.7.2'
4040
compile group: 'commons-configuration', name: 'commons-configuration', version: '1.9'
4141
compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
4242
compile group: 'com.uber.m3', name: 'tally-core', version: '0.10.0'

‎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 = "samples-domain";
21+
public static final String DOMAIN = "mindaugas-test-domain";
2222
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,14 @@
2222
import com.uber.cadence.activity.ActivityMethod;
2323
import com.uber.cadence.client.WorkflowClient;
2424
import com.uber.cadence.client.WorkflowClientOptions;
25+
import com.uber.cadence.internal.compatibility.Thrift2ProtoAdapter;
26+
import com.uber.cadence.internal.compatibility.proto.serviceclient.IGrpcServiceStubs;
2527
import com.uber.cadence.serviceclient.ClientOptions;
26-
import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
2728
import com.uber.cadence.worker.Worker;
2829
import com.uber.cadence.worker.WorkerFactory;
2930
import com.uber.cadence.workflow.Workflow;
3031
import com.uber.cadence.workflow.WorkflowMethod;
32+
import io.grpc.ManagedChannelBuilder;
3133

3234
/**
3335
* Hello World Cadence workflow that executes a single activity. Requires a local instance the
@@ -81,7 +83,7 @@ public static void main(String[] args) {
8183
// ClientOptions.newBuilder().setRpcTimeout(5 * 1000).build();
8284
WorkflowClient workflowClient =
8385
WorkflowClient.newInstance(
84-
new WorkflowServiceTChannel(ClientOptions.defaultInstance()),
86+
new Thrift2ProtoAdapter(IGrpcServiceStubs.newInstance()),
8587
WorkflowClientOptions.newBuilder().setDomain(DOMAIN).build());
8688
// Get worker to poll the task list.
8789
WorkerFactory factory = WorkerFactory.newInstance(workflowClient);

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
import com.uber.cadence.client.WorkflowClientOptions;
2525
import com.uber.cadence.client.WorkflowOptions;
2626
import com.uber.cadence.common.RetryOptions;
27+
import com.uber.cadence.internal.compatibility.Thrift2ProtoAdapter;
28+
import com.uber.cadence.internal.compatibility.proto.serviceclient.IGrpcServiceStubs;
2729
import com.uber.cadence.serviceclient.ClientOptions;
2830
import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
2931
import com.uber.cadence.worker.Worker;
@@ -108,7 +110,7 @@ public static void main(String[] args) {
108110
// ClientOptions.newBuilder().setRpcTimeout(5 * 1000).build();
109111
WorkflowClient workflowClient =
110112
WorkflowClient.newInstance(
111-
new WorkflowServiceTChannel(ClientOptions.defaultInstance()),
113+
new Thrift2ProtoAdapter(IGrpcServiceStubs.newInstance()),
112114
WorkflowClientOptions.newBuilder().setDomain(DOMAIN).build());
113115
// Get worker to poll the task list.
114116
WorkerFactory factory = WorkerFactory.newInstance(workflowClient);

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
import com.uber.cadence.activity.ActivityMethod;
2323
import com.uber.cadence.client.WorkflowClient;
2424
import com.uber.cadence.client.WorkflowClientOptions;
25+
import com.uber.cadence.internal.compatibility.Thrift2ProtoAdapter;
26+
import com.uber.cadence.internal.compatibility.proto.serviceclient.IGrpcServiceStubs;
2527
import com.uber.cadence.serviceclient.ClientOptions;
2628
import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
2729
import com.uber.cadence.worker.Worker;
@@ -89,7 +91,7 @@ public static void main(String[] args) {
8991
// ClientOptions.newBuilder().setRpcTimeout(5 * 1000).build();
9092
WorkflowClient workflowClient =
9193
WorkflowClient.newInstance(
92-
new WorkflowServiceTChannel(ClientOptions.defaultInstance()),
94+
new Thrift2ProtoAdapter(IGrpcServiceStubs.newInstance()),
9395
WorkflowClientOptions.newBuilder().setDomain(DOMAIN).build());
9496
// Get worker to poll the task list.
9597
WorkerFactory factory = WorkerFactory.newInstance(workflowClient);

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
import com.uber.cadence.client.ActivityCompletionClient;
2525
import com.uber.cadence.client.WorkflowClient;
2626
import com.uber.cadence.client.WorkflowClientOptions;
27+
import com.uber.cadence.internal.compatibility.Thrift2ProtoAdapter;
28+
import com.uber.cadence.internal.compatibility.proto.serviceclient.IGrpcServiceStubs;
2729
import com.uber.cadence.serviceclient.ClientOptions;
2830
import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
2931
import com.uber.cadence.worker.Worker;
@@ -110,7 +112,7 @@ public static void main(String[] args) throws ExecutionException, InterruptedExc
110112
// ClientOptions.newBuilder().setRpcTimeout(5 * 1000).build();
111113
WorkflowClient workflowClient =
112114
WorkflowClient.newInstance(
113-
new WorkflowServiceTChannel(ClientOptions.defaultInstance()),
115+
new Thrift2ProtoAdapter(IGrpcServiceStubs.newInstance()),
114116
WorkflowClientOptions.newBuilder().setDomain(DOMAIN).build());
115117
// Get worker to poll the task list.
116118
WorkerFactory factory = WorkerFactory.newInstance(workflowClient);

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
import com.uber.cadence.client.WorkflowClient;
2424
import com.uber.cadence.client.WorkflowClientOptions;
2525
import com.uber.cadence.client.WorkflowOptions;
26+
import com.uber.cadence.internal.compatibility.Thrift2ProtoAdapter;
27+
import com.uber.cadence.internal.compatibility.proto.serviceclient.IGrpcServiceStubs;
2628
import com.uber.cadence.serviceclient.ClientOptions;
2729
import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
2830
import com.uber.cadence.worker.Worker;
@@ -109,7 +111,7 @@ public static void main(String[] args) {
109111
// ClientOptions.newBuilder().setRpcTimeout(5 * 1000).build();
110112
WorkflowClient workflowClient =
111113
WorkflowClient.newInstance(
112-
new WorkflowServiceTChannel(ClientOptions.defaultInstance()),
114+
new Thrift2ProtoAdapter(IGrpcServiceStubs.newInstance()),
113115
WorkflowClientOptions.newBuilder().setDomain(DOMAIN).build());
114116
// Get worker to poll the task list.
115117
WorkerFactory factory = WorkerFactory.newInstance(workflowClient);

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
import com.uber.cadence.client.WorkflowClientOptions;
2525
import com.uber.cadence.client.WorkflowOptions;
2626
import com.uber.cadence.client.WorkflowStub;
27+
import com.uber.cadence.internal.compatibility.Thrift2ProtoAdapter;
28+
import com.uber.cadence.internal.compatibility.proto.serviceclient.IGrpcServiceStubs;
2729
import com.uber.cadence.serviceclient.ClientOptions;
2830
import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
2931
import com.uber.cadence.worker.Worker;
@@ -120,7 +122,7 @@ public static void main(String[] args) {
120122
// ClientOptions.newBuilder().setRpcTimeout(5 * 1000).build();
121123
WorkflowClient workflowClient =
122124
WorkflowClient.newInstance(
123-
new WorkflowServiceTChannel(ClientOptions.defaultInstance()),
125+
new Thrift2ProtoAdapter(IGrpcServiceStubs.newInstance()),
124126
WorkflowClientOptions.newBuilder().setDomain(DOMAIN).build());
125127
// Get worker to poll the task list.
126128
WorkerFactory factory = WorkerFactory.newInstance(workflowClient);

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
import com.uber.cadence.WorkflowExecution;
2323
import com.uber.cadence.client.WorkflowClient;
2424
import com.uber.cadence.client.WorkflowClientOptions;
25+
import com.uber.cadence.internal.compatibility.Thrift2ProtoAdapter;
26+
import com.uber.cadence.internal.compatibility.proto.serviceclient.IGrpcServiceStubs;
2527
import com.uber.cadence.serviceclient.ClientOptions;
2628
import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
2729
import com.uber.cadence.worker.Worker;
@@ -96,7 +98,7 @@ public static void main(String[] args) {
9698
// ClientOptions.newBuilder().setRpcTimeout(5 * 1000).build();
9799
WorkflowClient workflowClient =
98100
WorkflowClient.newInstance(
99-
new WorkflowServiceTChannel(ClientOptions.defaultInstance()),
101+
new Thrift2ProtoAdapter(IGrpcServiceStubs.newInstance()),
100102
WorkflowClientOptions.newBuilder().setDomain(DOMAIN).build());
101103
// Get worker to poll the task list.
102104
WorkerFactory factory = WorkerFactory.newInstance(workflowClient);

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
import com.uber.cadence.client.WorkflowClientOptions;
2727
import com.uber.cadence.client.WorkflowOptions;
2828
import com.uber.cadence.client.WorkflowStub;
29+
import com.uber.cadence.internal.compatibility.Thrift2ProtoAdapter;
30+
import com.uber.cadence.internal.compatibility.proto.serviceclient.IGrpcServiceStubs;
2931
import com.uber.cadence.serviceclient.ClientOptions;
3032
import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
3133
import com.uber.cadence.worker.Worker;
@@ -86,7 +88,7 @@ public static void main(String[] args) throws InterruptedException {
8688
// ClientOptions.newBuilder().setRpcTimeout(5 * 1000).build();
8789
WorkflowClient workflowClient =
8890
WorkflowClient.newInstance(
89-
new WorkflowServiceTChannel(ClientOptions.defaultInstance()),
91+
new Thrift2ProtoAdapter(IGrpcServiceStubs.newInstance()),
9092
WorkflowClientOptions.newBuilder().setDomain(DOMAIN).build());
9193
// Get worker to poll the task list.
9294
WorkerFactory factory = WorkerFactory.newInstance(workflowClient);

0 commit comments

Comments
 (0)