Skip to content

Commit 122acd2

Browse files
mattpollockmattpollock
committed
try, try, again
1 parent fccb78b commit 122acd2

File tree

19 files changed

+300
-370
lines changed

19 files changed

+300
-370
lines changed

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -561,16 +561,15 @@
561561
{{/vendorExtensions.x-streaming}}
562562
if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
563563
{{#returnType}}
564-
if (!.parse) {
565-
local_var_resp$content <- local_var_resp$response_as_text()
566-
return(local_var_resp)
567-
}
568-
569564
{{#isPrimitiveType}}
570565
# save response in a file
571566
if (!is.null(data_file)) {
572567
self$api_client$WriteFile(local_var_resp, data_file)
573568
}
569+
if (!.parse) {
570+
local_var_resp$content <- local_var_resp$response_as_text()
571+
return(local_var_resp)
572+
}
574573
575574
ApiResponse$new(content,resp)
576575
{{/isPrimitiveType}}
@@ -579,6 +578,10 @@
579578
if (!is.null(data_file)) {
580579
self$api_client$WriteFile(local_var_resp, data_file)
581580
}
581+
if (!.parse) {
582+
local_var_resp$content <- local_var_resp$response_as_text()
583+
return(local_var_resp)
584+
}
582585
583586
deserialized_resp_obj <- tryCatch(
584587
self$api_client$DeserializeResponse(local_var_resp, "{{returnType}}"),

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

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -133,15 +133,14 @@ AuthApi <- R6::R6Class(
133133
...)
134134

135135
if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
136-
if (!.parse) {
137-
local_var_resp$content <- local_var_resp$response_as_text()
138-
return(local_var_resp)
139-
}
140-
141136
# save response in a file
142137
if (!is.null(data_file)) {
143138
self$api_client$WriteFile(local_var_resp, data_file)
144139
}
140+
if (!.parse) {
141+
local_var_resp$content <- local_var_resp$response_as_text()
142+
return(local_var_resp)
143+
}
145144

146145
deserialized_resp_obj <- tryCatch(
147146
self$api_client$DeserializeResponse(local_var_resp, "character"),
@@ -231,15 +230,14 @@ AuthApi <- R6::R6Class(
231230
...)
232231

233232
if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
234-
if (!.parse) {
235-
local_var_resp$content <- local_var_resp$response_as_text()
236-
return(local_var_resp)
237-
}
238-
239233
# save response in a file
240234
if (!is.null(data_file)) {
241235
self$api_client$WriteFile(local_var_resp, data_file)
242236
}
237+
if (!.parse) {
238+
local_var_resp$content <- local_var_resp$response_as_text()
239+
return(local_var_resp)
240+
}
243241

244242
deserialized_resp_obj <- tryCatch(
245243
self$api_client$DeserializeResponse(local_var_resp, "character"),

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

Lines changed: 40 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -235,15 +235,14 @@ BodyApi <- R6::R6Class(
235235
...)
236236

237237
if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
238-
if (!.parse) {
239-
local_var_resp$content <- local_var_resp$response_as_text()
240-
return(local_var_resp)
241-
}
242-
243238
# save response in a file
244239
if (!is.null(data_file)) {
245240
self$api_client$WriteFile(local_var_resp, data_file)
246241
}
242+
if (!.parse) {
243+
local_var_resp$content <- local_var_resp$response_as_text()
244+
return(local_var_resp)
245+
}
247246

248247
deserialized_resp_obj <- tryCatch(
249248
self$api_client$DeserializeResponse(local_var_resp, "data.frame"),
@@ -341,15 +340,14 @@ BodyApi <- R6::R6Class(
341340
...)
342341

343342
if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
344-
if (!.parse) {
345-
local_var_resp$content <- local_var_resp$response_as_text()
346-
return(local_var_resp)
347-
}
348-
349343
# save response in a file
350344
if (!is.null(data_file)) {
351345
self$api_client$WriteFile(local_var_resp, data_file)
352346
}
347+
if (!.parse) {
348+
local_var_resp$content <- local_var_resp$response_as_text()
349+
return(local_var_resp)
350+
}
353351

354352
deserialized_resp_obj <- tryCatch(
355353
self$api_client$DeserializeResponse(local_var_resp, "character"),
@@ -446,15 +444,14 @@ BodyApi <- R6::R6Class(
446444
...)
447445

448446
if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
449-
if (!.parse) {
450-
local_var_resp$content <- local_var_resp$response_as_text()
451-
return(local_var_resp)
452-
}
453-
454447
# save response in a file
455448
if (!is.null(data_file)) {
456449
self$api_client$WriteFile(local_var_resp, data_file)
457450
}
451+
if (!.parse) {
452+
local_var_resp$content <- local_var_resp$response_as_text()
453+
return(local_var_resp)
454+
}
458455

459456
deserialized_resp_obj <- tryCatch(
460457
self$api_client$DeserializeResponse(local_var_resp, "character"),
@@ -547,15 +544,14 @@ BodyApi <- R6::R6Class(
547544
...)
548545

549546
if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
550-
if (!.parse) {
551-
local_var_resp$content <- local_var_resp$response_as_text()
552-
return(local_var_resp)
553-
}
554-
555547
# save response in a file
556548
if (!is.null(data_file)) {
557549
self$api_client$WriteFile(local_var_resp, data_file)
558550
}
551+
if (!.parse) {
552+
local_var_resp$content <- local_var_resp$response_as_text()
553+
return(local_var_resp)
554+
}
559555

560556
deserialized_resp_obj <- tryCatch(
561557
self$api_client$DeserializeResponse(local_var_resp, "character"),
@@ -653,15 +649,14 @@ BodyApi <- R6::R6Class(
653649
...)
654650

655651
if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
656-
if (!.parse) {
657-
local_var_resp$content <- local_var_resp$response_as_text()
658-
return(local_var_resp)
659-
}
660-
661652
# save response in a file
662653
if (!is.null(data_file)) {
663654
self$api_client$WriteFile(local_var_resp, data_file)
664655
}
656+
if (!.parse) {
657+
local_var_resp$content <- local_var_resp$response_as_text()
658+
return(local_var_resp)
659+
}
665660

666661
deserialized_resp_obj <- tryCatch(
667662
self$api_client$DeserializeResponse(local_var_resp, "Pet"),
@@ -759,15 +754,14 @@ BodyApi <- R6::R6Class(
759754
...)
760755

761756
if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
762-
if (!.parse) {
763-
local_var_resp$content <- local_var_resp$response_as_text()
764-
return(local_var_resp)
765-
}
766-
767757
# save response in a file
768758
if (!is.null(data_file)) {
769759
self$api_client$WriteFile(local_var_resp, data_file)
770760
}
761+
if (!.parse) {
762+
local_var_resp$content <- local_var_resp$response_as_text()
763+
return(local_var_resp)
764+
}
771765

772766
deserialized_resp_obj <- tryCatch(
773767
self$api_client$DeserializeResponse(local_var_resp, "character"),
@@ -865,15 +859,14 @@ BodyApi <- R6::R6Class(
865859
...)
866860

867861
if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
868-
if (!.parse) {
869-
local_var_resp$content <- local_var_resp$response_as_text()
870-
return(local_var_resp)
871-
}
872-
873862
# save response in a file
874863
if (!is.null(data_file)) {
875864
self$api_client$WriteFile(local_var_resp, data_file)
876865
}
866+
if (!.parse) {
867+
local_var_resp$content <- local_var_resp$response_as_text()
868+
return(local_var_resp)
869+
}
877870

878871
deserialized_resp_obj <- tryCatch(
879872
self$api_client$DeserializeResponse(local_var_resp, "Pet"),
@@ -971,15 +964,14 @@ BodyApi <- R6::R6Class(
971964
...)
972965

973966
if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
974-
if (!.parse) {
975-
local_var_resp$content <- local_var_resp$response_as_text()
976-
return(local_var_resp)
977-
}
978-
979967
# save response in a file
980968
if (!is.null(data_file)) {
981969
self$api_client$WriteFile(local_var_resp, data_file)
982970
}
971+
if (!.parse) {
972+
local_var_resp$content <- local_var_resp$response_as_text()
973+
return(local_var_resp)
974+
}
983975

984976
deserialized_resp_obj <- tryCatch(
985977
self$api_client$DeserializeResponse(local_var_resp, "character"),
@@ -1077,15 +1069,14 @@ BodyApi <- R6::R6Class(
10771069
...)
10781070

10791071
if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
1080-
if (!.parse) {
1081-
local_var_resp$content <- local_var_resp$response_as_text()
1082-
return(local_var_resp)
1083-
}
1084-
10851072
# save response in a file
10861073
if (!is.null(data_file)) {
10871074
self$api_client$WriteFile(local_var_resp, data_file)
10881075
}
1076+
if (!.parse) {
1077+
local_var_resp$content <- local_var_resp$response_as_text()
1078+
return(local_var_resp)
1079+
}
10891080

10901081
deserialized_resp_obj <- tryCatch(
10911082
self$api_client$DeserializeResponse(local_var_resp, "StringEnumRef"),
@@ -1183,15 +1174,14 @@ BodyApi <- R6::R6Class(
11831174
...)
11841175

11851176
if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
1186-
if (!.parse) {
1187-
local_var_resp$content <- local_var_resp$response_as_text()
1188-
return(local_var_resp)
1189-
}
1190-
11911177
# save response in a file
11921178
if (!is.null(data_file)) {
11931179
self$api_client$WriteFile(local_var_resp, data_file)
11941180
}
1181+
if (!.parse) {
1182+
local_var_resp$content <- local_var_resp$response_as_text()
1183+
return(local_var_resp)
1184+
}
11951185

11961186
deserialized_resp_obj <- tryCatch(
11971187
self$api_client$DeserializeResponse(local_var_resp, "character"),

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

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -166,15 +166,14 @@ FormApi <- R6::R6Class(
166166
...)
167167

168168
if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
169-
if (!.parse) {
170-
local_var_resp$content <- local_var_resp$response_as_text()
171-
return(local_var_resp)
172-
}
173-
174169
# save response in a file
175170
if (!is.null(data_file)) {
176171
self$api_client$WriteFile(local_var_resp, data_file)
177172
}
173+
if (!.parse) {
174+
local_var_resp$content <- local_var_resp$response_as_text()
175+
return(local_var_resp)
176+
}
178177

179178
deserialized_resp_obj <- tryCatch(
180179
self$api_client$DeserializeResponse(local_var_resp, "character"),
@@ -271,15 +270,14 @@ FormApi <- R6::R6Class(
271270
...)
272271

273272
if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
274-
if (!.parse) {
275-
local_var_resp$content <- local_var_resp$response_as_text()
276-
return(local_var_resp)
277-
}
278-
279273
# save response in a file
280274
if (!is.null(data_file)) {
281275
self$api_client$WriteFile(local_var_resp, data_file)
282276
}
277+
if (!.parse) {
278+
local_var_resp$content <- local_var_resp$response_as_text()
279+
return(local_var_resp)
280+
}
283281

284282
deserialized_resp_obj <- tryCatch(
285283
self$api_client$DeserializeResponse(local_var_resp, "character"),
@@ -407,15 +405,14 @@ FormApi <- R6::R6Class(
407405
...)
408406

409407
if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
410-
if (!.parse) {
411-
local_var_resp$content <- local_var_resp$response_as_text()
412-
return(local_var_resp)
413-
}
414-
415408
# save response in a file
416409
if (!is.null(data_file)) {
417410
self$api_client$WriteFile(local_var_resp, data_file)
418411
}
412+
if (!.parse) {
413+
local_var_resp$content <- local_var_resp$response_as_text()
414+
return(local_var_resp)
415+
}
419416

420417
deserialized_resp_obj <- tryCatch(
421418
self$api_client$DeserializeResponse(local_var_resp, "character"),

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,15 +154,14 @@ HeaderApi <- R6::R6Class(
154154
...)
155155

156156
if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
157-
if (!.parse) {
158-
local_var_resp$content <- local_var_resp$response_as_text()
159-
return(local_var_resp)
160-
}
161-
162157
# save response in a file
163158
if (!is.null(data_file)) {
164159
self$api_client$WriteFile(local_var_resp, data_file)
165160
}
161+
if (!.parse) {
162+
local_var_resp$content <- local_var_resp$response_as_text()
163+
return(local_var_resp)
164+
}
166165

167166
deserialized_resp_obj <- tryCatch(
168167
self$api_client$DeserializeResponse(local_var_resp, "character"),

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -169,15 +169,14 @@ PathApi <- R6::R6Class(
169169
...)
170170

171171
if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
172-
if (!.parse) {
173-
local_var_resp$content <- local_var_resp$response_as_text()
174-
return(local_var_resp)
175-
}
176-
177172
# save response in a file
178173
if (!is.null(data_file)) {
179174
self$api_client$WriteFile(local_var_resp, data_file)
180175
}
176+
if (!.parse) {
177+
local_var_resp$content <- local_var_resp$response_as_text()
178+
return(local_var_resp)
179+
}
181180

182181
deserialized_resp_obj <- tryCatch(
183182
self$api_client$DeserializeResponse(local_var_resp, "character"),

0 commit comments

Comments
 (0)