IWorkflowService and WorkflowClient.start (#12)

mfateev · web-flow · commit 18fa35302ac2 · 2018-03-16T09:57:45.000-07:00
diff --git a/src/main/java/com/uber/cadence/samples/common/QueryWorkflowExecution.java b/src/main/java/com/uber/cadence/samples/common/QueryWorkflowExecution.java
@@ -16,14 +16,14 @@
  */
 package com.uber.cadence.samples.common;
 
+import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
+
 import com.uber.cadence.WorkflowExecution;
-import com.uber.cadence.WorkflowService;
 import com.uber.cadence.client.UntypedWorkflowStub;
 import com.uber.cadence.client.WorkflowClient;
+import com.uber.cadence.serviceclient.IWorkflowService;
 import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
 
-import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
-
 /**
  * Simple example utility to query workflow execution using Cadence query API.
  * Cadence redirects query to any currently running workflow worker for the workflow type
@@ -39,7 +39,7 @@ public static void main(String[] args) throws Exception {
                     " <queryType> <workflowId> [<runId>]");
             System.exit(1);
         }
-        WorkflowService.Iface cadenceService = new WorkflowServiceTChannel();
+        IWorkflowService cadenceService = new WorkflowServiceTChannel();
 
         String queryType = args[0];
 
diff --git a/src/main/java/com/uber/cadence/samples/common/QueryWorkflowExecutionLocalReplay.java b/src/main/java/com/uber/cadence/samples/common/QueryWorkflowExecutionLocalReplay.java
@@ -16,13 +16,13 @@
  */
 package com.uber.cadence.samples.common;
 
+import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
+
 import com.uber.cadence.WorkflowExecution;
-import com.uber.cadence.WorkflowService;
+import com.uber.cadence.serviceclient.IWorkflowService;
 import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
 import com.uber.cadence.worker.Worker;
 
-import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
-
 /**
  * Query workflow execution by getting history from Cadence and executing it on a local worker.
  * Use this approach to debug workflow execution in a local environment.
@@ -37,7 +37,7 @@ public static void main(String[] args) throws Exception {
                     + "<workflow implementation class> <workflowId> <runId> <queryType>");
             System.exit(1);
         }
-        WorkflowService.Iface cadenceService = new WorkflowServiceTChannel();
+        IWorkflowService cadenceService = new WorkflowServiceTChannel();
 
         WorkflowExecution workflowExecution = new WorkflowExecution();
         String workflowId = args[1];
diff --git a/src/main/java/com/uber/cadence/samples/common/RegisterDomain.java b/src/main/java/com/uber/cadence/samples/common/RegisterDomain.java
@@ -16,17 +16,14 @@
  */
 package com.uber.cadence.samples.common;
 
+import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
+
 import com.uber.cadence.DomainAlreadyExistsError;
-import com.uber.cadence.DomainConfiguration;
 import com.uber.cadence.RegisterDomainRequest;
-import com.uber.cadence.UpdateDomainRequest;
-import com.uber.cadence.WorkflowService;
+import com.uber.cadence.serviceclient.IWorkflowService;
 import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
-import org.apache.thrift.TException;
-
 import java.io.IOException;
-
-import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
+import org.apache.thrift.TException;
 
 /**
  * Simple example utility to pretty print workflow execution history.
@@ -36,7 +33,7 @@
 public class RegisterDomain {
 
     public static void main(String[] args) throws TException, IOException {
-        WorkflowService.Iface cadenceService = new WorkflowServiceTChannel();
+        IWorkflowService cadenceService = new WorkflowServiceTChannel();
         RegisterDomainRequest request = new RegisterDomainRequest();
         request.setDescription("Java Samples");
         request.setEmitMetric(false);
diff --git a/src/main/java/com/uber/cadence/samples/common/WorkflowExecutionHistoryPrinter.java b/src/main/java/com/uber/cadence/samples/common/WorkflowExecutionHistoryPrinter.java
@@ -16,13 +16,13 @@
  */
 package com.uber.cadence.samples.common;
 
+import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
+
 import com.uber.cadence.WorkflowExecution;
-import com.uber.cadence.WorkflowService;
 import com.uber.cadence.internal.common.WorkflowExecutionUtils;
+import com.uber.cadence.serviceclient.IWorkflowService;
 import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
 
-import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
-
 /**
  * Simple example utility to pretty print workflow execution history.
  *
@@ -35,7 +35,7 @@ public static void main(String[] args) throws Exception {
             System.err.println("Usage: java " + WorkflowExecutionHistoryPrinter.class.getName() + " <workflowId> <runId>");
             System.exit(1);
         }
-        WorkflowService.Iface cadenceService = new WorkflowServiceTChannel();
+        IWorkflowService cadenceService = new WorkflowServiceTChannel();
         WorkflowExecution workflowExecution = new WorkflowExecution();
         String workflowId = args[0];
         workflowExecution.setWorkflowId(workflowId);
diff --git a/src/main/java/com/uber/cadence/samples/fileprocessing/FileProcessingStarter.java b/src/main/java/com/uber/cadence/samples/fileprocessing/FileProcessingStarter.java
@@ -16,12 +16,11 @@
  */
 package com.uber.cadence.samples.fileprocessing;
 
-import com.uber.cadence.client.WorkflowClient;
+import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
 
+import com.uber.cadence.client.WorkflowClient;
 import java.net.URL;
 
-import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
-
 /**
  * This is used for launching a Workflow instance of file processing sample.
  */
@@ -43,7 +42,7 @@ public static void main(String[] args) throws Exception {
         System.out.println("FileProcessingWorkflow completed");
 
         // Use this code instead of the above blocking call to start workflow asynchronously.
-//        WorkflowExecution workflowExecution = WorkflowClient.asyncStart(workflow::processFile, source, destination);
+//        WorkflowExecution workflowExecution = WorkflowClient.start(workflow::processFile, source, destination);
 //        System.out.println("Started periodic workflow with workflowId=\"" + workflowExecution.getWorkflowId()
 //                + "\" and runId=\"" + workflowExecution.getRunId() + "\"");
 //
diff --git a/src/main/java/com/uber/cadence/samples/fileprocessing/FileProcessingWorker.java b/src/main/java/com/uber/cadence/samples/fileprocessing/FileProcessingWorker.java
@@ -16,12 +16,11 @@
  */
 package com.uber.cadence.samples.fileprocessing;
 
-import com.uber.cadence.worker.Worker;
+import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
 
+import com.uber.cadence.worker.Worker;
 import java.lang.management.ManagementFactory;
 
-import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
-
 /**
  * This is the process which hosts all workflows and activities in this sample.
  * Run multiple instances of the worker in different windows. Then start workflow
diff --git a/src/main/java/com/uber/cadence/samples/fileprocessing/FileProcessingWorkflow.java b/src/main/java/com/uber/cadence/samples/fileprocessing/FileProcessingWorkflow.java
@@ -17,7 +17,6 @@
 package com.uber.cadence.samples.fileprocessing;
 
 import com.uber.cadence.workflow.WorkflowMethod;
-
 import java.net.URL;
 
 /**
diff --git a/src/main/java/com/uber/cadence/samples/fileprocessing/FileProcessingWorkflowImpl.java b/src/main/java/com/uber/cadence/samples/fileprocessing/FileProcessingWorkflowImpl.java
@@ -18,7 +18,6 @@
 
 import com.uber.cadence.activity.ActivityOptions;
 import com.uber.cadence.workflow.Workflow;
-
 import java.net.URL;
 import java.time.Duration;
 
diff --git a/src/main/java/com/uber/cadence/samples/fileprocessing/StoreActivitiesImpl.java b/src/main/java/com/uber/cadence/samples/fileprocessing/StoreActivitiesImpl.java
@@ -20,16 +20,9 @@
 import com.google.common.io.Resources;
 import com.uber.cadence.activity.Activity;
 import com.uber.cadence.workflow.Workflow;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.net.URL;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
 
 /**
  * Sample activities implementation.
diff --git a/src/main/java/com/uber/cadence/samples/hello/HelloActivity.java b/src/main/java/com/uber/cadence/samples/hello/HelloActivity.java
@@ -16,14 +16,14 @@
  */
 package com.uber.cadence.samples.hello;
 
+import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
+
 import com.uber.cadence.activity.ActivityMethod;
 import com.uber.cadence.client.WorkflowClient;
 import com.uber.cadence.worker.Worker;
 import com.uber.cadence.workflow.Workflow;
 import com.uber.cadence.workflow.WorkflowMethod;
 
-import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
-
 /**
  * Hello World Cadence workflow that executes a single activity.
  * Requires a local instance of Cadence server running.
diff --git a/src/main/java/com/uber/cadence/samples/hello/HelloActivityRetry.java b/src/main/java/com/uber/cadence/samples/hello/HelloActivityRetry.java
@@ -16,6 +16,8 @@
  */
 package com.uber.cadence.samples.hello;
 
+import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
+
 import com.uber.cadence.activity.ActivityOptions;
 import com.uber.cadence.client.WorkflowClient;
 import com.uber.cadence.client.WorkflowOptions;
@@ -24,11 +26,8 @@
 import com.uber.cadence.workflow.Functions;
 import com.uber.cadence.workflow.Workflow;
 import com.uber.cadence.workflow.WorkflowMethod;
-
 import java.time.Duration;
 
-import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
-
 /**
  * Demonstrates activity retries using exponential backoff algorithm.
  * Requires a local instance of Cadence server running.
diff --git a/src/main/java/com/uber/cadence/samples/hello/HelloAsync.java b/src/main/java/com/uber/cadence/samples/hello/HelloAsync.java
@@ -16,18 +16,17 @@
  */
 package com.uber.cadence.samples.hello;
 
+import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
+
 import com.uber.cadence.activity.ActivityMethod;
 import com.uber.cadence.client.WorkflowClient;
 import com.uber.cadence.worker.Worker;
 import com.uber.cadence.workflow.Async;
-import com.uber.cadence.workflow.Functions;
 import com.uber.cadence.workflow.Functions.Func;
 import com.uber.cadence.workflow.Promise;
 import com.uber.cadence.workflow.Workflow;
 import com.uber.cadence.workflow.WorkflowMethod;
 
-import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
-
 /**
  * Demonstrates asynchronous activity invocation.
  * Requires a local instance of Cadence server running.
diff --git a/src/main/java/com/uber/cadence/samples/hello/HelloAsyncActivityCompletion.java b/src/main/java/com/uber/cadence/samples/hello/HelloAsyncActivityCompletion.java
@@ -16,18 +16,17 @@
  */
 package com.uber.cadence.samples.hello;
 
+import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
+
 import com.uber.cadence.activity.Activity;
 import com.uber.cadence.activity.ActivityMethod;
 import com.uber.cadence.client.ActivityCompletionClient;
 import com.uber.cadence.client.WorkflowClient;
 import com.uber.cadence.worker.Worker;
 import com.uber.cadence.workflow.Workflow;
 import com.uber.cadence.workflow.WorkflowMethod;
-
 import java.util.concurrent.ForkJoinPool;
 
-import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
-
 /**
  * Demonstrates an asynchronous activity implementation.
  * Requires a local instance of Cadence server running.
@@ -82,7 +81,8 @@ private static class GreetingActivitiesImpl implements GreetingActivities {
         public String composeGreeting(String greeting, String name) {
             // TaskToken is a correlation token used to match activity task with completion
             byte[] taskToken = Activity.getTaskToken();
-            // In real life this request can be executed anywhere. By external service for example.
+            // In real life this request can be executed anywhere. By a separate service for
+            // example.
             ForkJoinPool.commonPool().execute(() -> composeGreetingAsync(taskToken, greeting, name));
             Activity.doNotCompleteOnReturn();
             // When doNotCompleteOnReturn() is invoked the return value is ignored.
diff --git a/src/main/java/com/uber/cadence/samples/hello/HelloAsyncLambda.java b/src/main/java/com/uber/cadence/samples/hello/HelloAsyncLambda.java
@@ -16,6 +16,8 @@
  */
 package com.uber.cadence.samples.hello;
 
+import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
+
 import com.uber.cadence.activity.ActivityOptions;
 import com.uber.cadence.client.WorkflowClient;
 import com.uber.cadence.client.WorkflowOptions;
@@ -24,11 +26,8 @@
 import com.uber.cadence.workflow.Promise;
 import com.uber.cadence.workflow.Workflow;
 import com.uber.cadence.workflow.WorkflowMethod;
-
 import java.time.Duration;
 
-import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
-
 /**
  * Demonstrates async invocation of an entire sequence of activities.
  * Requires a local instance of Cadence server running.
diff --git a/src/main/java/com/uber/cadence/samples/hello/HelloChild.java b/src/main/java/com/uber/cadence/samples/hello/HelloChild.java
@@ -16,15 +16,15 @@
  */
 package com.uber.cadence.samples.hello;
 
+import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
+
 import com.uber.cadence.client.WorkflowClient;
 import com.uber.cadence.worker.Worker;
 import com.uber.cadence.workflow.Async;
 import com.uber.cadence.workflow.Promise;
 import com.uber.cadence.workflow.Workflow;
 import com.uber.cadence.workflow.WorkflowMethod;
 
-import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
-
 /**
  * Demonstrates child workflow.
  * Requires a local instance of Cadence server running.
diff --git a/src/main/java/com/uber/cadence/samples/hello/HelloException.java b/src/main/java/com/uber/cadence/samples/hello/HelloException.java
@@ -16,6 +16,8 @@
  */
 package com.uber.cadence.samples.hello;
 
+import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
+
 import com.google.common.base.Throwables;
 import com.uber.cadence.activity.ActivityOptions;
 import com.uber.cadence.client.WorkflowClient;
@@ -24,12 +26,9 @@
 import com.uber.cadence.worker.Worker;
 import com.uber.cadence.workflow.Workflow;
 import com.uber.cadence.workflow.WorkflowMethod;
-
 import java.io.IOException;
 import java.time.Duration;
 
-import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
-
 /**
  * Demonstrates exception propagation across activity, child workflow and workflow client boundaries.
  * Shows how to deal with checked exceptions.
diff --git a/src/main/java/com/uber/cadence/samples/hello/HelloPeriodic.java b/src/main/java/com/uber/cadence/samples/hello/HelloPeriodic.java
@@ -16,6 +16,8 @@
  */
 package com.uber.cadence.samples.hello;
 
+import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
+
 import com.google.common.base.Throwables;
 import com.uber.cadence.WorkflowExecution;
 import com.uber.cadence.WorkflowIdReusePolicy;
@@ -25,15 +27,11 @@
 import com.uber.cadence.client.UntypedWorkflowStub;
 import com.uber.cadence.client.WorkflowClient;
 import com.uber.cadence.client.WorkflowException;
-import com.uber.cadence.client.WorkflowOptions;
 import com.uber.cadence.worker.Worker;
 import com.uber.cadence.workflow.Workflow;
 import com.uber.cadence.workflow.WorkflowMethod;
-
 import java.time.Duration;
 
-import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
-
 /**
  * Demonstrates a "cron" workflow that executes activity periodically.
  * Requires a local instance of Cadence server running.
@@ -139,7 +137,7 @@ public static void main(String[] args) throws InterruptedException {
             // New stub instance should be created for each new workflow start.
             GreetingWorkflow workflow = workflowClient.newWorkflowStub(GreetingWorkflow.class);
             try {
-                execution = WorkflowClient.asyncStart(workflow::greetPeriodically,
+                execution = WorkflowClient.start(workflow::greetPeriodically,
                         "World", Duration.ofSeconds(1));
                 System.out.println("Started " + execution);
             } catch (DuplicateWorkflowException e) {
diff --git a/src/main/java/com/uber/cadence/samples/hello/HelloQuery.java b/src/main/java/com/uber/cadence/samples/hello/HelloQuery.java
@@ -16,17 +16,16 @@
  */
 package com.uber.cadence.samples.hello;
 
+import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
+
 import com.uber.cadence.client.WorkflowClient;
 import com.uber.cadence.client.WorkflowOptions;
 import com.uber.cadence.worker.Worker;
 import com.uber.cadence.workflow.QueryMethod;
 import com.uber.cadence.workflow.Workflow;
 import com.uber.cadence.workflow.WorkflowMethod;
-
 import java.time.Duration;
 
-import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
-
 /**
  * Demonstrates query capability.
  * Requires a local instance of Cadence server running.
@@ -85,8 +84,8 @@ public static void main(String[] args) throws InterruptedException {
         GreetingWorkflow workflow = workflowClient.newWorkflowStub(GreetingWorkflow.class,
                 workflowOptions);
         // Start workflow asynchronously to not use another thread to query.
-        WorkflowClient.asyncStart(workflow::createGreeting, "World");
-        // After asyncStart for getGreeting returns the workflow is guaranteed to be started.
+        WorkflowClient.start(workflow::createGreeting, "World");
+        // After start for getGreeting returns the workflow is guaranteed to be started.
         // So we can send signal to it using workflow stub.
 
         System.out.println(workflow.queryGreeting()); // Should print Hello...
diff --git a/src/main/java/com/uber/cadence/samples/hello/HelloSignal.java b/src/main/java/com/uber/cadence/samples/hello/HelloSignal.java
