Skip to content

Commit fccb78b

Browse files
mattpollockmattpollock
committed
move handling of .parsed so that it applies to both primitive and non-primitive return types
1 parent 95f14b2 commit fccb78b

19 files changed

Lines changed: 370 additions & 372 deletions

File tree

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -561,6 +561,11 @@
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+
564569
{{#isPrimitiveType}}
565570
# save response in a file
566571
if (!is.null(data_file)) {
@@ -575,13 +580,6 @@
575580
self$api_client$WriteFile(local_var_resp, data_file)
576581
}
577582
578-
{{#returnType}}
579-
if (!.parse) {
580-
local_var_resp$content <- local_var_resp$response_as_text()
581-
return(local_var_resp)
582-
}
583-
{{/returnType}}
584-
585583
deserialized_resp_obj <- tryCatch(
586584
self$api_client$DeserializeResponse(local_var_resp, "{{returnType}}"),
587585
error = function(e) {

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

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

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

141+
# save response in a file
142+
if (!is.null(data_file)) {
143+
self$api_client$WriteFile(local_var_resp, data_file)
144+
}
145+
146146
deserialized_resp_obj <- tryCatch(
147147
self$api_client$DeserializeResponse(local_var_resp, "character"),
148148
error = function(e) {
@@ -231,16 +231,16 @@ AuthApi <- R6::R6Class(
231231
...)
232232

233233
if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
234-
# save response in a file
235-
if (!is.null(data_file)) {
236-
self$api_client$WriteFile(local_var_resp, data_file)
237-
}
238-
239234
if (!.parse) {
240235
local_var_resp$content <- local_var_resp$response_as_text()
241236
return(local_var_resp)
242237
}
243238

239+
# save response in a file
240+
if (!is.null(data_file)) {
241+
self$api_client$WriteFile(local_var_resp, data_file)
242+
}
243+
244244
deserialized_resp_obj <- tryCatch(
245245
self$api_client$DeserializeResponse(local_var_resp, "character"),
246246
error = function(e) {

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

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

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

243+
# save response in a file
244+
if (!is.null(data_file)) {
245+
self$api_client$WriteFile(local_var_resp, data_file)
246+
}
247+
248248
deserialized_resp_obj <- tryCatch(
249249
self$api_client$DeserializeResponse(local_var_resp, "data.frame"),
250250
error = function(e) {
@@ -341,16 +341,16 @@ BodyApi <- R6::R6Class(
341341
...)
342342

343343
if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
344-
# save response in a file
345-
if (!is.null(data_file)) {
346-
self$api_client$WriteFile(local_var_resp, data_file)
347-
}
348-
349344
if (!.parse) {
350345
local_var_resp$content <- local_var_resp$response_as_text()
351346
return(local_var_resp)
352347
}
353348

349+
# save response in a file
350+
if (!is.null(data_file)) {
351+
self$api_client$WriteFile(local_var_resp, data_file)
352+
}
353+
354354
deserialized_resp_obj <- tryCatch(
355355
self$api_client$DeserializeResponse(local_var_resp, "character"),
356356
error = function(e) {
@@ -446,16 +446,16 @@ BodyApi <- R6::R6Class(
446446
...)
447447

448448
if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
449-
# save response in a file
450-
if (!is.null(data_file)) {
451-
self$api_client$WriteFile(local_var_resp, data_file)
452-
}
453-
454449
if (!.parse) {
455450
local_var_resp$content <- local_var_resp$response_as_text()
456451
return(local_var_resp)
457452
}
458453

454+
# save response in a file
455+
if (!is.null(data_file)) {
456+
self$api_client$WriteFile(local_var_resp, data_file)
457+
}
458+
459459
deserialized_resp_obj <- tryCatch(
460460
self$api_client$DeserializeResponse(local_var_resp, "character"),
461461
error = function(e) {
@@ -547,16 +547,16 @@ BodyApi <- R6::R6Class(
547547
...)
548548

549549
if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
550-
# save response in a file
551-
if (!is.null(data_file)) {
552-
self$api_client$WriteFile(local_var_resp, data_file)
553-
}
554-
555550
if (!.parse) {
556551
local_var_resp$content <- local_var_resp$response_as_text()
557552
return(local_var_resp)
558553
}
559554

555+
# save response in a file
556+
if (!is.null(data_file)) {
557+
self$api_client$WriteFile(local_var_resp, data_file)
558+
}
559+
560560
deserialized_resp_obj <- tryCatch(
561561
self$api_client$DeserializeResponse(local_var_resp, "character"),
562562
error = function(e) {
@@ -653,16 +653,16 @@ BodyApi <- R6::R6Class(
653653
...)
654654

655655
if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
656-
# save response in a file
657-
if (!is.null(data_file)) {
658-
self$api_client$WriteFile(local_var_resp, data_file)
659-
}
660-
661656
if (!.parse) {
662657
local_var_resp$content <- local_var_resp$response_as_text()
663658
return(local_var_resp)
664659
}
665660

661+
# save response in a file
662+
if (!is.null(data_file)) {
663+
self$api_client$WriteFile(local_var_resp, data_file)
664+
}
665+
666666
deserialized_resp_obj <- tryCatch(
667667
self$api_client$DeserializeResponse(local_var_resp, "Pet"),
668668
error = function(e) {
@@ -759,16 +759,16 @@ BodyApi <- R6::R6Class(
759759
...)
760760

761761
if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
762-
# save response in a file
763-
if (!is.null(data_file)) {
764-
self$api_client$WriteFile(local_var_resp, data_file)
765-
}
766-
767762
if (!.parse) {
768763
local_var_resp$content <- local_var_resp$response_as_text()
769764
return(local_var_resp)
770765
}
771766

767+
# save response in a file
768+
if (!is.null(data_file)) {
769+
self$api_client$WriteFile(local_var_resp, data_file)
770+
}
771+
772772
deserialized_resp_obj <- tryCatch(
773773
self$api_client$DeserializeResponse(local_var_resp, "character"),
774774
error = function(e) {
@@ -865,16 +865,16 @@ BodyApi <- R6::R6Class(
865865
...)
866866

867867
if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
868-
# save response in a file
869-
if (!is.null(data_file)) {
870-
self$api_client$WriteFile(local_var_resp, data_file)
871-
}
872-
873868
if (!.parse) {
874869
local_var_resp$content <- local_var_resp$response_as_text()
875870
return(local_var_resp)
876871
}
877872

873+
# save response in a file
874+
if (!is.null(data_file)) {
875+
self$api_client$WriteFile(local_var_resp, data_file)
876+
}
877+
878878
deserialized_resp_obj <- tryCatch(
879879
self$api_client$DeserializeResponse(local_var_resp, "Pet"),
880880
error = function(e) {
@@ -971,16 +971,16 @@ BodyApi <- R6::R6Class(
971971
...)
972972

973973
if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
974-
# save response in a file
975-
if (!is.null(data_file)) {
976-
self$api_client$WriteFile(local_var_resp, data_file)
977-
}
978-
979974
if (!.parse) {
980975
local_var_resp$content <- local_var_resp$response_as_text()
981976
return(local_var_resp)
982977
}
983978

979+
# save response in a file
980+
if (!is.null(data_file)) {
981+
self$api_client$WriteFile(local_var_resp, data_file)
982+
}
983+
984984
deserialized_resp_obj <- tryCatch(
985985
self$api_client$DeserializeResponse(local_var_resp, "character"),
986986
error = function(e) {
@@ -1077,16 +1077,16 @@ BodyApi <- R6::R6Class(
10771077
...)
10781078

10791079
if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
1080-
# save response in a file
1081-
if (!is.null(data_file)) {
1082-
self$api_client$WriteFile(local_var_resp, data_file)
1083-
}
1084-
10851080
if (!.parse) {
10861081
local_var_resp$content <- local_var_resp$response_as_text()
10871082
return(local_var_resp)
10881083
}
10891084

1085+
# save response in a file
1086+
if (!is.null(data_file)) {
1087+
self$api_client$WriteFile(local_var_resp, data_file)
1088+
}
1089+
10901090
deserialized_resp_obj <- tryCatch(
10911091
self$api_client$DeserializeResponse(local_var_resp, "StringEnumRef"),
10921092
error = function(e) {
@@ -1183,16 +1183,16 @@ BodyApi <- R6::R6Class(
11831183
...)
11841184

11851185
if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
1186-
# save response in a file
1187-
if (!is.null(data_file)) {
1188-
self$api_client$WriteFile(local_var_resp, data_file)
1189-
}
1190-
11911186
if (!.parse) {
11921187
local_var_resp$content <- local_var_resp$response_as_text()
11931188
return(local_var_resp)
11941189
}
11951190

1191+
# save response in a file
1192+
if (!is.null(data_file)) {
1193+
self$api_client$WriteFile(local_var_resp, data_file)
1194+
}
1195+
11961196
deserialized_resp_obj <- tryCatch(
11971197
self$api_client$DeserializeResponse(local_var_resp, "character"),
11981198
error = function(e) {

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

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

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

174+
# save response in a file
175+
if (!is.null(data_file)) {
176+
self$api_client$WriteFile(local_var_resp, data_file)
177+
}
178+
179179
deserialized_resp_obj <- tryCatch(
180180
self$api_client$DeserializeResponse(local_var_resp, "character"),
181181
error = function(e) {
@@ -271,16 +271,16 @@ FormApi <- R6::R6Class(
271271
...)
272272

273273
if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
274-
# save response in a file
275-
if (!is.null(data_file)) {
276-
self$api_client$WriteFile(local_var_resp, data_file)
277-
}
278-
279274
if (!.parse) {
280275
local_var_resp$content <- local_var_resp$response_as_text()
281276
return(local_var_resp)
282277
}
283278

279+
# save response in a file
280+
if (!is.null(data_file)) {
281+
self$api_client$WriteFile(local_var_resp, data_file)
282+
}
283+
284284
deserialized_resp_obj <- tryCatch(
285285
self$api_client$DeserializeResponse(local_var_resp, "character"),
286286
error = function(e) {
@@ -407,16 +407,16 @@ FormApi <- R6::R6Class(
407407
...)
408408

409409
if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
410-
# save response in a file
411-
if (!is.null(data_file)) {
412-
self$api_client$WriteFile(local_var_resp, data_file)
413-
}
414-
415410
if (!.parse) {
416411
local_var_resp$content <- local_var_resp$response_as_text()
417412
return(local_var_resp)
418413
}
419414

415+
# save response in a file
416+
if (!is.null(data_file)) {
417+
self$api_client$WriteFile(local_var_resp, data_file)
418+
}
419+
420420
deserialized_resp_obj <- tryCatch(
421421
self$api_client$DeserializeResponse(local_var_resp, "character"),
422422
error = function(e) {

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

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

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

162+
# save response in a file
163+
if (!is.null(data_file)) {
164+
self$api_client$WriteFile(local_var_resp, data_file)
165+
}
166+
167167
deserialized_resp_obj <- tryCatch(
168168
self$api_client$DeserializeResponse(local_var_resp, "character"),
169169
error = function(e) {

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

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

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

177+
# save response in a file
178+
if (!is.null(data_file)) {
179+
self$api_client$WriteFile(local_var_resp, data_file)
180+
}
181+
182182
deserialized_resp_obj <- tryCatch(
183183
self$api_client$DeserializeResponse(local_var_resp, "character"),
184184
error = function(e) {

0 commit comments

Comments
 (0)