Skip to content

fix: update axum generated multipart requests to own the body #21301

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

Merged
wing328 merged 6 commits into from
May 31, 2025
Merged

fix: update axum generated multipart requests to own the body #21301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
932c047
fix: update axum generated multipart requests to own the Multipart or…
AlexandreCassagne May 19, 2025
9a4dad3
chore: run the updated rust-axum sample
AlexandreCassagne May 19, 2025
d6a7d48
chore: run the updated rust-axum sample (2)
AlexandreCassagne May 19, 2025
2d43c58
chore: fix inconsistent lifetimes
AlexandreCassagne May 19, 2025
e490e92
Merge branch 'OpenAPITools:master' into fix-axum-multipart-lifetime
AlexandreCassagne May 20, 2025
e27d148
chore: rerun axum samples
AlexandreCassagne May 20, 2025
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
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/resources/rust-axum/apis.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ pub trait {{classnamePascalCase}}<E: std::fmt::Debug + Send + Sync + 'static = (
{{/x-consumes-multipart}}
{{/x-consumes-multipart-related}}
{{#x-consumes-multipart}}
body: &Multipart,
body: Multipart,
{{/x-consumes-multipart}}
{{#x-consumes-multipart-related}}
body: &axum::body::Body,
body: axum::body::Body,
{{/x-consumes-multipart-related}}
) -> Result<{{{operationId}}}Response, E>;
{{/vendorExtensions}}
Expand Down
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/resources/rust-axum/server-operation.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,10 +226,10 @@ where
{{/x-consumes-multipart}}
{{/x-consumes-multipart-related}}
{{#x-consumes-multipart}}
&body,
body,
{{/x-consumes-multipart}}
{{#x-consumes-multipart-related}}
&body,
body,
{{/x-consumes-multipart-related}}
{{/vendorExtensions}}
).await;
Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/rust-axum/output/apikey-auths/.openapi-generator/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.13.0-SNAPSHOT
7.14.0-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/server/petstore/rust-axum/output/apikey-auths/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ server, you can easily generate a server stub.
To see how to make this your own, look here: [README]((https://openapi-generator.tech))

- API version: 1.0.0
- Generator version: 7.13.0-SNAPSHOT
- Generator version: 7.14.0-SNAPSHOT



Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/rust-axum/output/multipart-v3/.openapi-generator/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.13.0-SNAPSHOT
7.14.0-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/server/petstore/rust-axum/output/multipart-v3/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ server, you can easily generate a server stub.
To see how to make this your own, look here: [README]((https://openapi-generator.tech))

- API version: 1.0.7
- Generator version: 7.13.0-SNAPSHOT
- Generator version: 7.14.0-SNAPSHOT



Expand Down
6 changes: 3 additions & 3 deletions samples/server/petstore/rust-axum/output/multipart-v3/src/apis/default.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ pub trait Default<E: std::fmt::Debug + Send + Sync + 'static = ()>: super::Error
method: &Method,
host: &Host,
cookies: &CookieJar,
body: &axum::body::Body,
body: axum::body::Body,
) -> Result<MultipartRelatedRequestPostResponse, E>;

/// MultipartRequestPost - POST /multipart_request
Expand All @@ -50,7 +50,7 @@ pub trait Default<E: std::fmt::Debug + Send + Sync + 'static = ()>: super::Error
method: &Method,
host: &Host,
cookies: &CookieJar,
body: &Multipart,
body: Multipart,
) -> Result<MultipartRequestPostResponse, E>;

/// MultipleIdenticalMimeTypesPost - POST /multiple-identical-mime-types
Expand All @@ -59,6 +59,6 @@ pub trait Default<E: std::fmt::Debug + Send + Sync + 'static = ()>: super::Error
method: &Method,
host: &Host,
cookies: &CookieJar,
body: &axum::body::Body,
body: axum::body::Body,
) -> Result<MultipleIdenticalMimeTypesPostResponse, E>;
}
6 changes: 3 additions & 3 deletions samples/server/petstore/rust-axum/output/multipart-v3/src/server/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ where

let result = api_impl
.as_ref()
.multipart_related_request_post(&method, &host, &cookies, &body)
.multipart_related_request_post(&method, &host, &cookies, body)
.await;

let mut response = Response::builder();
Expand Down Expand Up @@ -129,7 +129,7 @@ where

let result = api_impl
.as_ref()
.multipart_request_post(&method, &host, &cookies, &body)
.multipart_request_post(&method, &host, &cookies, body)
.await;

let mut response = Response::builder();
Expand Down Expand Up @@ -190,7 +190,7 @@ where

let result = api_impl
.as_ref()
.multiple_identical_mime_types_post(&method, &host, &cookies, &body)
.multiple_identical_mime_types_post(&method, &host, &cookies, body)
.await;

let mut response = Response::builder();
Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/rust-axum/output/openapi-v3/.openapi-generator/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.13.0-SNAPSHOT
7.14.0-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/server/petstore/rust-axum/output/openapi-v3/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ server, you can easily generate a server stub.
To see how to make this your own, look here: [README]((https://openapi-generator.tech))

- API version: 1.0.7
- Generator version: 7.13.0-SNAPSHOT
- Generator version: 7.14.0-SNAPSHOT



Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/rust-axum/output/ops-v3/.openapi-generator/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.13.0-SNAPSHOT
7.14.0-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/server/petstore/rust-axum/output/ops-v3/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ server, you can easily generate a server stub.
To see how to make this your own, look here: [README]((https://openapi-generator.tech))

- API version: 0.0.1
- Generator version: 7.13.0-SNAPSHOT
- Generator version: 7.14.0-SNAPSHOT



Expand Down
2 changes: 1 addition & 1 deletion ...st-axum/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.13.0-SNAPSHOT
7.14.0-SNAPSHOT
2 changes: 1 addition & 1 deletion ...tore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ server, you can easily generate a server stub.
To see how to make this your own, look here: [README]((https://openapi-generator.tech))

- API version: 1.0.0
- Generator version: 7.13.0-SNAPSHOT
- Generator version: 7.14.0-SNAPSHOT



Expand Down
2 changes: 1 addition & 1 deletion ...petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/apis/pet.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,6 @@ pub trait Pet<E: std::fmt::Debug + Send + Sync + 'static = ()>: super::ErrorHand
host: &Host,
cookies: &CookieJar,
path_params: &models::UploadFilePathParams,
body: &Multipart,
body: Multipart,
) -> Result<UploadFileResponse, E>;
}
2 changes: 1 addition & 1 deletion ...tstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2052,7 +2052,7 @@ where

let result = api_impl
.as_ref()
.upload_file(&method, &host, &cookies, &path_params, &body)
.upload_file(&method, &host, &cookies, &path_params, body)
.await;

let mut response = Response::builder();
Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/rust-axum/output/petstore/.openapi-generator/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.13.0-SNAPSHOT
7.14.0-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/server/petstore/rust-axum/output/petstore/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ server, you can easily generate a server stub.
To see how to make this your own, look here: [README]((https://openapi-generator.tech))

- API version: 1.0.0
- Generator version: 7.13.0-SNAPSHOT
- Generator version: 7.14.0-SNAPSHOT



Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/rust-axum/output/petstore/src/apis/pet.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,6 @@ pub trait Pet<E: std::fmt::Debug + Send + Sync + 'static = ()>: super::ErrorHand
host: &Host,
cookies: &CookieJar,
path_params: &models::UploadFilePathParams,
body: &Multipart,
body: Multipart,
) -> Result<UploadFileResponse, E>;
}
2 changes: 1 addition & 1 deletion samples/server/petstore/rust-axum/output/petstore/src/server/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -732,7 +732,7 @@ where

let result = api_impl
.as_ref()
.upload_file(&method, &host, &cookies, &path_params, &body)
.upload_file(&method, &host, &cookies, &path_params, body)
.await;

let mut response = Response::builder();
Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/rust-axum/output/ping-bearer-auth/.openapi-generator/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.13.0-SNAPSHOT
7.14.0-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/server/petstore/rust-axum/output/ping-bearer-auth/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ server, you can easily generate a server stub.
To see how to make this your own, look here: [README]((https://openapi-generator.tech))

- API version: 1.0
- Generator version: 7.13.0-SNAPSHOT
- Generator version: 7.14.0-SNAPSHOT



Expand Down
1 change: 0 additions & 1 deletion ...les/server/petstore/rust-axum/output/rust-axum-array-params-test/.openapi-generator/FILES
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.gitignore
.openapi-generator-ignore
Cargo.toml
README.md
src/apis/default.rs
Expand Down
2 changes: 1 addition & 1 deletion ...s/server/petstore/rust-axum/output/rust-axum-array-params-test/.openapi-generator/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.13.0-SNAPSHOT
7.14.0-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/server/petstore/rust-axum/output/rust-axum-array-params-test/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ server, you can easily generate a server stub.
To see how to make this your own, look here: [README]((https://openapi-generator.tech))

- API version: 0.0.1
- Generator version: 7.13.0-SNAPSHOT
- Generator version: 7.14.0-SNAPSHOT



Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/rust-axum/output/rust-axum-header-uuid/.openapi-generator/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.13.0-SNAPSHOT
7.14.0-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/server/petstore/rust-axum/output/rust-axum-header-uuid/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ server, you can easily generate a server stub.
To see how to make this your own, look here: [README]((https://openapi-generator.tech))

- API version: 0.1.9
- Generator version: 7.13.0-SNAPSHOT
- Generator version: 7.14.0-SNAPSHOT



Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/rust-axum/output/rust-axum-oneof/.openapi-generator/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.13.0-SNAPSHOT
7.14.0-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/server/petstore/rust-axum/output/rust-axum-oneof/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ server, you can easily generate a server stub.
To see how to make this your own, look here: [README]((https://openapi-generator.tech))

- API version: 0.0.1
- Generator version: 7.13.0-SNAPSHOT
- Generator version: 7.14.0-SNAPSHOT



Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/rust-axum/output/rust-axum-test/.openapi-generator/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.13.0-SNAPSHOT
7.14.0-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/server/petstore/rust-axum/output/rust-axum-test/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ server, you can easily generate a server stub.
To see how to make this your own, look here: [README]((https://openapi-generator.tech))

- API version: 2.3.4
- Generator version: 7.13.0-SNAPSHOT
- Generator version: 7.14.0-SNAPSHOT



Expand Down
2 changes: 1 addition & 1 deletion ...les/server/petstore/rust-axum/output/rust-axum-validation-test/.openapi-generator/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.13.0-SNAPSHOT
7.14.0-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/server/petstore/rust-axum/output/rust-axum-validation-test/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ server, you can easily generate a server stub.
To see how to make this your own, look here: [README]((https://openapi-generator.tech))

- API version: 0.0.1
- Generator version: 7.13.0-SNAPSHOT
- Generator version: 7.14.0-SNAPSHOT



Expand Down
Loading