Skip to content

[R] Handling null values for optional params while building the model json object #2301

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

Closed
Ramanth wants to merge 2 commits into from
Closed

[R] Handling null values for optional params while building the model json object #2301

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5de43b4
updated toJSONString() to handle optional params
Ramanth Mar 5, 2019
0cd42fa
fixed the indentation mismatch
Ramanth Mar 5, 2019
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
20 changes: 14 additions & 6 deletions modules/openapi-generator/src/main/resources/r/model.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,8 @@
}
{{/vars}}
},
toJSONString = function() {
sprintf(
toJSONString = function() {
outstring = sprintf(
'{
{{#vars}}
"{{baseName}}":
Expand All @@ -181,24 +181,32 @@
{{/vars}}
}',
{{#vars}}
{{! Added the if else condition to handle null values}}
if (!is.null(self$`{{baseName}}`)) {
{{#isListContainer}}
{{#isPrimitiveType}}
paste(unlist(lapply(self$`{{{baseName}}}`, function(x) paste0('"', x, '"'))), collapse=","){{#hasMore}},{{/hasMore}}
paste(unlist(lapply(self$`{{{baseName}}}`, function(x) paste0('"', x, '"'))), collapse=",")
{{/isPrimitiveType}}
{{^isPrimitiveType}}
paste(unlist(lapply(self$`{{{baseName}}}`, function(x) jsonlite::toJSON(x$toJSON(), auto_unbox=TRUE))), collapse=","){{#hasMore}},{{/hasMore}}
paste(unlist(lapply(self$`{{{baseName}}}`, function(x) jsonlite::toJSON(x$toJSON(), auto_unbox=TRUE))), collapse=",")
{{/isPrimitiveType}}
{{/isListContainer}}
{{^isListContainer}}
{{#isPrimitiveType}}
self$`{{baseName}}`{{#hasMore}},{{/hasMore}}
self$`{{baseName}}`
{{/isPrimitiveType}}
{{^isPrimitiveType}}
jsonlite::toJSON(self$`{{baseName}}`$toJSON(), auto_unbox=TRUE){{#hasMore}},{{/hasMore}}
jsonlite::toJSON(self$`{{baseName}}`$toJSON(), auto_unbox=TRUE)
{{/isPrimitiveType}}
{{/isListContainer}}
}
else{
"null"
}{{#hasMore}},{{/hasMore}}
{{/vars}}
)
outstring = gsub("[\r\n]| ", "", outstring)
Copy link
Copy Markdown
Member

@wing328 wing328 Mar 5, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm afraid this won't work if the data/value contains line breaks

Copy link
Copy Markdown
Contributor Author

@Ramanth Ramanth Mar 5, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@wing328 you are right, i can remove this line considering what you mentioned. Thanks

gsub(':\\[null\\]|:\\\"null\\\"',':null',outstring)
},
fromJSONString = function({{classname}}Json) {
{{classname}}Object <- jsonlite::fromJSON({{classname}}Json)
Expand Down