Skip to content

Commit 0bcb2aa

Browse files
shijieshengshijiesheng
committed
also add nullable check for setdomain
Signed-off-by: Shijie Sheng <liouvetren@gmail.com>
1 parent e73d456 commit 0bcb2aa

File tree

2 files changed

+33
-33
lines changed

2 files changed

+33
-33
lines changed

‎src/main/java/com/uber/cadence/internal/compatibility/proto/mappers/DecisionMapper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ static Decision decision(com.uber.cadence.Decision d) {
202202
d.getStartChildWorkflowExecutionDecisionAttributes();
203203
StartChildWorkflowExecutionDecisionAttributes.Builder builder =
204204
StartChildWorkflowExecutionDecisionAttributes.newBuilder()
205-
.setDomain(attr.getDomain())
205+
.setDomain(attr.getDomain() != null ? attr.getDomain() : "")
206206
.setWorkflowId(attr.getWorkflowId())
207207
.setWorkflowType(workflowType(attr.getWorkflowType()))
208208
.setTaskList(taskList(attr.getTaskList()))
@@ -234,7 +234,7 @@ static Decision decision(com.uber.cadence.Decision d) {
234234
d.getSignalExternalWorkflowExecutionDecisionAttributes();
235235
SignalExternalWorkflowExecutionDecisionAttributes.Builder builder =
236236
SignalExternalWorkflowExecutionDecisionAttributes.newBuilder()
237-
.setDomain(attr.getDomain())
237+
.setDomain(attr.getDomain() != null ? attr.getDomain() : "")
238238
.setWorkflowExecution(workflowExecution(attr.getExecution()))
239239
.setSignalName(attr.getSignalName())
240240
.setInput(payload(attr.getInput()))

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

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public static CountWorkflowExecutionsRequest countWorkflowExecutionsRequest(
121121
return null;
122122
}
123123
CountWorkflowExecutionsRequest.Builder request =
124-
CountWorkflowExecutionsRequest.newBuilder().setDomain(t.getDomain());
124+
CountWorkflowExecutionsRequest.newBuilder().setDomain(t.getDomain() != null ? t.getDomain() : "");
125125
if (t.getQuery() != null) {
126126
request.setQuery(t.getQuery());
127127
}
@@ -134,7 +134,7 @@ public static DescribeTaskListRequest describeTaskListRequest(
134134
return null;
135135
}
136136
return DescribeTaskListRequest.newBuilder()
137-
.setDomain(t.getDomain())
137+
.setDomain(t.getDomain() != null ? t.getDomain() : "")
138138
.setTaskList(taskList(t.getTaskList()))
139139
.setTaskListType(taskListType(t.getTaskListType()))
140140
.setIncludeTaskListStatus(t.isIncludeTaskListStatus())
@@ -148,7 +148,7 @@ public static ListArchivedWorkflowExecutionsRequest listArchivedWorkflowExecutio
148148
}
149149
ListArchivedWorkflowExecutionsRequest.Builder request =
150150
ListArchivedWorkflowExecutionsRequest.newBuilder()
151-
.setDomain(t.getDomain())
151+
.setDomain(t.getDomain() != null ? t.getDomain() : "")
152152
.setPageSize(t.getPageSize());
153153
if (t.getNextPageToken() != null) {
154154
request.setNextPageToken(arrayToByteString(t.getNextPageToken()));
@@ -166,7 +166,7 @@ public static RequestCancelWorkflowExecutionRequest requestCancelWorkflowExecuti
166166
}
167167
RequestCancelWorkflowExecutionRequest.Builder builder =
168168
RequestCancelWorkflowExecutionRequest.newBuilder()
169-
.setDomain(t.getDomain())
169+
.setDomain(t.getDomain() != null ? t.getDomain() : "")
170170
.setWorkflowExecution(workflowExecution(t.getWorkflowExecution()))
171171
.setRequestId(t.getRequestId());
172172
if (t.getIdentity() != null) {
@@ -187,7 +187,7 @@ public static ResetStickyTaskListRequest resetStickyTaskListRequest(
187187
return null;
188188
}
189189
return ResetStickyTaskListRequest.newBuilder()
190-
.setDomain(t.getDomain())
190+
.setDomain(t.getDomain() != null ? t.getDomain() : "")
191191
.setWorkflowExecution(workflowExecution(t.getExecution()))
192192
.build();
193193
}
@@ -198,7 +198,7 @@ public static ResetWorkflowExecutionRequest resetWorkflowExecutionRequest(
198198
return null;
199199
}
200200
return ResetWorkflowExecutionRequest.newBuilder()
201-
.setDomain(t.getDomain())
201+
.setDomain(t.getDomain() != null ? t.getDomain() : "")
202202
.setWorkflowExecution(workflowExecution(t.getWorkflowExecution()))
203203
.setReason(t.getReason() != null ? t.getReason() : "")
204204
.setDecisionFinishEventId(t.getDecisionFinishEventId())
@@ -214,7 +214,7 @@ public static RespondActivityTaskCanceledByIDRequest respondActivityTaskCanceled
214214
}
215215
RespondActivityTaskCanceledByIDRequest.Builder builder =
216216
RespondActivityTaskCanceledByIDRequest.newBuilder()
217-
.setDomain(t.getDomain())
217+
.setDomain(t.getDomain() != null ? t.getDomain() : "")
218218
.setWorkflowExecution(TypeMapper.workflowRunPair(t.getWorkflowID(), t.getRunID()))
219219
.setActivityId(t.getActivityID())
220220
.setDetails(payload(t.getDetails()));
@@ -247,7 +247,7 @@ public static RespondActivityTaskCompletedByIDRequest respondActivityTaskComplet
247247
}
248248
RespondActivityTaskCompletedByIDRequest.Builder builder =
249249
RespondActivityTaskCompletedByIDRequest.newBuilder()
250-
.setDomain(t.getDomain())
250+
.setDomain(t.getDomain() != null ? t.getDomain() : "")
251251
.setWorkflowExecution(TypeMapper.workflowRunPair(t.getWorkflowID(), t.getRunID()))
252252
.setActivityId(t.getActivityID())
253253
.setResult(payload(t.getResult()));
@@ -280,7 +280,7 @@ public static RespondActivityTaskFailedByIDRequest respondActivityTaskFailedById
280280
}
281281
RespondActivityTaskFailedByIDRequest.Builder builder =
282282
RespondActivityTaskFailedByIDRequest.newBuilder()
283-
.setDomain(t.getDomain())
283+
.setDomain(t.getDomain() != null ? t.getDomain() : "")
284284
.setWorkflowExecution(TypeMapper.workflowRunPair(t.getWorkflowID(), t.getRunID()))
285285
.setActivityId(t.getActivityID())
286286
.setFailure(failure(t.getReason(), t.getDetails()));
@@ -384,7 +384,7 @@ public static ScanWorkflowExecutionsRequest scanWorkflowExecutionsRequest(
384384
}
385385
ScanWorkflowExecutionsRequest.Builder request =
386386
ScanWorkflowExecutionsRequest.newBuilder()
387-
.setDomain(t.getDomain())
387+
.setDomain(t.getDomain() != null ? t.getDomain() : "")
388388
.setPageSize(t.getPageSize());
389389
if (t.getNextPageToken() != null) {
390390
request.setNextPageToken(arrayToByteString(t.getNextPageToken()));
@@ -401,7 +401,7 @@ public static DescribeWorkflowExecutionRequest describeWorkflowExecutionRequest(
401401
return null;
402402
}
403403
return DescribeWorkflowExecutionRequest.newBuilder()
404-
.setDomain(t.getDomain())
404+
.setDomain(t.getDomain() != null ? t.getDomain() : "")
405405
.setWorkflowExecution(workflowExecution(t.getExecution()))
406406
.setQueryConsistencyLevel(queryConsistencyLevel(t.getQueryConsistencyLevel()))
407407
.build();
@@ -414,7 +414,7 @@ public static GetWorkflowExecutionHistoryRequest getWorkflowExecutionHistoryRequ
414414
}
415415
GetWorkflowExecutionHistoryRequest.Builder builder =
416416
GetWorkflowExecutionHistoryRequest.newBuilder()
417-
.setDomain(t.getDomain())
417+
.setDomain(t.getDomain() != null ? t.getDomain() : "")
418418
.setWorkflowExecution(workflowExecution(t.getExecution()))
419419
.setPageSize(t.getMaximumPageSize())
420420
.setWaitForNewEvent(t.isWaitForNewEvent())
@@ -434,7 +434,7 @@ public static SignalWithStartWorkflowExecutionRequest signalWithStartWorkflowExe
434434
}
435435
StartWorkflowExecutionRequest.Builder builder =
436436
StartWorkflowExecutionRequest.newBuilder()
437-
.setDomain(t.getDomain())
437+
.setDomain(t.getDomain() != null ? t.getDomain() : "")
438438
.setWorkflowId(t.getWorkflowId())
439439
.setWorkflowType(workflowType(t.getWorkflowType()))
440440
.setTaskList(taskList(t.getTaskList()))
@@ -497,7 +497,7 @@ public static SignalWorkflowExecutionRequest signalWorkflowExecutionRequest(
497497
}
498498
SignalWorkflowExecutionRequest.Builder builder =
499499
SignalWorkflowExecutionRequest.newBuilder()
500-
.setDomain(t.getDomain())
500+
.setDomain(t.getDomain() != null ? t.getDomain() : "")
501501
.setWorkflowExecution(workflowExecution(t.getWorkflowExecution()))
502502
.setSignalName(t.getSignalName())
503503
.setSignalInput(payload(t.getInput()))
@@ -518,7 +518,7 @@ public static StartWorkflowExecutionRequest startWorkflowExecutionRequest(
518518
}
519519
StartWorkflowExecutionRequest.Builder request =
520520
StartWorkflowExecutionRequest.newBuilder()
521-
.setDomain(t.getDomain())
521+
.setDomain(t.getDomain() != null ? t.getDomain() : "")
522522
.setWorkflowId(t.getWorkflowId())
523523
.setWorkflowType(workflowType(t.getWorkflowType()))
524524
.setTaskList(taskList(t.getTaskList()))
@@ -566,7 +566,7 @@ public static TerminateWorkflowExecutionRequest terminateWorkflowExecutionReques
566566
}
567567
TerminateWorkflowExecutionRequest.Builder builder =
568568
TerminateWorkflowExecutionRequest.newBuilder()
569-
.setDomain(t.getDomain())
569+
.setDomain(t.getDomain() != null ? t.getDomain() : "")
570570
.setWorkflowExecution(workflowExecution(t.getWorkflowExecution()))
571571
.setReason(t.getReason() != null ? t.getReason() : "")
572572
.setDetails(payload(t.getDetails()));
@@ -622,7 +622,7 @@ public static ListTaskListPartitionsRequest listTaskListPartitionsRequest(
622622
return null;
623623
}
624624
return ListTaskListPartitionsRequest.newBuilder()
625-
.setDomain(t.getDomain())
625+
.setDomain(t.getDomain() != null ? t.getDomain() : "")
626626
.setTaskList(taskList(t.getTaskList()))
627627
.build();
628628
}
@@ -634,7 +634,7 @@ public static ListWorkflowExecutionsRequest listWorkflowExecutionsRequest(
634634
}
635635
ListWorkflowExecutionsRequest.Builder request =
636636
ListWorkflowExecutionsRequest.newBuilder()
637-
.setDomain(t.getDomain())
637+
.setDomain(t.getDomain() != null ? t.getDomain() : "")
638638
.setPageSize(t.getPageSize());
639639
if (t.getNextPageToken() != null) {
640640
request.setNextPageToken(arrayToByteString(t.getNextPageToken()));
@@ -652,7 +652,7 @@ public static PollForActivityTaskRequest pollForActivityTaskRequest(
652652
}
653653
PollForActivityTaskRequest.Builder builder =
654654
PollForActivityTaskRequest.newBuilder()
655-
.setDomain(t.getDomain())
655+
.setDomain(t.getDomain() != null ? t.getDomain() : "")
656656
.setTaskList(taskList(t.getTaskList()))
657657
.setTaskListMetadata(taskListMetadata(t.getTaskListMetadata()));
658658
if (t.getIdentity() != null) {
@@ -668,7 +668,7 @@ public static PollForDecisionTaskRequest pollForDecisionTaskRequest(
668668
}
669669
PollForDecisionTaskRequest.Builder builder =
670670
PollForDecisionTaskRequest.newBuilder()
671-
.setDomain(t.getDomain())
671+
.setDomain(t.getDomain() != null ? t.getDomain() : "")
672672
.setTaskList(taskList(t.getTaskList()));
673673
if (t.getBinaryChecksum() != null) {
674674
builder.setBinaryChecksum(t.getBinaryChecksum());
@@ -684,7 +684,7 @@ public static QueryWorkflowRequest queryWorkflowRequest(com.uber.cadence.QueryWo
684684
return null;
685685
}
686686
return QueryWorkflowRequest.newBuilder()
687-
.setDomain(t.getDomain())
687+
.setDomain(t.getDomain() != null ? t.getDomain() : "")
688688
.setWorkflowExecution(workflowExecution(t.getExecution()))
689689
.setQuery(workflowQuery(t.getQuery()))
690690
.setQueryRejectCondition(queryRejectCondition(t.getQueryRejectCondition()))
@@ -699,7 +699,7 @@ public static RecordActivityTaskHeartbeatByIDRequest recordActivityTaskHeartbeat
699699
}
700700
RecordActivityTaskHeartbeatByIDRequest.Builder builder =
701701
RecordActivityTaskHeartbeatByIDRequest.newBuilder()
702-
.setDomain(t.getDomain())
702+
.setDomain(t.getDomain() != null ? t.getDomain() : "")
703703
.setWorkflowExecution(TypeMapper.workflowRunPair(t.getWorkflowID(), t.getRunID()))
704704
.setActivityId(t.getActivityID())
705705
.setDetails(payload(t.getDetails()));
@@ -756,7 +756,7 @@ public static RestartWorkflowExecutionRequest restartWorkflowExecutionRequest(
756756
return null;
757757
}
758758
return RestartWorkflowExecutionRequest.newBuilder()
759-
.setDomain(t.getDomain())
759+
.setDomain(t.getDomain() != null ? t.getDomain() : "")
760760
.setWorkflowExecution(workflowExecution(t.getWorkflowExecution()))
761761
.setReason(t.getReason() != null ? t.getReason() : "")
762762
.setIdentity(t.getIdentity() != null ? t.getIdentity() : "")
@@ -852,7 +852,7 @@ public static ListClosedWorkflowExecutionsRequest listClosedWorkflowExecutionsRe
852852
}
853853
ListClosedWorkflowExecutionsRequest.Builder request =
854854
ListClosedWorkflowExecutionsRequest.newBuilder()
855-
.setDomain(t.getDomain())
855+
.setDomain(t.getDomain() != null ? t.getDomain() : "")
856856
.setPageSize(t.getMaximumPageSize());
857857
if (t.getExecutionFilter() != null) {
858858
request.setExecutionFilter(workflowExecutionFilter(t.getExecutionFilter()));
@@ -879,7 +879,7 @@ public static ListOpenWorkflowExecutionsRequest listOpenWorkflowExecutionsReques
879879
}
880880
ListOpenWorkflowExecutionsRequest.Builder request =
881881
ListOpenWorkflowExecutionsRequest.newBuilder()
882-
.setDomain(t.getDomain())
882+
.setDomain(t.getDomain() != null ? t.getDomain() : "")
883883
.setPageSize(t.getMaximumPageSize());
884884
if (t.getExecutionFilter() != null) {
885885
request.setExecutionFilter(workflowExecutionFilter(t.getExecutionFilter()));
@@ -903,7 +903,7 @@ public static RespondActivityTaskFailedByIDRequest respondActivityTaskFailedByID
903903
}
904904
RespondActivityTaskFailedByIDRequest.Builder request =
905905
RespondActivityTaskFailedByIDRequest.newBuilder()
906-
.setDomain(failRequest.getDomain())
906+
.setDomain(failRequest.getDomain() != null ? failRequest.getDomain() : "")
907907
.setWorkflowExecution(
908908
TypeMapper.workflowRunPair(failRequest.getWorkflowID(), failRequest.getRunID()))
909909
.setActivityId(failRequest.getActivityID())
@@ -919,7 +919,7 @@ public static RespondActivityTaskCompletedByIDRequest respondActivityTaskComplet
919919
}
920920
RespondActivityTaskCompletedByIDRequest.Builder request =
921921
RespondActivityTaskCompletedByIDRequest.newBuilder()
922-
.setDomain(completeRequest.getDomain())
922+
.setDomain(completeRequest.getDomain() != null ? completeRequest.getDomain() : "")
923923
.setWorkflowExecution(
924924
TypeMapper.workflowRunPair(
925925
completeRequest.getWorkflowID(), completeRequest.getRunID()))
@@ -937,7 +937,7 @@ public static RecordActivityTaskHeartbeatByIDRequest recordActivityTaskHeartbeat
937937
}
938938
RecordActivityTaskHeartbeatByIDRequest.Builder request =
939939
RecordActivityTaskHeartbeatByIDRequest.newBuilder()
940-
.setDomain(heartbeatRequest.getDomain())
940+
.setDomain(heartbeatRequest.getDomain() != null ? heartbeatRequest.getDomain() : "")
941941
.setWorkflowExecution(
942942
TypeMapper.workflowRunPair(
943943
heartbeatRequest.getWorkflowID(), heartbeatRequest.getRunID()))
@@ -955,7 +955,7 @@ public static RespondActivityTaskCanceledByIDRequest respondActivityTaskCanceled
955955
}
956956
RespondActivityTaskCanceledByIDRequest.Builder request =
957957
RespondActivityTaskCanceledByIDRequest.newBuilder()
958-
.setDomain(canceledRequest.getDomain())
958+
.setDomain(canceledRequest.getDomain() != null ? canceledRequest.getDomain() : "")
959959
.setWorkflowExecution(
960960
TypeMapper.workflowRunPair(
961961
canceledRequest.getWorkflowID(), canceledRequest.getRunID()))
@@ -972,7 +972,7 @@ public static GetTaskListsByDomainRequest getTaskListsByDomainRequest(
972972
return null;
973973
}
974974
GetTaskListsByDomainRequest.Builder request =
975-
GetTaskListsByDomainRequest.newBuilder().setDomain(domainRequest.getDomainName());
975+
GetTaskListsByDomainRequest.newBuilder().setDomain(domainRequest.getDomainName() != null ? domainRequest.getDomainName() : "");
976976
return request.build();
977977
}
978978

@@ -981,6 +981,6 @@ public static RefreshWorkflowTasksRequest refreshWorkflowTasksRequest(
981981
if (request == null) {
982982
return null;
983983
}
984-
return RefreshWorkflowTasksRequest.newBuilder().setDomain(request.getDomain()).build();
984+
return RefreshWorkflowTasksRequest.newBuilder().setDomain(request.getDomain() != null ? request.getDomain() : "").build();
985985
}
986986
}

0 commit comments

Comments
 (0)