Skip to content

Commit fba3e9c

Browse files
mindaugasbarcauskasmindaugasbarcauskas
authored
Merge pull request #65 from uber/CDNC-735_grpc_samples
Updating samples to use grpc service.
2 parents cdd43b6 + 270c3f7 commit fba3e9c

22 files changed

+76
-69
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/hello/HelloActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +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.serviceclient.ClientOptions;
26-
import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
25+
import com.uber.cadence.internal.compatibility.Thrift2ProtoAdapter;
26+
import com.uber.cadence.internal.compatibility.proto.serviceclient.IGrpcServiceStubs;
2727
import com.uber.cadence.worker.Worker;
2828
import com.uber.cadence.worker.WorkerFactory;
2929
import com.uber.cadence.workflow.Workflow;
@@ -81,7 +81,7 @@ public static void main(String[] args) {
8181
// ClientOptions.newBuilder().setRpcTimeout(5 * 1000).build();
8282
WorkflowClient workflowClient =
8383
WorkflowClient.newInstance(
84-
new WorkflowServiceTChannel(ClientOptions.defaultInstance()),
84+
new Thrift2ProtoAdapter(IGrpcServiceStubs.newInstance()),
8585
WorkflowClientOptions.newBuilder().setDomain(DOMAIN).build());
8686
// Get worker to poll the task list.
8787
WorkerFactory factory = WorkerFactory.newInstance(workflowClient);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +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.serviceclient.ClientOptions;
28-
import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
27+
import com.uber.cadence.internal.compatibility.Thrift2ProtoAdapter;
28+
import com.uber.cadence.internal.compatibility.proto.serviceclient.IGrpcServiceStubs;
2929
import com.uber.cadence.worker.Worker;
3030
import com.uber.cadence.worker.WorkerFactory;
3131
import com.uber.cadence.workflow.Functions;
@@ -108,7 +108,7 @@ public static void main(String[] args) {
108108
// ClientOptions.newBuilder().setRpcTimeout(5 * 1000).build();
109109
WorkflowClient workflowClient =
110110
WorkflowClient.newInstance(
111-
new WorkflowServiceTChannel(ClientOptions.defaultInstance()),
111+
new Thrift2ProtoAdapter(IGrpcServiceStubs.newInstance()),
112112
WorkflowClientOptions.newBuilder().setDomain(DOMAIN).build());
113113
// Get worker to poll the task list.
114114
WorkerFactory factory = WorkerFactory.newInstance(workflowClient);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +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.serviceclient.ClientOptions;
26-
import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
25+
import com.uber.cadence.internal.compatibility.Thrift2ProtoAdapter;
26+
import com.uber.cadence.internal.compatibility.proto.serviceclient.IGrpcServiceStubs;
2727
import com.uber.cadence.worker.Worker;
2828
import com.uber.cadence.worker.WorkerFactory;
2929
import com.uber.cadence.workflow.Async;
@@ -89,7 +89,7 @@ public static void main(String[] args) {
8989
// ClientOptions.newBuilder().setRpcTimeout(5 * 1000).build();
9090
WorkflowClient workflowClient =
9191
WorkflowClient.newInstance(
92-
new WorkflowServiceTChannel(ClientOptions.defaultInstance()),
92+
new Thrift2ProtoAdapter(IGrpcServiceStubs.newInstance()),
9393
WorkflowClientOptions.newBuilder().setDomain(DOMAIN).build());
9494
// Get worker to poll the task list.
9595
WorkerFactory factory = WorkerFactory.newInstance(workflowClient);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +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.serviceclient.ClientOptions;
28-
import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
27+
import com.uber.cadence.internal.compatibility.Thrift2ProtoAdapter;
28+
import com.uber.cadence.internal.compatibility.proto.serviceclient.IGrpcServiceStubs;
2929
import com.uber.cadence.worker.Worker;
3030
import com.uber.cadence.worker.WorkerFactory;
3131
import com.uber.cadence.workflow.Workflow;
@@ -110,7 +110,7 @@ public static void main(String[] args) throws ExecutionException, InterruptedExc
110110
// ClientOptions.newBuilder().setRpcTimeout(5 * 1000).build();
111111
WorkflowClient workflowClient =
112112
WorkflowClient.newInstance(
113-
new WorkflowServiceTChannel(ClientOptions.defaultInstance()),
113+
new Thrift2ProtoAdapter(IGrpcServiceStubs.newInstance()),
114114
WorkflowClientOptions.newBuilder().setDomain(DOMAIN).build());
115115
// Get worker to poll the task list.
116116
WorkerFactory factory = WorkerFactory.newInstance(workflowClient);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +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.serviceclient.ClientOptions;
27-
import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
26+
import com.uber.cadence.internal.compatibility.Thrift2ProtoAdapter;
27+
import com.uber.cadence.internal.compatibility.proto.serviceclient.IGrpcServiceStubs;
2828
import com.uber.cadence.worker.Worker;
2929
import com.uber.cadence.worker.WorkerFactory;
3030
import com.uber.cadence.workflow.Async;
@@ -109,7 +109,7 @@ public static void main(String[] args) {
109109
// ClientOptions.newBuilder().setRpcTimeout(5 * 1000).build();
110110
WorkflowClient workflowClient =
111111
WorkflowClient.newInstance(
112-
new WorkflowServiceTChannel(ClientOptions.defaultInstance()),
112+
new Thrift2ProtoAdapter(IGrpcServiceStubs.newInstance()),
113113
WorkflowClientOptions.newBuilder().setDomain(DOMAIN).build());
114114
// Get worker to poll the task list.
115115
WorkerFactory factory = WorkerFactory.newInstance(workflowClient);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +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.serviceclient.ClientOptions;
28-
import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
27+
import com.uber.cadence.internal.compatibility.Thrift2ProtoAdapter;
28+
import com.uber.cadence.internal.compatibility.proto.serviceclient.IGrpcServiceStubs;
2929
import com.uber.cadence.worker.Worker;
3030
import com.uber.cadence.worker.WorkerFactory;
3131
import com.uber.cadence.workflow.CancellationScope;
@@ -120,7 +120,7 @@ public static void main(String[] args) {
120120
// ClientOptions.newBuilder().setRpcTimeout(5 * 1000).build();
121121
WorkflowClient workflowClient =
122122
WorkflowClient.newInstance(
123-
new WorkflowServiceTChannel(ClientOptions.defaultInstance()),
123+
new Thrift2ProtoAdapter(IGrpcServiceStubs.newInstance()),
124124
WorkflowClientOptions.newBuilder().setDomain(DOMAIN).build());
125125
// Get worker to poll the task list.
126126
WorkerFactory factory = WorkerFactory.newInstance(workflowClient);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +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.serviceclient.ClientOptions;
26-
import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
25+
import com.uber.cadence.internal.compatibility.Thrift2ProtoAdapter;
26+
import com.uber.cadence.internal.compatibility.proto.serviceclient.IGrpcServiceStubs;
2727
import com.uber.cadence.worker.Worker;
2828
import com.uber.cadence.worker.WorkerFactory;
2929
import com.uber.cadence.workflow.Async;
@@ -96,7 +96,7 @@ public static void main(String[] args) {
9696
// ClientOptions.newBuilder().setRpcTimeout(5 * 1000).build();
9797
WorkflowClient workflowClient =
9898
WorkflowClient.newInstance(
99-
new WorkflowServiceTChannel(ClientOptions.defaultInstance()),
99+
new Thrift2ProtoAdapter(IGrpcServiceStubs.newInstance()),
100100
WorkflowClientOptions.newBuilder().setDomain(DOMAIN).build());
101101
// Get worker to poll the task list.
102102
WorkerFactory factory = WorkerFactory.newInstance(workflowClient);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +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.serviceclient.ClientOptions;
30-
import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
29+
import com.uber.cadence.internal.compatibility.Thrift2ProtoAdapter;
30+
import com.uber.cadence.internal.compatibility.proto.serviceclient.IGrpcServiceStubs;
3131
import com.uber.cadence.worker.Worker;
3232
import com.uber.cadence.worker.WorkerFactory;
3333
import com.uber.cadence.workflow.QueryMethod;
@@ -86,7 +86,7 @@ public static void main(String[] args) throws InterruptedException {
8686
// ClientOptions.newBuilder().setRpcTimeout(5 * 1000).build();
8787
WorkflowClient workflowClient =
8888
WorkflowClient.newInstance(
89-
new WorkflowServiceTChannel(ClientOptions.defaultInstance()),
89+
new Thrift2ProtoAdapter(IGrpcServiceStubs.newInstance()),
9090
WorkflowClientOptions.newBuilder().setDomain(DOMAIN).build());
9191
// Get worker to poll the task list.
9292
WorkerFactory factory = WorkerFactory.newInstance(workflowClient);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
import com.uber.cadence.client.WorkflowClient;
2828
import com.uber.cadence.client.WorkflowClientOptions;
2929
import com.uber.cadence.common.CronSchedule;
30-
import com.uber.cadence.serviceclient.ClientOptions;
31-
import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
30+
import com.uber.cadence.internal.compatibility.Thrift2ProtoAdapter;
31+
import com.uber.cadence.internal.compatibility.proto.serviceclient.IGrpcServiceStubs;
3232
import com.uber.cadence.worker.Worker;
3333
import com.uber.cadence.worker.WorkerFactory;
3434
import com.uber.cadence.workflow.Workflow;
@@ -85,8 +85,8 @@ public void greet(String greeting) {
8585
}
8686

8787
public static void main(String[] args) throws InterruptedException {
88-
final WorkflowServiceTChannel cadenceService =
89-
new WorkflowServiceTChannel(ClientOptions.defaultInstance());
88+
final Thrift2ProtoAdapter cadenceService =
89+
new Thrift2ProtoAdapter(IGrpcServiceStubs.newInstance());
9090
// Get a new client
9191
// NOTE: to set a different options, you can do like this:
9292
// ClientOptions.newBuilder().setRpcTimeout(5 * 1000).build();

0 commit comments

Comments
 (0)