Skip to content

Commit fa8456a

Browse files
authored
remove unnecessary TaskListKind internal entity (#1023)
What changed? Remove internal TaskListKind entity use thrift entity directly (like everywhere else in the repo) Why? This complicates things and particularly for thrift deprecation How did you test it? Unit Test Signed-off-by: Shijie Sheng <[email protected]>
1 parent 468dee0 commit fa8456a

File tree

7 files changed

+8
-69
lines changed

7 files changed

+8
-69
lines changed

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

Lines changed: 0 additions & 33 deletions
This file was deleted.

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import com.uber.cadence.PollForDecisionTaskResponse;
2626
import com.uber.cadence.ServiceBusyError;
2727
import com.uber.cadence.TaskList;
28+
import com.uber.cadence.TaskListKind;
2829
import com.uber.cadence.common.BinaryChecksum;
2930
import com.uber.cadence.internal.metrics.MetricsTag;
3031
import com.uber.cadence.internal.metrics.MetricsType;
@@ -73,7 +74,7 @@ public PollForDecisionTaskResponse poll() throws TException {
7374
pollRequest.setIdentity(identity);
7475
pollRequest.setBinaryChecksum(BinaryChecksum.getBinaryChecksum());
7576

76-
TaskList tl = new TaskList().setName(taskList).setKind(taskListKind.toThrift());
77+
TaskList tl = new TaskList().setName(taskList).setKind(taskListKind);
7778
pollRequest.setTaskList(tl);
7879

7980
if (log.isDebugEnabled()) {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package com.uber.cadence.internal.worker;
1919

2020
import com.uber.cadence.PollForDecisionTaskResponse;
21+
import com.uber.cadence.TaskListKind;
2122
import com.uber.cadence.serviceclient.IWorkflowService;
2223
import com.uber.m3.tally.Scope;
2324
import java.util.Objects;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import com.uber.cadence.RespondDecisionTaskFailedRequest;
3030
import com.uber.cadence.RespondQueryTaskCompletedRequest;
3131
import com.uber.cadence.ScheduleActivityTaskDecisionAttributes;
32+
import com.uber.cadence.TaskListKind;
3233
import com.uber.cadence.WorkflowExecution;
3334
import com.uber.cadence.WorkflowExecutionStartedEventAttributes;
3435
import com.uber.cadence.WorkflowQuery;
@@ -107,7 +108,7 @@ public void start() {
107108
service,
108109
domain,
109110
taskList,
110-
TaskListKind.TASK_LIST_KIND_NORMAL,
111+
TaskListKind.NORMAL,
111112
options.getMetricsScope(),
112113
options.getIdentity()),
113114
pollTaskExecutor,

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.google.common.base.Preconditions;
2323
import com.google.common.base.Strings;
2424
import com.uber.cadence.PollForDecisionTaskResponse;
25+
import com.uber.cadence.TaskListKind;
2526
import com.uber.cadence.client.WorkflowClient;
2627
import com.uber.cadence.converter.DataConverter;
2728
import com.uber.cadence.converter.JsonDataConverter;
@@ -134,7 +135,7 @@ public WorkerFactory(WorkflowClient workflowClient, WorkerFactoryOptions factory
134135
workflowClient.getService(),
135136
workflowClient.getOptions().getDomain(),
136137
getStickyTaskListName(),
137-
TaskListKind.TASK_LIST_KIND_STICKY,
138+
TaskListKind.STICKY,
138139
stickyScope,
139140
workflowClient.getOptions().getIdentity())
140141
.get(),

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

Lines changed: 0 additions & 32 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public void setup() {
8080
mockService,
8181
"test-domain",
8282
"test-taskList",
83-
TaskListKind.TASK_LIST_KIND_NORMAL,
83+
TaskListKind.NORMAL,
8484
mockMetricScope,
8585
"test-identity");
8686
}

0 commit comments

Comments
 (0)