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

fix struct export in rust reqwest (#6453)

Browse Source
This commit is contained in:
William Cheng 2020-05-28 09:30:00 +08:00 committed by GitHub
parent 105efd3c68
commit e3faeac0f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 138 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache vendored
View File

@ -22,23 +22,23 @@ impl {{{classname}}}Client {
{{#operations}} {{#operations}}
{{#operation}} {{#operation}}
{{#vendorExtensions.x-group-parameters}} {{#vendorExtensions.x-group-parameters}}
{{#allParams}} {{#allParams}}
{{#-first}} {{#-first}}
/// struct for passing parameters to the method `{{operationId}}` /// struct for passing parameters to the method `{{operationId}}`
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub struct {{{operationIdCamelCase}}}Params { pub struct {{{classname}}}{{{operationIdCamelCase}}}Params {
{{/-first}} {{/-first}}
{{#description}} {{#description}}
/// {{{.}}} /// {{{.}}}
{{/description}} {{/description}}
pub {{{paramName}}}: {{^required}}Option<{{/required}}{{#required}}{{#isNullable}}Option<{{/isNullable}}{{/required}}{{#isString}}String{{/isString}}{{#isUuid}}String{{/isUuid}}{{^isString}}{{^isUuid}}{{^isPrimitiveType}}{{^isContainer}}crate::models::{{/isContainer}}{{/isPrimitiveType}}{{{dataType}}}{{/isUuid}}{{/isString}}{{^required}}>{{/required}}{{#required}}{{#isNullable}}>{{/isNullable}}{{/required}}{{#hasMore}}, {{/hasMore}} pub {{{paramName}}}: {{^required}}Option<{{/required}}{{#required}}{{#isNullable}}Option<{{/isNullable}}{{/required}}{{#isString}}String{{/isString}}{{#isUuid}}String{{/isUuid}}{{^isString}}{{^isUuid}}{{^isPrimitiveType}}{{^isContainer}}crate::models::{{/isContainer}}{{/isPrimitiveType}}{{{dataType}}}{{/isUuid}}{{/isString}}{{^required}}>{{/required}}{{#required}}{{#isNullable}}>{{/isNullable}}{{/required}}{{#hasMore}},{{/hasMore}}
{{#-last}} {{#-last}}
} }
{{/-last}} {{/-last}}
{{/allParams}} {{/allParams}}
{{/vendorExtensions.x-group-parameters}} {{/vendorExtensions.x-group-parameters}}
{{/operation}} {{/operation}}
{{/operations}} {{/operations}}
@ -46,7 +46,7 @@ pub trait {{{classname}}} {
{{#operations}} {{#operations}}
{{#operation}} {{#operation}}
{{#vendorExtensions.x-group-parameters}} {{#vendorExtensions.x-group-parameters}}
fn {{{operationId}}}(&self{{#allParams}}{{#-first}}, params: {{{operationIdCamelCase}}}Params{{/-first}}{{/allParams}}) -> Result<{{^returnType}}(){{/returnType}}{{#returnType}}{{{returnType}}}{{/returnType}}, Error>; fn {{{operationId}}}(&self{{#allParams}}{{#-first}}, params: {{{classname}}}{{{operationIdCamelCase}}}Params{{/-first}}{{/allParams}}) -> Result<{{^returnType}}(){{/returnType}}{{#returnType}}{{{returnType}}}{{/returnType}}, Error>;
{{/vendorExtensions.x-group-parameters}} {{/vendorExtensions.x-group-parameters}}
{{^vendorExtensions.x-group-parameters}} {{^vendorExtensions.x-group-parameters}}
fn {{{operationId}}}(&self, {{#allParams}}{{{paramName}}}: {{^required}}Option<{{/required}}{{#required}}{{#isNullable}}Option<{{/isNullable}}{{/required}}{{#isString}}&str{{/isString}}{{#isUuid}}&str{{/isUuid}}{{^isString}}{{^isUuid}}{{^isPrimitiveType}}{{^isContainer}}crate::models::{{/isContainer}}{{/isPrimitiveType}}{{{dataType}}}{{/isUuid}}{{/isString}}{{^required}}>{{/required}}{{#required}}{{#isNullable}}>{{/isNullable}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) -> Result<{{^returnType}}(){{/returnType}}{{#returnType}}{{{returnType}}}{{/returnType}}, Error>; fn {{{operationId}}}(&self, {{#allParams}}{{{paramName}}}: {{^required}}Option<{{/required}}{{#required}}{{#isNullable}}Option<{{/isNullable}}{{/required}}{{#isString}}&str{{/isString}}{{#isUuid}}&str{{/isUuid}}{{^isString}}{{^isUuid}}{{^isPrimitiveType}}{{^isContainer}}crate::models::{{/isContainer}}{{/isPrimitiveType}}{{{dataType}}}{{/isUuid}}{{/isString}}{{^required}}>{{/required}}{{#required}}{{#isNullable}}>{{/isNullable}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) -> Result<{{^returnType}}(){{/returnType}}{{#returnType}}{{{returnType}}}{{/returnType}}, Error>;
@ -59,7 +59,7 @@ impl {{{classname}}} for {{{classname}}}Client {
{{#operations}} {{#operations}}
{{#operation}} {{#operation}}
{{#vendorExtensions.x-group-parameters}} {{#vendorExtensions.x-group-parameters}}
fn {{{operationId}}}(&self{{#allParams}}{{#-first}}, params: {{{operationIdCamelCase}}}Params{{/-first}}{{/allParams}}) -> Result<{{^returnType}}(){{/returnType}}{{#returnType}}{{{returnType}}}{{/returnType}}, Error> { fn {{{operationId}}}(&self{{#allParams}}{{#-first}}, params: {{{classname}}}{{{operationIdCamelCase}}}Params{{/-first}}{{/allParams}}) -> Result<{{^returnType}}(){{/returnType}}{{#returnType}}{{{returnType}}}{{/returnType}}, Error> {
// unbox the parameters // unbox the parameters
{{#allParams}} {{#allParams}}
let {{paramName}} = params.{{paramName}}; let {{paramName}} = params.{{paramName}};

11
modules/openapi-generator/src/main/resources/rust/reqwest/api_mod.mustache vendored
View File

@ -35,9 +35,16 @@ pub fn urlencode<T: AsRef<str>>(s: T) -> String {
mod {{{classFilename}}}; mod {{{classFilename}}};
{{#operations}} {{#operations}}
{{#operation}} {{#operation}}
{{#-last}} {{#-first}}
pub use self::{{{classFilename}}}::{ {{{classname}}}, {{{classname}}}Client }; pub use self::{{{classFilename}}}::{ {{{classname}}}, {{{classname}}}Client };
{{/-last}} {{/-first}}
{{#vendorExtensions.x-group-parameters}}
{{#allParams}}
{{#-first}}
pub use self::{{{classFilename}}}::{ {{{classname}}}{{{operationIdCamelCase}}}Params };
{{/-first}}
{{/allParams}}
{{/vendorExtensions.x-group-parameters}}
{{/operation}} {{/operation}}
{{/operations}} {{/operations}}
{{/apis}} {{/apis}}

13
samples/client/petstore/rust/hyper/fileResponseTest/.openapi-generator/FILES Normal file
View File

@ -0,0 +1,13 @@
.gitignore
.travis.yml
Cargo.toml
README.md
docs/DefaultApi.md
git_push.sh
src/apis/client.rs
src/apis/configuration.rs
src/apis/default_api.rs
src/apis/mod.rs
src/apis/request.rs
src/lib.rs
src/models/mod.rs

29
samples/client/petstore/rust/hyper/petstore/.openapi-generator/FILES Normal file
View File

@ -0,0 +1,29 @@
.gitignore
.travis.yml
Cargo.toml
README.md
docs/ApiResponse.md
docs/Category.md
docs/Order.md
docs/Pet.md
docs/PetApi.md
docs/StoreApi.md
docs/Tag.md
docs/User.md
docs/UserApi.md
git_push.sh
src/apis/client.rs
src/apis/configuration.rs
src/apis/mod.rs
src/apis/pet_api.rs
src/apis/request.rs
src/apis/store_api.rs
src/apis/user_api.rs
src/lib.rs
src/models/api_response.rs
src/models/category.rs
src/models/mod.rs
src/models/order.rs
src/models/pet.rs
src/models/tag.rs
src/models/user.rs

15
samples/client/petstore/rust/hyper/rust-test/.openapi-generator/FILES Normal file
View File

@ -0,0 +1,15 @@
.gitignore
.travis.yml
Cargo.toml
README.md
docs/DefaultApi.md
docs/TypeTesting.md
git_push.sh
src/apis/client.rs
src/apis/configuration.rs
src/apis/default_api.rs
src/apis/mod.rs
src/apis/request.rs
src/lib.rs
src/models/mod.rs
src/models/type_testing.rs

12
samples/client/petstore/rust/reqwest/fileResponseTest/.openapi-generator/FILES Normal file
View File

@ -0,0 +1,12 @@
.gitignore
.travis.yml
Cargo.toml
README.md
docs/DefaultApi.md
git_push.sh
src/apis/client.rs
src/apis/configuration.rs
src/apis/default_api.rs
src/apis/mod.rs
src/lib.rs
src/models/mod.rs

28
samples/client/petstore/rust/reqwest/petstore/.openapi-generator/FILES Normal file
View File

@ -0,0 +1,28 @@
.gitignore
.travis.yml
Cargo.toml
README.md
docs/ApiResponse.md
docs/Category.md
docs/Order.md
docs/Pet.md
docs/PetApi.md
docs/StoreApi.md
docs/Tag.md
docs/User.md
docs/UserApi.md
git_push.sh
src/apis/client.rs
src/apis/configuration.rs
src/apis/mod.rs
src/apis/pet_api.rs
src/apis/store_api.rs
src/apis/user_api.rs
src/lib.rs
src/models/api_response.rs
src/models/category.rs
src/models/mod.rs
src/models/order.rs
src/models/pet.rs
src/models/tag.rs
src/models/user.rs

14
samples/client/petstore/rust/reqwest/rust-test/.openapi-generator/FILES Normal file
View File

@ -0,0 +1,14 @@
.gitignore
.travis.yml
Cargo.toml
README.md
docs/DefaultApi.md
docs/TypeTesting.md
git_push.sh
src/apis/client.rs
src/apis/configuration.rs
src/apis/default_api.rs
src/apis/mod.rs
src/lib.rs
src/models/mod.rs
src/models/type_testing.rs