Skip to content

Commit 7353f76

Browse files
authored
refactor gRPC time filters (#735)
1 parent c8cb440 commit 7353f76

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

src/main/java/com/uber/cadence/internal/compatibility/proto/RequestMapper.java

+8-7
Original file line numberDiff line numberDiff line change
@@ -786,9 +786,7 @@ public static ListClosedWorkflowExecutionsRequest listClosedWorkflowExecutionsRe
786786
ListClosedWorkflowExecutionsRequest.Builder request =
787787
ListClosedWorkflowExecutionsRequest.newBuilder()
788788
.setDomain(t.getDomain())
789-
.setPageSize(t.getMaximumPageSize())
790-
.setStartTimeFilter(startTimeFilter(t.StartTimeFilter));
791-
789+
.setPageSize(t.getMaximumPageSize());
792790
if (t.getExecutionFilter() != null) {
793791
request.setExecutionFilter(workflowExecutionFilter(t.getExecutionFilter()));
794792
}
@@ -801,6 +799,9 @@ public static ListClosedWorkflowExecutionsRequest listClosedWorkflowExecutionsRe
801799
if (t.getNextPageToken() != null) {
802800
request.setNextPageToken(arrayToByteString(t.getNextPageToken()));
803801
}
802+
if (t.getStartTimeFilter() != null) {
803+
request.setStartTimeFilter(startTimeFilter(t.getStartTimeFilter()));
804+
}
804805
return request.build();
805806
}
806807

@@ -812,9 +813,7 @@ public static ListOpenWorkflowExecutionsRequest listOpenWorkflowExecutionsReques
812813
ListOpenWorkflowExecutionsRequest.Builder request =
813814
ListOpenWorkflowExecutionsRequest.newBuilder()
814815
.setDomain(t.getDomain())
815-
.setPageSize(t.getMaximumPageSize())
816-
.setStartTimeFilter(startTimeFilter(t.StartTimeFilter));
817-
816+
.setPageSize(t.getMaximumPageSize());
818817
if (t.getExecutionFilter() != null) {
819818
request.setExecutionFilter(workflowExecutionFilter(t.getExecutionFilter()));
820819
}
@@ -824,7 +823,9 @@ public static ListOpenWorkflowExecutionsRequest listOpenWorkflowExecutionsReques
824823
if (t.getNextPageToken() != null) {
825824
request.setNextPageToken(arrayToByteString(t.getNextPageToken()));
826825
}
827-
826+
if (t.getStartTimeFilter() != null) {
827+
request.setStartTimeFilter(startTimeFilter(t.getStartTimeFilter()));
828+
}
828829
return request.build();
829830
}
830831
}

src/main/java/com/uber/cadence/internal/compatibility/proto/TypeMapper.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ static WorkerVersionInfo workerVersionInfo(com.uber.cadence.WorkerVersionInfo t)
231231

232232
static StartTimeFilter startTimeFilter(com.uber.cadence.StartTimeFilter t) {
233233
if (t == null) {
234-
return StartTimeFilter.newBuilder().build();
234+
return null;
235235
}
236236
return StartTimeFilter.newBuilder()
237237
.setEarliestTime(unixNanoToTime(t.getEarliestTime()))
@@ -259,7 +259,7 @@ static WorkflowTypeFilter workflowTypeFilter(com.uber.cadence.WorkflowTypeFilter
259259

260260
static StatusFilter statusFilter(com.uber.cadence.WorkflowExecutionCloseStatus t) {
261261
if (t == null) {
262-
return StatusFilter.newBuilder().build();
262+
return null;
263263
}
264264
return StatusFilter.newBuilder().setStatus(workflowExecutionCloseStatus(t)).build();
265265
}

0 commit comments

Comments
 (0)