Update package (#2)

halakaraki · web-flow · commit fcabedeface8 · 2018-08-22T16:07:32.000-07:00
update java client package
diff --git a/build.gradle b/build.gradle
@@ -33,7 +33,7 @@ repositories {
 }
 
 dependencies {
-    compile group: 'com.uber.cadence', name: 'cadence-client', version: '0.1.0'
+    compile group: 'com.uber.cadence', name: 'cadence-client', version: '2.0.0'
     compile group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.11.274'
     compile group: 'commons-configuration', name: 'commons-configuration', version: '1.9'
     compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
diff --git a/src/main/java/com/uber/cadence/samples/common/QueryWorkflowExecutionLocalReplay.java b/src/main/java/com/uber/cadence/samples/common/QueryWorkflowExecutionLocalReplay.java
@@ -53,7 +53,8 @@ public static void main(String[] args) throws Exception {
     @SuppressWarnings("unchecked")
     Class<Object> workflowImplementationType =
         (Class<Object>) Class.forName(implementationTypeName);
-    Worker replayer = new Worker(cadenceService, DOMAIN, null, null);
+    Worker.Factory factory = new Worker.Factory(cadenceService, DOMAIN);
+    Worker replayer = factory.newWorker("ignored");
     replayer.registerWorkflowImplementationTypes(workflowImplementationType);
     System.out.println("Beginning query replay for " + workflowExecution);
     String queryResult =
diff --git a/src/main/java/com/uber/cadence/samples/fileprocessing/FileProcessingWorker.java b/src/main/java/com/uber/cadence/samples/fileprocessing/FileProcessingWorker.java
@@ -37,18 +37,20 @@ public static void main(String[] args) {
 
     String hostSpecifiTaskList = ManagementFactory.getRuntimeMXBean().getName();
 
-    // Start worker to poll the common task list.
-    final Worker workerForCommonTaskList = new Worker(DOMAIN, TASK_LIST);
+    // Get worker to poll the common task list.
+    Worker.Factory factory = new Worker.Factory(DOMAIN);
+    final Worker workerForCommonTaskList = factory.newWorker(TASK_LIST);
     workerForCommonTaskList.registerWorkflowImplementationTypes(FileProcessingWorkflowImpl.class);
     StoreActivitiesImpl storeActivityImpl = new StoreActivitiesImpl(hostSpecifiTaskList);
     workerForCommonTaskList.registerActivitiesImplementations(storeActivityImpl);
-    workerForCommonTaskList.start();
-    System.out.println("Worker started for task list: " + TASK_LIST);
 
-    // Start worker to poll the host-specific task list.
-    final Worker workerForHostSpecificTaskList = new Worker(DOMAIN, hostSpecifiTaskList);
+    // Get worker to poll the host-specific task list.
+    final Worker workerForHostSpecificTaskList =factory.newWorker(hostSpecifiTaskList);
     workerForHostSpecificTaskList.registerActivitiesImplementations(storeActivityImpl);
-    workerForHostSpecificTaskList.start();
+
+    // Start all workers created by this factory.
+    factory.start();
+    System.out.println("Worker started for task list: " + TASK_LIST);
     System.out.println("Worker Started for activity task List: " + hostSpecifiTaskList);
   }
 }
diff --git a/src/main/java/com/uber/cadence/samples/hello/HelloActivity.java b/src/main/java/com/uber/cadence/samples/hello/HelloActivity.java
@@ -73,13 +73,14 @@ public String composeGreeting(String greeting, String name) {
 
   public static void main(String[] args) {
     // Start a worker that hosts both workflow and activity implementations.
-    Worker worker = new Worker(DOMAIN, TASK_LIST);
+    Worker.Factory factory = new Worker.Factory(DOMAIN);
+    Worker worker = factory.newWorker(TASK_LIST);
     // Workflows are stateful. So you need a type to create instances.
     worker.registerWorkflowImplementationTypes(GreetingWorkflowImpl.class);
     // Activities are stateless and thread safe. So a shared instance is used.
     worker.registerActivitiesImplementations(new GreetingActivitiesImpl());
     // Start listening to the workflow and activity task lists.
-    worker.start();
+    factory.start();
 
     // Start a workflow execution. Usually this is done from another program.
     WorkflowClient workflowClient = WorkflowClient.newInstance(DOMAIN);
diff --git a/src/main/java/com/uber/cadence/samples/hello/HelloActivityRetry.java b/src/main/java/com/uber/cadence/samples/hello/HelloActivityRetry.java
@@ -100,13 +100,14 @@ public synchronized String composeGreeting(String greeting, String name) {
 
   public static void main(String[] args) {
     // Start a worker that hosts both workflow and activity implementations.
-    Worker worker = new Worker(DOMAIN, TASK_LIST);
+    Worker.Factory factory = new Worker.Factory(DOMAIN);
+    Worker worker = factory.newWorker(TASK_LIST);
     // Workflows are stateful. So you need a type to create instances.
     worker.registerWorkflowImplementationTypes(GreetingWorkflowImpl.class);
     // Activities are stateless and thread safe. So a shared instance is used.
     worker.registerActivitiesImplementations(new GreetingActivitiesImpl());
     // Start listening to the workflow and activity task lists.
-    worker.start();
+    factory.start();
 
     // Start a workflow execution. Usually this is done from another program.
     WorkflowClient workflowClient = WorkflowClient.newInstance(DOMAIN);
diff --git a/src/main/java/com/uber/cadence/samples/hello/HelloAsync.java b/src/main/java/com/uber/cadence/samples/hello/HelloAsync.java
@@ -80,13 +80,14 @@ public String composeGreeting(String greeting, String name) {
 
   public static void main(String[] args) {
     // Start a worker that hosts both workflow and activity implementations.
-    Worker worker = new Worker(DOMAIN, TASK_LIST);
+    Worker.Factory factory = new Worker.Factory(DOMAIN);
+    Worker worker = factory.newWorker(TASK_LIST);
     // Workflows are stateful. So you need a type to create instances.
     worker.registerWorkflowImplementationTypes(GreetingWorkflowImpl.class);
     // Activities are stateless and thread safe. So a shared instance is used.
     worker.registerActivitiesImplementations(new GreetingActivitiesImpl());
     // Start listening to the workflow and activity task lists.
-    worker.start();
+    factory.start();
 
     // Start a workflow execution. Usually this is done from another program.
     WorkflowClient workflowClient = WorkflowClient.newInstance(DOMAIN);
diff --git a/src/main/java/com/uber/cadence/samples/hello/HelloAsyncActivityCompletion.java b/src/main/java/com/uber/cadence/samples/hello/HelloAsyncActivityCompletion.java
@@ -105,15 +105,16 @@ public static void main(String[] args) throws ExecutionException, InterruptedExc
     WorkflowClient workflowClient = WorkflowClient.newInstance(DOMAIN);
 
     // Start a worker that hosts both workflow and activity implementations.
-    Worker worker = new Worker(DOMAIN, TASK_LIST);
+    Worker.Factory factory = new Worker.Factory(DOMAIN);
+    Worker worker = factory.newWorker(TASK_LIST);
     // Workflows are stateful. So you need a type to create instances.
     worker.registerWorkflowImplementationTypes(GreetingWorkflowImpl.class);
     // Activities are stateless and thread safe. So a shared instance is used.
     // CompletionClient is passed to activity here only to support unit testing.
     ActivityCompletionClient completionClient = workflowClient.newActivityCompletionClient();
     worker.registerActivitiesImplementations(new GreetingActivitiesImpl(completionClient));
     // Start listening to the workflow and activity task lists.
-    worker.start();
+    factory.start();
 
     // Get a workflow stub using the same task list the worker uses.
     GreetingWorkflow workflow = workflowClient.newWorkflowStub(GreetingWorkflow.class);
diff --git a/src/main/java/com/uber/cadence/samples/hello/HelloAsyncLambda.java b/src/main/java/com/uber/cadence/samples/hello/HelloAsyncLambda.java
@@ -101,13 +101,14 @@ public String composeGreeting(String greeting, String name) {
 
   public static void main(String[] args) {
     // Start a worker that hosts both workflow and activity implementations.
-    Worker worker = new Worker(DOMAIN, TASK_LIST);
+    Worker.Factory factory = new Worker.Factory(DOMAIN);
+    Worker worker = factory.newWorker(TASK_LIST);
     // Workflows are stateful. So you need a type to create instances.
     worker.registerWorkflowImplementationTypes(GreetingWorkflowImpl.class);
     // Activities are stateless and thread safe. So a shared instance is used.
     worker.registerActivitiesImplementations(new GreetingActivitiesImpl());
     // Start listening to the workflow and activity task lists.
-    worker.start();
+    factory.start();
 
     // Start a workflow execution. Usually this is done from another program.
     WorkflowClient workflowClient = WorkflowClient.newInstance(DOMAIN);
diff --git a/src/main/java/com/uber/cadence/samples/hello/HelloChild.java b/src/main/java/com/uber/cadence/samples/hello/HelloChild.java
@@ -72,10 +72,11 @@ public String composeGreeting(String greeting, String name) {
 
   public static void main(String[] args) {
     // Start a worker that hosts both parent and child workflow implementations.
-    Worker worker = new Worker(DOMAIN, TASK_LIST);
+    Worker.Factory factory = new Worker.Factory(DOMAIN);
+    Worker worker = factory.newWorker(TASK_LIST);
     worker.registerWorkflowImplementationTypes(GreetingWorkflowImpl.class, GreetingChildImpl.class);
     // Start listening to the workflow task list.
-    worker.start();
+    factory.start();
 
     // Start a workflow execution. Usually this is done from another program.
     WorkflowClient workflowClient = WorkflowClient.newInstance(DOMAIN);
diff --git a/src/main/java/com/uber/cadence/samples/hello/HelloException.java b/src/main/java/com/uber/cadence/samples/hello/HelloException.java
@@ -159,10 +159,11 @@ public String composeGreeting(String greeting, String name) {
   }
 
   public static void main(String[] args) {
-    Worker worker = new Worker(DOMAIN, TASK_LIST);
+    Worker.Factory factory = new Worker.Factory(DOMAIN);
+    Worker worker = factory.newWorker(TASK_LIST);
     worker.registerWorkflowImplementationTypes(GreetingWorkflowImpl.class, GreetingChildImpl.class);
     worker.registerActivitiesImplementations(new GreetingActivitiesImpl());
-    worker.start();
+    factory.start();
 
     WorkflowClient workflowClient = WorkflowClient.newInstance(DOMAIN);
     WorkflowOptions workflowOptions =
diff --git a/src/main/java/com/uber/cadence/samples/hello/HelloPeriodic.java b/src/main/java/com/uber/cadence/samples/hello/HelloPeriodic.java
@@ -115,13 +115,14 @@ public void greet(String greeting) {
 
   public static void main(String[] args) throws InterruptedException {
     // Start a worker that hosts both workflow and activity implementations.
-    Worker worker = new Worker(DOMAIN, TASK_LIST);
+    Worker.Factory factory = new Worker.Factory(DOMAIN);
+    Worker worker = factory.newWorker(TASK_LIST);
     // Workflows are stateful. So you need a type to create instances.
     worker.registerWorkflowImplementationTypes(GreetingWorkflowImpl.class);
     // Activities are stateless and thread safe. So a shared instance is used.
     worker.registerActivitiesImplementations(new GreetingActivitiesImpl());
     // Start listening to the workflow and activity task lists.
-    worker.start();
+    factory.start();
 
     // Start a workflow execution. Usually this is done from another program.
     WorkflowClient workflowClient = WorkflowClient.newInstance(DOMAIN);
diff --git a/src/main/java/com/uber/cadence/samples/hello/HelloQuery.java b/src/main/java/com/uber/cadence/samples/hello/HelloQuery.java
@@ -64,9 +64,10 @@ public String queryGreeting() {
 
   public static void main(String[] args) throws InterruptedException {
     // Start a worker that hosts the workflow implementation.
-    Worker worker = new Worker(DOMAIN, TASK_LIST);
+    Worker.Factory factory = new Worker.Factory(DOMAIN);
+    Worker worker = factory.newWorker(TASK_LIST);
     worker.registerWorkflowImplementationTypes(GreetingWorkflowImpl.class);
-    worker.start();
+    factory.start();
 
     // Start a workflow execution. Usually this is done from another program.
     WorkflowClient workflowClient = WorkflowClient.newInstance(DOMAIN);
diff --git a/src/main/java/com/uber/cadence/samples/hello/HelloSignal.java b/src/main/java/com/uber/cadence/samples/hello/HelloSignal.java
@@ -22,16 +22,12 @@
 import com.uber.cadence.client.WorkflowClient;
 import com.uber.cadence.client.WorkflowOptions;
 import com.uber.cadence.worker.Worker;
-import com.uber.cadence.workflow.CompletablePromise;
 import com.uber.cadence.workflow.SignalMethod;
 import com.uber.cadence.workflow.Workflow;
 import com.uber.cadence.workflow.WorkflowMethod;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.BlockingDeque;
-import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.CompletableFuture;
 
 /**
@@ -45,9 +41,10 @@ public class HelloSignal {
 
   /** Workflow interface must have a method annotated with @WorkflowMethod. */
   public interface GreetingWorkflow {
-    /** @return list of greeting strings that were received through the
-     * waitForNameMethod. This method will block until the number of greetings
-     * specified are received. */
+    /**
+     * @return list of greeting strings that were received through the waitForNameMethod. This
+     *     method will block until the number of greetings specified are received.
+     */
     @WorkflowMethod
     List<String> getGreetings();
 
@@ -72,7 +69,7 @@ public List<String> getGreetings() {
 
       while (true) {
         Workflow.await(() -> !messageQueue.isEmpty() || exit);
-        if(messageQueue.isEmpty() && exit){
+        if (messageQueue.isEmpty() && exit) {
           return receivedMessages;
         }
         String message = messageQueue.remove(0);
@@ -93,9 +90,10 @@ public void exit() {
 
   public static void main(String[] args) throws Exception {
     // Start a worker that hosts the workflow implementation.
-    Worker worker = new Worker(DOMAIN, TASK_LIST);
+    Worker.Factory factory = new Worker.Factory(DOMAIN);
+    Worker worker = factory.newWorker(TASK_LIST);
     worker.registerWorkflowImplementationTypes(GreetingWorkflowImpl.class);
-    worker.start();
+    factory.start();
 
     // Start a workflow execution. Usually this is done from another program.
     WorkflowClient workflowClient = WorkflowClient.newInstance(DOMAIN);
diff --git a/src/test/java/com/uber/cadence/samples/fileprocessing/FileProcessingTest.java b/src/test/java/com/uber/cadence/samples/fileprocessing/FileProcessingTest.java
@@ -106,17 +106,15 @@ public void testHappyPath() {
     when(activities.download(anyObject()))
         .thenReturn(new TaskListFileNamePair(HOST_NAME_1, FILE_NAME_UNPROCESSED));
     worker.registerActivitiesImplementations(activities);
-    worker.start();
 
     StoreActivities activitiesHost1 = mock(StoreActivities.class);
     when(activitiesHost1.process(FILE_NAME_UNPROCESSED)).thenReturn(FILE_NAME_PROCESSED);
     workerHost1.registerActivitiesImplementations(activitiesHost1);
-    workerHost1.start();
 
     StoreActivities activitiesHost2 = mock(StoreActivities.class);
     workerHost2.registerActivitiesImplementations(activitiesHost2);
-    workerHost2.start();
 
+    testEnv.start();
     FileProcessingWorkflow workflow = workflowClient.newWorkflowStub(FileProcessingWorkflow.class);
 
     // Execute workflow waiting for completion.
@@ -139,19 +137,18 @@ public void testHostFailover() {
         .thenReturn(new TaskListFileNamePair(HOST_NAME_2, FILE_NAME_UNPROCESSED));
 
     worker.registerActivitiesImplementations(activities);
-    worker.start();
 
     StoreActivities activitiesHost1 = mock(StoreActivities.class);
     when(activitiesHost1.process(FILE_NAME_UNPROCESSED))
         .thenThrow(new SimulatedTimeoutException(TimeoutType.SCHEDULE_TO_START));
     workerHost1.registerActivitiesImplementations(activitiesHost1);
-    workerHost1.start();
 
     StoreActivities activitiesHost2 = mock(StoreActivities.class);
     when(activitiesHost2.process(FILE_NAME_UNPROCESSED)).thenReturn(FILE_NAME_PROCESSED);
 
     workerHost2.registerActivitiesImplementations(activitiesHost2);
-    workerHost2.start();
+
+    testEnv.start();
 
     FileProcessingWorkflow workflow = workflowClient.newWorkflowStub(FileProcessingWorkflow.class);
 
diff --git a/src/test/java/com/uber/cadence/samples/hello/HelloActivityRetryTest.java b/src/test/java/com/uber/cadence/samples/hello/HelloActivityRetryTest.java
@@ -77,7 +77,7 @@ public void tearDown() {
   @Test
   public void testActivityImpl() {
     worker.registerActivitiesImplementations(new GreetingActivitiesImpl());
-    worker.start();
+    testEnv.start();
 
     WorkflowOptions workflowOptions =
         new WorkflowOptions.Builder()
@@ -102,7 +102,7 @@ public void testMockedActivity() {
             new IllegalStateException("not yet3"))
         .thenReturn("Hello World!");
     worker.registerActivitiesImplementations(activities);
-    worker.start();
+    testEnv.start();
 
     // Get a workflow stub using the same task list the worker uses.
     WorkflowOptions workflowOptions =
diff --git a/src/test/java/com/uber/cadence/samples/hello/HelloActivityTest.java b/src/test/java/com/uber/cadence/samples/hello/HelloActivityTest.java
@@ -56,7 +56,7 @@ public void tearDown() {
   @Test
   public void testActivityImpl() {
     worker.registerActivitiesImplementations(new GreetingActivitiesImpl());
-    worker.start();
+    testEnv.start();
 
     // Get a workflow stub using the same task list the worker uses.
     GreetingWorkflow workflow = workflowClient.newWorkflowStub(GreetingWorkflow.class);
@@ -70,7 +70,7 @@ public void testMockedActivity() {
     GreetingActivities activities = mock(GreetingActivities.class);
     when(activities.composeGreeting("Hello", "World")).thenReturn("Hello World!");
     worker.registerActivitiesImplementations(activities);
-    worker.start();
+    testEnv.start();
 
     // Get a workflow stub using the same task list the worker uses.
     GreetingWorkflow workflow = workflowClient.newWorkflowStub(GreetingWorkflow.class);
diff --git a/src/test/java/com/uber/cadence/samples/hello/HelloAsyncActivityCompletionTest.java b/src/test/java/com/uber/cadence/samples/hello/HelloAsyncActivityCompletionTest.java
@@ -76,7 +76,7 @@ public void tearDown() {
   public void testActivityImpl() throws ExecutionException, InterruptedException {
     ActivityCompletionClient completionClient = workflowClient.newActivityCompletionClient();
     worker.registerActivitiesImplementations(new GreetingActivitiesImpl(completionClient));
-    worker.start();
+    testEnv.start();
 
     GreetingWorkflow workflow = workflowClient.newWorkflowStub(GreetingWorkflow.class);
     // Execute a workflow asynchronously.
diff --git a/src/test/java/com/uber/cadence/samples/hello/HelloAsyncLambdaTest.java b/src/test/java/com/uber/cadence/samples/hello/HelloAsyncLambdaTest.java
@@ -80,7 +80,7 @@ public void tearDown() {
   @Test
   public void testActivityImpl() {
     worker.registerActivitiesImplementations(new GreetingActivitiesImpl());
-    worker.start();
+    testEnv.start();
 
     // Get a workflow stub using the same task list the worker uses.
     WorkflowOptions workflowOptions =
@@ -101,7 +101,7 @@ public void testMockedActivity() {
     when(activities.getGreeting()).thenReturn("Hello");
     when(activities.composeGreeting("Hello", "World")).thenReturn("Hello World!");
     worker.registerActivitiesImplementations(activities);
-    worker.start();
+    testEnv.start();
 
     WorkflowOptions workflowOptions =
         new WorkflowOptions.Builder()
diff --git a/src/test/java/com/uber/cadence/samples/hello/HelloAsyncTest.java b/src/test/java/com/uber/cadence/samples/hello/HelloAsyncTest.java
@@ -75,7 +75,7 @@ public void tearDown() {
   @Test
   public void testActivityImpl() {
     worker.registerActivitiesImplementations(new GreetingActivitiesImpl());
-    worker.start();
+    testEnv.start();
 
     GreetingWorkflow workflow = workflowClient.newWorkflowStub(GreetingWorkflow.class);
     // Execute a workflow waiting for it to complete.
@@ -89,7 +89,7 @@ public void testMockedActivity() {
     when(activities.composeGreeting("Hello", "World")).thenReturn("Hello World!");
     when(activities.composeGreeting("Bye", "World")).thenReturn("Bye World!");
     worker.registerActivitiesImplementations(activities);
-    worker.start();
+    testEnv.start();
 
     GreetingWorkflow workflow = workflowClient.newWorkflowStub(GreetingWorkflow.class);
     // Execute a workflow waiting for it to complete.
diff --git a/src/test/java/com/uber/cadence/samples/hello/HelloChildTest.java b/src/test/java/com/uber/cadence/samples/hello/HelloChildTest.java
@@ -75,7 +75,7 @@ public void tearDown() {
   public void testChild() {
     worker.registerWorkflowImplementationTypes(GreetingWorkflowImpl.class, GreetingChildImpl.class);
 
-    worker.start();
+    testEnv.start();
 
     // Get a workflow stub using the same task list the worker uses.
     GreetingWorkflow workflow = workflowClient.newWorkflowStub(GreetingWorkflow.class);
@@ -98,7 +98,7 @@ public void testMockedChild() {
           lastChildMock.set(child);
           return child;
         });
-    worker.start();
+    testEnv.start();
 
     // Get a workflow stub using the same task list the worker uses.
     GreetingWorkflow workflow = workflowClient.newWorkflowStub(GreetingWorkflow.class);
diff --git a/src/test/java/com/uber/cadence/samples/hello/HelloExceptionTest.java b/src/test/java/com/uber/cadence/samples/hello/HelloExceptionTest.java
diff --git a/src/test/java/com/uber/cadence/samples/hello/HelloPeriodicTest.java b/src/test/java/com/uber/cadence/samples/hello/HelloPeriodicTest.java
diff --git a/src/test/java/com/uber/cadence/samples/hello/HelloQueryTest.java b/src/test/java/com/uber/cadence/samples/hello/HelloQueryTest.java
diff --git a/src/test/java/com/uber/cadence/samples/hello/HelloSignalTest.java b/src/test/java/com/uber/cadence/samples/hello/HelloSignalTest.java

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ repositories {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`dependencies {`
`36`		`- compile group: 'com.uber.cadence', name: 'cadence-client', version: '0.1.0'`
	`36`	`+ compile group: 'com.uber.cadence', name: 'cadence-client', version: '2.0.0'`
`37`	`37`	`compile group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.11.274'`
`38`	`38`	`compile group: 'commons-configuration', name: 'commons-configuration', version: '1.9'`
`39`	`39`	`compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'`