Skip to content

Commit 0de41cf

Browse files
mattpollockmattpollock
committed
adjust logic for avoiding logical vectors in a conditional statement
1 parent 4feb067 commit 0de41cf

File tree

7 files changed

+29
-29
lines changed

7 files changed

+29
-29
lines changed

‎modules/openapi-generator/src/main/resources/r/api.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@
646646
{{/useRlangExceptionHandling}}
647647
{{/returnExceptionOnFailure}}
648648
{{^returnExceptionOnFailure}}
649-
if (is.null(local_var_resp$response) || local_var_error_msg == "") {
649+
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
650650
local_var_resp$response <- "API server error"
651651
}
652652
return(local_var_resp)

‎samples/client/echo_api/r/R/auth_api.R‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ AuthApi <- R6::R6Class(
156156
response = local_var_resp,
157157
status_code = local_var_resp$status_code)
158158
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
159-
if (is.null(local_var_resp$response) || local_var_error_msg == "") {
159+
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
160160
local_var_resp$response <- "API server error"
161161
}
162162
return(local_var_resp)
@@ -251,7 +251,7 @@ AuthApi <- R6::R6Class(
251251
response = local_var_resp,
252252
status_code = local_var_resp$status_code)
253253
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
254-
if (is.null(local_var_resp$response) || local_var_error_msg == "") {
254+
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
255255
local_var_resp$response <- "API server error"
256256
}
257257
return(local_var_resp)

‎samples/client/echo_api/r/R/body_api.R‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ BodyApi <- R6::R6Class(
258258
response = local_var_resp,
259259
status_code = local_var_resp$status_code)
260260
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
261-
if (is.null(local_var_resp$response) || local_var_error_msg == "") {
261+
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
262262
local_var_resp$response <- "API server error"
263263
}
264264
return(local_var_resp)
@@ -361,7 +361,7 @@ BodyApi <- R6::R6Class(
361361
response = local_var_resp,
362362
status_code = local_var_resp$status_code)
363363
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
364-
if (is.null(local_var_resp$response) || local_var_error_msg == "") {
364+
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
365365
local_var_resp$response <- "API server error"
366366
}
367367
return(local_var_resp)
@@ -463,7 +463,7 @@ BodyApi <- R6::R6Class(
463463
response = local_var_resp,
464464
status_code = local_var_resp$status_code)
465465
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
466-
if (is.null(local_var_resp$response) || local_var_error_msg == "") {
466+
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
467467
local_var_resp$response <- "API server error"
468468
}
469469
return(local_var_resp)
@@ -561,7 +561,7 @@ BodyApi <- R6::R6Class(
561561
response = local_var_resp,
562562
status_code = local_var_resp$status_code)
563563
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
564-
if (is.null(local_var_resp$response) || local_var_error_msg == "") {
564+
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
565565
local_var_resp$response <- "API server error"
566566
}
567567
return(local_var_resp)
@@ -664,7 +664,7 @@ BodyApi <- R6::R6Class(
664664
response = local_var_resp,
665665
status_code = local_var_resp$status_code)
666666
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
667-
if (is.null(local_var_resp$response) || local_var_error_msg == "") {
667+
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
668668
local_var_resp$response <- "API server error"
669669
}
670670
return(local_var_resp)
@@ -767,7 +767,7 @@ BodyApi <- R6::R6Class(
767767
response = local_var_resp,
768768
status_code = local_var_resp$status_code)
769769
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
770-
if (is.null(local_var_resp$response) || local_var_error_msg == "") {
770+
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
771771
local_var_resp$response <- "API server error"
772772
}
773773
return(local_var_resp)
@@ -870,7 +870,7 @@ BodyApi <- R6::R6Class(
870870
response = local_var_resp,
871871
status_code = local_var_resp$status_code)
872872
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
873-
if (is.null(local_var_resp$response) || local_var_error_msg == "") {
873+
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
874874
local_var_resp$response <- "API server error"
875875
}
876876
return(local_var_resp)
@@ -973,7 +973,7 @@ BodyApi <- R6::R6Class(
973973
response = local_var_resp,
974974
status_code = local_var_resp$status_code)
975975
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
976-
if (is.null(local_var_resp$response) || local_var_error_msg == "") {
976+
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
977977
local_var_resp$response <- "API server error"
978978
}
979979
return(local_var_resp)
@@ -1076,7 +1076,7 @@ BodyApi <- R6::R6Class(
10761076
response = local_var_resp,
10771077
status_code = local_var_resp$status_code)
10781078
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
1079-
if (is.null(local_var_resp$response) || local_var_error_msg == "") {
1079+
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
10801080
local_var_resp$response <- "API server error"
10811081
}
10821082
return(local_var_resp)
@@ -1179,7 +1179,7 @@ BodyApi <- R6::R6Class(
11791179
response = local_var_resp,
11801180
status_code = local_var_resp$status_code)
11811181
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
1182-
if (is.null(local_var_resp$response) || local_var_error_msg == "") {
1182+
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
11831183
local_var_resp$response <- "API server error"
11841184
}
11851185
return(local_var_resp)

