loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[rust-server] add support for '|' in path segments (#667)

Browse Source 
* Added encoding for vertical bar character in object IDs for client requests

* Updated sample
This commit is contained in:
Benjamin Gill 2018-07-30 11:38:52 +01:00 committed by William Cheng
parent 036fa6918c
commit b0909ade6f
4 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/openapi-generator/src/main/resources/rust-server/client-mod.mustache
View File

@ -43,6 +43,14 @@ use {Api{{#apiInfo}}{{#apis}}{{#operations}}{{#operation}},
}; };
use models; use models;
define_encode_set! {
/// This encode set is used for object IDs
///
/// Aside from the special characters defined in the `PATH_SEGMENT_ENCODE_SET`,
/// the vertical bar (|) is encoded.
pub ID_ENCODE_SET = [PATH_SEGMENT_ENCODE_SET] | {'|'}
}
/// Convert input into a base path, e.g. "http://example:123". Also checks the scheme as it goes. /// Convert input into a base path, e.g. "http://example:123". Also checks the scheme as it goes.
fn into_base_path(input: &str, correct_scheme: Option<&'static str>) -> Result<String, ClientInitError> { fn into_base_path(input: &str, correct_scheme: Option<&'static str>) -> Result<String, ClientInitError> {
// First convert to Uri, since a base path is a subset of Uri. // First convert to Uri, since a base path is a subset of Uri.
@ -246,7 +254,7 @@ impl<F, C> Api<C> for Client<F> where
let uri = format!( let uri = format!(
"{}{{{basePathWithoutHost}}}{{path}}{{#queryParams}}{{#-first}}?{{/-first}}{{=<% %>=}}{<% paramName %>}<%={{ }}=%>{{/queryParams}}", "{}{{{basePathWithoutHost}}}{{path}}{{#queryParams}}{{#-first}}?{{/-first}}{{=<% %>=}}{<% paramName %>}<%={{ }}=%>{{/queryParams}}",
self.base_path{{#pathParams}}, {{{baseName}}}=utf8_percent_encode(&param_{{{paramName}}}.to_string(), PATH_SEGMENT_ENCODE_SET){{/pathParams}}{{#queryParams}}, self.base_path{{#pathParams}}, {{{baseName}}}=utf8_percent_encode(&param_{{{paramName}}}.to_string(), ID_ENCODE_SET){{/pathParams}}{{#queryParams}},
{{{paramName}}}=utf8_percent_encode(&query_{{{paramName}}}, QUERY_ENCODE_SET){{/queryParams}} {{{paramName}}}=utf8_percent_encode(&query_{{{paramName}}}, QUERY_ENCODE_SET){{/queryParams}}
); );

3
modules/openapi-generator/src/main/resources/rust-server/lib.mustache
View File

@ -19,6 +19,9 @@ extern crate hyper;
extern crate swagger; extern crate swagger;
#[macro_use]
extern crate url;
use futures::Stream; use futures::Stream;
use std::io::Error; use std::io::Error;

26
samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/client/mod.rs
View File

@ -74,6 +74,14 @@ use {Api,
}; };
use models; use models;
define_encode_set! {
/// This encode set is used for object IDs
///
/// Aside from the special characters defined in the `PATH_SEGMENT_ENCODE_SET`,
/// the vertical bar (|) is encoded.
pub ID_ENCODE_SET = [PATH_SEGMENT_ENCODE_SET] | {'|'}
}
/// Convert input into a base path, e.g. "http://example:123". Also checks the scheme as it goes. /// Convert input into a base path, e.g. "http://example:123". Also checks the scheme as it goes.
fn into_base_path(input: &str, correct_scheme: Option<&'static str>) -> Result<String, ClientInitError> { fn into_base_path(input: &str, correct_scheme: Option<&'static str>) -> Result<String, ClientInitError> {
// First convert to Uri, since a base path is a subset of Uri. // First convert to Uri, since a base path is a subset of Uri.
@ -1236,7 +1244,7 @@ if let Some(body) = body {
let uri = format!( let uri = format!(
"{}/v2/pet/{petId}", "{}/v2/pet/{petId}",
self.base_path, petId=utf8_percent_encode(&param_pet_id.to_string(), PATH_SEGMENT_ENCODE_SET) self.base_path, petId=utf8_percent_encode(&param_pet_id.to_string(), ID_ENCODE_SET)
); );
let uri = match Uri::from_str(&uri) { let uri = match Uri::from_str(&uri) {
@ -1461,7 +1469,7 @@ if let Some(body) = body {
let uri = format!( let uri = format!(
"{}/v2/pet/{petId}", "{}/v2/pet/{petId}",
self.base_path, petId=utf8_percent_encode(&param_pet_id.to_string(), PATH_SEGMENT_ENCODE_SET) self.base_path, petId=utf8_percent_encode(&param_pet_id.to_string(), ID_ENCODE_SET)
); );
let uri = match Uri::from_str(&uri) { let uri = match Uri::from_str(&uri) {
@ -1629,7 +1637,7 @@ if let Some(body) = body {
let uri = format!( let uri = format!(
"{}/v2/pet/{petId}", "{}/v2/pet/{petId}",
self.base_path, petId=utf8_percent_encode(&param_pet_id.to_string(), PATH_SEGMENT_ENCODE_SET) self.base_path, petId=utf8_percent_encode(&param_pet_id.to_string(), ID_ENCODE_SET)
); );
let uri = match Uri::from_str(&uri) { let uri = match Uri::from_str(&uri) {
@ -1693,7 +1701,7 @@ if let Some(body) = body {
let uri = format!( let uri = format!(
"{}/v2/pet/{petId}/uploadImage", "{}/v2/pet/{petId}/uploadImage",
self.base_path, petId=utf8_percent_encode(&param_pet_id.to_string(), PATH_SEGMENT_ENCODE_SET) self.base_path, petId=utf8_percent_encode(&param_pet_id.to_string(), ID_ENCODE_SET)
); );
let uri = match Uri::from_str(&uri) { let uri = match Uri::from_str(&uri) {
@ -1767,7 +1775,7 @@ if let Some(body) = body {
let uri = format!( let uri = format!(
"{}/v2/store/order/{order_id}", "{}/v2/store/order/{order_id}",
self.base_path, order_id=utf8_percent_encode(&param_order_id.to_string(), PATH_SEGMENT_ENCODE_SET) self.base_path, order_id=utf8_percent_encode(&param_order_id.to_string(), ID_ENCODE_SET)
); );
let uri = match Uri::from_str(&uri) { let uri = match Uri::from_str(&uri) {
@ -1900,7 +1908,7 @@ if let Some(body) = body {
let uri = format!( let uri = format!(
"{}/v2/store/order/{order_id}", "{}/v2/store/order/{order_id}",
self.base_path, order_id=utf8_percent_encode(&param_order_id.to_string(), PATH_SEGMENT_ENCODE_SET) self.base_path, order_id=utf8_percent_encode(&param_order_id.to_string(), ID_ENCODE_SET)
); );
let uri = match Uri::from_str(&uri) { let uri = match Uri::from_str(&uri) {
@ -2262,7 +2270,7 @@ if let Some(body) = body {
let uri = format!( let uri = format!(
"{}/v2/user/{username}", "{}/v2/user/{username}",
self.base_path, username=utf8_percent_encode(&param_username.to_string(), PATH_SEGMENT_ENCODE_SET) self.base_path, username=utf8_percent_encode(&param_username.to_string(), ID_ENCODE_SET)
); );
let uri = match Uri::from_str(&uri) { let uri = match Uri::from_str(&uri) {
@ -2328,7 +2336,7 @@ if let Some(body) = body {
let uri = format!( let uri = format!(
"{}/v2/user/{username}", "{}/v2/user/{username}",
self.base_path, username=utf8_percent_encode(&param_username.to_string(), PATH_SEGMENT_ENCODE_SET) self.base_path, username=utf8_percent_encode(&param_username.to_string(), ID_ENCODE_SET)
); );
let uri = match Uri::from_str(&uri) { let uri = match Uri::from_str(&uri) {
@ -2566,7 +2574,7 @@ if let Some(body) = body {
let uri = format!( let uri = format!(
"{}/v2/user/{username}", "{}/v2/user/{username}",
self.base_path, username=utf8_percent_encode(&param_username.to_string(), PATH_SEGMENT_ENCODE_SET) self.base_path, username=utf8_percent_encode(&param_username.to_string(), ID_ENCODE_SET)
); );
let uri = match Uri::from_str(&uri) { let uri = match Uri::from_str(&uri) {

3
samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/lib.rs
View File

@ -19,6 +19,9 @@ extern crate hyper;
extern crate swagger; extern crate swagger;
#[macro_use]
extern crate url;
use futures::Stream; use futures::Stream;
use std::io::Error; use std::io::Error;