diff --git a/src/main/java/com/uber/cadence/internal/worker/TaskListKind.java b/src/main/java/com/uber/cadence/internal/worker/TaskListKind.java deleted file mode 100644 index 7a157d148..000000000 --- a/src/main/java/com/uber/cadence/internal/worker/TaskListKind.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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); - } -} diff --git a/src/main/java/com/uber/cadence/internal/worker/WorkflowPollTask.java b/src/main/java/com/uber/cadence/internal/worker/WorkflowPollTask.java index 1d379237b..0b98bd6ba 100644 --- a/src/main/java/com/uber/cadence/internal/worker/WorkflowPollTask.java +++ b/src/main/java/com/uber/cadence/internal/worker/WorkflowPollTask.java @@ -25,6 +25,7 @@ import com.uber.cadence.PollForDecisionTaskResponse; import com.uber.cadence.ServiceBusyError; import com.uber.cadence.TaskList; +import com.uber.cadence.TaskListKind; import com.uber.cadence.common.BinaryChecksum; import com.uber.cadence.internal.metrics.MetricsTag; import com.uber.cadence.internal.metrics.MetricsType; @@ -73,7 +74,7 @@ public PollForDecisionTaskResponse poll() throws TException { pollRequest.setIdentity(identity); pollRequest.setBinaryChecksum(BinaryChecksum.getBinaryChecksum()); - TaskList tl = new TaskList().setName(taskList).setKind(taskListKind.toThrift()); + TaskList tl = new TaskList().setName(taskList).setKind(taskListKind); pollRequest.setTaskList(tl); if (log.isDebugEnabled()) { diff --git a/src/main/java/com/uber/cadence/internal/worker/WorkflowPollTaskFactory.java b/src/main/java/com/uber/cadence/internal/worker/WorkflowPollTaskFactory.java index 663cfe02b..19380e7d0 100644 --- a/src/main/java/com/uber/cadence/internal/worker/WorkflowPollTaskFactory.java +++ b/src/main/java/com/uber/cadence/internal/worker/WorkflowPollTaskFactory.java @@ -18,6 +18,7 @@ package com.uber.cadence.internal.worker; import com.uber.cadence.PollForDecisionTaskResponse; +import com.uber.cadence.TaskListKind; import com.uber.cadence.serviceclient.IWorkflowService; import com.uber.m3.tally.Scope; import java.util.Objects; diff --git a/src/main/java/com/uber/cadence/internal/worker/WorkflowWorker.java b/src/main/java/com/uber/cadence/internal/worker/WorkflowWorker.java index e77a9491a..e6ae5a4db 100644 --- a/src/main/java/com/uber/cadence/internal/worker/WorkflowWorker.java +++ b/src/main/java/com/uber/cadence/internal/worker/WorkflowWorker.java @@ -29,6 +29,7 @@ import com.uber.cadence.RespondDecisionTaskFailedRequest; import com.uber.cadence.RespondQueryTaskCompletedRequest; import com.uber.cadence.ScheduleActivityTaskDecisionAttributes; +import com.uber.cadence.TaskListKind; import com.uber.cadence.WorkflowExecution; import com.uber.cadence.WorkflowExecutionStartedEventAttributes; import com.uber.cadence.WorkflowQuery; @@ -107,7 +108,7 @@ public void start() { service, domain, taskList, - TaskListKind.TASK_LIST_KIND_NORMAL, + TaskListKind.NORMAL, options.getMetricsScope(), options.getIdentity()), pollTaskExecutor, diff --git a/src/main/java/com/uber/cadence/worker/WorkerFactory.java b/src/main/java/com/uber/cadence/worker/WorkerFactory.java index fc19dcb34..19e716082 100644 --- a/src/main/java/com/uber/cadence/worker/WorkerFactory.java +++ b/src/main/java/com/uber/cadence/worker/WorkerFactory.java @@ -22,6 +22,7 @@ import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.uber.cadence.PollForDecisionTaskResponse; +import com.uber.cadence.TaskListKind; import com.uber.cadence.client.WorkflowClient; import com.uber.cadence.converter.DataConverter; import com.uber.cadence.converter.JsonDataConverter; @@ -134,7 +135,7 @@ public WorkerFactory(WorkflowClient workflowClient, WorkerFactoryOptions factory workflowClient.getService(), workflowClient.getOptions().getDomain(), getStickyTaskListName(), - TaskListKind.TASK_LIST_KIND_STICKY, + TaskListKind.STICKY, stickyScope, workflowClient.getOptions().getIdentity()) .get(), diff --git a/src/test/java/com/uber/cadence/internal/worker/TaskListKindTest.java b/src/test/java/com/uber/cadence/internal/worker/TaskListKindTest.java deleted file mode 100644 index 4bade807a..000000000 --- a/src/test/java/com/uber/cadence/internal/worker/TaskListKindTest.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 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); - } -} diff --git a/src/test/java/com/uber/cadence/internal/worker/WorkflowPollTaskTest.java b/src/test/java/com/uber/cadence/internal/worker/WorkflowPollTaskTest.java index 9b36f551e..a96716d65 100644 --- a/src/test/java/com/uber/cadence/internal/worker/WorkflowPollTaskTest.java +++ b/src/test/java/com/uber/cadence/internal/worker/WorkflowPollTaskTest.java @@ -80,7 +80,7 @@ public void setup() { mockService, "test-domain", "test-taskList", - TaskListKind.TASK_LIST_KIND_NORMAL, + TaskListKind.NORMAL, mockMetricScope, "test-identity"); }