Populate tasklistkind in poll request (#859)

Author: shijiesheng

src/main/java/com/uber/cadence/internal/worker/TaskListKind.java

@@ -0,0 +1,33 @@
+/*
+ *  Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ *  Modifications copyright (C) 2017 Uber Technologies, Inc.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"). You may not
+ *  use this file except in compliance with the License. A copy of the License is
+ *  located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ *  or in the "license" file accompanying this file. This file is distributed on
+ *  an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ *  express or implied. See the License for the specific language governing
+ *  permissions and limitations under the License.
+ */
+
+package com.uber.cadence.internal.worker;
+
+public enum TaskListKind {
+  TASK_LIST_KIND_NORMAL(0),
+  TASK_LIST_KIND_STICKY(1);
+
+  private final int value;
+
+  TaskListKind(int value) {
+    this.value = value;
+  }
+
+  public com.uber.cadence.TaskListKind toThrift() {
+    return com.uber.cadence.TaskListKind.findByValue(this.value);
+  }
+}

src/main/java/com/uber/cadence/internal/worker/WorkflowPollTask.java

@@ -45,18 +45,21 @@ final class WorkflowPollTask implements Poller.PollTask<PollForDecisionTaskRespo
   private final IWorkflowService service;
   private final String domain;
   private final String taskList;
+  private final TaskListKind taskListKind;
   private final String identity;
 
   WorkflowPollTask(
       IWorkflowService service,
       String domain,
       String taskList,
+      TaskListKind taskListKind,
       Scope metricScope,
       String identity) {
     this.identity = Objects.requireNonNull(identity);
     this.service = Objects.requireNonNull(service);
     this.domain = Objects.requireNonNull(domain);
     this.taskList = Objects.requireNonNull(taskList);
+    this.taskListKind = Objects.requireNonNull(taskListKind);
     this.metricScope = Objects.requireNonNull(metricScope);
   }
 
@@ -70,8 +73,7 @@ public PollForDecisionTaskResponse poll() throws TException {
     pollRequest.setIdentity(identity);
     pollRequest.setBinaryChecksum(BinaryChecksum.getBinaryChecksum());
 
-    TaskList tl = new TaskList();
-    tl.setName(taskList);
+    TaskList tl = new TaskList().setName(taskList).setKind(taskListKind.toThrift());
     pollRequest.setTaskList(tl);
 
     if (log.isDebugEnabled()) {

src/main/java/com/uber/cadence/internal/worker/WorkflowPollTaskFactory.java

@@ -29,24 +29,27 @@ public class WorkflowPollTaskFactory
   private final IWorkflowService service;
   private final String domain;
   private final String taskList;
+  private final TaskListKind taskListKind;
   private final Scope metricScope;
   private final String identity;
 
   public WorkflowPollTaskFactory(
       IWorkflowService service,
       String domain,
       String taskList,
+      TaskListKind taskListKind,
       Scope metricScope,
       String identity) {
     this.service = Objects.requireNonNull(service, "service should not be null");
     this.domain = Objects.requireNonNull(domain, "domain should not be null");
     this.taskList = Objects.requireNonNull(taskList, "taskList should not be null");
+    this.taskListKind = Objects.requireNonNull(taskListKind, "taskList should not be null");
     this.metricScope = Objects.requireNonNull(metricScope, "metricScope should not be null");
     this.identity = Objects.requireNonNull(identity, "identity should not be null");
   }
 
   @Override
   public Poller.PollTask<PollForDecisionTaskResponse> get() {
-    return new WorkflowPollTask(service, domain, taskList, metricScope, identity);
+    return new WorkflowPollTask(service, domain, taskList, taskListKind, metricScope, identity);
   }
 }

src/main/java/com/uber/cadence/internal/worker/WorkflowWorker.java

@@ -104,7 +104,12 @@ public void start() {
           new Poller<>(
               options.getIdentity(),
               new WorkflowPollTask(
-                  service, domain, taskList, options.getMetricsScope(), options.getIdentity()),
+                  service,
+                  domain,
+                  taskList,
+                  TaskListKind.TASK_LIST_KIND_NORMAL,
+                  options.getMetricsScope(),
+                  options.getIdentity()),
               pollTaskExecutor,
               options.getPollerOptions(),
               options.getMetricsScope());

src/main/java/com/uber/cadence/worker/WorkerFactory.java

@@ -27,11 +27,7 @@
 import com.uber.cadence.internal.common.InternalUtils;
 import com.uber.cadence.internal.metrics.MetricsTag;
 import com.uber.cadence.internal.replay.DeciderCache;
-import com.uber.cadence.internal.worker.PollDecisionTaskDispatcher;
-import com.uber.cadence.internal.worker.Poller;
-import com.uber.cadence.internal.worker.PollerOptions;
-import com.uber.cadence.internal.worker.WorkerShutDownHandler;
-import com.uber.cadence.internal.worker.WorkflowPollTaskFactory;
+import com.uber.cadence.internal.worker.*;
 import com.uber.m3.tally.Scope;
 import com.uber.m3.util.ImmutableMap;
 import java.net.InetAddress;
@@ -131,6 +127,7 @@ public WorkerFactory(WorkflowClient workflowClient, WorkerFactoryOptions factory
                     workflowClient.getService(),
                     workflowClient.getOptions().getDomain(),
                     getStickyTaskListName(),
+                    TaskListKind.TASK_LIST_KIND_STICKY,
                     stickyScope,
                     workflowClient.getOptions().getIdentity())
                 .get(),

src/test/java/com/uber/cadence/internal/worker/TaskListKindTest.java

@@ -0,0 +1,32 @@
+/*
+ *  Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ *  Modifications copyright (C) 2017 Uber Technologies, Inc.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"). You may not
+ *  use this file except in compliance with the License. A copy of the License is
+ *  located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ *  or in the "license" file accompanying this file. This file is distributed on
+ *  an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ *  express or implied. See the License for the specific language governing
+ *  permissions and limitations under the License.
+ */
+
+package com.uber.cadence.internal.worker;
+
+import static junit.framework.TestCase.*;
+
+import org.junit.Test;
+
+public class TaskListKindTest {
+  @Test
+  public void toThrift() {
+    assertEquals(
+        TaskListKind.TASK_LIST_KIND_NORMAL.toThrift(), com.uber.cadence.TaskListKind.NORMAL);
+    assertEquals(
+        TaskListKind.TASK_LIST_KIND_STICKY.toThrift(), com.uber.cadence.TaskListKind.STICKY);
+  }
+}