[R] Enum R6Class Support, closes #3367

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

@@ -163,7 +163,7 @@
       apiResponse <- self${{{operationId}}}WithHttpInfo({{#allParams}}{{paramName}}, {{/allParams}}...)
       resp <- apiResponse$response
       if (httr::status_code(resp) >= 200 && httr::status_code(resp) <= 299) {
-        apiResponse$content
+        httr::content(resp)
       } else if (httr::status_code(resp) >= 300 && httr::status_code(resp) <= 399) {
         apiResponse
       } else if (httr::status_code(resp) >= 400 && httr::status_code(resp) <= 499) {

modules/openapi-generator/src/main/resources/r/model.mustache

@@ -3,23 +3,31 @@
 {{>partial_header}}
 #' @docType class
 #' @title {{classname}}
+#'
 #' @description {{classname}} Class
+#'
 #' @format An \code{R6Class} generator object
+#'
 {{#vars}}
 #' @field {{baseName}} {{title}} {{#isContainer}}{{#isListContainer}}list( {{/isListContainer}}{{#isMapContainer}}named list( {{/isMapContainer}}{{/isContainer}}{{^isPrimitiveType}}\link{{=<% %>=}}{<%/isPrimitiveType%><%={{ }}=%>{{#isContainer}}{{#items}}{{dataType}}{{/items}}{{/isContainer}}{{^isContainer}}{{dataType}}{{/isContainer}}{{=<% %>=}}<%^isPrimitiveType%>}<%={{ }}=%>{{/isPrimitiveType}}{{#isContainer}}{{#isListContainer}} ){{/isListContainer}}{{#isMapContainer}} ){{/isMapContainer}}{{/isContainer}} {{^required}}[optional]{{/required}}
 #'
 {{/vars}}
-#'
 #' @importFrom R6 R6Class
 #' @importFrom jsonlite fromJSON toJSON
+{{#isEnum}}
+{{>modelEnum}}
+{{/isEnum}}
+{{^isEnum}}
 #' @export
 {{classname}} <- R6::R6Class(
   '{{classname}}',
   public = list(
     {{#vars}}
     `{{{baseName}}}` = NULL,
     {{/vars}}
-    initialize = function({{#requiredVars}}`{{baseName}}`{{#hasMore}}, {{/hasMore}}{{/requiredVars}}{{#optionalVars}}{{#-first}}{{#requiredVars.0}}, {{/requiredVars.0}}{{/-first}}`{{baseName}}`={{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}NULL{{/defaultValue}}{{^-last}}, {{/-last}}{{/optionalVars}}, ...){
+    initialize = function(
+        {{#requiredVars}}`{{baseName}}`, {{/requiredVars}}{{#optionalVars}}`{{baseName}}`={{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}NULL{{/defaultValue}}, {{/optionalVars}}...
+    ) {
       local.optional.var <- list(...)
       {{#requiredVars}}
       if (!missing(`{{baseName}}`)) {
@@ -141,7 +149,8 @@
       {{classname}}Object
     },
     fromJSON = function({{classname}}Json) {
-      {{classname}}Object <- jsonlite::fromJSON({{classname}}Json)
+      {{classname}}Object <- jsonlite::fromJSON({{classname}}Json,
+            simplifyVector = FALSE)
       {{#vars}}
       if (!is.null({{classname}}Object$`{{baseName}}`)) {
         {{#isContainer}}
@@ -159,6 +168,7 @@
         {{/isContainer}}
       }
       {{/vars}}
+      self
     },
     toJSONString = function() {
       jsoncontent <- c(
@@ -222,7 +232,8 @@
       paste('{', jsoncontent, '}', sep = "")
     },
     fromJSONString = function({{classname}}Json) {
-      {{classname}}Object <- jsonlite::fromJSON({{classname}}Json)
+      {{classname}}Object <- jsonlite::fromJSON({{classname}}Json,
+            simplifyVector = FALSE)
       {{#vars}}
       {{! AAPI - added condition for handling container type of parameters, map and array}}
       {{#isContainer}}
@@ -241,5 +252,7 @@
     }
   )
 )
+{{/isEnum}}
 {{/model}}
 {{/models}}
+

modules/openapi-generator/src/main/resources/r/modelEnum.mustache

@@ -0,0 +1,48 @@
+#' @export
+{{#allowableValues}}
+{{classname}} <- R6::R6Class(
+    "{{classname}}",
+    public = list(
+        initialize = function(...) {
+            local.optional.var <- list(...)
+            val <- unlist(local.optional.var)
+            enumvec <- .parse_{{name}}()
+
+            stopifnot(length(val) == 1L)
+
+            if (!val %in% enumvec)
+                stop("Use one of the valid values: ",
+                    paste0(enumvec, collapse = ", "))
+            private$value <- val
+        },
+        toJSON = function() {
+            jsonlite::toJSON(private$value, auto_unbox = TRUE)
+        },
+        fromJSON = function({{classname}}Json) {
+            private$value <- jsonlite::fromJSON({{classname}}Json,
+                simplifyVector = FALSE)
+            self
+        },
+        toJSONString = function() {
+            as.character(jsonlite::toJSON(private$value,
+                auto_unbox = TRUE))
+        },
+        fromJSONString = function({{classname}}Json) {
+            private$value <- jsonlite::fromJSON({{classname}}Json,
+                simplifyVector = FALSE)
+            self
+        }
+    ),
+    private = list(
+        value = NULL
+    )
+)
+
+# add to utils.R
+.parse_{{name}} <- function(vals) {
+    res <- gsub("^\\[|\\]$", "",
+        "{{{values}}}"
+    )
+    unlist(strsplit(res, ", "))
+}
+{{/allowableValues}}

samples/client/petstore/R/R/category.R

@@ -8,13 +8,15 @@
 
 #' @docType class
 #' @title Category
+#'
 #' @description Category Class
+#'
 #' @format An \code{R6Class} generator object
+#'
 #' @field id  integer [optional]
 #'
 #' @field name  character [optional]
 #'
-#'
 #' @importFrom R6 R6Class
 #' @importFrom jsonlite fromJSON toJSON
 #' @export
@@ -23,7 +25,9 @@ Category <- R6::R6Class(
   public = list(
     `id` = NULL,
     `name` = NULL,
-    initialize = function(`id`=NULL, `name`=NULL, ...){
+    initialize = function(
+        `id`=NULL, `name`=NULL, ...
+    ) {
       local.optional.var <- list(...)
       if (!is.null(`id`)) {
         stopifnot(is.numeric(`id`), length(`id`) == 1)
@@ -48,13 +52,15 @@ Category <- R6::R6Class(
       CategoryObject
     },
     fromJSON = function(CategoryJson) {
-      CategoryObject <- jsonlite::fromJSON(CategoryJson)
+      CategoryObject <- jsonlite::fromJSON(CategoryJson,
+            simplifyVector = FALSE)
       if (!is.null(CategoryObject$`id`)) {
         self$`id` <- CategoryObject$`id`
       }
       if (!is.null(CategoryObject$`name`)) {
         self$`name` <- CategoryObject$`name`
       }
+      self
     },
     toJSONString = function() {
       jsoncontent <- c(
@@ -77,10 +83,12 @@ Category <- R6::R6Class(
       paste('{', jsoncontent, '}', sep = "")
     },
     fromJSONString = function(CategoryJson) {
-      CategoryObject <- jsonlite::fromJSON(CategoryJson)
+      CategoryObject <- jsonlite::fromJSON(CategoryJson,
+            simplifyVector = FALSE)
       self$`id` <- CategoryObject$`id`
       self$`name` <- CategoryObject$`name`
       self
     }
   )
 )
+

samples/client/petstore/R/R/model_api_response.R

@@ -8,15 +8,17 @@
 
 #' @docType class
 #' @title ModelApiResponse
+#'
 #' @description ModelApiResponse Class
+#'
 #' @format An \code{R6Class} generator object
+#'
 #' @field code  integer [optional]
 #'
 #' @field type  character [optional]
 #'
 #' @field message  character [optional]
 #'
-#'
 #' @importFrom R6 R6Class
 #' @importFrom jsonlite fromJSON toJSON
 #' @export
@@ -26,7 +28,9 @@ ModelApiResponse <- R6::R6Class(
     `code` = NULL,
     `type` = NULL,
     `message` = NULL,
-    initialize = function(`code`=NULL, `type`=NULL, `message`=NULL, ...){
+    initialize = function(
+        `code`=NULL, `type`=NULL, `message`=NULL, ...
+    ) {
       local.optional.var <- list(...)
       if (!is.null(`code`)) {
         stopifnot(is.numeric(`code`), length(`code`) == 1)
@@ -59,7 +63,8 @@ ModelApiResponse <- R6::R6Class(
       ModelApiResponseObject
     },
     fromJSON = function(ModelApiResponseJson) {
-      ModelApiResponseObject <- jsonlite::fromJSON(ModelApiResponseJson)
+      ModelApiResponseObject <- jsonlite::fromJSON(ModelApiResponseJson,
+            simplifyVector = FALSE)
       if (!is.null(ModelApiResponseObject$`code`)) {
         self$`code` <- ModelApiResponseObject$`code`
       }
@@ -69,6 +74,7 @@ ModelApiResponse <- R6::R6Class(
       if (!is.null(ModelApiResponseObject$`message`)) {
         self$`message` <- ModelApiResponseObject$`message`
       }
+      self
     },
     toJSONString = function() {
       jsoncontent <- c(
@@ -98,11 +104,13 @@ ModelApiResponse <- R6::R6Class(
       paste('{', jsoncontent, '}', sep = "")
     },
     fromJSONString = function(ModelApiResponseJson) {
-      ModelApiResponseObject <- jsonlite::fromJSON(ModelApiResponseJson)
+      ModelApiResponseObject <- jsonlite::fromJSON(ModelApiResponseJson,
+            simplifyVector = FALSE)
       self$`code` <- ModelApiResponseObject$`code`
       self$`type` <- ModelApiResponseObject$`type`
       self$`message` <- ModelApiResponseObject$`message`
       self
     }
   )
 )
+

samples/client/petstore/R/R/order.R

@@ -8,8 +8,11 @@
 
 #' @docType class
 #' @title Order
+#'
 #' @description Order Class
+#'
 #' @format An \code{R6Class} generator object
+#'
 #' @field id  integer [optional]
 #'
 #' @field petId  integer [optional]
@@ -22,7 +25,6 @@
 #'
 #' @field complete  character [optional]
 #'
-#'
 #' @importFrom R6 R6Class
 #' @importFrom jsonlite fromJSON toJSON
 #' @export
@@ -35,7 +37,9 @@ Order <- R6::R6Class(
     `shipDate` = NULL,
     `status` = NULL,
     `complete` = NULL,
-    initialize = function(`id`=NULL, `petId`=NULL, `quantity`=NULL, `shipDate`=NULL, `status`=NULL, `complete`=FALSE, ...){
+    initialize = function(
+        `id`=NULL, `petId`=NULL, `quantity`=NULL, `shipDate`=NULL, `status`=NULL, `complete`=FALSE, ...
+    ) {
       local.optional.var <- list(...)
       if (!is.null(`id`)) {
         stopifnot(is.numeric(`id`), length(`id`) == 1)
@@ -91,7 +95,8 @@ Order <- R6::R6Class(
       OrderObject
     },
     fromJSON = function(OrderJson) {
-      OrderObject <- jsonlite::fromJSON(OrderJson)
+      OrderObject <- jsonlite::fromJSON(OrderJson,
+            simplifyVector = FALSE)
       if (!is.null(OrderObject$`id`)) {
         self$`id` <- OrderObject$`id`
       }
@@ -110,6 +115,7 @@ Order <- R6::R6Class(
       if (!is.null(OrderObject$`complete`)) {
         self$`complete` <- OrderObject$`complete`
       }
+      self
     },
     toJSONString = function() {
       jsoncontent <- c(
@@ -160,7 +166,8 @@ Order <- R6::R6Class(
       paste('{', jsoncontent, '}', sep = "")
     },
     fromJSONString = function(OrderJson) {
-      OrderObject <- jsonlite::fromJSON(OrderJson)
+      OrderObject <- jsonlite::fromJSON(OrderJson,
+            simplifyVector = FALSE)
       self$`id` <- OrderObject$`id`
       self$`petId` <- OrderObject$`petId`
       self$`quantity` <- OrderObject$`quantity`
@@ -171,3 +178,4 @@ Order <- R6::R6Class(
     }
   )
 )
+

samples/client/petstore/R/R/pet.R

@@ -8,8 +8,11 @@
 
 #' @docType class
 #' @title Pet
+#'
 #' @description Pet Class
+#'
 #' @format An \code{R6Class} generator object
+#'
 #' @field id  integer [optional]
 #'
 #' @field category  \link{Category} [optional]
@@ -22,7 +25,6 @@
 #'
 #' @field status  character [optional]
 #'
-#'
 #' @importFrom R6 R6Class
 #' @importFrom jsonlite fromJSON toJSON
 #' @export
@@ -35,7 +37,9 @@ Pet <- R6::R6Class(
     `photoUrls` = NULL,
     `tags` = NULL,
     `status` = NULL,
-    initialize = function(`name`, `photoUrls`, `id`=NULL, `category`=NULL, `tags`=NULL, `status`=NULL, ...){
+    initialize = function(
+        `name`, `photoUrls`, `id`=NULL, `category`=NULL, `tags`=NULL, `status`=NULL, ...
+    ) {
       local.optional.var <- list(...)
       if (!missing(`name`)) {
         stopifnot(is.character(`name`), length(`name`) == 1)
@@ -94,7 +98,8 @@ Pet <- R6::R6Class(
       PetObject
     },
     fromJSON = function(PetJson) {
-      PetObject <- jsonlite::fromJSON(PetJson)
+      PetObject <- jsonlite::fromJSON(PetJson,
+            simplifyVector = FALSE)
       if (!is.null(PetObject$`id`)) {
         self$`id` <- PetObject$`id`
       }
@@ -115,6 +120,7 @@ Pet <- R6::R6Class(
       if (!is.null(PetObject$`status`)) {
         self$`status` <- PetObject$`status`
       }
+      self
     },
     toJSONString = function() {
       jsoncontent <- c(
@@ -165,7 +171,8 @@ Pet <- R6::R6Class(
       paste('{', jsoncontent, '}', sep = "")
     },
     fromJSONString = function(PetJson) {
-      PetObject <- jsonlite::fromJSON(PetJson)
+      PetObject <- jsonlite::fromJSON(PetJson,
+            simplifyVector = FALSE)
       self$`id` <- PetObject$`id`
       self$`category` <- Category$new()$fromJSON(jsonlite::toJSON(PetObject$category, auto_unbox = TRUE, digits = NA))
       self$`name` <- PetObject$`name`
@@ -176,3 +183,4 @@ Pet <- R6::R6Class(
     }
   )
 )
+