‎samples/client/echo_api/r/R/form_api.R‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ FormApi <- R6::R6Class(
189189
response = local_var_resp,
190190
status_code = local_var_resp$status_code)
191191
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
192-
if (is.null(local_var_resp$response) || local_var_error_msg == "") {
192+
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
193193
local_var_resp$response <- "API server error"
194194
}
195195
return(local_var_resp)
@@ -291,7 +291,7 @@ FormApi <- R6::R6Class(
291291
response = local_var_resp,
292292
status_code = local_var_resp$status_code)
293293
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
294-
if (is.null(local_var_resp$response) || local_var_error_msg == "") {
294+
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
295295
local_var_resp$response <- "API server error"
296296
}
297297
return(local_var_resp)
@@ -424,7 +424,7 @@ FormApi <- R6::R6Class(
424424
response = local_var_resp,
425425
status_code = local_var_resp$status_code)
426426
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
427-
if (is.null(local_var_resp$response) || local_var_error_msg == "") {
427+
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
428428
local_var_resp$response <- "API server error"
429429
}
430430
return(local_var_resp)

‎samples/client/echo_api/r/R/header_api.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ HeaderApi <- R6::R6Class(
177177
response = local_var_resp,
178178
status_code = local_var_resp$status_code)
179179
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
180-
if (is.null(local_var_resp$response) || local_var_error_msg == "") {
180+
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
181181
local_var_resp$response <- "API server error"
182182
}
183183
return(local_var_resp)

‎samples/client/echo_api/r/R/path_api.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ PathApi <- R6::R6Class(
192192
response = local_var_resp,
193193
status_code = local_var_resp$status_code)
194194
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
195-
if (is.null(local_var_resp$response) || local_var_error_msg == "") {
195+
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
196196
local_var_resp$response <- "API server error"
197197
}
198198
return(local_var_resp)

‎samples/client/echo_api/r/R/query_api.R‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ QueryApi <- R6::R6Class(
298298
response = local_var_resp,
299299
status_code = local_var_resp$status_code)
300300
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
301-
if (is.null(local_var_resp$response) || local_var_error_msg == "") {
301+
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
302302
local_var_resp$response <- "API server error"
303303
}
304304
return(local_var_resp)
@@ -413,7 +413,7 @@ QueryApi <- R6::R6Class(
413413
response = local_var_resp,
414414
status_code = local_var_resp$status_code)
415415
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
416-
if (is.null(local_var_resp$response) || local_var_error_msg == "") {
416+
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
417417
local_var_resp$response <- "API server error"
418418
}
419419
return(local_var_resp)
@@ -528,7 +528,7 @@ QueryApi <- R6::R6Class(
528528
response = local_var_resp,
529529
status_code = local_var_resp$status_code)
530530
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
531-
if (is.null(local_var_resp$response) || local_var_error_msg == "") {
531+
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
532532
local_var_resp$response <- "API server error"
533533
}
534534
return(local_var_resp)
@@ -627,7 +627,7 @@ QueryApi <- R6::R6Class(
627627
response = local_var_resp,
628628
status_code = local_var_resp$status_code)
629629
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
630-
if (is.null(local_var_resp$response) || local_var_error_msg == "") {
630+
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
631631
local_var_resp$response <- "API server error"
632632
}
633633
return(local_var_resp)
@@ -726,7 +726,7 @@ QueryApi <- R6::R6Class(
726726
response = local_var_resp,
727727
status_code = local_var_resp$status_code)
728728
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
729-
if (is.null(local_var_resp$response) || local_var_error_msg == "") {
729+
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
730730
local_var_resp$response <- "API server error"
731731
}
732732
return(local_var_resp)
@@ -826,7 +826,7 @@ QueryApi <- R6::R6Class(
826826
response = local_var_resp,
827827
status_code = local_var_resp$status_code)
828828
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
829-
if (is.null(local_var_resp$response) || local_var_error_msg == "") {
829+
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
830830
local_var_resp$response <- "API server error"
831831
}
832832
return(local_var_resp)
@@ -926,7 +926,7 @@ QueryApi <- R6::R6Class(
926926
response = local_var_resp,
927927
status_code = local_var_resp$status_code)
928928
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
929-
if (is.null(local_var_resp$response) || local_var_error_msg == "") {
929+
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
930930
local_var_resp$response <- "API server error"
931931
}
932932
return(local_var_resp)
@@ -1025,7 +1025,7 @@ QueryApi <- R6::R6Class(
10251025
response = local_var_resp,
10261026
status_code = local_var_resp$status_code)
10271027
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
1028-
if (is.null(local_var_resp$response) || local_var_error_msg == "") {
1028+
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
10291029
local_var_resp$response <- "API server error"
10301030
}
10311031
return(local_var_resp)
@@ -1124,7 +1124,7 @@ QueryApi <- R6::R6Class(
11241124
response = local_var_resp,
11251125
status_code = local_var_resp$status_code)
11261126
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
1127-
if (is.null(local_var_resp$response) || local_var_error_msg == "") {
1127+
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
11281128
local_var_resp$response <- "API server error"
11291129
}
11301130
return(local_var_resp)
@@ -1223,7 +1223,7 @@ QueryApi <- R6::R6Class(
12231223
response = local_var_resp,
12241224
status_code = local_var_resp$status_code)
12251225
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
1226-
if (is.null(local_var_resp$response) || local_var_error_msg == "") {
1226+
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
12271227
local_var_resp$response <- "API server error"
12281228
}
12291229
return(local_var_resp)
@@ -1331,7 +1331,7 @@ QueryApi <- R6::R6Class(
13311331
response = local_var_resp,
13321332
status_code = local_var_resp$status_code)
13331333
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
1334-
if (is.null(local_var_resp$response) || local_var_error_msg == "") {
1334+
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
13351335
local_var_resp$response <- "API server error"
13361336
}
13371337
return(local_var_resp)

0 commit comments

Comments
 (0)