[R] url-encode path parameters (#2397)

wing328 · web-flow · commit 5ba35ecd3141 · 2019-03-14T20:54:10.000+08:00
* url encode path parameter

* convert number to string before encoding
diff --git a/modules/openapi-generator/src/main/resources/r/api.mustache b/modules/openapi-generator/src/main/resources/r/api.mustache
@@ -78,7 +78,7 @@
       {{#hasPathParams}}
       {{#pathParams}}
       if (!missing(`{{paramName}}`)) {
-        urlPath <- gsub(paste0("\\{", "{{baseName}}", "\\}"), `{{paramName}}`, urlPath)
+        urlPath <- gsub(paste0("\\{", "{{baseName}}", "\\}"), URLencode(as.character(`{{paramName}}`), reserved = TRUE), urlPath)
       }
 
       {{/pathParams}}
diff --git a/samples/client/petstore/R/R/pet_api.R b/samples/client/petstore/R/R/pet_api.R
@@ -104,7 +104,7 @@ PetApi <- R6::R6Class(
 
       urlPath <- "/pet/{petId}"
       if (!missing(`pet.id`)) {
-        urlPath <- gsub(paste0("\\{", "petId", "\\}"), `pet.id`, urlPath)
+        urlPath <- gsub(paste0("\\{", "petId", "\\}"), URLencode(as.character(`pet.id`), reserved = TRUE), urlPath)
       }
 
       # OAuth token
@@ -199,7 +199,7 @@ PetApi <- R6::R6Class(
 
       urlPath <- "/pet/{petId}"
       if (!missing(`pet.id`)) {
-        urlPath <- gsub(paste0("\\{", "petId", "\\}"), `pet.id`, urlPath)
+        urlPath <- gsub(paste0("\\{", "petId", "\\}"), URLencode(as.character(`pet.id`), reserved = TRUE), urlPath)
       }
 
       # API key authentication
@@ -274,7 +274,7 @@ PetApi <- R6::R6Class(
 
       urlPath <- "/pet/{petId}"
       if (!missing(`pet.id`)) {
-        urlPath <- gsub(paste0("\\{", "petId", "\\}"), `pet.id`, urlPath)
+        urlPath <- gsub(paste0("\\{", "petId", "\\}"), URLencode(as.character(`pet.id`), reserved = TRUE), urlPath)
       }
 
       # OAuth token
@@ -312,7 +312,7 @@ PetApi <- R6::R6Class(
 
       urlPath <- "/pet/{petId}/uploadImage"
       if (!missing(`pet.id`)) {
-        urlPath <- gsub(paste0("\\{", "petId", "\\}"), `pet.id`, urlPath)
+        urlPath <- gsub(paste0("\\{", "petId", "\\}"), URLencode(as.character(`pet.id`), reserved = TRUE), urlPath)
       }
 
       # OAuth token
diff --git a/samples/client/petstore/R/R/store_api.R b/samples/client/petstore/R/R/store_api.R
@@ -55,7 +55,7 @@ StoreApi <- R6::R6Class(
 
       urlPath <- "/store/order/{orderId}"
       if (!missing(`order.id`)) {
-        urlPath <- gsub(paste0("\\{", "orderId", "\\}"), `order.id`, urlPath)
+        urlPath <- gsub(paste0("\\{", "orderId", "\\}"), URLencode(as.character(`order.id`), reserved = TRUE), urlPath)
       }
 
 
@@ -113,7 +113,7 @@ StoreApi <- R6::R6Class(
 
       urlPath <- "/store/order/{orderId}"
       if (!missing(`order.id`)) {
-        urlPath <- gsub(paste0("\\{", "orderId", "\\}"), `order.id`, urlPath)
+        urlPath <- gsub(paste0("\\{", "orderId", "\\}"), URLencode(as.character(`order.id`), reserved = TRUE), urlPath)
       }
 
 
diff --git a/samples/client/petstore/R/R/user_api.R b/samples/client/petstore/R/R/user_api.R
@@ -166,7 +166,7 @@ UserApi <- R6::R6Class(
 
       urlPath <- "/user/{username}"
       if (!missing(`username`)) {
-        urlPath <- gsub(paste0("\\{", "username", "\\}"), `username`, urlPath)
+        urlPath <- gsub(paste0("\\{", "username", "\\}"), URLencode(as.character(`username`), reserved = TRUE), urlPath)
       }
 
 
@@ -197,7 +197,7 @@ UserApi <- R6::R6Class(
 
       urlPath <- "/user/{username}"
       if (!missing(`username`)) {
-        urlPath <- gsub(paste0("\\{", "username", "\\}"), `username`, urlPath)
+        urlPath <- gsub(paste0("\\{", "username", "\\}"), URLencode(as.character(`username`), reserved = TRUE), urlPath)
       }
 
 
@@ -296,7 +296,7 @@ UserApi <- R6::R6Class(
 
       urlPath <- "/user/{username}"
       if (!missing(`username`)) {
-        urlPath <- gsub(paste0("\\{", "username", "\\}"), `username`, urlPath)
+        urlPath <- gsub(paste0("\\{", "username", "\\}"), URLencode(as.character(`username`), reserved = TRUE), urlPath)
       }
 
 

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@`
`78`	`78`	`{{#hasPathParams}}`
`79`	`79`	`{{#pathParams}}`
`80`	`80`	if (!missing(`{{paramName}}`)) {
`81`		- urlPath <- gsub(paste0("\\{", "{{baseName}}", "\\}"), `{{paramName}}`, urlPath)
	`81`	+ urlPath <- gsub(paste0("\\{", "{{baseName}}", "\\}"), URLencode(as.character(`{{paramName}}`), reserved = TRUE), urlPath)
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`{{/pathParams}}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ StoreApi <- R6::R6Class(`
`55`	`55`
`56`	`56`	`urlPath <- "/store/order/{orderId}"`
`57`	`57`	if (!missing(`order.id`)) {
`58`		- urlPath <- gsub(paste0("\\{", "orderId", "\\}"), `order.id`, urlPath)
	`58`	+ urlPath <- gsub(paste0("\\{", "orderId", "\\}"), URLencode(as.character(`order.id`), reserved = TRUE), urlPath)
`59`	`59`	`}`
`60`	`60`
`61`	`61`
`@@ -113,7 +113,7 @@ StoreApi <- R6::R6Class(`
`113`	`113`
`114`	`114`	`urlPath <- "/store/order/{orderId}"`
`115`	`115`	if (!missing(`order.id`)) {
`116`		- urlPath <- gsub(paste0("\\{", "orderId", "\\}"), `order.id`, urlPath)
	`116`	+ urlPath <- gsub(paste0("\\{", "orderId", "\\}"), URLencode(as.character(`order.id`), reserved = TRUE), urlPath)
`117`	`117`	`}`
`118`	`118`
`119`	`119`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ UserApi <- R6::R6Class(`
`166`	`166`
`167`	`167`	`urlPath <- "/user/{username}"`
`168`	`168`	if (!missing(`username`)) {
`169`		- urlPath <- gsub(paste0("\\{", "username", "\\}"), `username`, urlPath)
	`169`	+ urlPath <- gsub(paste0("\\{", "username", "\\}"), URLencode(as.character(`username`), reserved = TRUE), urlPath)
`170`	`170`	`}`
`171`	`171`
`172`	`172`
`@@ -197,7 +197,7 @@ UserApi <- R6::R6Class(`
`197`	`197`
`198`	`198`	`urlPath <- "/user/{username}"`
`199`	`199`	if (!missing(`username`)) {
`200`		- urlPath <- gsub(paste0("\\{", "username", "\\}"), `username`, urlPath)
	`200`	+ urlPath <- gsub(paste0("\\{", "username", "\\}"), URLencode(as.character(`username`), reserved = TRUE), urlPath)
`201`	`201`	`}`
`202`	`202`
`203`	`203`
`@@ -296,7 +296,7 @@ UserApi <- R6::R6Class(`
`296`	`296`
`297`	`297`	`urlPath <- "/user/{username}"`
`298`	`298`	if (!missing(`username`)) {
`299`		- urlPath <- gsub(paste0("\\{", "username", "\\}"), `username`, urlPath)
	`299`	+ urlPath <- gsub(paste0("\\{", "username", "\\}"), URLencode(as.character(`username`), reserved = TRUE), urlPath)
`300`	`300`	`}`
`301`	`301`
`302`	`302`