From 18b950cdc3f40e42ea072c31788d003f3b1e4022 Mon Sep 17 00:00:00 2001 From: Marcel Ramos Date: Thu, 28 Nov 2019 21:14:47 -0500 Subject: [PATCH] [BUG][R] use loadNamespace instead of package:pkgName string (#4614) * use loadNamespace instead of package:pkgName string * update R package code --- .../openapi-generator/src/main/resources/r/api.mustache | 2 +- .../openapi-generator/src/main/resources/r/model.mustache | 4 ++-- samples/client/petstore/R/R/pet.R | 8 ++++---- samples/client/petstore/R/R/pet_api.R | 8 ++++---- samples/client/petstore/R/R/store_api.R | 6 +++--- samples/client/petstore/R/R/user_api.R | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/r/api.mustache b/modules/openapi-generator/src/main/resources/r/api.mustache index faae7a57b7f..5fc18ec87e9 100644 --- a/modules/openapi-generator/src/main/resources/r/api.mustache +++ b/modules/openapi-generator/src/main/resources/r/api.mustache @@ -276,7 +276,7 @@ {{/isPrimitiveType}} {{^isPrimitiveType}} deserializedRespObj <- tryCatch( - self$apiClient$deserialize(resp, "{{returnType}}", "package:{{packageName}}"), + self$apiClient$deserialize(resp, "{{returnType}}", loadNamespace("{{packageName}}")), error = function(e){ {{#useDefaultExceptionHandling}} stop("Failed to deserialize response") diff --git a/modules/openapi-generator/src/main/resources/r/model.mustache b/modules/openapi-generator/src/main/resources/r/model.mustache index 04594e28a00..bf04a122144 100644 --- a/modules/openapi-generator/src/main/resources/r/model.mustache +++ b/modules/openapi-generator/src/main/resources/r/model.mustache @@ -145,7 +145,7 @@ {{#vars}} if (!is.null({{classname}}Object$`{{baseName}}`)) { {{#isContainer}} - self$`{{baseName}}` <- ApiClient$new()$deserializeObj({{classname}}Object$`{{baseName}}`, "{{dataType}}", "package:{{packageName}}") + self$`{{baseName}}` <- ApiClient$new()$deserializeObj({{classname}}Object$`{{baseName}}`, "{{dataType}}", loadNamespace("{{packageName}}")) {{/isContainer}} {{^isContainer}} {{#isPrimitiveType}} @@ -226,7 +226,7 @@ {{#vars}} {{! AAPI - added condition for handling container type of parameters, map and array}} {{#isContainer}} - self$`{{baseName}}` <- ApiClient$new()$deserializeObj({{classname}}Object$`{{baseName}}`, "{{dataType}}","package:{{packageName}}") + self$`{{baseName}}` <- ApiClient$new()$deserializeObj({{classname}}Object$`{{baseName}}`, "{{dataType}}", loadNamespace("{{packageName}}")) {{/isContainer}} {{^isContainer}} {{#isPrimitiveType}} diff --git a/samples/client/petstore/R/R/pet.R b/samples/client/petstore/R/R/pet.R index 307a5ed9704..760463d67ba 100644 --- a/samples/client/petstore/R/R/pet.R +++ b/samples/client/petstore/R/R/pet.R @@ -107,10 +107,10 @@ Pet <- R6::R6Class( self$`name` <- PetObject$`name` } if (!is.null(PetObject$`photoUrls`)) { - self$`photoUrls` <- ApiClient$new()$deserializeObj(PetObject$`photoUrls`, "array[character]", "package:petstore") + self$`photoUrls` <- ApiClient$new()$deserializeObj(PetObject$`photoUrls`, "array[character]", loadNamespace("petstore")) } if (!is.null(PetObject$`tags`)) { - self$`tags` <- ApiClient$new()$deserializeObj(PetObject$`tags`, "array[Tag]", "package:petstore") + self$`tags` <- ApiClient$new()$deserializeObj(PetObject$`tags`, "array[Tag]", loadNamespace("petstore")) } if (!is.null(PetObject$`status`)) { self$`status` <- PetObject$`status` @@ -169,8 +169,8 @@ Pet <- R6::R6Class( self$`id` <- PetObject$`id` self$`category` <- Category$new()$fromJSON(jsonlite::toJSON(PetObject$category, auto_unbox = TRUE, digits = NA)) self$`name` <- PetObject$`name` - self$`photoUrls` <- ApiClient$new()$deserializeObj(PetObject$`photoUrls`, "array[character]","package:petstore") - self$`tags` <- ApiClient$new()$deserializeObj(PetObject$`tags`, "array[Tag]","package:petstore") + self$`photoUrls` <- ApiClient$new()$deserializeObj(PetObject$`photoUrls`, "array[character]", loadNamespace("petstore")) + self$`tags` <- ApiClient$new()$deserializeObj(PetObject$`tags`, "array[Tag]", loadNamespace("petstore")) self$`status` <- PetObject$`status` self } diff --git a/samples/client/petstore/R/R/pet_api.R b/samples/client/petstore/R/R/pet_api.R index e0ad8275d82..f2e583bbcc5 100644 --- a/samples/client/petstore/R/R/pet_api.R +++ b/samples/client/petstore/R/R/pet_api.R @@ -469,7 +469,7 @@ PetApi <- R6::R6Class( if (httr::status_code(resp) >= 200 && httr::status_code(resp) <= 299) { deserializedRespObj <- tryCatch( - self$apiClient$deserialize(resp, "array[Pet]", "package:petstore"), + self$apiClient$deserialize(resp, "array[Pet]", loadNamespace("petstore")), error = function(e){ stop("Failed to deserialize response") } @@ -521,7 +521,7 @@ PetApi <- R6::R6Class( if (httr::status_code(resp) >= 200 && httr::status_code(resp) <= 299) { deserializedRespObj <- tryCatch( - self$apiClient$deserialize(resp, "array[Pet]", "package:petstore"), + self$apiClient$deserialize(resp, "array[Pet]", loadNamespace("petstore")), error = function(e){ stop("Failed to deserialize response") } @@ -577,7 +577,7 @@ PetApi <- R6::R6Class( if (httr::status_code(resp) >= 200 && httr::status_code(resp) <= 299) { deserializedRespObj <- tryCatch( - self$apiClient$deserialize(resp, "Pet", "package:petstore"), + self$apiClient$deserialize(resp, "Pet", loadNamespace("petstore")), error = function(e){ stop("Failed to deserialize response") } @@ -739,7 +739,7 @@ PetApi <- R6::R6Class( if (httr::status_code(resp) >= 200 && httr::status_code(resp) <= 299) { deserializedRespObj <- tryCatch( - self$apiClient$deserialize(resp, "ModelApiResponse", "package:petstore"), + self$apiClient$deserialize(resp, "ModelApiResponse", loadNamespace("petstore")), error = function(e){ stop("Failed to deserialize response") } diff --git a/samples/client/petstore/R/R/store_api.R b/samples/client/petstore/R/R/store_api.R index 2205c3796d1..8f45603288d 100644 --- a/samples/client/petstore/R/R/store_api.R +++ b/samples/client/petstore/R/R/store_api.R @@ -254,7 +254,7 @@ StoreApi <- R6::R6Class( if (httr::status_code(resp) >= 200 && httr::status_code(resp) <= 299) { deserializedRespObj <- tryCatch( - self$apiClient$deserialize(resp, "map(integer)", "package:petstore"), + self$apiClient$deserialize(resp, "map(integer)", loadNamespace("petstore")), error = function(e){ stop("Failed to deserialize response") } @@ -306,7 +306,7 @@ StoreApi <- R6::R6Class( if (httr::status_code(resp) >= 200 && httr::status_code(resp) <= 299) { deserializedRespObj <- tryCatch( - self$apiClient$deserialize(resp, "Order", "package:petstore"), + self$apiClient$deserialize(resp, "Order", loadNamespace("petstore")), error = function(e){ stop("Failed to deserialize response") } @@ -360,7 +360,7 @@ StoreApi <- R6::R6Class( if (httr::status_code(resp) >= 200 && httr::status_code(resp) <= 299) { deserializedRespObj <- tryCatch( - self$apiClient$deserialize(resp, "Order", "package:petstore"), + self$apiClient$deserialize(resp, "Order", loadNamespace("petstore")), error = function(e){ stop("Failed to deserialize response") } diff --git a/samples/client/petstore/R/R/user_api.R b/samples/client/petstore/R/R/user_api.R index 7fbcd73848b..051b5ae8927 100644 --- a/samples/client/petstore/R/R/user_api.R +++ b/samples/client/petstore/R/R/user_api.R @@ -521,7 +521,7 @@ UserApi <- R6::R6Class( if (httr::status_code(resp) >= 200 && httr::status_code(resp) <= 299) { deserializedRespObj <- tryCatch( - self$apiClient$deserialize(resp, "User", "package:petstore"), + self$apiClient$deserialize(resp, "User", loadNamespace("petstore")), error = function(e){ stop("Failed to deserialize response") } @@ -577,7 +577,7 @@ UserApi <- R6::R6Class( if (httr::status_code(resp) >= 200 && httr::status_code(resp) <= 299) { deserializedRespObj <- tryCatch( - self$apiClient$deserialize(resp, "character", "package:petstore"), + self$apiClient$deserialize(resp, "character", loadNamespace("petstore")), error = function(e){ stop("Failed to deserialize response") }