fix struct export in rust reqwest (#6453)

OpenAPITools · May 28, 2020 · e3faeac · e3faeac
1 parent 105efd3
commit e3faeac
Show file tree

Hide file tree

Showing 8 changed files with 138 additions and 20 deletions.
diff --git a/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache b/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache
@@ -22,31 +22,31 @@ impl {{{classname}}}Client {
 
 {{#operations}}
 {{#operation}}
-    {{#vendorExtensions.x-group-parameters}}
-    {{#allParams}}
-    {{#-first}}
-    /// struct for passing parameters to the method `{{operationId}}`
-    #[derive(Clone, Debug)]
-    pub struct {{{operationIdCamelCase}}}Params {
-    {{/-first}}
-        {{#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}}
-    {{#-last}}
-    }
+{{#vendorExtensions.x-group-parameters}}
+{{#allParams}}
+{{#-first}}
+/// struct for passing parameters to the method `{{operationId}}`
+#[derive(Clone, Debug)]
+pub struct {{{classname}}}{{{operationIdCamelCase}}}Params {
+{{/-first}}
+    {{#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}}
+{{#-last}}
+}
 
-    {{/-last}}
-    {{/allParams}}
-    {{/vendorExtensions.x-group-parameters}}
+{{/-last}}
+{{/allParams}}
+{{/vendorExtensions.x-group-parameters}}
 {{/operation}}
 {{/operations}}
 
 pub trait {{{classname}}} {
 {{#operations}}
 {{#operation}}
     {{#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}}
     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}}
 {{#operation}}
     {{#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
         {{#allParams}}
         let {{paramName}} = params.{{paramName}};

diff --git a/modules/openapi-generator/src/main/resources/rust/reqwest/api_mod.mustache b/modules/openapi-generator/src/main/resources/rust/reqwest/api_mod.mustache
@@ -35,9 +35,16 @@ pub fn urlencode<T: AsRef<str>>(s: T) -> String {
 mod {{{classFilename}}};
 {{#operations}}
 {{#operation}}
-{{#-last}}
+{{#-first}}
 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}}
 {{/operations}}
 {{/apis}}

diff --git a/samples/client/petstore/rust/hyper/fileResponseTest/.openapi-generator/FILES b/samples/client/petstore/rust/hyper/fileResponseTest/.openapi-generator/FILES
@@ -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
diff --git a/samples/client/petstore/rust/hyper/petstore/.openapi-generator/FILES b/samples/client/petstore/rust/hyper/petstore/.openapi-generator/FILES
@@ -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
diff --git a/samples/client/petstore/rust/hyper/rust-test/.openapi-generator/FILES b/samples/client/petstore/rust/hyper/rust-test/.openapi-generator/FILES
@@ -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
diff --git a/samples/client/petstore/rust/reqwest/fileResponseTest/.openapi-generator/FILES b/samples/client/petstore/rust/reqwest/fileResponseTest/.openapi-generator/FILES
@@ -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
diff --git a/samples/client/petstore/rust/reqwest/petstore/.openapi-generator/FILES b/samples/client/petstore/rust/reqwest/petstore/.openapi-generator/FILES
@@ -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
diff --git a/samples/client/petstore/rust/reqwest/rust-test/.openapi-generator/FILES b/samples/client/petstore/rust/reqwest/rust-test/.openapi-generator/FILES
@@ -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