Skip to content

[R] fix error handling in the R client #22704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 2 commits into from
Jan 18, 2026
+204 −95
Merged

[R] fix error handling in the R client #22704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4feb067
fix error handling in the R client
mattpollock Jan 15, 2026
0de41cf
adjust logic for avoiding logical vectors in a conditional statement
mattpollock Jan 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions modules/openapi-generator/src/main/resources/r/api.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@
if (typeof(stream_callback) == "closure") { # return void if streaming is enabled
return(invisible(NULL))
}

{{/vendorExtensions.x-streaming}}
if (local_var_response$status_code >= 200 && local_var_response$status_code <= 299) {
return(local_var_response$content)
Expand Down Expand Up @@ -561,7 +560,7 @@
self$api_client$WriteFile(local_var_resp, data_file)
}

ApiResponse$new(content,resp)
ApiResponse$new(content = content, response = resp, status_code = local_var_resp$status_code)
{{/isPrimitiveType}}
{{^isPrimitiveType}}
# save response in a file
Expand Down Expand Up @@ -609,7 +608,9 @@
{{/useRlangExceptionHandling}}
{{/returnExceptionOnFailure}}
{{^returnExceptionOnFailure}}
ApiResponse$new(paste("Server returned ", local_var_resp$status_code, " response status code."), local_var_resp)
ApiResponse$new(content = paste("Server returned ", local_var_resp$status_code, " response status code."),
response = local_var_resp,
status_code = local_var_resp$status_code)
{{/returnExceptionOnFailure}}
} else if (local_var_resp$status_code >= 400 && local_var_resp$status_code <= 499) {
{{#returnExceptionOnFailure}}
Expand All @@ -626,7 +627,9 @@
{{/useRlangExceptionHandling}}
{{/returnExceptionOnFailure}}
{{^returnExceptionOnFailure}}
ApiResponse$new("API client error", local_var_resp)
ApiResponse$new(content = "API client error",
response = local_var_resp,
status_code = local_var_resp$status_code)
{{/returnExceptionOnFailure}}
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
{{#returnExceptionOnFailure}}
Expand All @@ -643,7 +646,7 @@
{{/useRlangExceptionHandling}}
{{/returnExceptionOnFailure}}
{{^returnExceptionOnFailure}}
if (is.null(local_var_resp$response) || local_var_resp$response == "") {
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
local_var_resp$response <- "API server error"
}
return(local_var_resp)
Expand Down
20 changes: 14 additions & 6 deletions samples/client/echo_api/r/R/auth_api.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,11 +148,15 @@ AuthApi <- R6::R6Class(

local_var_error_msg <- local_var_resp$response_as_text()
if (local_var_resp$status_code >= 300 && local_var_resp$status_code <= 399) {
ApiResponse$new(paste("Server returned ", local_var_resp$status_code, " response status code."), local_var_resp)
ApiResponse$new(content = paste("Server returned ", local_var_resp$status_code, " response status code."),
response = local_var_resp,
status_code = local_var_resp$status_code)
} else if (local_var_resp$status_code >= 400 && local_var_resp$status_code <= 499) {
ApiResponse$new("API client error", local_var_resp)
ApiResponse$new(content = "API client error",
response = local_var_resp,
status_code = local_var_resp$status_code)
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
if (is.null(local_var_resp$response) || local_var_resp$response == "") {
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
local_var_resp$response <- "API server error"
}
return(local_var_resp)
Expand Down Expand Up @@ -239,11 +243,15 @@ AuthApi <- R6::R6Class(

local_var_error_msg <- local_var_resp$response_as_text()
if (local_var_resp$status_code >= 300 && local_var_resp$status_code <= 399) {
ApiResponse$new(paste("Server returned ", local_var_resp$status_code, " response status code."), local_var_resp)
ApiResponse$new(content = paste("Server returned ", local_var_resp$status_code, " response status code."),
response = local_var_resp,
status_code = local_var_resp$status_code)
} else if (local_var_resp$status_code >= 400 && local_var_resp$status_code <= 499) {
ApiResponse$new("API client error", local_var_resp)
ApiResponse$new(content = "API client error",
response = local_var_resp,
status_code = local_var_resp$status_code)
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
if (is.null(local_var_resp$response) || local_var_resp$response == "") {
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
local_var_resp$response <- "API server error"
}
return(local_var_resp)
Expand Down
100 changes: 70 additions & 30 deletions samples/client/echo_api/r/R/body_api.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,11 +250,15 @@ BodyApi <- R6::R6Class(

local_var_error_msg <- local_var_resp$response_as_text()
if (local_var_resp$status_code >= 300 && local_var_resp$status_code <= 399) {
ApiResponse$new(paste("Server returned ", local_var_resp$status_code, " response status code."), local_var_resp)
ApiResponse$new(content = paste("Server returned ", local_var_resp$status_code, " response status code."),
response = local_var_resp,
status_code = local_var_resp$status_code)
} else if (local_var_resp$status_code >= 400 && local_var_resp$status_code <= 499) {
ApiResponse$new("API client error", local_var_resp)
ApiResponse$new(content = "API client error",
response = local_var_resp,
status_code = local_var_resp$status_code)
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
if (is.null(local_var_resp$response) || local_var_resp$response == "") {
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
local_var_resp$response <- "API server error"
}
return(local_var_resp)
Expand Down Expand Up @@ -349,11 +353,15 @@ BodyApi <- R6::R6Class(

local_var_error_msg <- local_var_resp$response_as_text()
if (local_var_resp$status_code >= 300 && local_var_resp$status_code <= 399) {
ApiResponse$new(paste("Server returned ", local_var_resp$status_code, " response status code."), local_var_resp)
ApiResponse$new(content = paste("Server returned ", local_var_resp$status_code, " response status code."),
response = local_var_resp,
status_code = local_var_resp$status_code)
} else if (local_var_resp$status_code >= 400 && local_var_resp$status_code <= 499) {
ApiResponse$new("API client error", local_var_resp)
ApiResponse$new(content = "API client error",
response = local_var_resp,
status_code = local_var_resp$status_code)
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
if (is.null(local_var_resp$response) || local_var_resp$response == "") {
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
local_var_resp$response <- "API server error"
}
return(local_var_resp)
Expand Down Expand Up @@ -447,11 +455,15 @@ BodyApi <- R6::R6Class(

local_var_error_msg <- local_var_resp$response_as_text()
if (local_var_resp$status_code >= 300 && local_var_resp$status_code <= 399) {
ApiResponse$new(paste("Server returned ", local_var_resp$status_code, " response status code."), local_var_resp)
ApiResponse$new(content = paste("Server returned ", local_var_resp$status_code, " response status code."),
response = local_var_resp,
status_code = local_var_resp$status_code)
} else if (local_var_resp$status_code >= 400 && local_var_resp$status_code <= 499) {
ApiResponse$new("API client error", local_var_resp)
ApiResponse$new(content = "API client error",
response = local_var_resp,
status_code = local_var_resp$status_code)
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
if (is.null(local_var_resp$response) || local_var_resp$response == "") {
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
local_var_resp$response <- "API server error"
}
return(local_var_resp)
Expand Down Expand Up @@ -541,11 +553,15 @@ BodyApi <- R6::R6Class(

local_var_error_msg <- local_var_resp$response_as_text()
if (local_var_resp$status_code >= 300 && local_var_resp$status_code <= 399) {
ApiResponse$new(paste("Server returned ", local_var_resp$status_code, " response status code."), local_var_resp)
ApiResponse$new(content = paste("Server returned ", local_var_resp$status_code, " response status code."),
response = local_var_resp,
status_code = local_var_resp$status_code)
} else if (local_var_resp$status_code >= 400 && local_var_resp$status_code <= 499) {
ApiResponse$new("API client error", local_var_resp)
ApiResponse$new(content = "API client error",
response = local_var_resp,
status_code = local_var_resp$status_code)
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
if (is.null(local_var_resp$response) || local_var_resp$response == "") {
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
local_var_resp$response <- "API server error"
}
return(local_var_resp)
Expand Down Expand Up @@ -640,11 +656,15 @@ BodyApi <- R6::R6Class(

local_var_error_msg <- local_var_resp$response_as_text()
if (local_var_resp$status_code >= 300 && local_var_resp$status_code <= 399) {
ApiResponse$new(paste("Server returned ", local_var_resp$status_code, " response status code."), local_var_resp)
ApiResponse$new(content = paste("Server returned ", local_var_resp$status_code, " response status code."),
response = local_var_resp,
status_code = local_var_resp$status_code)
} else if (local_var_resp$status_code >= 400 && local_var_resp$status_code <= 499) {
ApiResponse$new("API client error", local_var_resp)
ApiResponse$new(content = "API client error",
response = local_var_resp,
status_code = local_var_resp$status_code)
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
if (is.null(local_var_resp$response) || local_var_resp$response == "") {
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
local_var_resp$response <- "API server error"
}
return(local_var_resp)
Expand Down Expand Up @@ -739,11 +759,15 @@ BodyApi <- R6::R6Class(

local_var_error_msg <- local_var_resp$response_as_text()
if (local_var_resp$status_code >= 300 && local_var_resp$status_code <= 399) {
ApiResponse$new(paste("Server returned ", local_var_resp$status_code, " response status code."), local_var_resp)
ApiResponse$new(content = paste("Server returned ", local_var_resp$status_code, " response status code."),
response = local_var_resp,
status_code = local_var_resp$status_code)
} else if (local_var_resp$status_code >= 400 && local_var_resp$status_code <= 499) {
ApiResponse$new("API client error", local_var_resp)
ApiResponse$new(content = "API client error",
response = local_var_resp,
status_code = local_var_resp$status_code)
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
if (is.null(local_var_resp$response) || local_var_resp$response == "") {
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
local_var_resp$response <- "API server error"
}
return(local_var_resp)
Expand Down Expand Up @@ -838,11 +862,15 @@ BodyApi <- R6::R6Class(

local_var_error_msg <- local_var_resp$response_as_text()
if (local_var_resp$status_code >= 300 && local_var_resp$status_code <= 399) {
ApiResponse$new(paste("Server returned ", local_var_resp$status_code, " response status code."), local_var_resp)
ApiResponse$new(content = paste("Server returned ", local_var_resp$status_code, " response status code."),
response = local_var_resp,
status_code = local_var_resp$status_code)
} else if (local_var_resp$status_code >= 400 && local_var_resp$status_code <= 499) {
ApiResponse$new("API client error", local_var_resp)
ApiResponse$new(content = "API client error",
response = local_var_resp,
status_code = local_var_resp$status_code)
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
if (is.null(local_var_resp$response) || local_var_resp$response == "") {
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
local_var_resp$response <- "API server error"
}
return(local_var_resp)
Expand Down Expand Up @@ -937,11 +965,15 @@ BodyApi <- R6::R6Class(

local_var_error_msg <- local_var_resp$response_as_text()
if (local_var_resp$status_code >= 300 && local_var_resp$status_code <= 399) {
ApiResponse$new(paste("Server returned ", local_var_resp$status_code, " response status code."), local_var_resp)
ApiResponse$new(content = paste("Server returned ", local_var_resp$status_code, " response status code."),
response = local_var_resp,
status_code = local_var_resp$status_code)
} else if (local_var_resp$status_code >= 400 && local_var_resp$status_code <= 499) {
ApiResponse$new("API client error", local_var_resp)
ApiResponse$new(content = "API client error",
response = local_var_resp,
status_code = local_var_resp$status_code)
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
if (is.null(local_var_resp$response) || local_var_resp$response == "") {
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
local_var_resp$response <- "API server error"
}
return(local_var_resp)
Expand Down Expand Up @@ -1036,11 +1068,15 @@ BodyApi <- R6::R6Class(

local_var_error_msg <- local_var_resp$response_as_text()
if (local_var_resp$status_code >= 300 && local_var_resp$status_code <= 399) {
ApiResponse$new(paste("Server returned ", local_var_resp$status_code, " response status code."), local_var_resp)
ApiResponse$new(content = paste("Server returned ", local_var_resp$status_code, " response status code."),
response = local_var_resp,
status_code = local_var_resp$status_code)
} else if (local_var_resp$status_code >= 400 && local_var_resp$status_code <= 499) {
ApiResponse$new("API client error", local_var_resp)
ApiResponse$new(content = "API client error",
response = local_var_resp,
status_code = local_var_resp$status_code)
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
if (is.null(local_var_resp$response) || local_var_resp$response == "") {
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
local_var_resp$response <- "API server error"
}
return(local_var_resp)
Expand Down Expand Up @@ -1135,11 +1171,15 @@ BodyApi <- R6::R6Class(

local_var_error_msg <- local_var_resp$response_as_text()
if (local_var_resp$status_code >= 300 && local_var_resp$status_code <= 399) {
ApiResponse$new(paste("Server returned ", local_var_resp$status_code, " response status code."), local_var_resp)
ApiResponse$new(content = paste("Server returned ", local_var_resp$status_code, " response status code."),
response = local_var_resp,
status_code = local_var_resp$status_code)
} else if (local_var_resp$status_code >= 400 && local_var_resp$status_code <= 499) {
ApiResponse$new("API client error", local_var_resp)
ApiResponse$new(content = "API client error",
response = local_var_resp,
status_code = local_var_resp$status_code)
} else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
if (is.null(local_var_resp$response) || local_var_resp$response == "") {
if (is.null(local_var_resp$response) || all(local_var_resp$response == "")) {
local_var_resp$response <- "API server error"
}
return(local_var_resp)
Expand Down
Loading
Loading