From dd503a68cacfaa04ac520a99fa649e2009a05ac1 Mon Sep 17 00:00:00 2001 From: Matthew Pollock Date: Mon, 26 Jan 2026 14:48:03 -0500 Subject: [PATCH 1/5] [R] avoid to-JSON issues when R6 classes contain lists of R6 classes --- .../main/resources/r/modelGeneric.mustache | 29 +++++++++++++++++-- samples/client/echo_api/r/R/bird.R | 23 +++++++++++++++ samples/client/echo_api/r/R/category.R | 23 +++++++++++++++ samples/client/echo_api/r/R/data_query.R | 23 +++++++++++++++ samples/client/echo_api/r/R/default_value.R | 25 +++++++++++++++- .../echo_api/r/R/number_properties_only.R | 23 +++++++++++++++ samples/client/echo_api/r/R/pet.R | 27 +++++++++++++++-- samples/client/echo_api/r/R/query.R | 23 +++++++++++++++ samples/client/echo_api/r/R/tag.R | 23 +++++++++++++++ ...est_form_object_multipart_request_marker.R | 23 +++++++++++++++ ...rue_object_all_of_query_object_parameter.R | 23 +++++++++++++++ ...true_array_string_query_object_parameter.R | 23 +++++++++++++++ .../R/allof_tag_api_response.R | 23 +++++++++++++++ .../petstore/R-httr2-wrapper/R/animal.R | 23 +++++++++++++++ .../petstore/R-httr2-wrapper/R/basque_pig.R | 23 +++++++++++++++ .../client/petstore/R-httr2-wrapper/R/cat.R | 23 +++++++++++++++ .../petstore/R-httr2-wrapper/R/category.R | 23 +++++++++++++++ .../petstore/R-httr2-wrapper/R/danish_pig.R | 23 +++++++++++++++ .../client/petstore/R-httr2-wrapper/R/date.R | 23 +++++++++++++++ .../client/petstore/R-httr2-wrapper/R/dog.R | 23 +++++++++++++++ .../petstore/R-httr2-wrapper/R/dummy_model.R | 23 +++++++++++++++ .../petstore/R-httr2-wrapper/R/format_test.R | 23 +++++++++++++++ .../R-httr2-wrapper/R/model_api_response.R | 23 +++++++++++++++ .../R-httr2-wrapper/R/nested_one_of.R | 25 +++++++++++++++- .../client/petstore/R-httr2-wrapper/R/order.R | 23 +++++++++++++++ .../client/petstore/R-httr2-wrapper/R/pet.R | 27 +++++++++++++++-- .../petstore/R-httr2-wrapper/R/pet_map.R | 23 +++++++++++++++ .../petstore/R-httr2-wrapper/R/special.R | 23 +++++++++++++++ .../client/petstore/R-httr2-wrapper/R/tag.R | 23 +++++++++++++++ .../R-httr2-wrapper/R/update_pet_request.R | 25 +++++++++++++++- .../client/petstore/R-httr2-wrapper/R/user.R | 23 +++++++++++++++ .../client/petstore/R-httr2-wrapper/R/whale.R | 23 +++++++++++++++ .../client/petstore/R-httr2-wrapper/R/zebra.R | 23 +++++++++++++++ .../R-httr2/R/allof_tag_api_response.R | 23 +++++++++++++++ samples/client/petstore/R-httr2/R/animal.R | 23 +++++++++++++++ .../client/petstore/R-httr2/R/basque_pig.R | 23 +++++++++++++++ samples/client/petstore/R-httr2/R/cat.R | 23 +++++++++++++++ samples/client/petstore/R-httr2/R/category.R | 23 +++++++++++++++ .../client/petstore/R-httr2/R/danish_pig.R | 23 +++++++++++++++ samples/client/petstore/R-httr2/R/date.R | 23 +++++++++++++++ samples/client/petstore/R-httr2/R/dog.R | 23 +++++++++++++++ .../client/petstore/R-httr2/R/format_test.R | 23 +++++++++++++++ .../client/petstore/R-httr2/R/just_model.R | 23 +++++++++++++++ .../petstore/R-httr2/R/model_api_response.R | 23 +++++++++++++++ .../client/petstore/R-httr2/R/nested_one_of.R | 25 +++++++++++++++- samples/client/petstore/R-httr2/R/order.R | 23 +++++++++++++++ samples/client/petstore/R-httr2/R/pet.R | 27 +++++++++++++++-- samples/client/petstore/R-httr2/R/pet_map.R | 23 +++++++++++++++ samples/client/petstore/R-httr2/R/special.R | 23 +++++++++++++++ samples/client/petstore/R-httr2/R/tag.R | 23 +++++++++++++++ .../petstore/R-httr2/R/update_pet_request.R | 25 +++++++++++++++- samples/client/petstore/R-httr2/R/user.R | 23 +++++++++++++++ samples/client/petstore/R-httr2/R/whale.R | 23 +++++++++++++++ samples/client/petstore/R-httr2/R/zebra.R | 23 +++++++++++++++ .../petstore/R/R/allof_tag_api_response.R | 23 +++++++++++++++ samples/client/petstore/R/R/animal.R | 23 +++++++++++++++ samples/client/petstore/R/R/basque_pig.R | 23 +++++++++++++++ samples/client/petstore/R/R/cat.R | 23 +++++++++++++++ samples/client/petstore/R/R/category.R | 23 +++++++++++++++ samples/client/petstore/R/R/danish_pig.R | 23 +++++++++++++++ samples/client/petstore/R/R/date.R | 23 +++++++++++++++ samples/client/petstore/R/R/dog.R | 23 +++++++++++++++ samples/client/petstore/R/R/dummy_model.R | 23 +++++++++++++++ samples/client/petstore/R/R/format_test.R | 23 +++++++++++++++ .../client/petstore/R/R/model_api_response.R | 23 +++++++++++++++ samples/client/petstore/R/R/nested_one_of.R | 25 +++++++++++++++- samples/client/petstore/R/R/order.R | 23 +++++++++++++++ samples/client/petstore/R/R/pet.R | 27 +++++++++++++++-- samples/client/petstore/R/R/pet_map.R | 23 +++++++++++++++ samples/client/petstore/R/R/special.R | 23 +++++++++++++++ samples/client/petstore/R/R/tag.R | 23 +++++++++++++++ .../client/petstore/R/R/update_pet_request.R | 25 +++++++++++++++- samples/client/petstore/R/R/user.R | 23 +++++++++++++++ samples/client/petstore/R/R/whale.R | 23 +++++++++++++++ samples/client/petstore/R/R/zebra.R | 23 +++++++++++++++ 75 files changed, 1743 insertions(+), 18 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/r/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/r/modelGeneric.mustache index 0da6607925aa..f527bdd0f6d6 100644 --- a/modules/openapi-generator/src/main/resources/r/modelGeneric.mustache +++ b/modules/openapi-generator/src/main/resources/r/modelGeneric.mustache @@ -242,7 +242,7 @@ self$`{{name}}` {{/isPrimitiveType}} {{^isPrimitiveType}} - lapply(self$`{{name}}`, function(x) x$toSimpleType()) + self$extractSimpleType(self$`{{name}}`) {{/isPrimitiveType}} {{/isArray}} {{#isMap}} @@ -250,7 +250,7 @@ self$`{{name}}` {{/isPrimitiveType}} {{^isPrimitiveType}} - lapply(self$`{{name}}`, function(x) x$toSimpleType()) + self$extractSimpleType(self$`{{name}}`) {{/isPrimitiveType}} {{/isMap}} {{/isContainer}} @@ -259,7 +259,7 @@ self$`{{name}}` {{/isPrimitiveType}} {{^isPrimitiveType}} - self$`{{name}}`$toSimpleType() + self$extractSimpleType(self$`{{name}}`) {{/isPrimitiveType}} {{/isContainer}} } @@ -273,6 +273,29 @@ return({{classname}}Object) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of {{{classname}}} #' diff --git a/samples/client/echo_api/r/R/bird.R b/samples/client/echo_api/r/R/bird.R index 97921b1c4c89..c425007d6e83 100644 --- a/samples/client/echo_api/r/R/bird.R +++ b/samples/client/echo_api/r/R/bird.R @@ -81,6 +81,29 @@ Bird <- R6::R6Class( return(BirdObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of Bird #' diff --git a/samples/client/echo_api/r/R/category.R b/samples/client/echo_api/r/R/category.R index 56aa69671774..d13dc6d8d7ce 100644 --- a/samples/client/echo_api/r/R/category.R +++ b/samples/client/echo_api/r/R/category.R @@ -81,6 +81,29 @@ Category <- R6::R6Class( return(CategoryObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of Category #' diff --git a/samples/client/echo_api/r/R/data_query.R b/samples/client/echo_api/r/R/data_query.R index 1340544416d0..c2f96bc442a1 100644 --- a/samples/client/echo_api/r/R/data_query.R +++ b/samples/client/echo_api/r/R/data_query.R @@ -120,6 +120,29 @@ DataQuery <- R6::R6Class( return(DataQueryObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of DataQuery #' diff --git a/samples/client/echo_api/r/R/default_value.R b/samples/client/echo_api/r/R/default_value.R index 2a3a83f32655..0af60c2201bc 100644 --- a/samples/client/echo_api/r/R/default_value.R +++ b/samples/client/echo_api/r/R/default_value.R @@ -119,7 +119,7 @@ DefaultValue <- R6::R6Class( DefaultValueObject <- list() if (!is.null(self$`array_string_enum_ref_default`)) { DefaultValueObject[["array_string_enum_ref_default"]] <- - lapply(self$`array_string_enum_ref_default`, function(x) x$toSimpleType()) + self$extractSimpleType(self$`array_string_enum_ref_default`) } if (!is.null(self$`array_string_enum_default`)) { DefaultValueObject[["array_string_enum_default"]] <- @@ -152,6 +152,29 @@ DefaultValue <- R6::R6Class( return(DefaultValueObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of DefaultValue #' diff --git a/samples/client/echo_api/r/R/number_properties_only.R b/samples/client/echo_api/r/R/number_properties_only.R index 7b146800ad34..847b65a3509d 100644 --- a/samples/client/echo_api/r/R/number_properties_only.R +++ b/samples/client/echo_api/r/R/number_properties_only.R @@ -91,6 +91,29 @@ NumberPropertiesOnly <- R6::R6Class( return(NumberPropertiesOnlyObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of NumberPropertiesOnly #' diff --git a/samples/client/echo_api/r/R/pet.R b/samples/client/echo_api/r/R/pet.R index 6f59d7ea1f6c..136c833819f5 100644 --- a/samples/client/echo_api/r/R/pet.R +++ b/samples/client/echo_api/r/R/pet.R @@ -115,7 +115,7 @@ Pet <- R6::R6Class( } if (!is.null(self$`category`)) { PetObject[["category"]] <- - self$`category`$toSimpleType() + self$extractSimpleType(self$`category`) } if (!is.null(self$`photoUrls`)) { PetObject[["photoUrls"]] <- @@ -123,7 +123,7 @@ Pet <- R6::R6Class( } if (!is.null(self$`tags`)) { PetObject[["tags"]] <- - lapply(self$`tags`, function(x) x$toSimpleType()) + self$extractSimpleType(self$`tags`) } if (!is.null(self$`status`)) { PetObject[["status"]] <- @@ -132,6 +132,29 @@ Pet <- R6::R6Class( return(PetObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of Pet #' diff --git a/samples/client/echo_api/r/R/query.R b/samples/client/echo_api/r/R/query.R index fd286ab3016d..57613f79a0b4 100644 --- a/samples/client/echo_api/r/R/query.R +++ b/samples/client/echo_api/r/R/query.R @@ -80,6 +80,29 @@ Query <- R6::R6Class( return(QueryObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of Query #' diff --git a/samples/client/echo_api/r/R/tag.R b/samples/client/echo_api/r/R/tag.R index 3a0d3c1d2390..2bec2d2fafaa 100644 --- a/samples/client/echo_api/r/R/tag.R +++ b/samples/client/echo_api/r/R/tag.R @@ -81,6 +81,29 @@ Tag <- R6::R6Class( return(TagObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of Tag #' diff --git a/samples/client/echo_api/r/R/test_form_object_multipart_request_marker.R b/samples/client/echo_api/r/R/test_form_object_multipart_request_marker.R index 5c9776f78ebe..d2dafca0d3a3 100644 --- a/samples/client/echo_api/r/R/test_form_object_multipart_request_marker.R +++ b/samples/client/echo_api/r/R/test_form_object_multipart_request_marker.R @@ -68,6 +68,29 @@ TestFormObjectMultipartRequestMarker <- R6::R6Class( return(TestFormObjectMultipartRequestMarkerObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of TestFormObjectMultipartRequestMarker #' diff --git a/samples/client/echo_api/r/R/test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.R b/samples/client/echo_api/r/R/test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.R index a441c20a8be3..c69a79ff34ee 100644 --- a/samples/client/echo_api/r/R/test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.R +++ b/samples/client/echo_api/r/R/test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.R @@ -107,6 +107,29 @@ TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter <- R6::R6Clas return(TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameterObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter #' diff --git a/samples/client/echo_api/r/R/test_query_style_form_explode_true_array_string_query_object_parameter.R b/samples/client/echo_api/r/R/test_query_style_form_explode_true_array_string_query_object_parameter.R index 9a874c05c0d1..64de4c207823 100644 --- a/samples/client/echo_api/r/R/test_query_style_form_explode_true_array_string_query_object_parameter.R +++ b/samples/client/echo_api/r/R/test_query_style_form_explode_true_array_string_query_object_parameter.R @@ -67,6 +67,29 @@ TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter <- R6::R6Class( return(TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameterObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/allof_tag_api_response.R b/samples/client/petstore/R-httr2-wrapper/R/allof_tag_api_response.R index 018600362d38..57a0eb7579fd 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/allof_tag_api_response.R +++ b/samples/client/petstore/R-httr2-wrapper/R/allof_tag_api_response.R @@ -134,6 +134,29 @@ AllofTagApiResponse <- R6::R6Class( return(AllofTagApiResponseObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of AllofTagApiResponse #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/animal.R b/samples/client/petstore/R-httr2-wrapper/R/animal.R index cf2e97f9af30..50b63b0f3a91 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/animal.R +++ b/samples/client/petstore/R-httr2-wrapper/R/animal.R @@ -97,6 +97,29 @@ Animal <- R6::R6Class( return(AnimalObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of Animal #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/basque_pig.R b/samples/client/petstore/R-httr2-wrapper/R/basque_pig.R index ca8601f4c3b1..f72037d832d4 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/basque_pig.R +++ b/samples/client/petstore/R-httr2-wrapper/R/basque_pig.R @@ -95,6 +95,29 @@ BasquePig <- R6::R6Class( return(BasquePigObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of BasquePig #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/cat.R b/samples/client/petstore/R-httr2-wrapper/R/cat.R index 270b87c21643..7a496e1b1488 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/cat.R +++ b/samples/client/petstore/R-httr2-wrapper/R/cat.R @@ -109,6 +109,29 @@ Cat <- R6::R6Class( return(CatObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of Cat #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/category.R b/samples/client/petstore/R-httr2-wrapper/R/category.R index 0dcbd1b81610..7d08e4b0ef31 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/category.R +++ b/samples/client/petstore/R-httr2-wrapper/R/category.R @@ -95,6 +95,29 @@ Category <- R6::R6Class( return(CategoryObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of Category #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/danish_pig.R b/samples/client/petstore/R-httr2-wrapper/R/danish_pig.R index 02d2208639b0..2cced513aed8 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/danish_pig.R +++ b/samples/client/petstore/R-httr2-wrapper/R/danish_pig.R @@ -95,6 +95,29 @@ DanishPig <- R6::R6Class( return(DanishPigObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of DanishPig #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/date.R b/samples/client/petstore/R-httr2-wrapper/R/date.R index 411249d3fba1..e3ceb668c336 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/date.R +++ b/samples/client/petstore/R-httr2-wrapper/R/date.R @@ -112,6 +112,29 @@ Date <- R6::R6Class( return(DateObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of Date #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/dog.R b/samples/client/petstore/R-httr2-wrapper/R/dog.R index 4d6dab71c61b..f0ca3a625fc9 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/dog.R +++ b/samples/client/petstore/R-httr2-wrapper/R/dog.R @@ -109,6 +109,29 @@ Dog <- R6::R6Class( return(DogObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of Dog #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/dummy_model.R b/samples/client/petstore/R-httr2-wrapper/R/dummy_model.R index cbea7830b824..850428ca3cfd 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/dummy_model.R +++ b/samples/client/petstore/R-httr2-wrapper/R/dummy_model.R @@ -82,6 +82,29 @@ DummyModel <- R6::R6Class( return(DummyModelObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of DummyModel #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/format_test.R b/samples/client/petstore/R-httr2-wrapper/R/format_test.R index 7d1bded3c5a8..d96d953a5de6 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/format_test.R +++ b/samples/client/petstore/R-httr2-wrapper/R/format_test.R @@ -255,6 +255,29 @@ FormatTest <- R6::R6Class( return(FormatTestObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of FormatTest #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/model_api_response.R b/samples/client/petstore/R-httr2-wrapper/R/model_api_response.R index a3a46dfb7907..a26bb4d94bc3 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/model_api_response.R +++ b/samples/client/petstore/R-httr2-wrapper/R/model_api_response.R @@ -108,6 +108,29 @@ ModelApiResponse <- R6::R6Class( return(ModelApiResponseObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of ModelApiResponse #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/nested_one_of.R b/samples/client/petstore/R-httr2-wrapper/R/nested_one_of.R index 31dcc2f10d01..634964fee461 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/nested_one_of.R +++ b/samples/client/petstore/R-httr2-wrapper/R/nested_one_of.R @@ -84,7 +84,7 @@ NestedOneOf <- R6::R6Class( } if (!is.null(self$`nested_pig`)) { NestedOneOfObject[["nested_pig"]] <- - self$`nested_pig`$toSimpleType() + self$extractSimpleType(self$`nested_pig`) } for (key in names(self$additional_properties)) { NestedOneOfObject[[key]] <- self$additional_properties[[key]] @@ -93,6 +93,29 @@ NestedOneOf <- R6::R6Class( return(NestedOneOfObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of NestedOneOf #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/order.R b/samples/client/petstore/R-httr2-wrapper/R/order.R index 07378f03666c..bb82014b8f8d 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/order.R +++ b/samples/client/petstore/R-httr2-wrapper/R/order.R @@ -150,6 +150,29 @@ Order <- R6::R6Class( return(OrderObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of Order #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/pet.R b/samples/client/petstore/R-httr2-wrapper/R/pet.R index 27db68d8fdbd..3da18df63011 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/pet.R +++ b/samples/client/petstore/R-httr2-wrapper/R/pet.R @@ -121,7 +121,7 @@ Pet <- R6::R6Class( } if (!is.null(self$`category`)) { PetObject[["category"]] <- - self$`category`$toSimpleType() + self$extractSimpleType(self$`category`) } if (!is.null(self$`name`)) { PetObject[["name"]] <- @@ -133,7 +133,7 @@ Pet <- R6::R6Class( } if (!is.null(self$`tags`)) { PetObject[["tags"]] <- - lapply(self$`tags`, function(x) x$toSimpleType()) + self$extractSimpleType(self$`tags`) } if (!is.null(self$`status`)) { PetObject[["status"]] <- @@ -146,6 +146,29 @@ Pet <- R6::R6Class( return(PetObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of Pet #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/pet_map.R b/samples/client/petstore/R-httr2-wrapper/R/pet_map.R index aa59c50a09c0..6ba1b89d2038 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/pet_map.R +++ b/samples/client/petstore/R-httr2-wrapper/R/pet_map.R @@ -81,6 +81,29 @@ PetMap <- R6::R6Class( return(PetMapObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of PetMap #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/special.R b/samples/client/petstore/R-httr2-wrapper/R/special.R index 4c27190313fb..467775bd362a 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/special.R +++ b/samples/client/petstore/R-httr2-wrapper/R/special.R @@ -162,6 +162,29 @@ Special <- R6::R6Class( return(SpecialObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of Special #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/tag.R b/samples/client/petstore/R-httr2-wrapper/R/tag.R index b4c893dfe77e..6b466e090abf 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/tag.R +++ b/samples/client/petstore/R-httr2-wrapper/R/tag.R @@ -95,6 +95,29 @@ Tag <- R6::R6Class( return(TagObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of Tag #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/update_pet_request.R b/samples/client/petstore/R-httr2-wrapper/R/update_pet_request.R index 3559d3c4d838..2bdb591a433a 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/update_pet_request.R +++ b/samples/client/petstore/R-httr2-wrapper/R/update_pet_request.R @@ -77,7 +77,7 @@ UpdatePetRequest <- R6::R6Class( UpdatePetRequestObject <- list() if (!is.null(self$`jsonData`)) { UpdatePetRequestObject[["jsonData"]] <- - self$`jsonData`$toSimpleType() + self$extractSimpleType(self$`jsonData`) } if (!is.null(self$`binaryDataN2Information`)) { UpdatePetRequestObject[["binaryDataN2Information"]] <- @@ -90,6 +90,29 @@ UpdatePetRequest <- R6::R6Class( return(UpdatePetRequestObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of UpdatePetRequest #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/user.R b/samples/client/petstore/R-httr2-wrapper/R/user.R index 361d0d454f21..ba79866f322a 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/user.R +++ b/samples/client/petstore/R-httr2-wrapper/R/user.R @@ -173,6 +173,29 @@ User <- R6::R6Class( return(UserObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of User #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/whale.R b/samples/client/petstore/R-httr2-wrapper/R/whale.R index ea54d3bdf71c..bfb7ee0db2e1 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/whale.R +++ b/samples/client/petstore/R-httr2-wrapper/R/whale.R @@ -108,6 +108,29 @@ Whale <- R6::R6Class( return(WhaleObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of Whale #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/zebra.R b/samples/client/petstore/R-httr2-wrapper/R/zebra.R index 6b85dbff4093..dabac1248d44 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/zebra.R +++ b/samples/client/petstore/R-httr2-wrapper/R/zebra.R @@ -98,6 +98,29 @@ Zebra <- R6::R6Class( return(ZebraObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of Zebra #' diff --git a/samples/client/petstore/R-httr2/R/allof_tag_api_response.R b/samples/client/petstore/R-httr2/R/allof_tag_api_response.R index 37fa07aaa475..f0f55d0cd0de 100644 --- a/samples/client/petstore/R-httr2/R/allof_tag_api_response.R +++ b/samples/client/petstore/R-httr2/R/allof_tag_api_response.R @@ -120,6 +120,29 @@ AllofTagApiResponse <- R6::R6Class( return(AllofTagApiResponseObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of AllofTagApiResponse #' diff --git a/samples/client/petstore/R-httr2/R/animal.R b/samples/client/petstore/R-httr2/R/animal.R index 8b7e9dba4ffe..b6054904cb9c 100644 --- a/samples/client/petstore/R-httr2/R/animal.R +++ b/samples/client/petstore/R-httr2/R/animal.R @@ -83,6 +83,29 @@ Animal <- R6::R6Class( return(AnimalObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of Animal #' diff --git a/samples/client/petstore/R-httr2/R/basque_pig.R b/samples/client/petstore/R-httr2/R/basque_pig.R index 77af09db6a04..dc77709dd97d 100644 --- a/samples/client/petstore/R-httr2/R/basque_pig.R +++ b/samples/client/petstore/R-httr2/R/basque_pig.R @@ -81,6 +81,29 @@ BasquePig <- R6::R6Class( return(BasquePigObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of BasquePig #' diff --git a/samples/client/petstore/R-httr2/R/cat.R b/samples/client/petstore/R-httr2/R/cat.R index 54784f94e2b5..1a587ef3b4c9 100644 --- a/samples/client/petstore/R-httr2/R/cat.R +++ b/samples/client/petstore/R-httr2/R/cat.R @@ -95,6 +95,29 @@ Cat <- R6::R6Class( return(CatObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of Cat #' diff --git a/samples/client/petstore/R-httr2/R/category.R b/samples/client/petstore/R-httr2/R/category.R index 9448df38190e..f8b5fd758669 100644 --- a/samples/client/petstore/R-httr2/R/category.R +++ b/samples/client/petstore/R-httr2/R/category.R @@ -81,6 +81,29 @@ Category <- R6::R6Class( return(CategoryObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of Category #' diff --git a/samples/client/petstore/R-httr2/R/danish_pig.R b/samples/client/petstore/R-httr2/R/danish_pig.R index e5eeb4446146..1ea49b8b8f77 100644 --- a/samples/client/petstore/R-httr2/R/danish_pig.R +++ b/samples/client/petstore/R-httr2/R/danish_pig.R @@ -81,6 +81,29 @@ DanishPig <- R6::R6Class( return(DanishPigObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of DanishPig #' diff --git a/samples/client/petstore/R-httr2/R/date.R b/samples/client/petstore/R-httr2/R/date.R index 81dc68d4feec..ea8795a072cf 100644 --- a/samples/client/petstore/R-httr2/R/date.R +++ b/samples/client/petstore/R-httr2/R/date.R @@ -98,6 +98,29 @@ Date <- R6::R6Class( return(DateObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of Date #' diff --git a/samples/client/petstore/R-httr2/R/dog.R b/samples/client/petstore/R-httr2/R/dog.R index 1928ffc3985c..409d51840f30 100644 --- a/samples/client/petstore/R-httr2/R/dog.R +++ b/samples/client/petstore/R-httr2/R/dog.R @@ -95,6 +95,29 @@ Dog <- R6::R6Class( return(DogObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of Dog #' diff --git a/samples/client/petstore/R-httr2/R/format_test.R b/samples/client/petstore/R-httr2/R/format_test.R index 1e8a62b2fd9c..5d65389415d1 100644 --- a/samples/client/petstore/R-httr2/R/format_test.R +++ b/samples/client/petstore/R-httr2/R/format_test.R @@ -241,6 +241,29 @@ FormatTest <- R6::R6Class( return(FormatTestObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of FormatTest #' diff --git a/samples/client/petstore/R-httr2/R/just_model.R b/samples/client/petstore/R-httr2/R/just_model.R index 89d14ef99c3a..cb8dfb8541d1 100644 --- a/samples/client/petstore/R-httr2/R/just_model.R +++ b/samples/client/petstore/R-httr2/R/just_model.R @@ -68,6 +68,29 @@ JustModel <- R6::R6Class( return(JustModelObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of JustModel #' diff --git a/samples/client/petstore/R-httr2/R/model_api_response.R b/samples/client/petstore/R-httr2/R/model_api_response.R index d65c1860ce2c..fdf1f63b1e95 100644 --- a/samples/client/petstore/R-httr2/R/model_api_response.R +++ b/samples/client/petstore/R-httr2/R/model_api_response.R @@ -94,6 +94,29 @@ ModelApiResponse <- R6::R6Class( return(ModelApiResponseObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of ModelApiResponse #' diff --git a/samples/client/petstore/R-httr2/R/nested_one_of.R b/samples/client/petstore/R-httr2/R/nested_one_of.R index d0ef1f9b67a5..22fbef2a4122 100644 --- a/samples/client/petstore/R-httr2/R/nested_one_of.R +++ b/samples/client/petstore/R-httr2/R/nested_one_of.R @@ -74,11 +74,34 @@ NestedOneOf <- R6::R6Class( } if (!is.null(self$`nested_pig`)) { NestedOneOfObject[["nested_pig"]] <- - self$`nested_pig`$toSimpleType() + self$extractSimpleType(self$`nested_pig`) } return(NestedOneOfObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of NestedOneOf #' diff --git a/samples/client/petstore/R-httr2/R/order.R b/samples/client/petstore/R-httr2/R/order.R index cf6bcb48bc85..e5e1ba50a537 100644 --- a/samples/client/petstore/R-httr2/R/order.R +++ b/samples/client/petstore/R-httr2/R/order.R @@ -136,6 +136,29 @@ Order <- R6::R6Class( return(OrderObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of Order #' diff --git a/samples/client/petstore/R-httr2/R/pet.R b/samples/client/petstore/R-httr2/R/pet.R index c3d0bc32fd61..8cf20cacaac7 100644 --- a/samples/client/petstore/R-httr2/R/pet.R +++ b/samples/client/petstore/R-httr2/R/pet.R @@ -111,7 +111,7 @@ Pet <- R6::R6Class( } if (!is.null(self$`category`)) { PetObject[["category"]] <- - self$`category`$toSimpleType() + self$extractSimpleType(self$`category`) } if (!is.null(self$`name`)) { PetObject[["name"]] <- @@ -123,7 +123,7 @@ Pet <- R6::R6Class( } if (!is.null(self$`tags`)) { PetObject[["tags"]] <- - lapply(self$`tags`, function(x) x$toSimpleType()) + self$extractSimpleType(self$`tags`) } if (!is.null(self$`status`)) { PetObject[["status"]] <- @@ -132,6 +132,29 @@ Pet <- R6::R6Class( return(PetObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of Pet #' diff --git a/samples/client/petstore/R-httr2/R/pet_map.R b/samples/client/petstore/R-httr2/R/pet_map.R index e0e63305d0fd..c81b747f8e74 100644 --- a/samples/client/petstore/R-httr2/R/pet_map.R +++ b/samples/client/petstore/R-httr2/R/pet_map.R @@ -67,6 +67,29 @@ PetMap <- R6::R6Class( return(PetMapObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of PetMap #' diff --git a/samples/client/petstore/R-httr2/R/special.R b/samples/client/petstore/R-httr2/R/special.R index 2e4c8ccdc0cf..e65663ae6684 100644 --- a/samples/client/petstore/R-httr2/R/special.R +++ b/samples/client/petstore/R-httr2/R/special.R @@ -148,6 +148,29 @@ Special <- R6::R6Class( return(SpecialObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of Special #' diff --git a/samples/client/petstore/R-httr2/R/tag.R b/samples/client/petstore/R-httr2/R/tag.R index 96383b87f07f..a40b0234e1fd 100644 --- a/samples/client/petstore/R-httr2/R/tag.R +++ b/samples/client/petstore/R-httr2/R/tag.R @@ -81,6 +81,29 @@ Tag <- R6::R6Class( return(TagObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of Tag #' diff --git a/samples/client/petstore/R-httr2/R/update_pet_request.R b/samples/client/petstore/R-httr2/R/update_pet_request.R index e42c9a114546..829e8f6b677a 100644 --- a/samples/client/petstore/R-httr2/R/update_pet_request.R +++ b/samples/client/petstore/R-httr2/R/update_pet_request.R @@ -67,7 +67,7 @@ UpdatePetRequest <- R6::R6Class( UpdatePetRequestObject <- list() if (!is.null(self$`jsonData`)) { UpdatePetRequestObject[["jsonData"]] <- - self$`jsonData`$toSimpleType() + self$extractSimpleType(self$`jsonData`) } if (!is.null(self$`binaryDataN2Information`)) { UpdatePetRequestObject[["binaryDataN2Information"]] <- @@ -76,6 +76,29 @@ UpdatePetRequest <- R6::R6Class( return(UpdatePetRequestObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of UpdatePetRequest #' diff --git a/samples/client/petstore/R-httr2/R/user.R b/samples/client/petstore/R-httr2/R/user.R index 76c4970a45d6..323c158e016e 100644 --- a/samples/client/petstore/R-httr2/R/user.R +++ b/samples/client/petstore/R-httr2/R/user.R @@ -159,6 +159,29 @@ User <- R6::R6Class( return(UserObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of User #' diff --git a/samples/client/petstore/R-httr2/R/whale.R b/samples/client/petstore/R-httr2/R/whale.R index fef88a7c6375..c03624188f3b 100644 --- a/samples/client/petstore/R-httr2/R/whale.R +++ b/samples/client/petstore/R-httr2/R/whale.R @@ -94,6 +94,29 @@ Whale <- R6::R6Class( return(WhaleObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of Whale #' diff --git a/samples/client/petstore/R-httr2/R/zebra.R b/samples/client/petstore/R-httr2/R/zebra.R index c5165a867082..3cdeec3eb392 100644 --- a/samples/client/petstore/R-httr2/R/zebra.R +++ b/samples/client/petstore/R-httr2/R/zebra.R @@ -84,6 +84,29 @@ Zebra <- R6::R6Class( return(ZebraObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of Zebra #' diff --git a/samples/client/petstore/R/R/allof_tag_api_response.R b/samples/client/petstore/R/R/allof_tag_api_response.R index 018600362d38..57a0eb7579fd 100644 --- a/samples/client/petstore/R/R/allof_tag_api_response.R +++ b/samples/client/petstore/R/R/allof_tag_api_response.R @@ -134,6 +134,29 @@ AllofTagApiResponse <- R6::R6Class( return(AllofTagApiResponseObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of AllofTagApiResponse #' diff --git a/samples/client/petstore/R/R/animal.R b/samples/client/petstore/R/R/animal.R index cf2e97f9af30..50b63b0f3a91 100644 --- a/samples/client/petstore/R/R/animal.R +++ b/samples/client/petstore/R/R/animal.R @@ -97,6 +97,29 @@ Animal <- R6::R6Class( return(AnimalObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of Animal #' diff --git a/samples/client/petstore/R/R/basque_pig.R b/samples/client/petstore/R/R/basque_pig.R index ca8601f4c3b1..f72037d832d4 100644 --- a/samples/client/petstore/R/R/basque_pig.R +++ b/samples/client/petstore/R/R/basque_pig.R @@ -95,6 +95,29 @@ BasquePig <- R6::R6Class( return(BasquePigObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of BasquePig #' diff --git a/samples/client/petstore/R/R/cat.R b/samples/client/petstore/R/R/cat.R index 270b87c21643..7a496e1b1488 100644 --- a/samples/client/petstore/R/R/cat.R +++ b/samples/client/petstore/R/R/cat.R @@ -109,6 +109,29 @@ Cat <- R6::R6Class( return(CatObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of Cat #' diff --git a/samples/client/petstore/R/R/category.R b/samples/client/petstore/R/R/category.R index 0dcbd1b81610..7d08e4b0ef31 100644 --- a/samples/client/petstore/R/R/category.R +++ b/samples/client/petstore/R/R/category.R @@ -95,6 +95,29 @@ Category <- R6::R6Class( return(CategoryObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of Category #' diff --git a/samples/client/petstore/R/R/danish_pig.R b/samples/client/petstore/R/R/danish_pig.R index 02d2208639b0..2cced513aed8 100644 --- a/samples/client/petstore/R/R/danish_pig.R +++ b/samples/client/petstore/R/R/danish_pig.R @@ -95,6 +95,29 @@ DanishPig <- R6::R6Class( return(DanishPigObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of DanishPig #' diff --git a/samples/client/petstore/R/R/date.R b/samples/client/petstore/R/R/date.R index 411249d3fba1..e3ceb668c336 100644 --- a/samples/client/petstore/R/R/date.R +++ b/samples/client/petstore/R/R/date.R @@ -112,6 +112,29 @@ Date <- R6::R6Class( return(DateObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of Date #' diff --git a/samples/client/petstore/R/R/dog.R b/samples/client/petstore/R/R/dog.R index 4d6dab71c61b..f0ca3a625fc9 100644 --- a/samples/client/petstore/R/R/dog.R +++ b/samples/client/petstore/R/R/dog.R @@ -109,6 +109,29 @@ Dog <- R6::R6Class( return(DogObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of Dog #' diff --git a/samples/client/petstore/R/R/dummy_model.R b/samples/client/petstore/R/R/dummy_model.R index cbea7830b824..850428ca3cfd 100644 --- a/samples/client/petstore/R/R/dummy_model.R +++ b/samples/client/petstore/R/R/dummy_model.R @@ -82,6 +82,29 @@ DummyModel <- R6::R6Class( return(DummyModelObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of DummyModel #' diff --git a/samples/client/petstore/R/R/format_test.R b/samples/client/petstore/R/R/format_test.R index 7d1bded3c5a8..d96d953a5de6 100644 --- a/samples/client/petstore/R/R/format_test.R +++ b/samples/client/petstore/R/R/format_test.R @@ -255,6 +255,29 @@ FormatTest <- R6::R6Class( return(FormatTestObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of FormatTest #' diff --git a/samples/client/petstore/R/R/model_api_response.R b/samples/client/petstore/R/R/model_api_response.R index a3a46dfb7907..a26bb4d94bc3 100644 --- a/samples/client/petstore/R/R/model_api_response.R +++ b/samples/client/petstore/R/R/model_api_response.R @@ -108,6 +108,29 @@ ModelApiResponse <- R6::R6Class( return(ModelApiResponseObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of ModelApiResponse #' diff --git a/samples/client/petstore/R/R/nested_one_of.R b/samples/client/petstore/R/R/nested_one_of.R index 31dcc2f10d01..634964fee461 100644 --- a/samples/client/petstore/R/R/nested_one_of.R +++ b/samples/client/petstore/R/R/nested_one_of.R @@ -84,7 +84,7 @@ NestedOneOf <- R6::R6Class( } if (!is.null(self$`nested_pig`)) { NestedOneOfObject[["nested_pig"]] <- - self$`nested_pig`$toSimpleType() + self$extractSimpleType(self$`nested_pig`) } for (key in names(self$additional_properties)) { NestedOneOfObject[[key]] <- self$additional_properties[[key]] @@ -93,6 +93,29 @@ NestedOneOf <- R6::R6Class( return(NestedOneOfObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of NestedOneOf #' diff --git a/samples/client/petstore/R/R/order.R b/samples/client/petstore/R/R/order.R index 07378f03666c..bb82014b8f8d 100644 --- a/samples/client/petstore/R/R/order.R +++ b/samples/client/petstore/R/R/order.R @@ -150,6 +150,29 @@ Order <- R6::R6Class( return(OrderObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of Order #' diff --git a/samples/client/petstore/R/R/pet.R b/samples/client/petstore/R/R/pet.R index 27db68d8fdbd..3da18df63011 100644 --- a/samples/client/petstore/R/R/pet.R +++ b/samples/client/petstore/R/R/pet.R @@ -121,7 +121,7 @@ Pet <- R6::R6Class( } if (!is.null(self$`category`)) { PetObject[["category"]] <- - self$`category`$toSimpleType() + self$extractSimpleType(self$`category`) } if (!is.null(self$`name`)) { PetObject[["name"]] <- @@ -133,7 +133,7 @@ Pet <- R6::R6Class( } if (!is.null(self$`tags`)) { PetObject[["tags"]] <- - lapply(self$`tags`, function(x) x$toSimpleType()) + self$extractSimpleType(self$`tags`) } if (!is.null(self$`status`)) { PetObject[["status"]] <- @@ -146,6 +146,29 @@ Pet <- R6::R6Class( return(PetObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of Pet #' diff --git a/samples/client/petstore/R/R/pet_map.R b/samples/client/petstore/R/R/pet_map.R index aa59c50a09c0..6ba1b89d2038 100644 --- a/samples/client/petstore/R/R/pet_map.R +++ b/samples/client/petstore/R/R/pet_map.R @@ -81,6 +81,29 @@ PetMap <- R6::R6Class( return(PetMapObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of PetMap #' diff --git a/samples/client/petstore/R/R/special.R b/samples/client/petstore/R/R/special.R index 4c27190313fb..467775bd362a 100644 --- a/samples/client/petstore/R/R/special.R +++ b/samples/client/petstore/R/R/special.R @@ -162,6 +162,29 @@ Special <- R6::R6Class( return(SpecialObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of Special #' diff --git a/samples/client/petstore/R/R/tag.R b/samples/client/petstore/R/R/tag.R index b4c893dfe77e..6b466e090abf 100644 --- a/samples/client/petstore/R/R/tag.R +++ b/samples/client/petstore/R/R/tag.R @@ -95,6 +95,29 @@ Tag <- R6::R6Class( return(TagObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of Tag #' diff --git a/samples/client/petstore/R/R/update_pet_request.R b/samples/client/petstore/R/R/update_pet_request.R index 3559d3c4d838..2bdb591a433a 100644 --- a/samples/client/petstore/R/R/update_pet_request.R +++ b/samples/client/petstore/R/R/update_pet_request.R @@ -77,7 +77,7 @@ UpdatePetRequest <- R6::R6Class( UpdatePetRequestObject <- list() if (!is.null(self$`jsonData`)) { UpdatePetRequestObject[["jsonData"]] <- - self$`jsonData`$toSimpleType() + self$extractSimpleType(self$`jsonData`) } if (!is.null(self$`binaryDataN2Information`)) { UpdatePetRequestObject[["binaryDataN2Information"]] <- @@ -90,6 +90,29 @@ UpdatePetRequest <- R6::R6Class( return(UpdatePetRequestObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of UpdatePetRequest #' diff --git a/samples/client/petstore/R/R/user.R b/samples/client/petstore/R/R/user.R index 361d0d454f21..ba79866f322a 100644 --- a/samples/client/petstore/R/R/user.R +++ b/samples/client/petstore/R/R/user.R @@ -173,6 +173,29 @@ User <- R6::R6Class( return(UserObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of User #' diff --git a/samples/client/petstore/R/R/whale.R b/samples/client/petstore/R/R/whale.R index ea54d3bdf71c..bfb7ee0db2e1 100644 --- a/samples/client/petstore/R/R/whale.R +++ b/samples/client/petstore/R/R/whale.R @@ -108,6 +108,29 @@ Whale <- R6::R6Class( return(WhaleObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of Whale #' diff --git a/samples/client/petstore/R/R/zebra.R b/samples/client/petstore/R/R/zebra.R index 6b85dbff4093..dabac1248d44 100644 --- a/samples/client/petstore/R/R/zebra.R +++ b/samples/client/petstore/R/R/zebra.R @@ -98,6 +98,29 @@ Zebra <- R6::R6Class( return(ZebraObject) }, + extractSimpleType = function(x) { + if (R6::is.R6(x)) { + return(x$toSimpleType()) + } else if (!self$hasNestedR6(x)) { + return(x) + } + lapply(x, self$extractSimpleType) + }, + + hasNestedR6 = function(x) { + if (R6::is.R6(x)) { + return(TRUE) + } + if (is.list(x)) { + for (item in x) { + if (self$hasNestedR6(item)) { + return(TRUE) + } + } + } + FALSE + } + #' @description #' Deserialize JSON string into an instance of Zebra #' From eaf6590ad20bfe0a6ab0ebcf1e767370bbc545d0 Mon Sep 17 00:00:00 2001 From: Matthew Pollock Date: Tue, 27 Jan 2026 11:26:46 -0500 Subject: [PATCH 2/5] fix missing comma --- .../src/main/resources/r/modelGeneric.mustache | 2 +- samples/client/echo_api/r/R/bird.R | 2 +- samples/client/echo_api/r/R/category.R | 2 +- samples/client/echo_api/r/R/data_query.R | 2 +- samples/client/echo_api/r/R/default_value.R | 2 +- samples/client/echo_api/r/R/number_properties_only.R | 2 +- samples/client/echo_api/r/R/pet.R | 2 +- samples/client/echo_api/r/R/query.R | 2 +- samples/client/echo_api/r/R/tag.R | 2 +- .../echo_api/r/R/test_form_object_multipart_request_marker.R | 2 +- ...p_object_explode_true_object_all_of_query_object_parameter.R | 2 +- ...tyle_form_explode_true_array_string_query_object_parameter.R | 2 +- .../client/petstore/R-httr2-wrapper/R/allof_tag_api_response.R | 2 +- samples/client/petstore/R-httr2-wrapper/R/animal.R | 2 +- samples/client/petstore/R-httr2-wrapper/R/basque_pig.R | 2 +- samples/client/petstore/R-httr2-wrapper/R/cat.R | 2 +- samples/client/petstore/R-httr2-wrapper/R/category.R | 2 +- samples/client/petstore/R-httr2-wrapper/R/danish_pig.R | 2 +- samples/client/petstore/R-httr2-wrapper/R/date.R | 2 +- samples/client/petstore/R-httr2-wrapper/R/dog.R | 2 +- samples/client/petstore/R-httr2-wrapper/R/dummy_model.R | 2 +- samples/client/petstore/R-httr2-wrapper/R/format_test.R | 2 +- samples/client/petstore/R-httr2-wrapper/R/model_api_response.R | 2 +- samples/client/petstore/R-httr2-wrapper/R/nested_one_of.R | 2 +- samples/client/petstore/R-httr2-wrapper/R/order.R | 2 +- samples/client/petstore/R-httr2-wrapper/R/pet.R | 2 +- samples/client/petstore/R-httr2-wrapper/R/pet_map.R | 2 +- samples/client/petstore/R-httr2-wrapper/R/special.R | 2 +- samples/client/petstore/R-httr2-wrapper/R/tag.R | 2 +- samples/client/petstore/R-httr2-wrapper/R/update_pet_request.R | 2 +- samples/client/petstore/R-httr2-wrapper/R/user.R | 2 +- samples/client/petstore/R-httr2-wrapper/R/whale.R | 2 +- samples/client/petstore/R-httr2-wrapper/R/zebra.R | 2 +- samples/client/petstore/R-httr2/R/allof_tag_api_response.R | 2 +- samples/client/petstore/R-httr2/R/animal.R | 2 +- samples/client/petstore/R-httr2/R/basque_pig.R | 2 +- samples/client/petstore/R-httr2/R/cat.R | 2 +- samples/client/petstore/R-httr2/R/category.R | 2 +- samples/client/petstore/R-httr2/R/danish_pig.R | 2 +- samples/client/petstore/R-httr2/R/date.R | 2 +- samples/client/petstore/R-httr2/R/dog.R | 2 +- samples/client/petstore/R-httr2/R/format_test.R | 2 +- samples/client/petstore/R-httr2/R/just_model.R | 2 +- samples/client/petstore/R-httr2/R/model_api_response.R | 2 +- samples/client/petstore/R-httr2/R/nested_one_of.R | 2 +- samples/client/petstore/R-httr2/R/order.R | 2 +- samples/client/petstore/R-httr2/R/pet.R | 2 +- samples/client/petstore/R-httr2/R/pet_map.R | 2 +- samples/client/petstore/R-httr2/R/special.R | 2 +- samples/client/petstore/R-httr2/R/tag.R | 2 +- samples/client/petstore/R-httr2/R/update_pet_request.R | 2 +- samples/client/petstore/R-httr2/R/user.R | 2 +- samples/client/petstore/R-httr2/R/whale.R | 2 +- samples/client/petstore/R-httr2/R/zebra.R | 2 +- samples/client/petstore/R/R/allof_tag_api_response.R | 2 +- samples/client/petstore/R/R/animal.R | 2 +- samples/client/petstore/R/R/basque_pig.R | 2 +- samples/client/petstore/R/R/cat.R | 2 +- samples/client/petstore/R/R/category.R | 2 +- samples/client/petstore/R/R/danish_pig.R | 2 +- samples/client/petstore/R/R/date.R | 2 +- samples/client/petstore/R/R/dog.R | 2 +- samples/client/petstore/R/R/dummy_model.R | 2 +- samples/client/petstore/R/R/format_test.R | 2 +- samples/client/petstore/R/R/model_api_response.R | 2 +- samples/client/petstore/R/R/nested_one_of.R | 2 +- samples/client/petstore/R/R/order.R | 2 +- samples/client/petstore/R/R/pet.R | 2 +- samples/client/petstore/R/R/pet_map.R | 2 +- samples/client/petstore/R/R/special.R | 2 +- samples/client/petstore/R/R/tag.R | 2 +- samples/client/petstore/R/R/update_pet_request.R | 2 +- samples/client/petstore/R/R/user.R | 2 +- samples/client/petstore/R/R/whale.R | 2 +- samples/client/petstore/R/R/zebra.R | 2 +- 75 files changed, 75 insertions(+), 75 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/r/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/r/modelGeneric.mustache index f527bdd0f6d6..fe9c96a2e675 100644 --- a/modules/openapi-generator/src/main/resources/r/modelGeneric.mustache +++ b/modules/openapi-generator/src/main/resources/r/modelGeneric.mustache @@ -294,7 +294,7 @@ } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of {{{classname}}} diff --git a/samples/client/echo_api/r/R/bird.R b/samples/client/echo_api/r/R/bird.R index c425007d6e83..08f55b830de6 100644 --- a/samples/client/echo_api/r/R/bird.R +++ b/samples/client/echo_api/r/R/bird.R @@ -102,7 +102,7 @@ Bird <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of Bird diff --git a/samples/client/echo_api/r/R/category.R b/samples/client/echo_api/r/R/category.R index d13dc6d8d7ce..200f7bec80b6 100644 --- a/samples/client/echo_api/r/R/category.R +++ b/samples/client/echo_api/r/R/category.R @@ -102,7 +102,7 @@ Category <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of Category diff --git a/samples/client/echo_api/r/R/data_query.R b/samples/client/echo_api/r/R/data_query.R index c2f96bc442a1..9dede297985d 100644 --- a/samples/client/echo_api/r/R/data_query.R +++ b/samples/client/echo_api/r/R/data_query.R @@ -141,7 +141,7 @@ DataQuery <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of DataQuery diff --git a/samples/client/echo_api/r/R/default_value.R b/samples/client/echo_api/r/R/default_value.R index 0af60c2201bc..e6a089514fc0 100644 --- a/samples/client/echo_api/r/R/default_value.R +++ b/samples/client/echo_api/r/R/default_value.R @@ -173,7 +173,7 @@ DefaultValue <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of DefaultValue diff --git a/samples/client/echo_api/r/R/number_properties_only.R b/samples/client/echo_api/r/R/number_properties_only.R index 847b65a3509d..81fcfd9659b9 100644 --- a/samples/client/echo_api/r/R/number_properties_only.R +++ b/samples/client/echo_api/r/R/number_properties_only.R @@ -112,7 +112,7 @@ NumberPropertiesOnly <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of NumberPropertiesOnly diff --git a/samples/client/echo_api/r/R/pet.R b/samples/client/echo_api/r/R/pet.R index 136c833819f5..b4cae7506eec 100644 --- a/samples/client/echo_api/r/R/pet.R +++ b/samples/client/echo_api/r/R/pet.R @@ -153,7 +153,7 @@ Pet <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of Pet diff --git a/samples/client/echo_api/r/R/query.R b/samples/client/echo_api/r/R/query.R index 57613f79a0b4..48b5f64ae3bb 100644 --- a/samples/client/echo_api/r/R/query.R +++ b/samples/client/echo_api/r/R/query.R @@ -101,7 +101,7 @@ Query <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of Query diff --git a/samples/client/echo_api/r/R/tag.R b/samples/client/echo_api/r/R/tag.R index 2bec2d2fafaa..e2cc5eb56d6e 100644 --- a/samples/client/echo_api/r/R/tag.R +++ b/samples/client/echo_api/r/R/tag.R @@ -102,7 +102,7 @@ Tag <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of Tag diff --git a/samples/client/echo_api/r/R/test_form_object_multipart_request_marker.R b/samples/client/echo_api/r/R/test_form_object_multipart_request_marker.R index d2dafca0d3a3..261cf8f33896 100644 --- a/samples/client/echo_api/r/R/test_form_object_multipart_request_marker.R +++ b/samples/client/echo_api/r/R/test_form_object_multipart_request_marker.R @@ -89,7 +89,7 @@ TestFormObjectMultipartRequestMarker <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of TestFormObjectMultipartRequestMarker diff --git a/samples/client/echo_api/r/R/test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.R b/samples/client/echo_api/r/R/test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.R index c69a79ff34ee..0792bbd726f1 100644 --- a/samples/client/echo_api/r/R/test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.R +++ b/samples/client/echo_api/r/R/test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.R @@ -128,7 +128,7 @@ TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter <- R6::R6Clas } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter diff --git a/samples/client/echo_api/r/R/test_query_style_form_explode_true_array_string_query_object_parameter.R b/samples/client/echo_api/r/R/test_query_style_form_explode_true_array_string_query_object_parameter.R index 64de4c207823..5f9256d6ef4d 100644 --- a/samples/client/echo_api/r/R/test_query_style_form_explode_true_array_string_query_object_parameter.R +++ b/samples/client/echo_api/r/R/test_query_style_form_explode_true_array_string_query_object_parameter.R @@ -88,7 +88,7 @@ TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter diff --git a/samples/client/petstore/R-httr2-wrapper/R/allof_tag_api_response.R b/samples/client/petstore/R-httr2-wrapper/R/allof_tag_api_response.R index 57a0eb7579fd..36c6f8cc0c4e 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/allof_tag_api_response.R +++ b/samples/client/petstore/R-httr2-wrapper/R/allof_tag_api_response.R @@ -155,7 +155,7 @@ AllofTagApiResponse <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of AllofTagApiResponse diff --git a/samples/client/petstore/R-httr2-wrapper/R/animal.R b/samples/client/petstore/R-httr2-wrapper/R/animal.R index 50b63b0f3a91..13f86852c68f 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/animal.R +++ b/samples/client/petstore/R-httr2-wrapper/R/animal.R @@ -118,7 +118,7 @@ Animal <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of Animal diff --git a/samples/client/petstore/R-httr2-wrapper/R/basque_pig.R b/samples/client/petstore/R-httr2-wrapper/R/basque_pig.R index f72037d832d4..a1af7722d363 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/basque_pig.R +++ b/samples/client/petstore/R-httr2-wrapper/R/basque_pig.R @@ -116,7 +116,7 @@ BasquePig <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of BasquePig diff --git a/samples/client/petstore/R-httr2-wrapper/R/cat.R b/samples/client/petstore/R-httr2-wrapper/R/cat.R index 7a496e1b1488..0036d6fd26e0 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/cat.R +++ b/samples/client/petstore/R-httr2-wrapper/R/cat.R @@ -130,7 +130,7 @@ Cat <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of Cat diff --git a/samples/client/petstore/R-httr2-wrapper/R/category.R b/samples/client/petstore/R-httr2-wrapper/R/category.R index 7d08e4b0ef31..98b5a5ac8c76 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/category.R +++ b/samples/client/petstore/R-httr2-wrapper/R/category.R @@ -116,7 +116,7 @@ Category <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of Category diff --git a/samples/client/petstore/R-httr2-wrapper/R/danish_pig.R b/samples/client/petstore/R-httr2-wrapper/R/danish_pig.R index 2cced513aed8..8c9934df1141 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/danish_pig.R +++ b/samples/client/petstore/R-httr2-wrapper/R/danish_pig.R @@ -116,7 +116,7 @@ DanishPig <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of DanishPig diff --git a/samples/client/petstore/R-httr2-wrapper/R/date.R b/samples/client/petstore/R-httr2-wrapper/R/date.R index e3ceb668c336..0d41c26315cb 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/date.R +++ b/samples/client/petstore/R-httr2-wrapper/R/date.R @@ -133,7 +133,7 @@ Date <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of Date diff --git a/samples/client/petstore/R-httr2-wrapper/R/dog.R b/samples/client/petstore/R-httr2-wrapper/R/dog.R index f0ca3a625fc9..88bd4ae37701 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/dog.R +++ b/samples/client/petstore/R-httr2-wrapper/R/dog.R @@ -130,7 +130,7 @@ Dog <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of Dog diff --git a/samples/client/petstore/R-httr2-wrapper/R/dummy_model.R b/samples/client/petstore/R-httr2-wrapper/R/dummy_model.R index 850428ca3cfd..d4e3e067ef38 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/dummy_model.R +++ b/samples/client/petstore/R-httr2-wrapper/R/dummy_model.R @@ -103,7 +103,7 @@ DummyModel <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of DummyModel diff --git a/samples/client/petstore/R-httr2-wrapper/R/format_test.R b/samples/client/petstore/R-httr2-wrapper/R/format_test.R index d96d953a5de6..feb246ad71e6 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/format_test.R +++ b/samples/client/petstore/R-httr2-wrapper/R/format_test.R @@ -276,7 +276,7 @@ FormatTest <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of FormatTest diff --git a/samples/client/petstore/R-httr2-wrapper/R/model_api_response.R b/samples/client/petstore/R-httr2-wrapper/R/model_api_response.R index a26bb4d94bc3..17dfaff7d10d 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/model_api_response.R +++ b/samples/client/petstore/R-httr2-wrapper/R/model_api_response.R @@ -129,7 +129,7 @@ ModelApiResponse <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of ModelApiResponse diff --git a/samples/client/petstore/R-httr2-wrapper/R/nested_one_of.R b/samples/client/petstore/R-httr2-wrapper/R/nested_one_of.R index 634964fee461..fe396f11faa4 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/nested_one_of.R +++ b/samples/client/petstore/R-httr2-wrapper/R/nested_one_of.R @@ -114,7 +114,7 @@ NestedOneOf <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of NestedOneOf diff --git a/samples/client/petstore/R-httr2-wrapper/R/order.R b/samples/client/petstore/R-httr2-wrapper/R/order.R index bb82014b8f8d..040c3e21652e 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/order.R +++ b/samples/client/petstore/R-httr2-wrapper/R/order.R @@ -171,7 +171,7 @@ Order <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of Order diff --git a/samples/client/petstore/R-httr2-wrapper/R/pet.R b/samples/client/petstore/R-httr2-wrapper/R/pet.R index 3da18df63011..37d2db91adb7 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/pet.R +++ b/samples/client/petstore/R-httr2-wrapper/R/pet.R @@ -167,7 +167,7 @@ Pet <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of Pet diff --git a/samples/client/petstore/R-httr2-wrapper/R/pet_map.R b/samples/client/petstore/R-httr2-wrapper/R/pet_map.R index 6ba1b89d2038..5f8bb19acd8a 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/pet_map.R +++ b/samples/client/petstore/R-httr2-wrapper/R/pet_map.R @@ -102,7 +102,7 @@ PetMap <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of PetMap diff --git a/samples/client/petstore/R-httr2-wrapper/R/special.R b/samples/client/petstore/R-httr2-wrapper/R/special.R index 467775bd362a..a3fbe1864619 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/special.R +++ b/samples/client/petstore/R-httr2-wrapper/R/special.R @@ -183,7 +183,7 @@ Special <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of Special diff --git a/samples/client/petstore/R-httr2-wrapper/R/tag.R b/samples/client/petstore/R-httr2-wrapper/R/tag.R index 6b466e090abf..d224593d8ca5 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/tag.R +++ b/samples/client/petstore/R-httr2-wrapper/R/tag.R @@ -116,7 +116,7 @@ Tag <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of Tag diff --git a/samples/client/petstore/R-httr2-wrapper/R/update_pet_request.R b/samples/client/petstore/R-httr2-wrapper/R/update_pet_request.R index 2bdb591a433a..7a4fb1112f75 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/update_pet_request.R +++ b/samples/client/petstore/R-httr2-wrapper/R/update_pet_request.R @@ -111,7 +111,7 @@ UpdatePetRequest <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of UpdatePetRequest diff --git a/samples/client/petstore/R-httr2-wrapper/R/user.R b/samples/client/petstore/R-httr2-wrapper/R/user.R index ba79866f322a..c3a6c3d9448f 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/user.R +++ b/samples/client/petstore/R-httr2-wrapper/R/user.R @@ -194,7 +194,7 @@ User <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of User diff --git a/samples/client/petstore/R-httr2-wrapper/R/whale.R b/samples/client/petstore/R-httr2-wrapper/R/whale.R index bfb7ee0db2e1..eda476ba4e83 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/whale.R +++ b/samples/client/petstore/R-httr2-wrapper/R/whale.R @@ -129,7 +129,7 @@ Whale <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of Whale diff --git a/samples/client/petstore/R-httr2-wrapper/R/zebra.R b/samples/client/petstore/R-httr2-wrapper/R/zebra.R index dabac1248d44..547275c2a080 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/zebra.R +++ b/samples/client/petstore/R-httr2-wrapper/R/zebra.R @@ -119,7 +119,7 @@ Zebra <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of Zebra diff --git a/samples/client/petstore/R-httr2/R/allof_tag_api_response.R b/samples/client/petstore/R-httr2/R/allof_tag_api_response.R index f0f55d0cd0de..ea36d31ee4ab 100644 --- a/samples/client/petstore/R-httr2/R/allof_tag_api_response.R +++ b/samples/client/petstore/R-httr2/R/allof_tag_api_response.R @@ -141,7 +141,7 @@ AllofTagApiResponse <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of AllofTagApiResponse diff --git a/samples/client/petstore/R-httr2/R/animal.R b/samples/client/petstore/R-httr2/R/animal.R index b6054904cb9c..eb5e614b5a45 100644 --- a/samples/client/petstore/R-httr2/R/animal.R +++ b/samples/client/petstore/R-httr2/R/animal.R @@ -104,7 +104,7 @@ Animal <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of Animal diff --git a/samples/client/petstore/R-httr2/R/basque_pig.R b/samples/client/petstore/R-httr2/R/basque_pig.R index dc77709dd97d..42ad2f7f9f2c 100644 --- a/samples/client/petstore/R-httr2/R/basque_pig.R +++ b/samples/client/petstore/R-httr2/R/basque_pig.R @@ -102,7 +102,7 @@ BasquePig <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of BasquePig diff --git a/samples/client/petstore/R-httr2/R/cat.R b/samples/client/petstore/R-httr2/R/cat.R index 1a587ef3b4c9..32d3fb57f610 100644 --- a/samples/client/petstore/R-httr2/R/cat.R +++ b/samples/client/petstore/R-httr2/R/cat.R @@ -116,7 +116,7 @@ Cat <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of Cat diff --git a/samples/client/petstore/R-httr2/R/category.R b/samples/client/petstore/R-httr2/R/category.R index f8b5fd758669..e546fde38730 100644 --- a/samples/client/petstore/R-httr2/R/category.R +++ b/samples/client/petstore/R-httr2/R/category.R @@ -102,7 +102,7 @@ Category <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of Category diff --git a/samples/client/petstore/R-httr2/R/danish_pig.R b/samples/client/petstore/R-httr2/R/danish_pig.R index 1ea49b8b8f77..a94a0465465c 100644 --- a/samples/client/petstore/R-httr2/R/danish_pig.R +++ b/samples/client/petstore/R-httr2/R/danish_pig.R @@ -102,7 +102,7 @@ DanishPig <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of DanishPig diff --git a/samples/client/petstore/R-httr2/R/date.R b/samples/client/petstore/R-httr2/R/date.R index ea8795a072cf..14a5c424911c 100644 --- a/samples/client/petstore/R-httr2/R/date.R +++ b/samples/client/petstore/R-httr2/R/date.R @@ -119,7 +119,7 @@ Date <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of Date diff --git a/samples/client/petstore/R-httr2/R/dog.R b/samples/client/petstore/R-httr2/R/dog.R index 409d51840f30..d51e0365f181 100644 --- a/samples/client/petstore/R-httr2/R/dog.R +++ b/samples/client/petstore/R-httr2/R/dog.R @@ -116,7 +116,7 @@ Dog <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of Dog diff --git a/samples/client/petstore/R-httr2/R/format_test.R b/samples/client/petstore/R-httr2/R/format_test.R index 5d65389415d1..94b0b14a478a 100644 --- a/samples/client/petstore/R-httr2/R/format_test.R +++ b/samples/client/petstore/R-httr2/R/format_test.R @@ -262,7 +262,7 @@ FormatTest <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of FormatTest diff --git a/samples/client/petstore/R-httr2/R/just_model.R b/samples/client/petstore/R-httr2/R/just_model.R index cb8dfb8541d1..bc80cd833d4e 100644 --- a/samples/client/petstore/R-httr2/R/just_model.R +++ b/samples/client/petstore/R-httr2/R/just_model.R @@ -89,7 +89,7 @@ JustModel <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of JustModel diff --git a/samples/client/petstore/R-httr2/R/model_api_response.R b/samples/client/petstore/R-httr2/R/model_api_response.R index fdf1f63b1e95..ee48076d9369 100644 --- a/samples/client/petstore/R-httr2/R/model_api_response.R +++ b/samples/client/petstore/R-httr2/R/model_api_response.R @@ -115,7 +115,7 @@ ModelApiResponse <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of ModelApiResponse diff --git a/samples/client/petstore/R-httr2/R/nested_one_of.R b/samples/client/petstore/R-httr2/R/nested_one_of.R index 22fbef2a4122..dc43a39e5f41 100644 --- a/samples/client/petstore/R-httr2/R/nested_one_of.R +++ b/samples/client/petstore/R-httr2/R/nested_one_of.R @@ -100,7 +100,7 @@ NestedOneOf <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of NestedOneOf diff --git a/samples/client/petstore/R-httr2/R/order.R b/samples/client/petstore/R-httr2/R/order.R index e5e1ba50a537..9a68a5791f84 100644 --- a/samples/client/petstore/R-httr2/R/order.R +++ b/samples/client/petstore/R-httr2/R/order.R @@ -157,7 +157,7 @@ Order <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of Order diff --git a/samples/client/petstore/R-httr2/R/pet.R b/samples/client/petstore/R-httr2/R/pet.R index 8cf20cacaac7..93e6b64c3e7b 100644 --- a/samples/client/petstore/R-httr2/R/pet.R +++ b/samples/client/petstore/R-httr2/R/pet.R @@ -153,7 +153,7 @@ Pet <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of Pet diff --git a/samples/client/petstore/R-httr2/R/pet_map.R b/samples/client/petstore/R-httr2/R/pet_map.R index c81b747f8e74..9b6e53fb82b9 100644 --- a/samples/client/petstore/R-httr2/R/pet_map.R +++ b/samples/client/petstore/R-httr2/R/pet_map.R @@ -88,7 +88,7 @@ PetMap <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of PetMap diff --git a/samples/client/petstore/R-httr2/R/special.R b/samples/client/petstore/R-httr2/R/special.R index e65663ae6684..fa859534205c 100644 --- a/samples/client/petstore/R-httr2/R/special.R +++ b/samples/client/petstore/R-httr2/R/special.R @@ -169,7 +169,7 @@ Special <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of Special diff --git a/samples/client/petstore/R-httr2/R/tag.R b/samples/client/petstore/R-httr2/R/tag.R index a40b0234e1fd..62ad2a0d9878 100644 --- a/samples/client/petstore/R-httr2/R/tag.R +++ b/samples/client/petstore/R-httr2/R/tag.R @@ -102,7 +102,7 @@ Tag <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of Tag diff --git a/samples/client/petstore/R-httr2/R/update_pet_request.R b/samples/client/petstore/R-httr2/R/update_pet_request.R index 829e8f6b677a..dc2ede0a8e16 100644 --- a/samples/client/petstore/R-httr2/R/update_pet_request.R +++ b/samples/client/petstore/R-httr2/R/update_pet_request.R @@ -97,7 +97,7 @@ UpdatePetRequest <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of UpdatePetRequest diff --git a/samples/client/petstore/R-httr2/R/user.R b/samples/client/petstore/R-httr2/R/user.R index 323c158e016e..4afa30dd4f23 100644 --- a/samples/client/petstore/R-httr2/R/user.R +++ b/samples/client/petstore/R-httr2/R/user.R @@ -180,7 +180,7 @@ User <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of User diff --git a/samples/client/petstore/R-httr2/R/whale.R b/samples/client/petstore/R-httr2/R/whale.R index c03624188f3b..99ae1b9d2116 100644 --- a/samples/client/petstore/R-httr2/R/whale.R +++ b/samples/client/petstore/R-httr2/R/whale.R @@ -115,7 +115,7 @@ Whale <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of Whale diff --git a/samples/client/petstore/R-httr2/R/zebra.R b/samples/client/petstore/R-httr2/R/zebra.R index 3cdeec3eb392..aaaa9317d29d 100644 --- a/samples/client/petstore/R-httr2/R/zebra.R +++ b/samples/client/petstore/R-httr2/R/zebra.R @@ -105,7 +105,7 @@ Zebra <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of Zebra diff --git a/samples/client/petstore/R/R/allof_tag_api_response.R b/samples/client/petstore/R/R/allof_tag_api_response.R index 57a0eb7579fd..36c6f8cc0c4e 100644 --- a/samples/client/petstore/R/R/allof_tag_api_response.R +++ b/samples/client/petstore/R/R/allof_tag_api_response.R @@ -155,7 +155,7 @@ AllofTagApiResponse <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of AllofTagApiResponse diff --git a/samples/client/petstore/R/R/animal.R b/samples/client/petstore/R/R/animal.R index 50b63b0f3a91..13f86852c68f 100644 --- a/samples/client/petstore/R/R/animal.R +++ b/samples/client/petstore/R/R/animal.R @@ -118,7 +118,7 @@ Animal <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of Animal diff --git a/samples/client/petstore/R/R/basque_pig.R b/samples/client/petstore/R/R/basque_pig.R index f72037d832d4..a1af7722d363 100644 --- a/samples/client/petstore/R/R/basque_pig.R +++ b/samples/client/petstore/R/R/basque_pig.R @@ -116,7 +116,7 @@ BasquePig <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of BasquePig diff --git a/samples/client/petstore/R/R/cat.R b/samples/client/petstore/R/R/cat.R index 7a496e1b1488..0036d6fd26e0 100644 --- a/samples/client/petstore/R/R/cat.R +++ b/samples/client/petstore/R/R/cat.R @@ -130,7 +130,7 @@ Cat <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of Cat diff --git a/samples/client/petstore/R/R/category.R b/samples/client/petstore/R/R/category.R index 7d08e4b0ef31..98b5a5ac8c76 100644 --- a/samples/client/petstore/R/R/category.R +++ b/samples/client/petstore/R/R/category.R @@ -116,7 +116,7 @@ Category <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of Category diff --git a/samples/client/petstore/R/R/danish_pig.R b/samples/client/petstore/R/R/danish_pig.R index 2cced513aed8..8c9934df1141 100644 --- a/samples/client/petstore/R/R/danish_pig.R +++ b/samples/client/petstore/R/R/danish_pig.R @@ -116,7 +116,7 @@ DanishPig <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of DanishPig diff --git a/samples/client/petstore/R/R/date.R b/samples/client/petstore/R/R/date.R index e3ceb668c336..0d41c26315cb 100644 --- a/samples/client/petstore/R/R/date.R +++ b/samples/client/petstore/R/R/date.R @@ -133,7 +133,7 @@ Date <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of Date diff --git a/samples/client/petstore/R/R/dog.R b/samples/client/petstore/R/R/dog.R index f0ca3a625fc9..88bd4ae37701 100644 --- a/samples/client/petstore/R/R/dog.R +++ b/samples/client/petstore/R/R/dog.R @@ -130,7 +130,7 @@ Dog <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of Dog diff --git a/samples/client/petstore/R/R/dummy_model.R b/samples/client/petstore/R/R/dummy_model.R index 850428ca3cfd..d4e3e067ef38 100644 --- a/samples/client/petstore/R/R/dummy_model.R +++ b/samples/client/petstore/R/R/dummy_model.R @@ -103,7 +103,7 @@ DummyModel <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of DummyModel diff --git a/samples/client/petstore/R/R/format_test.R b/samples/client/petstore/R/R/format_test.R index d96d953a5de6..feb246ad71e6 100644 --- a/samples/client/petstore/R/R/format_test.R +++ b/samples/client/petstore/R/R/format_test.R @@ -276,7 +276,7 @@ FormatTest <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of FormatTest diff --git a/samples/client/petstore/R/R/model_api_response.R b/samples/client/petstore/R/R/model_api_response.R index a26bb4d94bc3..17dfaff7d10d 100644 --- a/samples/client/petstore/R/R/model_api_response.R +++ b/samples/client/petstore/R/R/model_api_response.R @@ -129,7 +129,7 @@ ModelApiResponse <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of ModelApiResponse diff --git a/samples/client/petstore/R/R/nested_one_of.R b/samples/client/petstore/R/R/nested_one_of.R index 634964fee461..fe396f11faa4 100644 --- a/samples/client/petstore/R/R/nested_one_of.R +++ b/samples/client/petstore/R/R/nested_one_of.R @@ -114,7 +114,7 @@ NestedOneOf <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of NestedOneOf diff --git a/samples/client/petstore/R/R/order.R b/samples/client/petstore/R/R/order.R index bb82014b8f8d..040c3e21652e 100644 --- a/samples/client/petstore/R/R/order.R +++ b/samples/client/petstore/R/R/order.R @@ -171,7 +171,7 @@ Order <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of Order diff --git a/samples/client/petstore/R/R/pet.R b/samples/client/petstore/R/R/pet.R index 3da18df63011..37d2db91adb7 100644 --- a/samples/client/petstore/R/R/pet.R +++ b/samples/client/petstore/R/R/pet.R @@ -167,7 +167,7 @@ Pet <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of Pet diff --git a/samples/client/petstore/R/R/pet_map.R b/samples/client/petstore/R/R/pet_map.R index 6ba1b89d2038..5f8bb19acd8a 100644 --- a/samples/client/petstore/R/R/pet_map.R +++ b/samples/client/petstore/R/R/pet_map.R @@ -102,7 +102,7 @@ PetMap <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of PetMap diff --git a/samples/client/petstore/R/R/special.R b/samples/client/petstore/R/R/special.R index 467775bd362a..a3fbe1864619 100644 --- a/samples/client/petstore/R/R/special.R +++ b/samples/client/petstore/R/R/special.R @@ -183,7 +183,7 @@ Special <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of Special diff --git a/samples/client/petstore/R/R/tag.R b/samples/client/petstore/R/R/tag.R index 6b466e090abf..d224593d8ca5 100644 --- a/samples/client/petstore/R/R/tag.R +++ b/samples/client/petstore/R/R/tag.R @@ -116,7 +116,7 @@ Tag <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of Tag diff --git a/samples/client/petstore/R/R/update_pet_request.R b/samples/client/petstore/R/R/update_pet_request.R index 2bdb591a433a..7a4fb1112f75 100644 --- a/samples/client/petstore/R/R/update_pet_request.R +++ b/samples/client/petstore/R/R/update_pet_request.R @@ -111,7 +111,7 @@ UpdatePetRequest <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of UpdatePetRequest diff --git a/samples/client/petstore/R/R/user.R b/samples/client/petstore/R/R/user.R index ba79866f322a..c3a6c3d9448f 100644 --- a/samples/client/petstore/R/R/user.R +++ b/samples/client/petstore/R/R/user.R @@ -194,7 +194,7 @@ User <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of User diff --git a/samples/client/petstore/R/R/whale.R b/samples/client/petstore/R/R/whale.R index bfb7ee0db2e1..eda476ba4e83 100644 --- a/samples/client/petstore/R/R/whale.R +++ b/samples/client/petstore/R/R/whale.R @@ -129,7 +129,7 @@ Whale <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of Whale diff --git a/samples/client/petstore/R/R/zebra.R b/samples/client/petstore/R/R/zebra.R index dabac1248d44..547275c2a080 100644 --- a/samples/client/petstore/R/R/zebra.R +++ b/samples/client/petstore/R/R/zebra.R @@ -119,7 +119,7 @@ Zebra <- R6::R6Class( } } FALSE - } + }, #' @description #' Deserialize JSON string into an instance of Zebra From ace75e558659604f6dbca35f218bc503179ea20b Mon Sep 17 00:00:00 2001 From: Matthew Pollock Date: Wed, 28 Jan 2026 20:19:50 -0500 Subject: [PATCH 3/5] only include extractor methods when they are needed --- .../codegen/languages/RClientCodegen.java | 8 +++++++ .../main/resources/r/modelGeneric.mustache | 4 +++- samples/client/echo_api/r/R/bird.R | 22 ------------------- samples/client/echo_api/r/R/category.R | 22 ------------------- samples/client/echo_api/r/R/data_query.R | 22 ------------------- .../echo_api/r/R/number_properties_only.R | 22 ------------------- samples/client/echo_api/r/R/query.R | 22 ------------------- samples/client/echo_api/r/R/tag.R | 22 ------------------- ...est_form_object_multipart_request_marker.R | 22 ------------------- ...rue_object_all_of_query_object_parameter.R | 22 ------------------- ...true_array_string_query_object_parameter.R | 22 ------------------- .../R/allof_tag_api_response.R | 22 ------------------- .../petstore/R-httr2-wrapper/R/animal.R | 22 ------------------- .../petstore/R-httr2-wrapper/R/basque_pig.R | 22 ------------------- .../client/petstore/R-httr2-wrapper/R/cat.R | 22 ------------------- .../petstore/R-httr2-wrapper/R/category.R | 22 ------------------- .../petstore/R-httr2-wrapper/R/danish_pig.R | 22 ------------------- .../client/petstore/R-httr2-wrapper/R/date.R | 22 ------------------- .../client/petstore/R-httr2-wrapper/R/dog.R | 22 ------------------- .../petstore/R-httr2-wrapper/R/dummy_model.R | 22 ------------------- .../petstore/R-httr2-wrapper/R/format_test.R | 22 ------------------- .../R-httr2-wrapper/R/model_api_response.R | 22 ------------------- .../client/petstore/R-httr2-wrapper/R/order.R | 22 ------------------- .../petstore/R-httr2-wrapper/R/pet_map.R | 22 ------------------- .../petstore/R-httr2-wrapper/R/special.R | 22 ------------------- .../client/petstore/R-httr2-wrapper/R/tag.R | 22 ------------------- .../client/petstore/R-httr2-wrapper/R/user.R | 22 ------------------- .../client/petstore/R-httr2-wrapper/R/whale.R | 22 ------------------- .../client/petstore/R-httr2-wrapper/R/zebra.R | 22 ------------------- .../R-httr2/R/allof_tag_api_response.R | 22 ------------------- samples/client/petstore/R-httr2/R/animal.R | 22 ------------------- .../client/petstore/R-httr2/R/basque_pig.R | 22 ------------------- samples/client/petstore/R-httr2/R/cat.R | 22 ------------------- samples/client/petstore/R-httr2/R/category.R | 22 ------------------- .../client/petstore/R-httr2/R/danish_pig.R | 22 ------------------- samples/client/petstore/R-httr2/R/date.R | 22 ------------------- samples/client/petstore/R-httr2/R/dog.R | 22 ------------------- .../client/petstore/R-httr2/R/format_test.R | 22 ------------------- .../client/petstore/R-httr2/R/just_model.R | 22 ------------------- .../petstore/R-httr2/R/model_api_response.R | 22 ------------------- samples/client/petstore/R-httr2/R/order.R | 22 ------------------- samples/client/petstore/R-httr2/R/pet_map.R | 22 ------------------- samples/client/petstore/R-httr2/R/special.R | 22 ------------------- samples/client/petstore/R-httr2/R/tag.R | 22 ------------------- samples/client/petstore/R-httr2/R/user.R | 22 ------------------- samples/client/petstore/R-httr2/R/whale.R | 22 ------------------- samples/client/petstore/R-httr2/R/zebra.R | 22 ------------------- .../petstore/R/R/allof_tag_api_response.R | 22 ------------------- samples/client/petstore/R/R/animal.R | 22 ------------------- samples/client/petstore/R/R/basque_pig.R | 22 ------------------- samples/client/petstore/R/R/cat.R | 22 ------------------- samples/client/petstore/R/R/category.R | 22 ------------------- samples/client/petstore/R/R/danish_pig.R | 22 ------------------- samples/client/petstore/R/R/date.R | 22 ------------------- samples/client/petstore/R/R/dog.R | 22 ------------------- samples/client/petstore/R/R/dummy_model.R | 22 ------------------- samples/client/petstore/R/R/format_test.R | 22 ------------------- .../client/petstore/R/R/model_api_response.R | 22 ------------------- samples/client/petstore/R/R/order.R | 22 ------------------- samples/client/petstore/R/R/pet_map.R | 22 ------------------- samples/client/petstore/R/R/special.R | 22 ------------------- samples/client/petstore/R/R/tag.R | 22 ------------------- samples/client/petstore/R/R/user.R | 22 ------------------- samples/client/petstore/R/R/whale.R | 22 ------------------- samples/client/petstore/R/R/zebra.R | 22 ------------------- 65 files changed, 11 insertions(+), 1387 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java index d588e42b0995..188436a75eb5 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java @@ -601,6 +601,7 @@ public String toOperationId(String operationId) { public ModelsMap postProcessModels(ModelsMap objs) { for (ModelMap mo : objs.getModels()) { CodegenModel cm = mo.getModel(); + boolean needsExtractSimpleType = false; for (CodegenProperty var : cm.vars) { // check to see if base name is an empty string if ("".equals(var.baseName)) { @@ -608,10 +609,17 @@ public ModelsMap postProcessModels(ModelsMap objs) { var.baseName = "empty_string"; } + if (!var.isPrimitiveType) { + needsExtractSimpleType = true; + } + // create extension x-r-doc-type to store the data type in r doc format var.vendorExtensions.put("x-r-doc-type", constructRdocType(var)); } + // create extension x-r-has-non-primitive-field to indicate whether generated models need special handling for complex types + cm.vendorExtensions.put("x-r-has-non-primitive-field", needsExtractSimpleType); + // apply the same fix, enhancement for allVars for (CodegenProperty var : cm.allVars) { // check to see if base name is an empty string diff --git a/modules/openapi-generator/src/main/resources/r/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/r/modelGeneric.mustache index fe9c96a2e675..a2ad855a4e93 100644 --- a/modules/openapi-generator/src/main/resources/r/modelGeneric.mustache +++ b/modules/openapi-generator/src/main/resources/r/modelGeneric.mustache @@ -273,7 +273,8 @@ return({{classname}}Object) }, - extractSimpleType = function(x) { + {{#vendorExtensions.x-r-has-non-primitive-field}} + extractSimpleType = function(x) git{ if (R6::is.R6(x)) { return(x$toSimpleType()) } else if (!self$hasNestedR6(x)) { @@ -295,6 +296,7 @@ } FALSE }, + {{/vendorExtensions.x-r-has-non-primitive-field}} #' @description #' Deserialize JSON string into an instance of {{{classname}}} diff --git a/samples/client/echo_api/r/R/bird.R b/samples/client/echo_api/r/R/bird.R index 08f55b830de6..7d3592a0a4b7 100644 --- a/samples/client/echo_api/r/R/bird.R +++ b/samples/client/echo_api/r/R/bird.R @@ -81,28 +81,6 @@ Bird <- R6::R6Class( return(BirdObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of Bird diff --git a/samples/client/echo_api/r/R/category.R b/samples/client/echo_api/r/R/category.R index 200f7bec80b6..f305585be77a 100644 --- a/samples/client/echo_api/r/R/category.R +++ b/samples/client/echo_api/r/R/category.R @@ -81,28 +81,6 @@ Category <- R6::R6Class( return(CategoryObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of Category diff --git a/samples/client/echo_api/r/R/data_query.R b/samples/client/echo_api/r/R/data_query.R index 9dede297985d..772a2ba6d93f 100644 --- a/samples/client/echo_api/r/R/data_query.R +++ b/samples/client/echo_api/r/R/data_query.R @@ -120,28 +120,6 @@ DataQuery <- R6::R6Class( return(DataQueryObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of DataQuery diff --git a/samples/client/echo_api/r/R/number_properties_only.R b/samples/client/echo_api/r/R/number_properties_only.R index 81fcfd9659b9..fb20c5f155bf 100644 --- a/samples/client/echo_api/r/R/number_properties_only.R +++ b/samples/client/echo_api/r/R/number_properties_only.R @@ -91,28 +91,6 @@ NumberPropertiesOnly <- R6::R6Class( return(NumberPropertiesOnlyObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of NumberPropertiesOnly diff --git a/samples/client/echo_api/r/R/query.R b/samples/client/echo_api/r/R/query.R index 48b5f64ae3bb..a0966929ac32 100644 --- a/samples/client/echo_api/r/R/query.R +++ b/samples/client/echo_api/r/R/query.R @@ -80,28 +80,6 @@ Query <- R6::R6Class( return(QueryObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of Query diff --git a/samples/client/echo_api/r/R/tag.R b/samples/client/echo_api/r/R/tag.R index e2cc5eb56d6e..02d4f7c0792d 100644 --- a/samples/client/echo_api/r/R/tag.R +++ b/samples/client/echo_api/r/R/tag.R @@ -81,28 +81,6 @@ Tag <- R6::R6Class( return(TagObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of Tag diff --git a/samples/client/echo_api/r/R/test_form_object_multipart_request_marker.R b/samples/client/echo_api/r/R/test_form_object_multipart_request_marker.R index 261cf8f33896..cbbdca82c52e 100644 --- a/samples/client/echo_api/r/R/test_form_object_multipart_request_marker.R +++ b/samples/client/echo_api/r/R/test_form_object_multipart_request_marker.R @@ -68,28 +68,6 @@ TestFormObjectMultipartRequestMarker <- R6::R6Class( return(TestFormObjectMultipartRequestMarkerObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of TestFormObjectMultipartRequestMarker diff --git a/samples/client/echo_api/r/R/test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.R b/samples/client/echo_api/r/R/test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.R index 0792bbd726f1..c7152b40ac9a 100644 --- a/samples/client/echo_api/r/R/test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.R +++ b/samples/client/echo_api/r/R/test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.R @@ -107,28 +107,6 @@ TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter <- R6::R6Clas return(TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameterObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter diff --git a/samples/client/echo_api/r/R/test_query_style_form_explode_true_array_string_query_object_parameter.R b/samples/client/echo_api/r/R/test_query_style_form_explode_true_array_string_query_object_parameter.R index 5f9256d6ef4d..30d4c9eeae80 100644 --- a/samples/client/echo_api/r/R/test_query_style_form_explode_true_array_string_query_object_parameter.R +++ b/samples/client/echo_api/r/R/test_query_style_form_explode_true_array_string_query_object_parameter.R @@ -67,28 +67,6 @@ TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter <- R6::R6Class( return(TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameterObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter diff --git a/samples/client/petstore/R-httr2-wrapper/R/allof_tag_api_response.R b/samples/client/petstore/R-httr2-wrapper/R/allof_tag_api_response.R index 36c6f8cc0c4e..db24b5854a5c 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/allof_tag_api_response.R +++ b/samples/client/petstore/R-httr2-wrapper/R/allof_tag_api_response.R @@ -134,28 +134,6 @@ AllofTagApiResponse <- R6::R6Class( return(AllofTagApiResponseObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of AllofTagApiResponse diff --git a/samples/client/petstore/R-httr2-wrapper/R/animal.R b/samples/client/petstore/R-httr2-wrapper/R/animal.R index 13f86852c68f..b18bf52a7d51 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/animal.R +++ b/samples/client/petstore/R-httr2-wrapper/R/animal.R @@ -97,28 +97,6 @@ Animal <- R6::R6Class( return(AnimalObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of Animal diff --git a/samples/client/petstore/R-httr2-wrapper/R/basque_pig.R b/samples/client/petstore/R-httr2-wrapper/R/basque_pig.R index a1af7722d363..beda411e2563 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/basque_pig.R +++ b/samples/client/petstore/R-httr2-wrapper/R/basque_pig.R @@ -95,28 +95,6 @@ BasquePig <- R6::R6Class( return(BasquePigObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of BasquePig diff --git a/samples/client/petstore/R-httr2-wrapper/R/cat.R b/samples/client/petstore/R-httr2-wrapper/R/cat.R index 0036d6fd26e0..187b0908c746 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/cat.R +++ b/samples/client/petstore/R-httr2-wrapper/R/cat.R @@ -109,28 +109,6 @@ Cat <- R6::R6Class( return(CatObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of Cat diff --git a/samples/client/petstore/R-httr2-wrapper/R/category.R b/samples/client/petstore/R-httr2-wrapper/R/category.R index 98b5a5ac8c76..c46a4fa2245b 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/category.R +++ b/samples/client/petstore/R-httr2-wrapper/R/category.R @@ -95,28 +95,6 @@ Category <- R6::R6Class( return(CategoryObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of Category diff --git a/samples/client/petstore/R-httr2-wrapper/R/danish_pig.R b/samples/client/petstore/R-httr2-wrapper/R/danish_pig.R index 8c9934df1141..f70adc021243 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/danish_pig.R +++ b/samples/client/petstore/R-httr2-wrapper/R/danish_pig.R @@ -95,28 +95,6 @@ DanishPig <- R6::R6Class( return(DanishPigObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of DanishPig diff --git a/samples/client/petstore/R-httr2-wrapper/R/date.R b/samples/client/petstore/R-httr2-wrapper/R/date.R index 0d41c26315cb..7e0939f5e39c 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/date.R +++ b/samples/client/petstore/R-httr2-wrapper/R/date.R @@ -112,28 +112,6 @@ Date <- R6::R6Class( return(DateObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of Date diff --git a/samples/client/petstore/R-httr2-wrapper/R/dog.R b/samples/client/petstore/R-httr2-wrapper/R/dog.R index 88bd4ae37701..634d7751d260 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/dog.R +++ b/samples/client/petstore/R-httr2-wrapper/R/dog.R @@ -109,28 +109,6 @@ Dog <- R6::R6Class( return(DogObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of Dog diff --git a/samples/client/petstore/R-httr2-wrapper/R/dummy_model.R b/samples/client/petstore/R-httr2-wrapper/R/dummy_model.R index d4e3e067ef38..1aadcd661997 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/dummy_model.R +++ b/samples/client/petstore/R-httr2-wrapper/R/dummy_model.R @@ -82,28 +82,6 @@ DummyModel <- R6::R6Class( return(DummyModelObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of DummyModel diff --git a/samples/client/petstore/R-httr2-wrapper/R/format_test.R b/samples/client/petstore/R-httr2-wrapper/R/format_test.R index feb246ad71e6..27f3fd93b4ec 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/format_test.R +++ b/samples/client/petstore/R-httr2-wrapper/R/format_test.R @@ -255,28 +255,6 @@ FormatTest <- R6::R6Class( return(FormatTestObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of FormatTest diff --git a/samples/client/petstore/R-httr2-wrapper/R/model_api_response.R b/samples/client/petstore/R-httr2-wrapper/R/model_api_response.R index 17dfaff7d10d..eb02f5cb7188 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/model_api_response.R +++ b/samples/client/petstore/R-httr2-wrapper/R/model_api_response.R @@ -108,28 +108,6 @@ ModelApiResponse <- R6::R6Class( return(ModelApiResponseObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of ModelApiResponse diff --git a/samples/client/petstore/R-httr2-wrapper/R/order.R b/samples/client/petstore/R-httr2-wrapper/R/order.R index 040c3e21652e..9595e4c6edd5 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/order.R +++ b/samples/client/petstore/R-httr2-wrapper/R/order.R @@ -150,28 +150,6 @@ Order <- R6::R6Class( return(OrderObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of Order diff --git a/samples/client/petstore/R-httr2-wrapper/R/pet_map.R b/samples/client/petstore/R-httr2-wrapper/R/pet_map.R index 5f8bb19acd8a..c728b929d019 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/pet_map.R +++ b/samples/client/petstore/R-httr2-wrapper/R/pet_map.R @@ -81,28 +81,6 @@ PetMap <- R6::R6Class( return(PetMapObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of PetMap diff --git a/samples/client/petstore/R-httr2-wrapper/R/special.R b/samples/client/petstore/R-httr2-wrapper/R/special.R index a3fbe1864619..8dd5c81535aa 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/special.R +++ b/samples/client/petstore/R-httr2-wrapper/R/special.R @@ -162,28 +162,6 @@ Special <- R6::R6Class( return(SpecialObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of Special diff --git a/samples/client/petstore/R-httr2-wrapper/R/tag.R b/samples/client/petstore/R-httr2-wrapper/R/tag.R index d224593d8ca5..706a72a3d91e 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/tag.R +++ b/samples/client/petstore/R-httr2-wrapper/R/tag.R @@ -95,28 +95,6 @@ Tag <- R6::R6Class( return(TagObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of Tag diff --git a/samples/client/petstore/R-httr2-wrapper/R/user.R b/samples/client/petstore/R-httr2-wrapper/R/user.R index c3a6c3d9448f..3a178d9ecfb9 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/user.R +++ b/samples/client/petstore/R-httr2-wrapper/R/user.R @@ -173,28 +173,6 @@ User <- R6::R6Class( return(UserObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of User diff --git a/samples/client/petstore/R-httr2-wrapper/R/whale.R b/samples/client/petstore/R-httr2-wrapper/R/whale.R index eda476ba4e83..5ea51f82a219 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/whale.R +++ b/samples/client/petstore/R-httr2-wrapper/R/whale.R @@ -108,28 +108,6 @@ Whale <- R6::R6Class( return(WhaleObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of Whale diff --git a/samples/client/petstore/R-httr2-wrapper/R/zebra.R b/samples/client/petstore/R-httr2-wrapper/R/zebra.R index 547275c2a080..2d886d721fcf 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/zebra.R +++ b/samples/client/petstore/R-httr2-wrapper/R/zebra.R @@ -98,28 +98,6 @@ Zebra <- R6::R6Class( return(ZebraObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of Zebra diff --git a/samples/client/petstore/R-httr2/R/allof_tag_api_response.R b/samples/client/petstore/R-httr2/R/allof_tag_api_response.R index ea36d31ee4ab..c725f2151378 100644 --- a/samples/client/petstore/R-httr2/R/allof_tag_api_response.R +++ b/samples/client/petstore/R-httr2/R/allof_tag_api_response.R @@ -120,28 +120,6 @@ AllofTagApiResponse <- R6::R6Class( return(AllofTagApiResponseObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of AllofTagApiResponse diff --git a/samples/client/petstore/R-httr2/R/animal.R b/samples/client/petstore/R-httr2/R/animal.R index eb5e614b5a45..18c590ec71bd 100644 --- a/samples/client/petstore/R-httr2/R/animal.R +++ b/samples/client/petstore/R-httr2/R/animal.R @@ -83,28 +83,6 @@ Animal <- R6::R6Class( return(AnimalObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of Animal diff --git a/samples/client/petstore/R-httr2/R/basque_pig.R b/samples/client/petstore/R-httr2/R/basque_pig.R index 42ad2f7f9f2c..56c22f2a9ae1 100644 --- a/samples/client/petstore/R-httr2/R/basque_pig.R +++ b/samples/client/petstore/R-httr2/R/basque_pig.R @@ -81,28 +81,6 @@ BasquePig <- R6::R6Class( return(BasquePigObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of BasquePig diff --git a/samples/client/petstore/R-httr2/R/cat.R b/samples/client/petstore/R-httr2/R/cat.R index 32d3fb57f610..348980576dcc 100644 --- a/samples/client/petstore/R-httr2/R/cat.R +++ b/samples/client/petstore/R-httr2/R/cat.R @@ -95,28 +95,6 @@ Cat <- R6::R6Class( return(CatObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of Cat diff --git a/samples/client/petstore/R-httr2/R/category.R b/samples/client/petstore/R-httr2/R/category.R index e546fde38730..62cbc7c57aa6 100644 --- a/samples/client/petstore/R-httr2/R/category.R +++ b/samples/client/petstore/R-httr2/R/category.R @@ -81,28 +81,6 @@ Category <- R6::R6Class( return(CategoryObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of Category diff --git a/samples/client/petstore/R-httr2/R/danish_pig.R b/samples/client/petstore/R-httr2/R/danish_pig.R index a94a0465465c..ef7de45a6a5e 100644 --- a/samples/client/petstore/R-httr2/R/danish_pig.R +++ b/samples/client/petstore/R-httr2/R/danish_pig.R @@ -81,28 +81,6 @@ DanishPig <- R6::R6Class( return(DanishPigObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of DanishPig diff --git a/samples/client/petstore/R-httr2/R/date.R b/samples/client/petstore/R-httr2/R/date.R index 14a5c424911c..e1348fd5270f 100644 --- a/samples/client/petstore/R-httr2/R/date.R +++ b/samples/client/petstore/R-httr2/R/date.R @@ -98,28 +98,6 @@ Date <- R6::R6Class( return(DateObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of Date diff --git a/samples/client/petstore/R-httr2/R/dog.R b/samples/client/petstore/R-httr2/R/dog.R index d51e0365f181..ec0dd386fec9 100644 --- a/samples/client/petstore/R-httr2/R/dog.R +++ b/samples/client/petstore/R-httr2/R/dog.R @@ -95,28 +95,6 @@ Dog <- R6::R6Class( return(DogObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of Dog diff --git a/samples/client/petstore/R-httr2/R/format_test.R b/samples/client/petstore/R-httr2/R/format_test.R index 94b0b14a478a..c1d5351cbaf0 100644 --- a/samples/client/petstore/R-httr2/R/format_test.R +++ b/samples/client/petstore/R-httr2/R/format_test.R @@ -241,28 +241,6 @@ FormatTest <- R6::R6Class( return(FormatTestObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of FormatTest diff --git a/samples/client/petstore/R-httr2/R/just_model.R b/samples/client/petstore/R-httr2/R/just_model.R index bc80cd833d4e..88d8b9ad9a8f 100644 --- a/samples/client/petstore/R-httr2/R/just_model.R +++ b/samples/client/petstore/R-httr2/R/just_model.R @@ -68,28 +68,6 @@ JustModel <- R6::R6Class( return(JustModelObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of JustModel diff --git a/samples/client/petstore/R-httr2/R/model_api_response.R b/samples/client/petstore/R-httr2/R/model_api_response.R index ee48076d9369..f254a90bb916 100644 --- a/samples/client/petstore/R-httr2/R/model_api_response.R +++ b/samples/client/petstore/R-httr2/R/model_api_response.R @@ -94,28 +94,6 @@ ModelApiResponse <- R6::R6Class( return(ModelApiResponseObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of ModelApiResponse diff --git a/samples/client/petstore/R-httr2/R/order.R b/samples/client/petstore/R-httr2/R/order.R index 9a68a5791f84..6e57bdfe1a56 100644 --- a/samples/client/petstore/R-httr2/R/order.R +++ b/samples/client/petstore/R-httr2/R/order.R @@ -136,28 +136,6 @@ Order <- R6::R6Class( return(OrderObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of Order diff --git a/samples/client/petstore/R-httr2/R/pet_map.R b/samples/client/petstore/R-httr2/R/pet_map.R index 9b6e53fb82b9..e73c8e59b37f 100644 --- a/samples/client/petstore/R-httr2/R/pet_map.R +++ b/samples/client/petstore/R-httr2/R/pet_map.R @@ -67,28 +67,6 @@ PetMap <- R6::R6Class( return(PetMapObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of PetMap diff --git a/samples/client/petstore/R-httr2/R/special.R b/samples/client/petstore/R-httr2/R/special.R index fa859534205c..19f0b45c6964 100644 --- a/samples/client/petstore/R-httr2/R/special.R +++ b/samples/client/petstore/R-httr2/R/special.R @@ -148,28 +148,6 @@ Special <- R6::R6Class( return(SpecialObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of Special diff --git a/samples/client/petstore/R-httr2/R/tag.R b/samples/client/petstore/R-httr2/R/tag.R index 62ad2a0d9878..d774f0541db0 100644 --- a/samples/client/petstore/R-httr2/R/tag.R +++ b/samples/client/petstore/R-httr2/R/tag.R @@ -81,28 +81,6 @@ Tag <- R6::R6Class( return(TagObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of Tag diff --git a/samples/client/petstore/R-httr2/R/user.R b/samples/client/petstore/R-httr2/R/user.R index 4afa30dd4f23..4d05c7e1b590 100644 --- a/samples/client/petstore/R-httr2/R/user.R +++ b/samples/client/petstore/R-httr2/R/user.R @@ -159,28 +159,6 @@ User <- R6::R6Class( return(UserObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of User diff --git a/samples/client/petstore/R-httr2/R/whale.R b/samples/client/petstore/R-httr2/R/whale.R index 99ae1b9d2116..90528e13f67e 100644 --- a/samples/client/petstore/R-httr2/R/whale.R +++ b/samples/client/petstore/R-httr2/R/whale.R @@ -94,28 +94,6 @@ Whale <- R6::R6Class( return(WhaleObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of Whale diff --git a/samples/client/petstore/R-httr2/R/zebra.R b/samples/client/petstore/R-httr2/R/zebra.R index aaaa9317d29d..39502684eba7 100644 --- a/samples/client/petstore/R-httr2/R/zebra.R +++ b/samples/client/petstore/R-httr2/R/zebra.R @@ -84,28 +84,6 @@ Zebra <- R6::R6Class( return(ZebraObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of Zebra diff --git a/samples/client/petstore/R/R/allof_tag_api_response.R b/samples/client/petstore/R/R/allof_tag_api_response.R index 36c6f8cc0c4e..db24b5854a5c 100644 --- a/samples/client/petstore/R/R/allof_tag_api_response.R +++ b/samples/client/petstore/R/R/allof_tag_api_response.R @@ -134,28 +134,6 @@ AllofTagApiResponse <- R6::R6Class( return(AllofTagApiResponseObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of AllofTagApiResponse diff --git a/samples/client/petstore/R/R/animal.R b/samples/client/petstore/R/R/animal.R index 13f86852c68f..b18bf52a7d51 100644 --- a/samples/client/petstore/R/R/animal.R +++ b/samples/client/petstore/R/R/animal.R @@ -97,28 +97,6 @@ Animal <- R6::R6Class( return(AnimalObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of Animal diff --git a/samples/client/petstore/R/R/basque_pig.R b/samples/client/petstore/R/R/basque_pig.R index a1af7722d363..beda411e2563 100644 --- a/samples/client/petstore/R/R/basque_pig.R +++ b/samples/client/petstore/R/R/basque_pig.R @@ -95,28 +95,6 @@ BasquePig <- R6::R6Class( return(BasquePigObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of BasquePig diff --git a/samples/client/petstore/R/R/cat.R b/samples/client/petstore/R/R/cat.R index 0036d6fd26e0..187b0908c746 100644 --- a/samples/client/petstore/R/R/cat.R +++ b/samples/client/petstore/R/R/cat.R @@ -109,28 +109,6 @@ Cat <- R6::R6Class( return(CatObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of Cat diff --git a/samples/client/petstore/R/R/category.R b/samples/client/petstore/R/R/category.R index 98b5a5ac8c76..c46a4fa2245b 100644 --- a/samples/client/petstore/R/R/category.R +++ b/samples/client/petstore/R/R/category.R @@ -95,28 +95,6 @@ Category <- R6::R6Class( return(CategoryObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of Category diff --git a/samples/client/petstore/R/R/danish_pig.R b/samples/client/petstore/R/R/danish_pig.R index 8c9934df1141..f70adc021243 100644 --- a/samples/client/petstore/R/R/danish_pig.R +++ b/samples/client/petstore/R/R/danish_pig.R @@ -95,28 +95,6 @@ DanishPig <- R6::R6Class( return(DanishPigObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of DanishPig diff --git a/samples/client/petstore/R/R/date.R b/samples/client/petstore/R/R/date.R index 0d41c26315cb..7e0939f5e39c 100644 --- a/samples/client/petstore/R/R/date.R +++ b/samples/client/petstore/R/R/date.R @@ -112,28 +112,6 @@ Date <- R6::R6Class( return(DateObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of Date diff --git a/samples/client/petstore/R/R/dog.R b/samples/client/petstore/R/R/dog.R index 88bd4ae37701..634d7751d260 100644 --- a/samples/client/petstore/R/R/dog.R +++ b/samples/client/petstore/R/R/dog.R @@ -109,28 +109,6 @@ Dog <- R6::R6Class( return(DogObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of Dog diff --git a/samples/client/petstore/R/R/dummy_model.R b/samples/client/petstore/R/R/dummy_model.R index d4e3e067ef38..1aadcd661997 100644 --- a/samples/client/petstore/R/R/dummy_model.R +++ b/samples/client/petstore/R/R/dummy_model.R @@ -82,28 +82,6 @@ DummyModel <- R6::R6Class( return(DummyModelObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of DummyModel diff --git a/samples/client/petstore/R/R/format_test.R b/samples/client/petstore/R/R/format_test.R index feb246ad71e6..27f3fd93b4ec 100644 --- a/samples/client/petstore/R/R/format_test.R +++ b/samples/client/petstore/R/R/format_test.R @@ -255,28 +255,6 @@ FormatTest <- R6::R6Class( return(FormatTestObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of FormatTest diff --git a/samples/client/petstore/R/R/model_api_response.R b/samples/client/petstore/R/R/model_api_response.R index 17dfaff7d10d..eb02f5cb7188 100644 --- a/samples/client/petstore/R/R/model_api_response.R +++ b/samples/client/petstore/R/R/model_api_response.R @@ -108,28 +108,6 @@ ModelApiResponse <- R6::R6Class( return(ModelApiResponseObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of ModelApiResponse diff --git a/samples/client/petstore/R/R/order.R b/samples/client/petstore/R/R/order.R index 040c3e21652e..9595e4c6edd5 100644 --- a/samples/client/petstore/R/R/order.R +++ b/samples/client/petstore/R/R/order.R @@ -150,28 +150,6 @@ Order <- R6::R6Class( return(OrderObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of Order diff --git a/samples/client/petstore/R/R/pet_map.R b/samples/client/petstore/R/R/pet_map.R index 5f8bb19acd8a..c728b929d019 100644 --- a/samples/client/petstore/R/R/pet_map.R +++ b/samples/client/petstore/R/R/pet_map.R @@ -81,28 +81,6 @@ PetMap <- R6::R6Class( return(PetMapObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of PetMap diff --git a/samples/client/petstore/R/R/special.R b/samples/client/petstore/R/R/special.R index a3fbe1864619..8dd5c81535aa 100644 --- a/samples/client/petstore/R/R/special.R +++ b/samples/client/petstore/R/R/special.R @@ -162,28 +162,6 @@ Special <- R6::R6Class( return(SpecialObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of Special diff --git a/samples/client/petstore/R/R/tag.R b/samples/client/petstore/R/R/tag.R index d224593d8ca5..706a72a3d91e 100644 --- a/samples/client/petstore/R/R/tag.R +++ b/samples/client/petstore/R/R/tag.R @@ -95,28 +95,6 @@ Tag <- R6::R6Class( return(TagObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of Tag diff --git a/samples/client/petstore/R/R/user.R b/samples/client/petstore/R/R/user.R index c3a6c3d9448f..3a178d9ecfb9 100644 --- a/samples/client/petstore/R/R/user.R +++ b/samples/client/petstore/R/R/user.R @@ -173,28 +173,6 @@ User <- R6::R6Class( return(UserObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of User diff --git a/samples/client/petstore/R/R/whale.R b/samples/client/petstore/R/R/whale.R index eda476ba4e83..5ea51f82a219 100644 --- a/samples/client/petstore/R/R/whale.R +++ b/samples/client/petstore/R/R/whale.R @@ -108,28 +108,6 @@ Whale <- R6::R6Class( return(WhaleObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of Whale diff --git a/samples/client/petstore/R/R/zebra.R b/samples/client/petstore/R/R/zebra.R index 547275c2a080..2d886d721fcf 100644 --- a/samples/client/petstore/R/R/zebra.R +++ b/samples/client/petstore/R/R/zebra.R @@ -98,28 +98,6 @@ Zebra <- R6::R6Class( return(ZebraObject) }, - extractSimpleType = function(x) { - if (R6::is.R6(x)) { - return(x$toSimpleType()) - } else if (!self$hasNestedR6(x)) { - return(x) - } - lapply(x, self$extractSimpleType) - }, - - hasNestedR6 = function(x) { - if (R6::is.R6(x)) { - return(TRUE) - } - if (is.list(x)) { - for (item in x) { - if (self$hasNestedR6(item)) { - return(TRUE) - } - } - } - FALSE - }, #' @description #' Deserialize JSON string into an instance of Zebra From 0dcd27b3b51aff56e9ea1d69d1a1060eeebc76ef Mon Sep 17 00:00:00 2001 From: Matthew Pollock Date: Wed, 28 Jan 2026 20:31:01 -0500 Subject: [PATCH 4/5] regenerate samples --- .../src/main/resources/r/modelGeneric.mustache | 2 +- samples/client/echo_api/r/R/bird.R | 1 - samples/client/echo_api/r/R/category.R | 1 - samples/client/echo_api/r/R/data_query.R | 1 - samples/client/echo_api/r/R/default_value.R | 2 +- samples/client/echo_api/r/R/number_properties_only.R | 1 - samples/client/echo_api/r/R/pet.R | 2 +- samples/client/echo_api/r/R/query.R | 1 - samples/client/echo_api/r/R/tag.R | 1 - .../echo_api/r/R/test_form_object_multipart_request_marker.R | 1 - ...p_object_explode_true_object_all_of_query_object_parameter.R | 1 - ...tyle_form_explode_true_array_string_query_object_parameter.R | 1 - .../client/petstore/R-httr2-wrapper/R/allof_tag_api_response.R | 1 - samples/client/petstore/R-httr2-wrapper/R/animal.R | 1 - samples/client/petstore/R-httr2-wrapper/R/basque_pig.R | 1 - samples/client/petstore/R-httr2-wrapper/R/cat.R | 1 - samples/client/petstore/R-httr2-wrapper/R/category.R | 1 - samples/client/petstore/R-httr2-wrapper/R/danish_pig.R | 1 - samples/client/petstore/R-httr2-wrapper/R/date.R | 1 - samples/client/petstore/R-httr2-wrapper/R/dog.R | 1 - samples/client/petstore/R-httr2-wrapper/R/dummy_model.R | 1 - samples/client/petstore/R-httr2-wrapper/R/format_test.R | 1 - samples/client/petstore/R-httr2-wrapper/R/model_api_response.R | 1 - samples/client/petstore/R-httr2-wrapper/R/nested_one_of.R | 2 +- samples/client/petstore/R-httr2-wrapper/R/order.R | 1 - samples/client/petstore/R-httr2-wrapper/R/pet.R | 2 +- samples/client/petstore/R-httr2-wrapper/R/pet_map.R | 1 - samples/client/petstore/R-httr2-wrapper/R/special.R | 1 - samples/client/petstore/R-httr2-wrapper/R/tag.R | 1 - samples/client/petstore/R-httr2-wrapper/R/update_pet_request.R | 2 +- samples/client/petstore/R-httr2-wrapper/R/user.R | 1 - samples/client/petstore/R-httr2-wrapper/R/whale.R | 1 - samples/client/petstore/R-httr2-wrapper/R/zebra.R | 1 - samples/client/petstore/R-httr2/R/allof_tag_api_response.R | 1 - samples/client/petstore/R-httr2/R/animal.R | 1 - samples/client/petstore/R-httr2/R/basque_pig.R | 1 - samples/client/petstore/R-httr2/R/cat.R | 1 - samples/client/petstore/R-httr2/R/category.R | 1 - samples/client/petstore/R-httr2/R/danish_pig.R | 1 - samples/client/petstore/R-httr2/R/date.R | 1 - samples/client/petstore/R-httr2/R/dog.R | 1 - samples/client/petstore/R-httr2/R/format_test.R | 1 - samples/client/petstore/R-httr2/R/just_model.R | 1 - samples/client/petstore/R-httr2/R/model_api_response.R | 1 - samples/client/petstore/R-httr2/R/nested_one_of.R | 2 +- samples/client/petstore/R-httr2/R/order.R | 1 - samples/client/petstore/R-httr2/R/pet.R | 2 +- samples/client/petstore/R-httr2/R/pet_map.R | 1 - samples/client/petstore/R-httr2/R/special.R | 1 - samples/client/petstore/R-httr2/R/tag.R | 1 - samples/client/petstore/R-httr2/R/update_pet_request.R | 2 +- samples/client/petstore/R-httr2/R/user.R | 1 - samples/client/petstore/R-httr2/R/whale.R | 1 - samples/client/petstore/R-httr2/R/zebra.R | 1 - samples/client/petstore/R/R/allof_tag_api_response.R | 1 - samples/client/petstore/R/R/animal.R | 1 - samples/client/petstore/R/R/basque_pig.R | 1 - samples/client/petstore/R/R/cat.R | 1 - samples/client/petstore/R/R/category.R | 1 - samples/client/petstore/R/R/danish_pig.R | 1 - samples/client/petstore/R/R/date.R | 1 - samples/client/petstore/R/R/dog.R | 1 - samples/client/petstore/R/R/dummy_model.R | 1 - samples/client/petstore/R/R/format_test.R | 1 - samples/client/petstore/R/R/model_api_response.R | 1 - samples/client/petstore/R/R/nested_one_of.R | 2 +- samples/client/petstore/R/R/order.R | 1 - samples/client/petstore/R/R/pet.R | 2 +- samples/client/petstore/R/R/pet_map.R | 1 - samples/client/petstore/R/R/special.R | 1 - samples/client/petstore/R/R/tag.R | 1 - samples/client/petstore/R/R/update_pet_request.R | 2 +- samples/client/petstore/R/R/user.R | 1 - samples/client/petstore/R/R/whale.R | 1 - samples/client/petstore/R/R/zebra.R | 1 - 75 files changed, 12 insertions(+), 75 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/r/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/r/modelGeneric.mustache index a2ad855a4e93..6f171d786d42 100644 --- a/modules/openapi-generator/src/main/resources/r/modelGeneric.mustache +++ b/modules/openapi-generator/src/main/resources/r/modelGeneric.mustache @@ -272,8 +272,8 @@ {{/isAdditionalPropertiesTrue}} return({{classname}}Object) }, - {{#vendorExtensions.x-r-has-non-primitive-field}} + extractSimpleType = function(x) git{ if (R6::is.R6(x)) { return(x$toSimpleType()) diff --git a/samples/client/echo_api/r/R/bird.R b/samples/client/echo_api/r/R/bird.R index 7d3592a0a4b7..97921b1c4c89 100644 --- a/samples/client/echo_api/r/R/bird.R +++ b/samples/client/echo_api/r/R/bird.R @@ -81,7 +81,6 @@ Bird <- R6::R6Class( return(BirdObject) }, - #' @description #' Deserialize JSON string into an instance of Bird #' diff --git a/samples/client/echo_api/r/R/category.R b/samples/client/echo_api/r/R/category.R index f305585be77a..56aa69671774 100644 --- a/samples/client/echo_api/r/R/category.R +++ b/samples/client/echo_api/r/R/category.R @@ -81,7 +81,6 @@ Category <- R6::R6Class( return(CategoryObject) }, - #' @description #' Deserialize JSON string into an instance of Category #' diff --git a/samples/client/echo_api/r/R/data_query.R b/samples/client/echo_api/r/R/data_query.R index 772a2ba6d93f..1340544416d0 100644 --- a/samples/client/echo_api/r/R/data_query.R +++ b/samples/client/echo_api/r/R/data_query.R @@ -120,7 +120,6 @@ DataQuery <- R6::R6Class( return(DataQueryObject) }, - #' @description #' Deserialize JSON string into an instance of DataQuery #' diff --git a/samples/client/echo_api/r/R/default_value.R b/samples/client/echo_api/r/R/default_value.R index e6a089514fc0..48f458aa7293 100644 --- a/samples/client/echo_api/r/R/default_value.R +++ b/samples/client/echo_api/r/R/default_value.R @@ -152,7 +152,7 @@ DefaultValue <- R6::R6Class( return(DefaultValueObject) }, - extractSimpleType = function(x) { + extractSimpleType = function(x) git{ if (R6::is.R6(x)) { return(x$toSimpleType()) } else if (!self$hasNestedR6(x)) { diff --git a/samples/client/echo_api/r/R/number_properties_only.R b/samples/client/echo_api/r/R/number_properties_only.R index fb20c5f155bf..7b146800ad34 100644 --- a/samples/client/echo_api/r/R/number_properties_only.R +++ b/samples/client/echo_api/r/R/number_properties_only.R @@ -91,7 +91,6 @@ NumberPropertiesOnly <- R6::R6Class( return(NumberPropertiesOnlyObject) }, - #' @description #' Deserialize JSON string into an instance of NumberPropertiesOnly #' diff --git a/samples/client/echo_api/r/R/pet.R b/samples/client/echo_api/r/R/pet.R index b4cae7506eec..c6faa201b439 100644 --- a/samples/client/echo_api/r/R/pet.R +++ b/samples/client/echo_api/r/R/pet.R @@ -132,7 +132,7 @@ Pet <- R6::R6Class( return(PetObject) }, - extractSimpleType = function(x) { + extractSimpleType = function(x) git{ if (R6::is.R6(x)) { return(x$toSimpleType()) } else if (!self$hasNestedR6(x)) { diff --git a/samples/client/echo_api/r/R/query.R b/samples/client/echo_api/r/R/query.R index a0966929ac32..fd286ab3016d 100644 --- a/samples/client/echo_api/r/R/query.R +++ b/samples/client/echo_api/r/R/query.R @@ -80,7 +80,6 @@ Query <- R6::R6Class( return(QueryObject) }, - #' @description #' Deserialize JSON string into an instance of Query #' diff --git a/samples/client/echo_api/r/R/tag.R b/samples/client/echo_api/r/R/tag.R index 02d4f7c0792d..3a0d3c1d2390 100644 --- a/samples/client/echo_api/r/R/tag.R +++ b/samples/client/echo_api/r/R/tag.R @@ -81,7 +81,6 @@ Tag <- R6::R6Class( return(TagObject) }, - #' @description #' Deserialize JSON string into an instance of Tag #' diff --git a/samples/client/echo_api/r/R/test_form_object_multipart_request_marker.R b/samples/client/echo_api/r/R/test_form_object_multipart_request_marker.R index cbbdca82c52e..5c9776f78ebe 100644 --- a/samples/client/echo_api/r/R/test_form_object_multipart_request_marker.R +++ b/samples/client/echo_api/r/R/test_form_object_multipart_request_marker.R @@ -68,7 +68,6 @@ TestFormObjectMultipartRequestMarker <- R6::R6Class( return(TestFormObjectMultipartRequestMarkerObject) }, - #' @description #' Deserialize JSON string into an instance of TestFormObjectMultipartRequestMarker #' diff --git a/samples/client/echo_api/r/R/test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.R b/samples/client/echo_api/r/R/test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.R index c7152b40ac9a..a441c20a8be3 100644 --- a/samples/client/echo_api/r/R/test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.R +++ b/samples/client/echo_api/r/R/test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.R @@ -107,7 +107,6 @@ TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter <- R6::R6Clas return(TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameterObject) }, - #' @description #' Deserialize JSON string into an instance of TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter #' diff --git a/samples/client/echo_api/r/R/test_query_style_form_explode_true_array_string_query_object_parameter.R b/samples/client/echo_api/r/R/test_query_style_form_explode_true_array_string_query_object_parameter.R index 30d4c9eeae80..9a874c05c0d1 100644 --- a/samples/client/echo_api/r/R/test_query_style_form_explode_true_array_string_query_object_parameter.R +++ b/samples/client/echo_api/r/R/test_query_style_form_explode_true_array_string_query_object_parameter.R @@ -67,7 +67,6 @@ TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter <- R6::R6Class( return(TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameterObject) }, - #' @description #' Deserialize JSON string into an instance of TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/allof_tag_api_response.R b/samples/client/petstore/R-httr2-wrapper/R/allof_tag_api_response.R index db24b5854a5c..018600362d38 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/allof_tag_api_response.R +++ b/samples/client/petstore/R-httr2-wrapper/R/allof_tag_api_response.R @@ -134,7 +134,6 @@ AllofTagApiResponse <- R6::R6Class( return(AllofTagApiResponseObject) }, - #' @description #' Deserialize JSON string into an instance of AllofTagApiResponse #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/animal.R b/samples/client/petstore/R-httr2-wrapper/R/animal.R index b18bf52a7d51..cf2e97f9af30 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/animal.R +++ b/samples/client/petstore/R-httr2-wrapper/R/animal.R @@ -97,7 +97,6 @@ Animal <- R6::R6Class( return(AnimalObject) }, - #' @description #' Deserialize JSON string into an instance of Animal #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/basque_pig.R b/samples/client/petstore/R-httr2-wrapper/R/basque_pig.R index beda411e2563..ca8601f4c3b1 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/basque_pig.R +++ b/samples/client/petstore/R-httr2-wrapper/R/basque_pig.R @@ -95,7 +95,6 @@ BasquePig <- R6::R6Class( return(BasquePigObject) }, - #' @description #' Deserialize JSON string into an instance of BasquePig #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/cat.R b/samples/client/petstore/R-httr2-wrapper/R/cat.R index 187b0908c746..270b87c21643 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/cat.R +++ b/samples/client/petstore/R-httr2-wrapper/R/cat.R @@ -109,7 +109,6 @@ Cat <- R6::R6Class( return(CatObject) }, - #' @description #' Deserialize JSON string into an instance of Cat #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/category.R b/samples/client/petstore/R-httr2-wrapper/R/category.R index c46a4fa2245b..0dcbd1b81610 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/category.R +++ b/samples/client/petstore/R-httr2-wrapper/R/category.R @@ -95,7 +95,6 @@ Category <- R6::R6Class( return(CategoryObject) }, - #' @description #' Deserialize JSON string into an instance of Category #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/danish_pig.R b/samples/client/petstore/R-httr2-wrapper/R/danish_pig.R index f70adc021243..02d2208639b0 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/danish_pig.R +++ b/samples/client/petstore/R-httr2-wrapper/R/danish_pig.R @@ -95,7 +95,6 @@ DanishPig <- R6::R6Class( return(DanishPigObject) }, - #' @description #' Deserialize JSON string into an instance of DanishPig #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/date.R b/samples/client/petstore/R-httr2-wrapper/R/date.R index 7e0939f5e39c..411249d3fba1 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/date.R +++ b/samples/client/petstore/R-httr2-wrapper/R/date.R @@ -112,7 +112,6 @@ Date <- R6::R6Class( return(DateObject) }, - #' @description #' Deserialize JSON string into an instance of Date #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/dog.R b/samples/client/petstore/R-httr2-wrapper/R/dog.R index 634d7751d260..4d6dab71c61b 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/dog.R +++ b/samples/client/petstore/R-httr2-wrapper/R/dog.R @@ -109,7 +109,6 @@ Dog <- R6::R6Class( return(DogObject) }, - #' @description #' Deserialize JSON string into an instance of Dog #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/dummy_model.R b/samples/client/petstore/R-httr2-wrapper/R/dummy_model.R index 1aadcd661997..cbea7830b824 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/dummy_model.R +++ b/samples/client/petstore/R-httr2-wrapper/R/dummy_model.R @@ -82,7 +82,6 @@ DummyModel <- R6::R6Class( return(DummyModelObject) }, - #' @description #' Deserialize JSON string into an instance of DummyModel #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/format_test.R b/samples/client/petstore/R-httr2-wrapper/R/format_test.R index 27f3fd93b4ec..7d1bded3c5a8 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/format_test.R +++ b/samples/client/petstore/R-httr2-wrapper/R/format_test.R @@ -255,7 +255,6 @@ FormatTest <- R6::R6Class( return(FormatTestObject) }, - #' @description #' Deserialize JSON string into an instance of FormatTest #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/model_api_response.R b/samples/client/petstore/R-httr2-wrapper/R/model_api_response.R index eb02f5cb7188..a3a46dfb7907 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/model_api_response.R +++ b/samples/client/petstore/R-httr2-wrapper/R/model_api_response.R @@ -108,7 +108,6 @@ ModelApiResponse <- R6::R6Class( return(ModelApiResponseObject) }, - #' @description #' Deserialize JSON string into an instance of ModelApiResponse #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/nested_one_of.R b/samples/client/petstore/R-httr2-wrapper/R/nested_one_of.R index fe396f11faa4..e3897274f920 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/nested_one_of.R +++ b/samples/client/petstore/R-httr2-wrapper/R/nested_one_of.R @@ -93,7 +93,7 @@ NestedOneOf <- R6::R6Class( return(NestedOneOfObject) }, - extractSimpleType = function(x) { + extractSimpleType = function(x) git{ if (R6::is.R6(x)) { return(x$toSimpleType()) } else if (!self$hasNestedR6(x)) { diff --git a/samples/client/petstore/R-httr2-wrapper/R/order.R b/samples/client/petstore/R-httr2-wrapper/R/order.R index 9595e4c6edd5..07378f03666c 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/order.R +++ b/samples/client/petstore/R-httr2-wrapper/R/order.R @@ -150,7 +150,6 @@ Order <- R6::R6Class( return(OrderObject) }, - #' @description #' Deserialize JSON string into an instance of Order #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/pet.R b/samples/client/petstore/R-httr2-wrapper/R/pet.R index 37d2db91adb7..9feddb8d60df 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/pet.R +++ b/samples/client/petstore/R-httr2-wrapper/R/pet.R @@ -146,7 +146,7 @@ Pet <- R6::R6Class( return(PetObject) }, - extractSimpleType = function(x) { + extractSimpleType = function(x) git{ if (R6::is.R6(x)) { return(x$toSimpleType()) } else if (!self$hasNestedR6(x)) { diff --git a/samples/client/petstore/R-httr2-wrapper/R/pet_map.R b/samples/client/petstore/R-httr2-wrapper/R/pet_map.R index c728b929d019..aa59c50a09c0 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/pet_map.R +++ b/samples/client/petstore/R-httr2-wrapper/R/pet_map.R @@ -81,7 +81,6 @@ PetMap <- R6::R6Class( return(PetMapObject) }, - #' @description #' Deserialize JSON string into an instance of PetMap #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/special.R b/samples/client/petstore/R-httr2-wrapper/R/special.R index 8dd5c81535aa..4c27190313fb 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/special.R +++ b/samples/client/petstore/R-httr2-wrapper/R/special.R @@ -162,7 +162,6 @@ Special <- R6::R6Class( return(SpecialObject) }, - #' @description #' Deserialize JSON string into an instance of Special #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/tag.R b/samples/client/petstore/R-httr2-wrapper/R/tag.R index 706a72a3d91e..b4c893dfe77e 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/tag.R +++ b/samples/client/petstore/R-httr2-wrapper/R/tag.R @@ -95,7 +95,6 @@ Tag <- R6::R6Class( return(TagObject) }, - #' @description #' Deserialize JSON string into an instance of Tag #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/update_pet_request.R b/samples/client/petstore/R-httr2-wrapper/R/update_pet_request.R index 7a4fb1112f75..b1260ad00637 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/update_pet_request.R +++ b/samples/client/petstore/R-httr2-wrapper/R/update_pet_request.R @@ -90,7 +90,7 @@ UpdatePetRequest <- R6::R6Class( return(UpdatePetRequestObject) }, - extractSimpleType = function(x) { + extractSimpleType = function(x) git{ if (R6::is.R6(x)) { return(x$toSimpleType()) } else if (!self$hasNestedR6(x)) { diff --git a/samples/client/petstore/R-httr2-wrapper/R/user.R b/samples/client/petstore/R-httr2-wrapper/R/user.R index 3a178d9ecfb9..361d0d454f21 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/user.R +++ b/samples/client/petstore/R-httr2-wrapper/R/user.R @@ -173,7 +173,6 @@ User <- R6::R6Class( return(UserObject) }, - #' @description #' Deserialize JSON string into an instance of User #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/whale.R b/samples/client/petstore/R-httr2-wrapper/R/whale.R index 5ea51f82a219..ea54d3bdf71c 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/whale.R +++ b/samples/client/petstore/R-httr2-wrapper/R/whale.R @@ -108,7 +108,6 @@ Whale <- R6::R6Class( return(WhaleObject) }, - #' @description #' Deserialize JSON string into an instance of Whale #' diff --git a/samples/client/petstore/R-httr2-wrapper/R/zebra.R b/samples/client/petstore/R-httr2-wrapper/R/zebra.R index 2d886d721fcf..6b85dbff4093 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/zebra.R +++ b/samples/client/petstore/R-httr2-wrapper/R/zebra.R @@ -98,7 +98,6 @@ Zebra <- R6::R6Class( return(ZebraObject) }, - #' @description #' Deserialize JSON string into an instance of Zebra #' diff --git a/samples/client/petstore/R-httr2/R/allof_tag_api_response.R b/samples/client/petstore/R-httr2/R/allof_tag_api_response.R index c725f2151378..37fa07aaa475 100644 --- a/samples/client/petstore/R-httr2/R/allof_tag_api_response.R +++ b/samples/client/petstore/R-httr2/R/allof_tag_api_response.R @@ -120,7 +120,6 @@ AllofTagApiResponse <- R6::R6Class( return(AllofTagApiResponseObject) }, - #' @description #' Deserialize JSON string into an instance of AllofTagApiResponse #' diff --git a/samples/client/petstore/R-httr2/R/animal.R b/samples/client/petstore/R-httr2/R/animal.R index 18c590ec71bd..8b7e9dba4ffe 100644 --- a/samples/client/petstore/R-httr2/R/animal.R +++ b/samples/client/petstore/R-httr2/R/animal.R @@ -83,7 +83,6 @@ Animal <- R6::R6Class( return(AnimalObject) }, - #' @description #' Deserialize JSON string into an instance of Animal #' diff --git a/samples/client/petstore/R-httr2/R/basque_pig.R b/samples/client/petstore/R-httr2/R/basque_pig.R index 56c22f2a9ae1..77af09db6a04 100644 --- a/samples/client/petstore/R-httr2/R/basque_pig.R +++ b/samples/client/petstore/R-httr2/R/basque_pig.R @@ -81,7 +81,6 @@ BasquePig <- R6::R6Class( return(BasquePigObject) }, - #' @description #' Deserialize JSON string into an instance of BasquePig #' diff --git a/samples/client/petstore/R-httr2/R/cat.R b/samples/client/petstore/R-httr2/R/cat.R index 348980576dcc..54784f94e2b5 100644 --- a/samples/client/petstore/R-httr2/R/cat.R +++ b/samples/client/petstore/R-httr2/R/cat.R @@ -95,7 +95,6 @@ Cat <- R6::R6Class( return(CatObject) }, - #' @description #' Deserialize JSON string into an instance of Cat #' diff --git a/samples/client/petstore/R-httr2/R/category.R b/samples/client/petstore/R-httr2/R/category.R index 62cbc7c57aa6..9448df38190e 100644 --- a/samples/client/petstore/R-httr2/R/category.R +++ b/samples/client/petstore/R-httr2/R/category.R @@ -81,7 +81,6 @@ Category <- R6::R6Class( return(CategoryObject) }, - #' @description #' Deserialize JSON string into an instance of Category #' diff --git a/samples/client/petstore/R-httr2/R/danish_pig.R b/samples/client/petstore/R-httr2/R/danish_pig.R index ef7de45a6a5e..e5eeb4446146 100644 --- a/samples/client/petstore/R-httr2/R/danish_pig.R +++ b/samples/client/petstore/R-httr2/R/danish_pig.R @@ -81,7 +81,6 @@ DanishPig <- R6::R6Class( return(DanishPigObject) }, - #' @description #' Deserialize JSON string into an instance of DanishPig #' diff --git a/samples/client/petstore/R-httr2/R/date.R b/samples/client/petstore/R-httr2/R/date.R index e1348fd5270f..81dc68d4feec 100644 --- a/samples/client/petstore/R-httr2/R/date.R +++ b/samples/client/petstore/R-httr2/R/date.R @@ -98,7 +98,6 @@ Date <- R6::R6Class( return(DateObject) }, - #' @description #' Deserialize JSON string into an instance of Date #' diff --git a/samples/client/petstore/R-httr2/R/dog.R b/samples/client/petstore/R-httr2/R/dog.R index ec0dd386fec9..1928ffc3985c 100644 --- a/samples/client/petstore/R-httr2/R/dog.R +++ b/samples/client/petstore/R-httr2/R/dog.R @@ -95,7 +95,6 @@ Dog <- R6::R6Class( return(DogObject) }, - #' @description #' Deserialize JSON string into an instance of Dog #' diff --git a/samples/client/petstore/R-httr2/R/format_test.R b/samples/client/petstore/R-httr2/R/format_test.R index c1d5351cbaf0..1e8a62b2fd9c 100644 --- a/samples/client/petstore/R-httr2/R/format_test.R +++ b/samples/client/petstore/R-httr2/R/format_test.R @@ -241,7 +241,6 @@ FormatTest <- R6::R6Class( return(FormatTestObject) }, - #' @description #' Deserialize JSON string into an instance of FormatTest #' diff --git a/samples/client/petstore/R-httr2/R/just_model.R b/samples/client/petstore/R-httr2/R/just_model.R index 88d8b9ad9a8f..89d14ef99c3a 100644 --- a/samples/client/petstore/R-httr2/R/just_model.R +++ b/samples/client/petstore/R-httr2/R/just_model.R @@ -68,7 +68,6 @@ JustModel <- R6::R6Class( return(JustModelObject) }, - #' @description #' Deserialize JSON string into an instance of JustModel #' diff --git a/samples/client/petstore/R-httr2/R/model_api_response.R b/samples/client/petstore/R-httr2/R/model_api_response.R index f254a90bb916..d65c1860ce2c 100644 --- a/samples/client/petstore/R-httr2/R/model_api_response.R +++ b/samples/client/petstore/R-httr2/R/model_api_response.R @@ -94,7 +94,6 @@ ModelApiResponse <- R6::R6Class( return(ModelApiResponseObject) }, - #' @description #' Deserialize JSON string into an instance of ModelApiResponse #' diff --git a/samples/client/petstore/R-httr2/R/nested_one_of.R b/samples/client/petstore/R-httr2/R/nested_one_of.R index dc43a39e5f41..ee3149efb41c 100644 --- a/samples/client/petstore/R-httr2/R/nested_one_of.R +++ b/samples/client/petstore/R-httr2/R/nested_one_of.R @@ -79,7 +79,7 @@ NestedOneOf <- R6::R6Class( return(NestedOneOfObject) }, - extractSimpleType = function(x) { + extractSimpleType = function(x) git{ if (R6::is.R6(x)) { return(x$toSimpleType()) } else if (!self$hasNestedR6(x)) { diff --git a/samples/client/petstore/R-httr2/R/order.R b/samples/client/petstore/R-httr2/R/order.R index 6e57bdfe1a56..cf6bcb48bc85 100644 --- a/samples/client/petstore/R-httr2/R/order.R +++ b/samples/client/petstore/R-httr2/R/order.R @@ -136,7 +136,6 @@ Order <- R6::R6Class( return(OrderObject) }, - #' @description #' Deserialize JSON string into an instance of Order #' diff --git a/samples/client/petstore/R-httr2/R/pet.R b/samples/client/petstore/R-httr2/R/pet.R index 93e6b64c3e7b..de1f051ec371 100644 --- a/samples/client/petstore/R-httr2/R/pet.R +++ b/samples/client/petstore/R-httr2/R/pet.R @@ -132,7 +132,7 @@ Pet <- R6::R6Class( return(PetObject) }, - extractSimpleType = function(x) { + extractSimpleType = function(x) git{ if (R6::is.R6(x)) { return(x$toSimpleType()) } else if (!self$hasNestedR6(x)) { diff --git a/samples/client/petstore/R-httr2/R/pet_map.R b/samples/client/petstore/R-httr2/R/pet_map.R index e73c8e59b37f..e0e63305d0fd 100644 --- a/samples/client/petstore/R-httr2/R/pet_map.R +++ b/samples/client/petstore/R-httr2/R/pet_map.R @@ -67,7 +67,6 @@ PetMap <- R6::R6Class( return(PetMapObject) }, - #' @description #' Deserialize JSON string into an instance of PetMap #' diff --git a/samples/client/petstore/R-httr2/R/special.R b/samples/client/petstore/R-httr2/R/special.R index 19f0b45c6964..2e4c8ccdc0cf 100644 --- a/samples/client/petstore/R-httr2/R/special.R +++ b/samples/client/petstore/R-httr2/R/special.R @@ -148,7 +148,6 @@ Special <- R6::R6Class( return(SpecialObject) }, - #' @description #' Deserialize JSON string into an instance of Special #' diff --git a/samples/client/petstore/R-httr2/R/tag.R b/samples/client/petstore/R-httr2/R/tag.R index d774f0541db0..96383b87f07f 100644 --- a/samples/client/petstore/R-httr2/R/tag.R +++ b/samples/client/petstore/R-httr2/R/tag.R @@ -81,7 +81,6 @@ Tag <- R6::R6Class( return(TagObject) }, - #' @description #' Deserialize JSON string into an instance of Tag #' diff --git a/samples/client/petstore/R-httr2/R/update_pet_request.R b/samples/client/petstore/R-httr2/R/update_pet_request.R index dc2ede0a8e16..9f1c423cdb54 100644 --- a/samples/client/petstore/R-httr2/R/update_pet_request.R +++ b/samples/client/petstore/R-httr2/R/update_pet_request.R @@ -76,7 +76,7 @@ UpdatePetRequest <- R6::R6Class( return(UpdatePetRequestObject) }, - extractSimpleType = function(x) { + extractSimpleType = function(x) git{ if (R6::is.R6(x)) { return(x$toSimpleType()) } else if (!self$hasNestedR6(x)) { diff --git a/samples/client/petstore/R-httr2/R/user.R b/samples/client/petstore/R-httr2/R/user.R index 4d05c7e1b590..76c4970a45d6 100644 --- a/samples/client/petstore/R-httr2/R/user.R +++ b/samples/client/petstore/R-httr2/R/user.R @@ -159,7 +159,6 @@ User <- R6::R6Class( return(UserObject) }, - #' @description #' Deserialize JSON string into an instance of User #' diff --git a/samples/client/petstore/R-httr2/R/whale.R b/samples/client/petstore/R-httr2/R/whale.R index 90528e13f67e..fef88a7c6375 100644 --- a/samples/client/petstore/R-httr2/R/whale.R +++ b/samples/client/petstore/R-httr2/R/whale.R @@ -94,7 +94,6 @@ Whale <- R6::R6Class( return(WhaleObject) }, - #' @description #' Deserialize JSON string into an instance of Whale #' diff --git a/samples/client/petstore/R-httr2/R/zebra.R b/samples/client/petstore/R-httr2/R/zebra.R index 39502684eba7..c5165a867082 100644 --- a/samples/client/petstore/R-httr2/R/zebra.R +++ b/samples/client/petstore/R-httr2/R/zebra.R @@ -84,7 +84,6 @@ Zebra <- R6::R6Class( return(ZebraObject) }, - #' @description #' Deserialize JSON string into an instance of Zebra #' diff --git a/samples/client/petstore/R/R/allof_tag_api_response.R b/samples/client/petstore/R/R/allof_tag_api_response.R index db24b5854a5c..018600362d38 100644 --- a/samples/client/petstore/R/R/allof_tag_api_response.R +++ b/samples/client/petstore/R/R/allof_tag_api_response.R @@ -134,7 +134,6 @@ AllofTagApiResponse <- R6::R6Class( return(AllofTagApiResponseObject) }, - #' @description #' Deserialize JSON string into an instance of AllofTagApiResponse #' diff --git a/samples/client/petstore/R/R/animal.R b/samples/client/petstore/R/R/animal.R index b18bf52a7d51..cf2e97f9af30 100644 --- a/samples/client/petstore/R/R/animal.R +++ b/samples/client/petstore/R/R/animal.R @@ -97,7 +97,6 @@ Animal <- R6::R6Class( return(AnimalObject) }, - #' @description #' Deserialize JSON string into an instance of Animal #' diff --git a/samples/client/petstore/R/R/basque_pig.R b/samples/client/petstore/R/R/basque_pig.R index beda411e2563..ca8601f4c3b1 100644 --- a/samples/client/petstore/R/R/basque_pig.R +++ b/samples/client/petstore/R/R/basque_pig.R @@ -95,7 +95,6 @@ BasquePig <- R6::R6Class( return(BasquePigObject) }, - #' @description #' Deserialize JSON string into an instance of BasquePig #' diff --git a/samples/client/petstore/R/R/cat.R b/samples/client/petstore/R/R/cat.R index 187b0908c746..270b87c21643 100644 --- a/samples/client/petstore/R/R/cat.R +++ b/samples/client/petstore/R/R/cat.R @@ -109,7 +109,6 @@ Cat <- R6::R6Class( return(CatObject) }, - #' @description #' Deserialize JSON string into an instance of Cat #' diff --git a/samples/client/petstore/R/R/category.R b/samples/client/petstore/R/R/category.R index c46a4fa2245b..0dcbd1b81610 100644 --- a/samples/client/petstore/R/R/category.R +++ b/samples/client/petstore/R/R/category.R @@ -95,7 +95,6 @@ Category <- R6::R6Class( return(CategoryObject) }, - #' @description #' Deserialize JSON string into an instance of Category #' diff --git a/samples/client/petstore/R/R/danish_pig.R b/samples/client/petstore/R/R/danish_pig.R index f70adc021243..02d2208639b0 100644 --- a/samples/client/petstore/R/R/danish_pig.R +++ b/samples/client/petstore/R/R/danish_pig.R @@ -95,7 +95,6 @@ DanishPig <- R6::R6Class( return(DanishPigObject) }, - #' @description #' Deserialize JSON string into an instance of DanishPig #' diff --git a/samples/client/petstore/R/R/date.R b/samples/client/petstore/R/R/date.R index 7e0939f5e39c..411249d3fba1 100644 --- a/samples/client/petstore/R/R/date.R +++ b/samples/client/petstore/R/R/date.R @@ -112,7 +112,6 @@ Date <- R6::R6Class( return(DateObject) }, - #' @description #' Deserialize JSON string into an instance of Date #' diff --git a/samples/client/petstore/R/R/dog.R b/samples/client/petstore/R/R/dog.R index 634d7751d260..4d6dab71c61b 100644 --- a/samples/client/petstore/R/R/dog.R +++ b/samples/client/petstore/R/R/dog.R @@ -109,7 +109,6 @@ Dog <- R6::R6Class( return(DogObject) }, - #' @description #' Deserialize JSON string into an instance of Dog #' diff --git a/samples/client/petstore/R/R/dummy_model.R b/samples/client/petstore/R/R/dummy_model.R index 1aadcd661997..cbea7830b824 100644 --- a/samples/client/petstore/R/R/dummy_model.R +++ b/samples/client/petstore/R/R/dummy_model.R @@ -82,7 +82,6 @@ DummyModel <- R6::R6Class( return(DummyModelObject) }, - #' @description #' Deserialize JSON string into an instance of DummyModel #' diff --git a/samples/client/petstore/R/R/format_test.R b/samples/client/petstore/R/R/format_test.R index 27f3fd93b4ec..7d1bded3c5a8 100644 --- a/samples/client/petstore/R/R/format_test.R +++ b/samples/client/petstore/R/R/format_test.R @@ -255,7 +255,6 @@ FormatTest <- R6::R6Class( return(FormatTestObject) }, - #' @description #' Deserialize JSON string into an instance of FormatTest #' diff --git a/samples/client/petstore/R/R/model_api_response.R b/samples/client/petstore/R/R/model_api_response.R index eb02f5cb7188..a3a46dfb7907 100644 --- a/samples/client/petstore/R/R/model_api_response.R +++ b/samples/client/petstore/R/R/model_api_response.R @@ -108,7 +108,6 @@ ModelApiResponse <- R6::R6Class( return(ModelApiResponseObject) }, - #' @description #' Deserialize JSON string into an instance of ModelApiResponse #' diff --git a/samples/client/petstore/R/R/nested_one_of.R b/samples/client/petstore/R/R/nested_one_of.R index fe396f11faa4..e3897274f920 100644 --- a/samples/client/petstore/R/R/nested_one_of.R +++ b/samples/client/petstore/R/R/nested_one_of.R @@ -93,7 +93,7 @@ NestedOneOf <- R6::R6Class( return(NestedOneOfObject) }, - extractSimpleType = function(x) { + extractSimpleType = function(x) git{ if (R6::is.R6(x)) { return(x$toSimpleType()) } else if (!self$hasNestedR6(x)) { diff --git a/samples/client/petstore/R/R/order.R b/samples/client/petstore/R/R/order.R index 9595e4c6edd5..07378f03666c 100644 --- a/samples/client/petstore/R/R/order.R +++ b/samples/client/petstore/R/R/order.R @@ -150,7 +150,6 @@ Order <- R6::R6Class( return(OrderObject) }, - #' @description #' Deserialize JSON string into an instance of Order #' diff --git a/samples/client/petstore/R/R/pet.R b/samples/client/petstore/R/R/pet.R index 37d2db91adb7..9feddb8d60df 100644 --- a/samples/client/petstore/R/R/pet.R +++ b/samples/client/petstore/R/R/pet.R @@ -146,7 +146,7 @@ Pet <- R6::R6Class( return(PetObject) }, - extractSimpleType = function(x) { + extractSimpleType = function(x) git{ if (R6::is.R6(x)) { return(x$toSimpleType()) } else if (!self$hasNestedR6(x)) { diff --git a/samples/client/petstore/R/R/pet_map.R b/samples/client/petstore/R/R/pet_map.R index c728b929d019..aa59c50a09c0 100644 --- a/samples/client/petstore/R/R/pet_map.R +++ b/samples/client/petstore/R/R/pet_map.R @@ -81,7 +81,6 @@ PetMap <- R6::R6Class( return(PetMapObject) }, - #' @description #' Deserialize JSON string into an instance of PetMap #' diff --git a/samples/client/petstore/R/R/special.R b/samples/client/petstore/R/R/special.R index 8dd5c81535aa..4c27190313fb 100644 --- a/samples/client/petstore/R/R/special.R +++ b/samples/client/petstore/R/R/special.R @@ -162,7 +162,6 @@ Special <- R6::R6Class( return(SpecialObject) }, - #' @description #' Deserialize JSON string into an instance of Special #' diff --git a/samples/client/petstore/R/R/tag.R b/samples/client/petstore/R/R/tag.R index 706a72a3d91e..b4c893dfe77e 100644 --- a/samples/client/petstore/R/R/tag.R +++ b/samples/client/petstore/R/R/tag.R @@ -95,7 +95,6 @@ Tag <- R6::R6Class( return(TagObject) }, - #' @description #' Deserialize JSON string into an instance of Tag #' diff --git a/samples/client/petstore/R/R/update_pet_request.R b/samples/client/petstore/R/R/update_pet_request.R index 7a4fb1112f75..b1260ad00637 100644 --- a/samples/client/petstore/R/R/update_pet_request.R +++ b/samples/client/petstore/R/R/update_pet_request.R @@ -90,7 +90,7 @@ UpdatePetRequest <- R6::R6Class( return(UpdatePetRequestObject) }, - extractSimpleType = function(x) { + extractSimpleType = function(x) git{ if (R6::is.R6(x)) { return(x$toSimpleType()) } else if (!self$hasNestedR6(x)) { diff --git a/samples/client/petstore/R/R/user.R b/samples/client/petstore/R/R/user.R index 3a178d9ecfb9..361d0d454f21 100644 --- a/samples/client/petstore/R/R/user.R +++ b/samples/client/petstore/R/R/user.R @@ -173,7 +173,6 @@ User <- R6::R6Class( return(UserObject) }, - #' @description #' Deserialize JSON string into an instance of User #' diff --git a/samples/client/petstore/R/R/whale.R b/samples/client/petstore/R/R/whale.R index 5ea51f82a219..ea54d3bdf71c 100644 --- a/samples/client/petstore/R/R/whale.R +++ b/samples/client/petstore/R/R/whale.R @@ -108,7 +108,6 @@ Whale <- R6::R6Class( return(WhaleObject) }, - #' @description #' Deserialize JSON string into an instance of Whale #' diff --git a/samples/client/petstore/R/R/zebra.R b/samples/client/petstore/R/R/zebra.R index 2d886d721fcf..6b85dbff4093 100644 --- a/samples/client/petstore/R/R/zebra.R +++ b/samples/client/petstore/R/R/zebra.R @@ -98,7 +98,6 @@ Zebra <- R6::R6Class( return(ZebraObject) }, - #' @description #' Deserialize JSON string into an instance of Zebra #' From 9327b21cf6d1d173de777434c40e9858a0fa2b11 Mon Sep 17 00:00:00 2001 From: Matthew Pollock Date: Wed, 28 Jan 2026 20:39:03 -0500 Subject: [PATCH 5/5] fix typo --- .../src/main/resources/r/modelGeneric.mustache | 2 +- samples/client/echo_api/r/R/default_value.R | 2 +- samples/client/echo_api/r/R/pet.R | 2 +- samples/client/petstore/R-httr2-wrapper/R/nested_one_of.R | 2 +- samples/client/petstore/R-httr2-wrapper/R/pet.R | 2 +- samples/client/petstore/R-httr2-wrapper/R/update_pet_request.R | 2 +- samples/client/petstore/R-httr2/R/nested_one_of.R | 2 +- samples/client/petstore/R-httr2/R/pet.R | 2 +- samples/client/petstore/R-httr2/R/update_pet_request.R | 2 +- samples/client/petstore/R/R/nested_one_of.R | 2 +- samples/client/petstore/R/R/pet.R | 2 +- samples/client/petstore/R/R/update_pet_request.R | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/r/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/r/modelGeneric.mustache index 6f171d786d42..ed5873bd9305 100644 --- a/modules/openapi-generator/src/main/resources/r/modelGeneric.mustache +++ b/modules/openapi-generator/src/main/resources/r/modelGeneric.mustache @@ -274,7 +274,7 @@ }, {{#vendorExtensions.x-r-has-non-primitive-field}} - extractSimpleType = function(x) git{ + extractSimpleType = function(x) { if (R6::is.R6(x)) { return(x$toSimpleType()) } else if (!self$hasNestedR6(x)) { diff --git a/samples/client/echo_api/r/R/default_value.R b/samples/client/echo_api/r/R/default_value.R index 48f458aa7293..e6a089514fc0 100644 --- a/samples/client/echo_api/r/R/default_value.R +++ b/samples/client/echo_api/r/R/default_value.R @@ -152,7 +152,7 @@ DefaultValue <- R6::R6Class( return(DefaultValueObject) }, - extractSimpleType = function(x) git{ + extractSimpleType = function(x) { if (R6::is.R6(x)) { return(x$toSimpleType()) } else if (!self$hasNestedR6(x)) { diff --git a/samples/client/echo_api/r/R/pet.R b/samples/client/echo_api/r/R/pet.R index c6faa201b439..b4cae7506eec 100644 --- a/samples/client/echo_api/r/R/pet.R +++ b/samples/client/echo_api/r/R/pet.R @@ -132,7 +132,7 @@ Pet <- R6::R6Class( return(PetObject) }, - extractSimpleType = function(x) git{ + extractSimpleType = function(x) { if (R6::is.R6(x)) { return(x$toSimpleType()) } else if (!self$hasNestedR6(x)) { diff --git a/samples/client/petstore/R-httr2-wrapper/R/nested_one_of.R b/samples/client/petstore/R-httr2-wrapper/R/nested_one_of.R index e3897274f920..fe396f11faa4 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/nested_one_of.R +++ b/samples/client/petstore/R-httr2-wrapper/R/nested_one_of.R @@ -93,7 +93,7 @@ NestedOneOf <- R6::R6Class( return(NestedOneOfObject) }, - extractSimpleType = function(x) git{ + extractSimpleType = function(x) { if (R6::is.R6(x)) { return(x$toSimpleType()) } else if (!self$hasNestedR6(x)) { diff --git a/samples/client/petstore/R-httr2-wrapper/R/pet.R b/samples/client/petstore/R-httr2-wrapper/R/pet.R index 9feddb8d60df..37d2db91adb7 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/pet.R +++ b/samples/client/petstore/R-httr2-wrapper/R/pet.R @@ -146,7 +146,7 @@ Pet <- R6::R6Class( return(PetObject) }, - extractSimpleType = function(x) git{ + extractSimpleType = function(x) { if (R6::is.R6(x)) { return(x$toSimpleType()) } else if (!self$hasNestedR6(x)) { diff --git a/samples/client/petstore/R-httr2-wrapper/R/update_pet_request.R b/samples/client/petstore/R-httr2-wrapper/R/update_pet_request.R index b1260ad00637..7a4fb1112f75 100644 --- a/samples/client/petstore/R-httr2-wrapper/R/update_pet_request.R +++ b/samples/client/petstore/R-httr2-wrapper/R/update_pet_request.R @@ -90,7 +90,7 @@ UpdatePetRequest <- R6::R6Class( return(UpdatePetRequestObject) }, - extractSimpleType = function(x) git{ + extractSimpleType = function(x) { if (R6::is.R6(x)) { return(x$toSimpleType()) } else if (!self$hasNestedR6(x)) { diff --git a/samples/client/petstore/R-httr2/R/nested_one_of.R b/samples/client/petstore/R-httr2/R/nested_one_of.R index ee3149efb41c..dc43a39e5f41 100644 --- a/samples/client/petstore/R-httr2/R/nested_one_of.R +++ b/samples/client/petstore/R-httr2/R/nested_one_of.R @@ -79,7 +79,7 @@ NestedOneOf <- R6::R6Class( return(NestedOneOfObject) }, - extractSimpleType = function(x) git{ + extractSimpleType = function(x) { if (R6::is.R6(x)) { return(x$toSimpleType()) } else if (!self$hasNestedR6(x)) { diff --git a/samples/client/petstore/R-httr2/R/pet.R b/samples/client/petstore/R-httr2/R/pet.R index de1f051ec371..93e6b64c3e7b 100644 --- a/samples/client/petstore/R-httr2/R/pet.R +++ b/samples/client/petstore/R-httr2/R/pet.R @@ -132,7 +132,7 @@ Pet <- R6::R6Class( return(PetObject) }, - extractSimpleType = function(x) git{ + extractSimpleType = function(x) { if (R6::is.R6(x)) { return(x$toSimpleType()) } else if (!self$hasNestedR6(x)) { diff --git a/samples/client/petstore/R-httr2/R/update_pet_request.R b/samples/client/petstore/R-httr2/R/update_pet_request.R index 9f1c423cdb54..dc2ede0a8e16 100644 --- a/samples/client/petstore/R-httr2/R/update_pet_request.R +++ b/samples/client/petstore/R-httr2/R/update_pet_request.R @@ -76,7 +76,7 @@ UpdatePetRequest <- R6::R6Class( return(UpdatePetRequestObject) }, - extractSimpleType = function(x) git{ + extractSimpleType = function(x) { if (R6::is.R6(x)) { return(x$toSimpleType()) } else if (!self$hasNestedR6(x)) { diff --git a/samples/client/petstore/R/R/nested_one_of.R b/samples/client/petstore/R/R/nested_one_of.R index e3897274f920..fe396f11faa4 100644 --- a/samples/client/petstore/R/R/nested_one_of.R +++ b/samples/client/petstore/R/R/nested_one_of.R @@ -93,7 +93,7 @@ NestedOneOf <- R6::R6Class( return(NestedOneOfObject) }, - extractSimpleType = function(x) git{ + extractSimpleType = function(x) { if (R6::is.R6(x)) { return(x$toSimpleType()) } else if (!self$hasNestedR6(x)) { diff --git a/samples/client/petstore/R/R/pet.R b/samples/client/petstore/R/R/pet.R index 9feddb8d60df..37d2db91adb7 100644 --- a/samples/client/petstore/R/R/pet.R +++ b/samples/client/petstore/R/R/pet.R @@ -146,7 +146,7 @@ Pet <- R6::R6Class( return(PetObject) }, - extractSimpleType = function(x) git{ + extractSimpleType = function(x) { if (R6::is.R6(x)) { return(x$toSimpleType()) } else if (!self$hasNestedR6(x)) { diff --git a/samples/client/petstore/R/R/update_pet_request.R b/samples/client/petstore/R/R/update_pet_request.R index b1260ad00637..7a4fb1112f75 100644 --- a/samples/client/petstore/R/R/update_pet_request.R +++ b/samples/client/petstore/R/R/update_pet_request.R @@ -90,7 +90,7 @@ UpdatePetRequest <- R6::R6Class( return(UpdatePetRequestObject) }, - extractSimpleType = function(x) git{ + extractSimpleType = function(x) { if (R6::is.R6(x)) { return(x$toSimpleType()) } else if (!self$hasNestedR6(x)) {