diff --git a/modules/openapi-generator/src/main/resources/rust-axum/Cargo.mustache b/modules/openapi-generator/src/main/resources/rust-axum/Cargo.mustache index c076f50f91c7..b61ae08a5912 100644 --- a/modules/openapi-generator/src/main/resources/rust-axum/Cargo.mustache +++ b/modules/openapi-generator/src/main/resources/rust-axum/Cargo.mustache @@ -42,7 +42,11 @@ conversion = [ ammonia = "4" async-trait = "0.1" axum = { version = "0.8", features = ["multipart"] } -axum-extra = { version = "0.12", features = ["cookie", "query"] } +axum-extra = { version = "0.12", features = [ + "cookie", + "query", + "typed-header", +] } base64 = "0.22" bytes = "1" chrono = { version = "0.4", features = ["serde"] } @@ -51,6 +55,7 @@ frunk-enum-core = { version = "0.3", optional = true } frunk-enum-derive = { version = "0.3", optional = true } frunk_core = { version = "0.4", optional = true } frunk_derives = { version = "0.4", optional = true } +headers = "0.4" http = "1" lazy_static = "1" regex = "1" diff --git a/modules/openapi-generator/src/main/resources/rust-axum/apis-mod.mustache b/modules/openapi-generator/src/main/resources/rust-axum/apis-mod.mustache index ad8f71344843..fda7fae4606f 100644 --- a/modules/openapi-generator/src/main/resources/rust-axum/apis-mod.mustache +++ b/modules/openapi-generator/src/main/resources/rust-axum/apis-mod.mustache @@ -91,7 +91,7 @@ pub trait ErrorHandler { async fn handle_error( &self, method: &::http::Method, - host: &axum_extra::extract::Host, + host: &headers::Host, cookies: &axum_extra::extract::CookieJar, error: E ) -> Result { diff --git a/modules/openapi-generator/src/main/resources/rust-axum/apis.mustache b/modules/openapi-generator/src/main/resources/rust-axum/apis.mustache index 1ed9600ac311..93eed08578d5 100644 --- a/modules/openapi-generator/src/main/resources/rust-axum/apis.mustache +++ b/modules/openapi-generator/src/main/resources/rust-axum/apis.mustache @@ -1,7 +1,8 @@ use async_trait::async_trait; use axum::extract::*; -use axum_extra::extract::{CookieJar, Host}; +use axum_extra::extract::CookieJar; use bytes::Bytes; +use headers::Host; use http::Method; use serde::{Deserialize, Serialize}; diff --git a/modules/openapi-generator/src/main/resources/rust-axum/server-imports.mustache b/modules/openapi-generator/src/main/resources/rust-axum/server-imports.mustache index 9bb2805c725d..eeb9197279af 100644 --- a/modules/openapi-generator/src/main/resources/rust-axum/server-imports.mustache +++ b/modules/openapi-generator/src/main/resources/rust-axum/server-imports.mustache @@ -1,16 +1,21 @@ use std::collections::HashMap; use axum::{body::Body, extract::*, response::Response, routing::*}; -use axum_extra::extract::{CookieJar, Host, Query as QueryExtra}; +use axum_extra::{ + TypedHeader, + extract::{CookieJar, Query as QueryExtra}, +}; use bytes::Bytes; -use http::{header::CONTENT_TYPE, HeaderMap, HeaderName, HeaderValue, Method, StatusCode}; +use headers::Host; +use http::{HeaderMap, HeaderName, HeaderValue, Method, StatusCode, header::CONTENT_TYPE}; use tracing::error; use validator::{Validate, ValidationErrors}; -use crate::{header, types::*}; - #[allow(unused_imports)] use crate::{apis, models}; - +use crate::{header, types::*}; #[allow(unused_imports)] -use crate::{models::check_xss_string, models::check_xss_vec_string, models::check_xss_map_string, models::check_xss_map_nested, models::check_xss_map}; +use crate::{ + models::check_xss_map, models::check_xss_map_nested, models::check_xss_map_string, + models::check_xss_string, models::check_xss_vec_string, +}; diff --git a/modules/openapi-generator/src/main/resources/rust-axum/server-operation.mustache b/modules/openapi-generator/src/main/resources/rust-axum/server-operation.mustache index c6d463f21791..2d128beb4d01 100644 --- a/modules/openapi-generator/src/main/resources/rust-axum/server-operation.mustache +++ b/modules/openapi-generator/src/main/resources/rust-axum/server-operation.mustache @@ -2,7 +2,7 @@ #[tracing::instrument(skip_all)] async fn {{#vendorExtensions}}{{{x-operation-id}}}{{/vendorExtensions}}( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, {{#headerParams.size}} headers: HeaderMap, diff --git a/samples/server/petstore/rust-axum/output/apikey-authorization/.openapi-generator/VERSION b/samples/server/petstore/rust-axum/output/apikey-authorization/.openapi-generator/VERSION index 2fb556b60635..909dcd0eca63 100644 --- a/samples/server/petstore/rust-axum/output/apikey-authorization/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-axum/output/apikey-authorization/.openapi-generator/VERSION @@ -1 +1 @@ -7.18.0-SNAPSHOT +7.19.0-SNAPSHOT diff --git a/samples/server/petstore/rust-axum/output/apikey-authorization/Cargo.toml b/samples/server/petstore/rust-axum/output/apikey-authorization/Cargo.toml index 7736a8057849..d25f0ebc5a34 100644 --- a/samples/server/petstore/rust-axum/output/apikey-authorization/Cargo.toml +++ b/samples/server/petstore/rust-axum/output/apikey-authorization/Cargo.toml @@ -21,7 +21,11 @@ conversion = [ ammonia = "4" async-trait = "0.1" axum = { version = "0.8", features = ["multipart"] } -axum-extra = { version = "0.12", features = ["cookie", "query"] } +axum-extra = { version = "0.12", features = [ + "cookie", + "query", + "typed-header", +] } base64 = "0.22" bytes = "1" chrono = { version = "0.4", features = ["serde"] } @@ -30,6 +34,7 @@ frunk-enum-core = { version = "0.3", optional = true } frunk-enum-derive = { version = "0.3", optional = true } frunk_core = { version = "0.4", optional = true } frunk_derives = { version = "0.4", optional = true } +headers = "0.4" http = "1" lazy_static = "1" regex = "1" diff --git a/samples/server/petstore/rust-axum/output/apikey-authorization/README.md b/samples/server/petstore/rust-axum/output/apikey-authorization/README.md index c2f426598f39..98310613d995 100644 --- a/samples/server/petstore/rust-axum/output/apikey-authorization/README.md +++ b/samples/server/petstore/rust-axum/output/apikey-authorization/README.md @@ -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.18.0-SNAPSHOT +- Generator version: 7.19.0-SNAPSHOT diff --git a/samples/server/petstore/rust-axum/output/apikey-authorization/src/apis/mod.rs b/samples/server/petstore/rust-axum/output/apikey-authorization/src/apis/mod.rs index c7a7083c9d7b..a136f9cc1fdf 100644 --- a/samples/server/petstore/rust-axum/output/apikey-authorization/src/apis/mod.rs +++ b/samples/server/petstore/rust-axum/output/apikey-authorization/src/apis/mod.rs @@ -85,7 +85,7 @@ pub trait ErrorHandler { async fn handle_error( &self, method: &::http::Method, - host: &axum_extra::extract::Host, + host: &headers::Host, cookies: &axum_extra::extract::CookieJar, error: E, ) -> Result { diff --git a/samples/server/petstore/rust-axum/output/apikey-authorization/src/apis/payments.rs b/samples/server/petstore/rust-axum/output/apikey-authorization/src/apis/payments.rs index 32766efa6d14..b66851df8058 100644 --- a/samples/server/petstore/rust-axum/output/apikey-authorization/src/apis/payments.rs +++ b/samples/server/petstore/rust-axum/output/apikey-authorization/src/apis/payments.rs @@ -1,7 +1,8 @@ use async_trait::async_trait; use axum::extract::*; -use axum_extra::extract::{CookieJar, Host}; +use axum_extra::extract::CookieJar; use bytes::Bytes; +use headers::Host; use http::Method; use serde::{Deserialize, Serialize}; diff --git a/samples/server/petstore/rust-axum/output/apikey-authorization/src/server/mod.rs b/samples/server/petstore/rust-axum/output/apikey-authorization/src/server/mod.rs index 5b4646f7a4ae..c915455dcdbf 100644 --- a/samples/server/petstore/rust-axum/output/apikey-authorization/src/server/mod.rs +++ b/samples/server/petstore/rust-axum/output/apikey-authorization/src/server/mod.rs @@ -1,17 +1,19 @@ use std::collections::HashMap; use axum::{body::Body, extract::*, response::Response, routing::*}; -use axum_extra::extract::{CookieJar, Host, Query as QueryExtra}; +use axum_extra::{ + TypedHeader, + extract::{CookieJar, Query as QueryExtra}, +}; use bytes::Bytes; +use headers::Host; use http::{HeaderMap, HeaderName, HeaderValue, Method, StatusCode, header::CONTENT_TYPE}; use tracing::error; use validator::{Validate, ValidationErrors}; -use crate::{header, types::*}; - #[allow(unused_imports)] use crate::{apis, models}; - +use crate::{header, types::*}; #[allow(unused_imports)] use crate::{ models::check_xss_map, models::check_xss_map_nested, models::check_xss_map_string, @@ -61,7 +63,7 @@ fn get_payment_method_by_id_validation( #[tracing::instrument(skip_all)] async fn get_payment_method_by_id( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, headers: HeaderMap, Path(path_params): Path, @@ -216,7 +218,7 @@ fn get_payment_methods_validation() -> std::result::Result<(), ValidationErrors> #[tracing::instrument(skip_all)] async fn get_payment_methods( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, headers: HeaderMap, State(api_impl): State, @@ -365,7 +367,7 @@ fn post_make_payment_validation( #[tracing::instrument(skip_all)] async fn post_make_payment( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, headers: HeaderMap, State(api_impl): State, diff --git a/samples/server/petstore/rust-axum/output/apikey-auths/.openapi-generator/VERSION b/samples/server/petstore/rust-axum/output/apikey-auths/.openapi-generator/VERSION index 2fb556b60635..909dcd0eca63 100644 --- a/samples/server/petstore/rust-axum/output/apikey-auths/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-axum/output/apikey-auths/.openapi-generator/VERSION @@ -1 +1 @@ -7.18.0-SNAPSHOT +7.19.0-SNAPSHOT diff --git a/samples/server/petstore/rust-axum/output/apikey-auths/Cargo.toml b/samples/server/petstore/rust-axum/output/apikey-auths/Cargo.toml index 533c1426b96e..4837826de3c5 100644 --- a/samples/server/petstore/rust-axum/output/apikey-auths/Cargo.toml +++ b/samples/server/petstore/rust-axum/output/apikey-auths/Cargo.toml @@ -21,7 +21,11 @@ conversion = [ ammonia = "4" async-trait = "0.1" axum = { version = "0.8", features = ["multipart"] } -axum-extra = { version = "0.12", features = ["cookie", "query"] } +axum-extra = { version = "0.12", features = [ + "cookie", + "query", + "typed-header", +] } base64 = "0.22" bytes = "1" chrono = { version = "0.4", features = ["serde"] } @@ -30,6 +34,7 @@ frunk-enum-core = { version = "0.3", optional = true } frunk-enum-derive = { version = "0.3", optional = true } frunk_core = { version = "0.4", optional = true } frunk_derives = { version = "0.4", optional = true } +headers = "0.4" http = "1" lazy_static = "1" regex = "1" diff --git a/samples/server/petstore/rust-axum/output/apikey-auths/README.md b/samples/server/petstore/rust-axum/output/apikey-auths/README.md index b1560b5d0bb4..185bcdd9daff 100644 --- a/samples/server/petstore/rust-axum/output/apikey-auths/README.md +++ b/samples/server/petstore/rust-axum/output/apikey-auths/README.md @@ -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.18.0-SNAPSHOT +- Generator version: 7.19.0-SNAPSHOT diff --git a/samples/server/petstore/rust-axum/output/apikey-auths/src/apis/mod.rs b/samples/server/petstore/rust-axum/output/apikey-auths/src/apis/mod.rs index 33e6137c13c4..d3a46c91e5ec 100644 --- a/samples/server/petstore/rust-axum/output/apikey-auths/src/apis/mod.rs +++ b/samples/server/petstore/rust-axum/output/apikey-auths/src/apis/mod.rs @@ -56,7 +56,7 @@ pub trait ErrorHandler { async fn handle_error( &self, method: &::http::Method, - host: &axum_extra::extract::Host, + host: &headers::Host, cookies: &axum_extra::extract::CookieJar, error: E, ) -> Result { diff --git a/samples/server/petstore/rust-axum/output/apikey-auths/src/apis/payments.rs b/samples/server/petstore/rust-axum/output/apikey-auths/src/apis/payments.rs index 2bdf4d433d21..37480061497f 100644 --- a/samples/server/petstore/rust-axum/output/apikey-auths/src/apis/payments.rs +++ b/samples/server/petstore/rust-axum/output/apikey-auths/src/apis/payments.rs @@ -1,7 +1,8 @@ use async_trait::async_trait; use axum::extract::*; -use axum_extra::extract::{CookieJar, Host}; +use axum_extra::extract::CookieJar; use bytes::Bytes; +use headers::Host; use http::Method; use serde::{Deserialize, Serialize}; diff --git a/samples/server/petstore/rust-axum/output/apikey-auths/src/server/mod.rs b/samples/server/petstore/rust-axum/output/apikey-auths/src/server/mod.rs index 95a7473d2eed..7eafb8dcc543 100644 --- a/samples/server/petstore/rust-axum/output/apikey-auths/src/server/mod.rs +++ b/samples/server/petstore/rust-axum/output/apikey-auths/src/server/mod.rs @@ -1,17 +1,19 @@ use std::collections::HashMap; use axum::{body::Body, extract::*, response::Response, routing::*}; -use axum_extra::extract::{CookieJar, Host, Query as QueryExtra}; +use axum_extra::{ + TypedHeader, + extract::{CookieJar, Query as QueryExtra}, +}; use bytes::Bytes; +use headers::Host; use http::{HeaderMap, HeaderName, HeaderValue, Method, StatusCode, header::CONTENT_TYPE}; use tracing::error; use validator::{Validate, ValidationErrors}; -use crate::{header, types::*}; - #[allow(unused_imports)] use crate::{apis, models}; - +use crate::{header, types::*}; #[allow(unused_imports)] use crate::{ models::check_xss_map, models::check_xss_map_nested, models::check_xss_map_string, @@ -59,7 +61,7 @@ fn get_payment_method_by_id_validation( #[tracing::instrument(skip_all)] async fn get_payment_method_by_id( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, headers: HeaderMap, Path(path_params): Path, @@ -163,7 +165,7 @@ fn get_payment_methods_validation() -> std::result::Result<(), ValidationErrors> #[tracing::instrument(skip_all)] async fn get_payment_methods( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, headers: HeaderMap, State(api_impl): State, @@ -261,7 +263,7 @@ fn post_make_payment_validation( #[tracing::instrument(skip_all)] async fn post_make_payment( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, headers: HeaderMap, State(api_impl): State, diff --git a/samples/server/petstore/rust-axum/output/multipart-v3/.openapi-generator/VERSION b/samples/server/petstore/rust-axum/output/multipart-v3/.openapi-generator/VERSION index 2fb556b60635..909dcd0eca63 100644 --- a/samples/server/petstore/rust-axum/output/multipart-v3/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-axum/output/multipart-v3/.openapi-generator/VERSION @@ -1 +1 @@ -7.18.0-SNAPSHOT +7.19.0-SNAPSHOT diff --git a/samples/server/petstore/rust-axum/output/multipart-v3/Cargo.toml b/samples/server/petstore/rust-axum/output/multipart-v3/Cargo.toml index 5d2067989a1a..9622d95bd896 100644 --- a/samples/server/petstore/rust-axum/output/multipart-v3/Cargo.toml +++ b/samples/server/petstore/rust-axum/output/multipart-v3/Cargo.toml @@ -21,7 +21,11 @@ conversion = [ ammonia = "4" async-trait = "0.1" axum = { version = "0.8", features = ["multipart"] } -axum-extra = { version = "0.12", features = ["cookie", "query"] } +axum-extra = { version = "0.12", features = [ + "cookie", + "query", + "typed-header", +] } base64 = "0.22" bytes = "1" chrono = { version = "0.4", features = ["serde"] } @@ -30,6 +34,7 @@ frunk-enum-core = { version = "0.3", optional = true } frunk-enum-derive = { version = "0.3", optional = true } frunk_core = { version = "0.4", optional = true } frunk_derives = { version = "0.4", optional = true } +headers = "0.4" http = "1" lazy_static = "1" regex = "1" diff --git a/samples/server/petstore/rust-axum/output/multipart-v3/README.md b/samples/server/petstore/rust-axum/output/multipart-v3/README.md index 828cf43ab45f..75e40a064107 100644 --- a/samples/server/petstore/rust-axum/output/multipart-v3/README.md +++ b/samples/server/petstore/rust-axum/output/multipart-v3/README.md @@ -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.18.0-SNAPSHOT +- Generator version: 7.19.0-SNAPSHOT diff --git a/samples/server/petstore/rust-axum/output/multipart-v3/src/apis/default.rs b/samples/server/petstore/rust-axum/output/multipart-v3/src/apis/default.rs index b9cdb2c1dfd4..6463c8209e87 100644 --- a/samples/server/petstore/rust-axum/output/multipart-v3/src/apis/default.rs +++ b/samples/server/petstore/rust-axum/output/multipart-v3/src/apis/default.rs @@ -1,7 +1,8 @@ use async_trait::async_trait; use axum::extract::*; -use axum_extra::extract::{CookieJar, Host}; +use axum_extra::extract::CookieJar; use bytes::Bytes; +use headers::Host; use http::Method; use serde::{Deserialize, Serialize}; diff --git a/samples/server/petstore/rust-axum/output/multipart-v3/src/apis/mod.rs b/samples/server/petstore/rust-axum/output/multipart-v3/src/apis/mod.rs index be654b5f14ce..da9c9e1b91fa 100644 --- a/samples/server/petstore/rust-axum/output/multipart-v3/src/apis/mod.rs +++ b/samples/server/petstore/rust-axum/output/multipart-v3/src/apis/mod.rs @@ -8,7 +8,7 @@ pub trait ErrorHandler { async fn handle_error( &self, method: &::http::Method, - host: &axum_extra::extract::Host, + host: &headers::Host, cookies: &axum_extra::extract::CookieJar, error: E, ) -> Result { diff --git a/samples/server/petstore/rust-axum/output/multipart-v3/src/server/mod.rs b/samples/server/petstore/rust-axum/output/multipart-v3/src/server/mod.rs index c9e2cd2f6124..370194560845 100644 --- a/samples/server/petstore/rust-axum/output/multipart-v3/src/server/mod.rs +++ b/samples/server/petstore/rust-axum/output/multipart-v3/src/server/mod.rs @@ -1,17 +1,19 @@ use std::collections::HashMap; use axum::{body::Body, extract::*, response::Response, routing::*}; -use axum_extra::extract::{CookieJar, Host, Query as QueryExtra}; +use axum_extra::{ + TypedHeader, + extract::{CookieJar, Query as QueryExtra}, +}; use bytes::Bytes; +use headers::Host; use http::{HeaderMap, HeaderName, HeaderValue, Method, StatusCode, header::CONTENT_TYPE}; use tracing::error; use validator::{Validate, ValidationErrors}; -use crate::{header, types::*}; - #[allow(unused_imports)] use crate::{apis, models}; - +use crate::{header, types::*}; #[allow(unused_imports)] use crate::{ models::check_xss_map, models::check_xss_map_nested, models::check_xss_map_string, @@ -50,7 +52,7 @@ fn multipart_related_request_post_validation() -> std::result::Result<(), Valida #[tracing::instrument(skip_all)] async fn multipart_related_request_post( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, body: axum::body::Body, @@ -111,7 +113,7 @@ fn multipart_request_post_validation() -> std::result::Result<(), ValidationErro #[tracing::instrument(skip_all)] async fn multipart_request_post( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, body: Multipart, @@ -171,7 +173,7 @@ fn multiple_identical_mime_types_post_validation() -> std::result::Result<(), Va #[tracing::instrument(skip_all)] async fn multiple_identical_mime_types_post( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, body: axum::body::Body, diff --git a/samples/server/petstore/rust-axum/output/openapi-v3/.openapi-generator/VERSION b/samples/server/petstore/rust-axum/output/openapi-v3/.openapi-generator/VERSION index 2fb556b60635..909dcd0eca63 100644 --- a/samples/server/petstore/rust-axum/output/openapi-v3/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-axum/output/openapi-v3/.openapi-generator/VERSION @@ -1 +1 @@ -7.18.0-SNAPSHOT +7.19.0-SNAPSHOT diff --git a/samples/server/petstore/rust-axum/output/openapi-v3/Cargo.toml b/samples/server/petstore/rust-axum/output/openapi-v3/Cargo.toml index 1159680156f6..07fb394eaf4d 100644 --- a/samples/server/petstore/rust-axum/output/openapi-v3/Cargo.toml +++ b/samples/server/petstore/rust-axum/output/openapi-v3/Cargo.toml @@ -21,7 +21,11 @@ conversion = [ ammonia = "4" async-trait = "0.1" axum = { version = "0.8", features = ["multipart"] } -axum-extra = { version = "0.12", features = ["cookie", "query"] } +axum-extra = { version = "0.12", features = [ + "cookie", + "query", + "typed-header", +] } base64 = "0.22" bytes = "1" chrono = { version = "0.4", features = ["serde"] } @@ -30,6 +34,7 @@ frunk-enum-core = { version = "0.3", optional = true } frunk-enum-derive = { version = "0.3", optional = true } frunk_core = { version = "0.4", optional = true } frunk_derives = { version = "0.4", optional = true } +headers = "0.4" http = "1" lazy_static = "1" regex = "1" diff --git a/samples/server/petstore/rust-axum/output/openapi-v3/README.md b/samples/server/petstore/rust-axum/output/openapi-v3/README.md index 797abf902311..c63f1afbfd63 100644 --- a/samples/server/petstore/rust-axum/output/openapi-v3/README.md +++ b/samples/server/petstore/rust-axum/output/openapi-v3/README.md @@ -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.18.0-SNAPSHOT +- Generator version: 7.19.0-SNAPSHOT diff --git a/samples/server/petstore/rust-axum/output/openapi-v3/src/apis/default.rs b/samples/server/petstore/rust-axum/output/openapi-v3/src/apis/default.rs index 99f8d44cbe1e..e8db7581d5f1 100644 --- a/samples/server/petstore/rust-axum/output/openapi-v3/src/apis/default.rs +++ b/samples/server/petstore/rust-axum/output/openapi-v3/src/apis/default.rs @@ -1,7 +1,8 @@ use async_trait::async_trait; use axum::extract::*; -use axum_extra::extract::{CookieJar, Host}; +use axum_extra::extract::CookieJar; use bytes::Bytes; +use headers::Host; use http::Method; use serde::{Deserialize, Serialize}; diff --git a/samples/server/petstore/rust-axum/output/openapi-v3/src/apis/info_repo.rs b/samples/server/petstore/rust-axum/output/openapi-v3/src/apis/info_repo.rs index d4ea2e89cb40..85801e8371be 100644 --- a/samples/server/petstore/rust-axum/output/openapi-v3/src/apis/info_repo.rs +++ b/samples/server/petstore/rust-axum/output/openapi-v3/src/apis/info_repo.rs @@ -1,7 +1,8 @@ use async_trait::async_trait; use axum::extract::*; -use axum_extra::extract::{CookieJar, Host}; +use axum_extra::extract::CookieJar; use bytes::Bytes; +use headers::Host; use http::Method; use serde::{Deserialize, Serialize}; diff --git a/samples/server/petstore/rust-axum/output/openapi-v3/src/apis/mod.rs b/samples/server/petstore/rust-axum/output/openapi-v3/src/apis/mod.rs index 134b27873bfb..84e0689e7f51 100644 --- a/samples/server/petstore/rust-axum/output/openapi-v3/src/apis/mod.rs +++ b/samples/server/petstore/rust-axum/output/openapi-v3/src/apis/mod.rs @@ -10,7 +10,7 @@ pub trait ErrorHandler { async fn handle_error( &self, method: &::http::Method, - host: &axum_extra::extract::Host, + host: &headers::Host, cookies: &axum_extra::extract::CookieJar, error: E, ) -> Result { diff --git a/samples/server/petstore/rust-axum/output/openapi-v3/src/apis/repo.rs b/samples/server/petstore/rust-axum/output/openapi-v3/src/apis/repo.rs index 7f454233599b..ba8052b0b230 100644 --- a/samples/server/petstore/rust-axum/output/openapi-v3/src/apis/repo.rs +++ b/samples/server/petstore/rust-axum/output/openapi-v3/src/apis/repo.rs @@ -1,7 +1,8 @@ use async_trait::async_trait; use axum::extract::*; -use axum_extra::extract::{CookieJar, Host}; +use axum_extra::extract::CookieJar; use bytes::Bytes; +use headers::Host; use http::Method; use serde::{Deserialize, Serialize}; diff --git a/samples/server/petstore/rust-axum/output/openapi-v3/src/server/mod.rs b/samples/server/petstore/rust-axum/output/openapi-v3/src/server/mod.rs index 19a75e4603aa..285553bd2951 100644 --- a/samples/server/petstore/rust-axum/output/openapi-v3/src/server/mod.rs +++ b/samples/server/petstore/rust-axum/output/openapi-v3/src/server/mod.rs @@ -1,17 +1,19 @@ use std::collections::HashMap; use axum::{body::Body, extract::*, response::Response, routing::*}; -use axum_extra::extract::{CookieJar, Host, Query as QueryExtra}; +use axum_extra::{ + TypedHeader, + extract::{CookieJar, Query as QueryExtra}, +}; use bytes::Bytes; +use headers::Host; use http::{HeaderMap, HeaderName, HeaderValue, Method, StatusCode, header::CONTENT_TYPE}; use tracing::error; use validator::{Validate, ValidationErrors}; -use crate::{header, types::*}; - #[allow(unused_imports)] use crate::{apis, models}; - +use crate::{header, types::*}; #[allow(unused_imports)] use crate::{ models::check_xss_map, models::check_xss_map_nested, models::check_xss_map_string, @@ -134,7 +136,7 @@ fn any_of_get_validation( #[tracing::instrument(skip_all)] async fn any_of_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, QueryExtra(query_params): QueryExtra, State(api_impl): State, @@ -245,7 +247,7 @@ fn callback_with_header_post_validation( #[tracing::instrument(skip_all)] async fn callback_with_header_post( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, QueryExtra(query_params): QueryExtra, State(api_impl): State, @@ -306,7 +308,7 @@ fn complex_query_param_get_validation( #[tracing::instrument(skip_all)] async fn complex_query_param_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, QueryExtra(query_params): QueryExtra, State(api_impl): State, @@ -367,7 +369,7 @@ fn enum_in_path_path_param_get_validation( #[tracing::instrument(skip_all)] async fn enum_in_path_path_param_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, Path(path_params): Path, State(api_impl): State, @@ -428,7 +430,7 @@ fn examples_test_validation( #[tracing::instrument(skip_all)] async fn examples_test( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, QueryExtra(query_params): QueryExtra, State(api_impl): State, @@ -511,7 +513,7 @@ fn form_test_validation( #[tracing::instrument(skip_all)] async fn form_test( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, Form(body): Form, @@ -572,7 +574,7 @@ fn get_with_boolean_parameter_validation( #[tracing::instrument(skip_all)] async fn get_with_boolean_parameter( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, QueryExtra(query_params): QueryExtra, State(api_impl): State, @@ -633,7 +635,7 @@ fn json_complex_query_param_get_validation( #[tracing::instrument(skip_all)] async fn json_complex_query_param_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, QueryExtra(query_params): QueryExtra, State(api_impl): State, @@ -694,7 +696,7 @@ fn mandatory_request_header_get_validation( #[tracing::instrument(skip_all)] async fn mandatory_request_header_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, headers: HeaderMap, State(api_impl): State, @@ -784,7 +786,7 @@ fn merge_patch_json_get_validation() -> std::result::Result<(), ValidationErrors #[tracing::instrument(skip_all)] async fn merge_patch_json_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -856,7 +858,7 @@ fn multiget_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn multiget_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -1013,7 +1015,7 @@ fn multiple_auth_scheme_get_validation() -> std::result::Result<(), ValidationEr #[tracing::instrument(skip_all)] async fn multiple_auth_scheme_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -1078,7 +1080,7 @@ async fn multiple_path_params_with_very_long_path_to_test_formatting_path_param_ E, >( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, Path(path_params): Path< models::MultiplePathParamsWithVeryLongPathToTestFormattingPathParamAPathParamBGetPathParams, @@ -1144,7 +1146,7 @@ fn one_of_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn one_of_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -1211,7 +1213,7 @@ fn override_server_get_validation() -> std::result::Result<(), ValidationErrors> #[tracing::instrument(skip_all)] async fn override_server_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -1271,7 +1273,7 @@ fn paramget_get_validation( #[tracing::instrument(skip_all)] async fn paramget_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, QueryExtra(query_params): QueryExtra, State(api_impl): State, @@ -1342,7 +1344,7 @@ fn readonly_auth_scheme_get_validation() -> std::result::Result<(), ValidationEr #[tracing::instrument(skip_all)] async fn readonly_auth_scheme_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -1400,7 +1402,7 @@ fn register_callback_post_validation( #[tracing::instrument(skip_all)] async fn register_callback_post( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, QueryExtra(query_params): QueryExtra, State(api_impl): State, @@ -1465,7 +1467,7 @@ fn required_octet_stream_put_validation( #[tracing::instrument(skip_all)] async fn required_octet_stream_put( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, body: Bytes, @@ -1522,7 +1524,7 @@ fn responses_with_headers_get_validation() -> std::result::Result<(), Validation #[tracing::instrument(skip_all)] async fn responses_with_headers_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -1681,7 +1683,7 @@ fn rfc7807_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn rfc7807_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -1785,7 +1787,7 @@ fn two_first_letter_headers_validation( #[tracing::instrument(skip_all)] async fn two_first_letter_headers( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, headers: HeaderMap, State(api_impl): State, @@ -1899,7 +1901,7 @@ fn untyped_property_get_validation( #[tracing::instrument(skip_all)] async fn untyped_property_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, Json(body): Json>, @@ -1954,7 +1956,7 @@ fn uuid_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn uuid_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -2027,7 +2029,7 @@ fn xml_extra_post_validation(body: Bytes) -> std::result::Result<(Bytes,), Valid #[tracing::instrument(skip_all)] async fn xml_extra_post( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, body: Bytes, @@ -2094,7 +2096,7 @@ fn xml_other_post_validation(body: Bytes) -> std::result::Result<(Bytes,), Valid #[tracing::instrument(skip_all)] async fn xml_other_post( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, body: Bytes, @@ -2167,7 +2169,7 @@ fn xml_other_put_validation(body: Bytes) -> std::result::Result<(Bytes,), Valida #[tracing::instrument(skip_all)] async fn xml_other_put( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, body: Bytes, @@ -2234,7 +2236,7 @@ fn xml_post_validation(body: Bytes) -> std::result::Result<(Bytes,), ValidationE #[tracing::instrument(skip_all)] async fn xml_post( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, body: Bytes, @@ -2301,7 +2303,7 @@ fn xml_put_validation(body: Bytes) -> std::result::Result<(Bytes,), ValidationEr #[tracing::instrument(skip_all)] async fn xml_put( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, body: Bytes, @@ -2366,7 +2368,7 @@ fn get_repo_info_validation( #[tracing::instrument(skip_all)] async fn get_repo_info( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, Path(path_params): Path, State(api_impl): State, @@ -2449,7 +2451,7 @@ fn create_repo_validation( #[tracing::instrument(skip_all)] async fn create_repo( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, Json(body): Json, diff --git a/samples/server/petstore/rust-axum/output/ops-v3/.openapi-generator/VERSION b/samples/server/petstore/rust-axum/output/ops-v3/.openapi-generator/VERSION index 2fb556b60635..909dcd0eca63 100644 --- a/samples/server/petstore/rust-axum/output/ops-v3/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-axum/output/ops-v3/.openapi-generator/VERSION @@ -1 +1 @@ -7.18.0-SNAPSHOT +7.19.0-SNAPSHOT diff --git a/samples/server/petstore/rust-axum/output/ops-v3/Cargo.toml b/samples/server/petstore/rust-axum/output/ops-v3/Cargo.toml index 3d6220e7f0c9..56955ad3d28b 100644 --- a/samples/server/petstore/rust-axum/output/ops-v3/Cargo.toml +++ b/samples/server/petstore/rust-axum/output/ops-v3/Cargo.toml @@ -21,7 +21,11 @@ conversion = [ ammonia = "4" async-trait = "0.1" axum = { version = "0.8", features = ["multipart"] } -axum-extra = { version = "0.12", features = ["cookie", "query"] } +axum-extra = { version = "0.12", features = [ + "cookie", + "query", + "typed-header", +] } base64 = "0.22" bytes = "1" chrono = { version = "0.4", features = ["serde"] } @@ -30,6 +34,7 @@ frunk-enum-core = { version = "0.3", optional = true } frunk-enum-derive = { version = "0.3", optional = true } frunk_core = { version = "0.4", optional = true } frunk_derives = { version = "0.4", optional = true } +headers = "0.4" http = "1" lazy_static = "1" regex = "1" diff --git a/samples/server/petstore/rust-axum/output/ops-v3/README.md b/samples/server/petstore/rust-axum/output/ops-v3/README.md index d1bf74ebf3b8..82dd488c0590 100644 --- a/samples/server/petstore/rust-axum/output/ops-v3/README.md +++ b/samples/server/petstore/rust-axum/output/ops-v3/README.md @@ -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.18.0-SNAPSHOT +- Generator version: 7.19.0-SNAPSHOT diff --git a/samples/server/petstore/rust-axum/output/ops-v3/src/apis/default.rs b/samples/server/petstore/rust-axum/output/ops-v3/src/apis/default.rs index cbae47c7a871..254e9b7e1bca 100644 --- a/samples/server/petstore/rust-axum/output/ops-v3/src/apis/default.rs +++ b/samples/server/petstore/rust-axum/output/ops-v3/src/apis/default.rs @@ -1,7 +1,8 @@ use async_trait::async_trait; use axum::extract::*; -use axum_extra::extract::{CookieJar, Host}; +use axum_extra::extract::CookieJar; use bytes::Bytes; +use headers::Host; use http::Method; use serde::{Deserialize, Serialize}; diff --git a/samples/server/petstore/rust-axum/output/ops-v3/src/apis/mod.rs b/samples/server/petstore/rust-axum/output/ops-v3/src/apis/mod.rs index be654b5f14ce..da9c9e1b91fa 100644 --- a/samples/server/petstore/rust-axum/output/ops-v3/src/apis/mod.rs +++ b/samples/server/petstore/rust-axum/output/ops-v3/src/apis/mod.rs @@ -8,7 +8,7 @@ pub trait ErrorHandler { async fn handle_error( &self, method: &::http::Method, - host: &axum_extra::extract::Host, + host: &headers::Host, cookies: &axum_extra::extract::CookieJar, error: E, ) -> Result { diff --git a/samples/server/petstore/rust-axum/output/ops-v3/src/server/mod.rs b/samples/server/petstore/rust-axum/output/ops-v3/src/server/mod.rs index b3d5e1f0491f..d2cfdc048c10 100644 --- a/samples/server/petstore/rust-axum/output/ops-v3/src/server/mod.rs +++ b/samples/server/petstore/rust-axum/output/ops-v3/src/server/mod.rs @@ -1,17 +1,19 @@ use std::collections::HashMap; use axum::{body::Body, extract::*, response::Response, routing::*}; -use axum_extra::extract::{CookieJar, Host, Query as QueryExtra}; +use axum_extra::{ + TypedHeader, + extract::{CookieJar, Query as QueryExtra}, +}; use bytes::Bytes; +use headers::Host; use http::{HeaderMap, HeaderName, HeaderValue, Method, StatusCode, header::CONTENT_TYPE}; use tracing::error; use validator::{Validate, ValidationErrors}; -use crate::{header, types::*}; - #[allow(unused_imports)] use crate::{apis, models}; - +use crate::{header, types::*}; #[allow(unused_imports)] use crate::{ models::check_xss_map, models::check_xss_map_nested, models::check_xss_map_string, @@ -75,7 +77,7 @@ fn op10_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn op10_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -131,7 +133,7 @@ fn op11_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn op11_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -187,7 +189,7 @@ fn op12_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn op12_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -243,7 +245,7 @@ fn op13_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn op13_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -299,7 +301,7 @@ fn op14_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn op14_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -355,7 +357,7 @@ fn op15_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn op15_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -411,7 +413,7 @@ fn op16_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn op16_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -467,7 +469,7 @@ fn op17_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn op17_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -523,7 +525,7 @@ fn op18_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn op18_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -579,7 +581,7 @@ fn op19_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn op19_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -635,7 +637,7 @@ fn op1_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn op1_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -691,7 +693,7 @@ fn op20_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn op20_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -747,7 +749,7 @@ fn op21_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn op21_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -803,7 +805,7 @@ fn op22_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn op22_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -859,7 +861,7 @@ fn op23_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn op23_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -915,7 +917,7 @@ fn op24_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn op24_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -971,7 +973,7 @@ fn op25_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn op25_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -1027,7 +1029,7 @@ fn op26_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn op26_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -1083,7 +1085,7 @@ fn op27_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn op27_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -1139,7 +1141,7 @@ fn op28_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn op28_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -1195,7 +1197,7 @@ fn op29_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn op29_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -1251,7 +1253,7 @@ fn op2_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn op2_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -1307,7 +1309,7 @@ fn op30_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn op30_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -1363,7 +1365,7 @@ fn op31_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn op31_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -1419,7 +1421,7 @@ fn op32_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn op32_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -1475,7 +1477,7 @@ fn op33_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn op33_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -1531,7 +1533,7 @@ fn op34_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn op34_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -1587,7 +1589,7 @@ fn op35_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn op35_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -1643,7 +1645,7 @@ fn op36_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn op36_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -1699,7 +1701,7 @@ fn op37_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn op37_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -1755,7 +1757,7 @@ fn op3_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn op3_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -1811,7 +1813,7 @@ fn op4_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn op4_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -1867,7 +1869,7 @@ fn op5_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn op5_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -1923,7 +1925,7 @@ fn op6_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn op6_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -1979,7 +1981,7 @@ fn op7_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn op7_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -2035,7 +2037,7 @@ fn op8_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn op8_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -2091,7 +2093,7 @@ fn op9_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn op9_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result diff --git a/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/VERSION b/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/VERSION index 2fb556b60635..909dcd0eca63 100644 --- a/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/VERSION @@ -1 +1 @@ -7.18.0-SNAPSHOT +7.19.0-SNAPSHOT diff --git a/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/Cargo.toml b/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/Cargo.toml index 3f6e1767aa8d..1369603b681f 100644 --- a/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/Cargo.toml +++ b/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/Cargo.toml @@ -23,7 +23,11 @@ conversion = [ ammonia = "4" async-trait = "0.1" axum = { version = "0.8", features = ["multipart"] } -axum-extra = { version = "0.12", features = ["cookie", "query"] } +axum-extra = { version = "0.12", features = [ + "cookie", + "query", + "typed-header", +] } base64 = "0.22" bytes = "1" chrono = { version = "0.4", features = ["serde"] } @@ -32,6 +36,7 @@ frunk-enum-core = { version = "0.3", optional = true } frunk-enum-derive = { version = "0.3", optional = true } frunk_core = { version = "0.4", optional = true } frunk_derives = { version = "0.4", optional = true } +headers = "0.4" http = "1" lazy_static = "1" regex = "1" diff --git a/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/README.md b/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/README.md index 2a8c076f253a..1eec8170868c 100644 --- a/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/README.md +++ b/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/README.md @@ -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.18.0-SNAPSHOT +- Generator version: 7.19.0-SNAPSHOT diff --git a/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/apis/another_fake.rs b/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/apis/another_fake.rs index 3909f91949fa..694b5025e73b 100644 --- a/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/apis/another_fake.rs +++ b/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/apis/another_fake.rs @@ -1,7 +1,8 @@ use async_trait::async_trait; use axum::extract::*; -use axum_extra::extract::{CookieJar, Host}; +use axum_extra::extract::CookieJar; use bytes::Bytes; +use headers::Host; use http::Method; use serde::{Deserialize, Serialize}; diff --git a/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/apis/fake.rs b/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/apis/fake.rs index 628096aba506..8fc6cd0244be 100644 --- a/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/apis/fake.rs +++ b/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/apis/fake.rs @@ -1,7 +1,8 @@ use async_trait::async_trait; use axum::extract::*; -use axum_extra::extract::{CookieJar, Host}; +use axum_extra::extract::CookieJar; use bytes::Bytes; +use headers::Host; use http::Method; use serde::{Deserialize, Serialize}; diff --git a/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/apis/fake_classname_tags123.rs b/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/apis/fake_classname_tags123.rs index ee2b23e6f874..415ae998043a 100644 --- a/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/apis/fake_classname_tags123.rs +++ b/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/apis/fake_classname_tags123.rs @@ -1,7 +1,8 @@ use async_trait::async_trait; use axum::extract::*; -use axum_extra::extract::{CookieJar, Host}; +use axum_extra::extract::CookieJar; use bytes::Bytes; +use headers::Host; use http::Method; use serde::{Deserialize, Serialize}; diff --git a/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/apis/mod.rs b/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/apis/mod.rs index f4e08d545b31..ea1b4d266fe0 100644 --- a/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/apis/mod.rs +++ b/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/apis/mod.rs @@ -48,7 +48,7 @@ pub trait ErrorHandler { async fn handle_error( &self, method: &::http::Method, - host: &axum_extra::extract::Host, + host: &headers::Host, cookies: &axum_extra::extract::CookieJar, error: E, ) -> Result { diff --git a/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/apis/pet.rs b/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/apis/pet.rs index 713ccf267e02..7c8e9a309d39 100644 --- a/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/apis/pet.rs +++ b/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/apis/pet.rs @@ -1,7 +1,8 @@ use async_trait::async_trait; use axum::extract::*; -use axum_extra::extract::{CookieJar, Host}; +use axum_extra::extract::CookieJar; use bytes::Bytes; +use headers::Host; use http::Method; use serde::{Deserialize, Serialize}; diff --git a/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/apis/store.rs b/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/apis/store.rs index 4027411aabcb..aee48238ad72 100644 --- a/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/apis/store.rs +++ b/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/apis/store.rs @@ -1,7 +1,8 @@ use async_trait::async_trait; use axum::extract::*; -use axum_extra::extract::{CookieJar, Host}; +use axum_extra::extract::CookieJar; use bytes::Bytes; +use headers::Host; use http::Method; use serde::{Deserialize, Serialize}; diff --git a/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/apis/user.rs b/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/apis/user.rs index 6e0d65737430..ef37e78acc54 100644 --- a/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/apis/user.rs +++ b/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/apis/user.rs @@ -1,7 +1,8 @@ use async_trait::async_trait; use axum::extract::*; -use axum_extra::extract::{CookieJar, Host}; +use axum_extra::extract::CookieJar; use bytes::Bytes; +use headers::Host; use http::Method; use serde::{Deserialize, Serialize}; diff --git a/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs b/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs index 2ea0e7abe474..3484510ac7aa 100644 --- a/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs +++ b/samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs @@ -1,17 +1,19 @@ use std::collections::HashMap; use axum::{body::Body, extract::*, response::Response, routing::*}; -use axum_extra::extract::{CookieJar, Host, Query as QueryExtra}; +use axum_extra::{ + TypedHeader, + extract::{CookieJar, Query as QueryExtra}, +}; use bytes::Bytes; +use headers::Host; use http::{HeaderMap, HeaderName, HeaderValue, Method, StatusCode, header::CONTENT_TYPE}; use tracing::error; use validator::{Validate, ValidationErrors}; -use crate::{header, types::*}; - #[allow(unused_imports)] use crate::{apis, models}; - +use crate::{header, types::*}; #[allow(unused_imports)] use crate::{ models::check_xss_map, models::check_xss_map_nested, models::check_xss_map_string, @@ -154,7 +156,7 @@ fn test_special_tags_validation( #[tracing::instrument(skip_all)] async fn test_special_tags( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, Json(body): Json, @@ -228,7 +230,7 @@ fn call123example_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn call123example( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -301,7 +303,7 @@ fn fake_outer_boolean_serialize_validation( #[tracing::instrument(skip_all)] async fn fake_outer_boolean_serialize( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, Json(body): Json>, @@ -389,7 +391,7 @@ fn fake_outer_composite_serialize_validation( #[tracing::instrument(skip_all)] async fn fake_outer_composite_serialize( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, Json(body): Json>, @@ -477,7 +479,7 @@ fn fake_outer_number_serialize_validation( #[tracing::instrument(skip_all)] async fn fake_outer_number_serialize( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, Json(body): Json>, @@ -565,7 +567,7 @@ fn fake_outer_string_serialize_validation( #[tracing::instrument(skip_all)] async fn fake_outer_string_serialize( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, Json(body): Json>, @@ -640,7 +642,7 @@ fn fake_response_with_numerical_description_validation() -> std::result::Result< #[tracing::instrument(skip_all)] async fn fake_response_with_numerical_description( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -704,7 +706,7 @@ fn hyphen_param_validation( #[tracing::instrument(skip_all)] async fn hyphen_param( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, Path(path_params): Path, State(api_impl): State, @@ -779,7 +781,7 @@ fn test_body_with_query_params_validation( #[tracing::instrument(skip_all)] async fn test_body_with_query_params( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, QueryExtra(query_params): QueryExtra, State(api_impl): State, @@ -854,7 +856,7 @@ fn test_client_model_validation( #[tracing::instrument(skip_all)] async fn test_client_model( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, Json(body): Json, @@ -940,7 +942,7 @@ fn test_endpoint_parameters_validation( #[tracing::instrument(skip_all)] async fn test_endpoint_parameters( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, headers: HeaderMap, State(api_impl): State, @@ -1040,7 +1042,7 @@ fn test_enum_parameters_validation( #[tracing::instrument(skip_all)] async fn test_enum_parameters( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, headers: HeaderMap, QueryExtra(query_params): QueryExtra, @@ -1175,7 +1177,7 @@ fn test_inline_additional_properties_validation( #[tracing::instrument(skip_all)] async fn test_inline_additional_properties( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, Json(body): Json>, @@ -1248,7 +1250,7 @@ fn test_json_form_data_validation( #[tracing::instrument(skip_all)] async fn test_json_form_data( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, Form(body): Form, @@ -1320,7 +1322,7 @@ fn test_classname_validation( #[tracing::instrument(skip_all)] async fn test_classname( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, Json(body): Json, @@ -1406,7 +1408,7 @@ fn add_pet_validation(body: models::Pet) -> std::result::Result<(models::Pet,), #[tracing::instrument(skip_all)] async fn add_pet( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, Json(body): Json, @@ -1475,7 +1477,7 @@ fn delete_pet_validation( #[tracing::instrument(skip_all)] async fn delete_pet( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, headers: HeaderMap, Path(path_params): Path, @@ -1566,7 +1568,7 @@ fn find_pets_by_status_validation( #[tracing::instrument(skip_all)] async fn find_pets_by_status( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, QueryExtra(query_params): QueryExtra, State(api_impl): State, @@ -1641,7 +1643,7 @@ fn find_pets_by_tags_validation( #[tracing::instrument(skip_all)] async fn find_pets_by_tags( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, QueryExtra(query_params): QueryExtra, State(api_impl): State, @@ -1716,7 +1718,7 @@ fn get_pet_by_id_validation( #[tracing::instrument(skip_all)] async fn get_pet_by_id( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, headers: HeaderMap, Path(path_params): Path, @@ -1813,7 +1815,7 @@ fn update_pet_validation( #[tracing::instrument(skip_all)] async fn update_pet( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, Json(body): Json, @@ -1903,7 +1905,7 @@ fn update_pet_with_form_validation( #[tracing::instrument(skip_all)] async fn update_pet_with_form( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, Path(path_params): Path, State(api_impl): State, @@ -1969,7 +1971,7 @@ fn upload_file_validation( #[tracing::instrument(skip_all)] async fn upload_file( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, Path(path_params): Path, State(api_impl): State, @@ -2048,7 +2050,7 @@ fn delete_order_validation( #[tracing::instrument(skip_all)] async fn delete_order( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, Path(path_params): Path, State(api_impl): State, @@ -2112,7 +2114,7 @@ fn get_inventory_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn get_inventory( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, headers: HeaderMap, State(api_impl): State, @@ -2200,7 +2202,7 @@ fn get_order_by_id_validation( #[tracing::instrument(skip_all)] async fn get_order_by_id( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, Path(path_params): Path, State(api_impl): State, @@ -2286,7 +2288,7 @@ fn place_order_validation( #[tracing::instrument(skip_all)] async fn place_order( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, Json(body): Json, @@ -2368,7 +2370,7 @@ fn create_user_validation( #[tracing::instrument(skip_all)] async fn create_user( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, Json(body): Json, @@ -2440,7 +2442,7 @@ fn create_users_with_array_input_validation( #[tracing::instrument(skip_all)] async fn create_users_with_array_input( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, Json(body): Json>, @@ -2513,7 +2515,7 @@ fn create_users_with_list_input_validation( #[tracing::instrument(skip_all)] async fn create_users_with_list_input( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, Json(body): Json>, @@ -2578,7 +2580,7 @@ fn delete_user_validation( #[tracing::instrument(skip_all)] async fn delete_user( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, Path(path_params): Path, State(api_impl): State, @@ -2646,7 +2648,7 @@ fn get_user_by_name_validation( #[tracing::instrument(skip_all)] async fn get_user_by_name( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, Path(path_params): Path, State(api_impl): State, @@ -2724,7 +2726,7 @@ fn login_user_validation( #[tracing::instrument(skip_all)] async fn login_user( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, QueryExtra(query_params): QueryExtra, State(api_impl): State, @@ -2831,7 +2833,7 @@ fn logout_user_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn logout_user( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -2904,7 +2906,7 @@ fn update_user_validation( #[tracing::instrument(skip_all)] async fn update_user( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, Path(path_params): Path, State(api_impl): State, diff --git a/samples/server/petstore/rust-axum/output/petstore/.openapi-generator/VERSION b/samples/server/petstore/rust-axum/output/petstore/.openapi-generator/VERSION index 2fb556b60635..909dcd0eca63 100644 --- a/samples/server/petstore/rust-axum/output/petstore/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-axum/output/petstore/.openapi-generator/VERSION @@ -1 +1 @@ -7.18.0-SNAPSHOT +7.19.0-SNAPSHOT diff --git a/samples/server/petstore/rust-axum/output/petstore/Cargo.toml b/samples/server/petstore/rust-axum/output/petstore/Cargo.toml index 96e79c3c0f90..64dad1efda43 100644 --- a/samples/server/petstore/rust-axum/output/petstore/Cargo.toml +++ b/samples/server/petstore/rust-axum/output/petstore/Cargo.toml @@ -22,7 +22,11 @@ conversion = [ ammonia = "4" async-trait = "0.1" axum = { version = "0.8", features = ["multipart"] } -axum-extra = { version = "0.12", features = ["cookie", "query"] } +axum-extra = { version = "0.12", features = [ + "cookie", + "query", + "typed-header", +] } base64 = "0.22" bytes = "1" chrono = { version = "0.4", features = ["serde"] } @@ -31,6 +35,7 @@ frunk-enum-core = { version = "0.3", optional = true } frunk-enum-derive = { version = "0.3", optional = true } frunk_core = { version = "0.4", optional = true } frunk_derives = { version = "0.4", optional = true } +headers = "0.4" http = "1" lazy_static = "1" regex = "1" diff --git a/samples/server/petstore/rust-axum/output/petstore/README.md b/samples/server/petstore/rust-axum/output/petstore/README.md index 5462c95f1eb5..0bca7b688b55 100644 --- a/samples/server/petstore/rust-axum/output/petstore/README.md +++ b/samples/server/petstore/rust-axum/output/petstore/README.md @@ -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.18.0-SNAPSHOT +- Generator version: 7.19.0-SNAPSHOT diff --git a/samples/server/petstore/rust-axum/output/petstore/src/apis/mod.rs b/samples/server/petstore/rust-axum/output/petstore/src/apis/mod.rs index f7641631f008..d95b855640a7 100644 --- a/samples/server/petstore/rust-axum/output/petstore/src/apis/mod.rs +++ b/samples/server/petstore/rust-axum/output/petstore/src/apis/mod.rs @@ -23,7 +23,7 @@ pub trait ErrorHandler { async fn handle_error( &self, method: &::http::Method, - host: &axum_extra::extract::Host, + host: &headers::Host, cookies: &axum_extra::extract::CookieJar, error: E, ) -> Result { diff --git a/samples/server/petstore/rust-axum/output/petstore/src/apis/pet.rs b/samples/server/petstore/rust-axum/output/petstore/src/apis/pet.rs index e198cf1fffe1..23766464f0bd 100644 --- a/samples/server/petstore/rust-axum/output/petstore/src/apis/pet.rs +++ b/samples/server/petstore/rust-axum/output/petstore/src/apis/pet.rs @@ -1,7 +1,8 @@ use async_trait::async_trait; use axum::extract::*; -use axum_extra::extract::{CookieJar, Host}; +use axum_extra::extract::CookieJar; use bytes::Bytes; +use headers::Host; use http::Method; use serde::{Deserialize, Serialize}; diff --git a/samples/server/petstore/rust-axum/output/petstore/src/apis/store.rs b/samples/server/petstore/rust-axum/output/petstore/src/apis/store.rs index a4b3b99459cf..9520d9d2e4f6 100644 --- a/samples/server/petstore/rust-axum/output/petstore/src/apis/store.rs +++ b/samples/server/petstore/rust-axum/output/petstore/src/apis/store.rs @@ -1,7 +1,8 @@ use async_trait::async_trait; use axum::extract::*; -use axum_extra::extract::{CookieJar, Host}; +use axum_extra::extract::CookieJar; use bytes::Bytes; +use headers::Host; use http::Method; use serde::{Deserialize, Serialize}; diff --git a/samples/server/petstore/rust-axum/output/petstore/src/apis/user.rs b/samples/server/petstore/rust-axum/output/petstore/src/apis/user.rs index fb120849ce8c..fb15949dd668 100644 --- a/samples/server/petstore/rust-axum/output/petstore/src/apis/user.rs +++ b/samples/server/petstore/rust-axum/output/petstore/src/apis/user.rs @@ -1,7 +1,8 @@ use async_trait::async_trait; use axum::extract::*; -use axum_extra::extract::{CookieJar, Host}; +use axum_extra::extract::CookieJar; use bytes::Bytes; +use headers::Host; use http::Method; use serde::{Deserialize, Serialize}; diff --git a/samples/server/petstore/rust-axum/output/petstore/src/server/mod.rs b/samples/server/petstore/rust-axum/output/petstore/src/server/mod.rs index 90091c58f5f9..4a5c8f22f4db 100644 --- a/samples/server/petstore/rust-axum/output/petstore/src/server/mod.rs +++ b/samples/server/petstore/rust-axum/output/petstore/src/server/mod.rs @@ -1,17 +1,19 @@ use std::collections::HashMap; use axum::{body::Body, extract::*, response::Response, routing::*}; -use axum_extra::extract::{CookieJar, Host, Query as QueryExtra}; +use axum_extra::{ + TypedHeader, + extract::{CookieJar, Query as QueryExtra}, +}; use bytes::Bytes; +use headers::Host; use http::{HeaderMap, HeaderName, HeaderValue, Method, StatusCode, header::CONTENT_TYPE}; use tracing::error; use validator::{Validate, ValidationErrors}; -use crate::{header, types::*}; - #[allow(unused_imports)] use crate::{apis, models}; - +use crate::{header, types::*}; #[allow(unused_imports)] use crate::{ models::check_xss_map, models::check_xss_map_nested, models::check_xss_map_string, @@ -97,7 +99,7 @@ fn add_pet_validation(body: models::Pet) -> std::result::Result<(models::Pet,), #[tracing::instrument(skip_all)] async fn add_pet( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, Json(body): Json, @@ -176,7 +178,7 @@ fn delete_pet_validation( #[tracing::instrument(skip_all)] async fn delete_pet( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, headers: HeaderMap, Path(path_params): Path, @@ -267,7 +269,7 @@ fn find_pets_by_status_validation( #[tracing::instrument(skip_all)] async fn find_pets_by_status( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, QueryExtra(query_params): QueryExtra, State(api_impl): State, @@ -342,7 +344,7 @@ fn find_pets_by_tags_validation( #[tracing::instrument(skip_all)] async fn find_pets_by_tags( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, QueryExtra(query_params): QueryExtra, State(api_impl): State, @@ -417,7 +419,7 @@ fn get_pet_by_id_validation( #[tracing::instrument(skip_all)] async fn get_pet_by_id( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, headers: HeaderMap, Path(path_params): Path, @@ -514,7 +516,7 @@ fn update_pet_validation( #[tracing::instrument(skip_all)] async fn update_pet( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, Json(body): Json, @@ -614,7 +616,7 @@ fn update_pet_with_form_validation( #[tracing::instrument(skip_all)] async fn update_pet_with_form( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, Path(path_params): Path, State(api_impl): State, @@ -680,7 +682,7 @@ fn upload_file_validation( #[tracing::instrument(skip_all)] async fn upload_file( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, Path(path_params): Path, State(api_impl): State, @@ -759,7 +761,7 @@ fn delete_order_validation( #[tracing::instrument(skip_all)] async fn delete_order( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, Path(path_params): Path, State(api_impl): State, @@ -823,7 +825,7 @@ fn get_inventory_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn get_inventory( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, headers: HeaderMap, State(api_impl): State, @@ -911,7 +913,7 @@ fn get_order_by_id_validation( #[tracing::instrument(skip_all)] async fn get_order_by_id( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, Path(path_params): Path, State(api_impl): State, @@ -997,7 +999,7 @@ fn place_order_validation( #[tracing::instrument(skip_all)] async fn place_order( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, Json(body): Json, @@ -1079,7 +1081,7 @@ fn create_user_validation( #[tracing::instrument(skip_all)] async fn create_user( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, headers: HeaderMap, State(api_impl): State, @@ -1162,7 +1164,7 @@ fn create_users_with_array_input_validation( #[tracing::instrument(skip_all)] async fn create_users_with_array_input( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, headers: HeaderMap, State(api_impl): State, @@ -1246,7 +1248,7 @@ fn create_users_with_list_input_validation( #[tracing::instrument(skip_all)] async fn create_users_with_list_input( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, headers: HeaderMap, State(api_impl): State, @@ -1322,7 +1324,7 @@ fn delete_user_validation( #[tracing::instrument(skip_all)] async fn delete_user( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, headers: HeaderMap, Path(path_params): Path, @@ -1401,7 +1403,7 @@ fn get_user_by_name_validation( #[tracing::instrument(skip_all)] async fn get_user_by_name( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, Path(path_params): Path, State(api_impl): State, @@ -1479,7 +1481,7 @@ fn login_user_validation( #[tracing::instrument(skip_all)] async fn login_user( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, QueryExtra(query_params): QueryExtra, State(api_impl): State, @@ -1602,7 +1604,7 @@ fn logout_user_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn logout_user( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, headers: HeaderMap, State(api_impl): State, @@ -1686,7 +1688,7 @@ fn update_user_validation( #[tracing::instrument(skip_all)] async fn update_user( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, headers: HeaderMap, Path(path_params): Path, diff --git a/samples/server/petstore/rust-axum/output/ping-bearer-auth/.openapi-generator/VERSION b/samples/server/petstore/rust-axum/output/ping-bearer-auth/.openapi-generator/VERSION index 2fb556b60635..909dcd0eca63 100644 --- a/samples/server/petstore/rust-axum/output/ping-bearer-auth/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-axum/output/ping-bearer-auth/.openapi-generator/VERSION @@ -1 +1 @@ -7.18.0-SNAPSHOT +7.19.0-SNAPSHOT diff --git a/samples/server/petstore/rust-axum/output/ping-bearer-auth/Cargo.toml b/samples/server/petstore/rust-axum/output/ping-bearer-auth/Cargo.toml index 5bbb3a0a8b68..8382c393904d 100644 --- a/samples/server/petstore/rust-axum/output/ping-bearer-auth/Cargo.toml +++ b/samples/server/petstore/rust-axum/output/ping-bearer-auth/Cargo.toml @@ -21,7 +21,11 @@ conversion = [ ammonia = "4" async-trait = "0.1" axum = { version = "0.8", features = ["multipart"] } -axum-extra = { version = "0.12", features = ["cookie", "query"] } +axum-extra = { version = "0.12", features = [ + "cookie", + "query", + "typed-header", +] } base64 = "0.22" bytes = "1" chrono = { version = "0.4", features = ["serde"] } @@ -30,6 +34,7 @@ frunk-enum-core = { version = "0.3", optional = true } frunk-enum-derive = { version = "0.3", optional = true } frunk_core = { version = "0.4", optional = true } frunk_derives = { version = "0.4", optional = true } +headers = "0.4" http = "1" lazy_static = "1" regex = "1" diff --git a/samples/server/petstore/rust-axum/output/ping-bearer-auth/README.md b/samples/server/petstore/rust-axum/output/ping-bearer-auth/README.md index 402ef34fd7a4..7aef5e8e9028 100644 --- a/samples/server/petstore/rust-axum/output/ping-bearer-auth/README.md +++ b/samples/server/petstore/rust-axum/output/ping-bearer-auth/README.md @@ -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.18.0-SNAPSHOT +- Generator version: 7.19.0-SNAPSHOT diff --git a/samples/server/petstore/rust-axum/output/ping-bearer-auth/src/apis/default.rs b/samples/server/petstore/rust-axum/output/ping-bearer-auth/src/apis/default.rs index 3c050b37a413..db22ed61fa41 100644 --- a/samples/server/petstore/rust-axum/output/ping-bearer-auth/src/apis/default.rs +++ b/samples/server/petstore/rust-axum/output/ping-bearer-auth/src/apis/default.rs @@ -1,7 +1,8 @@ use async_trait::async_trait; use axum::extract::*; -use axum_extra::extract::{CookieJar, Host}; +use axum_extra::extract::CookieJar; use bytes::Bytes; +use headers::Host; use http::Method; use serde::{Deserialize, Serialize}; diff --git a/samples/server/petstore/rust-axum/output/ping-bearer-auth/src/apis/mod.rs b/samples/server/petstore/rust-axum/output/ping-bearer-auth/src/apis/mod.rs index 0b899404c400..db918caf097f 100644 --- a/samples/server/petstore/rust-axum/output/ping-bearer-auth/src/apis/mod.rs +++ b/samples/server/petstore/rust-axum/output/ping-bearer-auth/src/apis/mod.rs @@ -30,7 +30,7 @@ pub trait ErrorHandler { async fn handle_error( &self, method: &::http::Method, - host: &axum_extra::extract::Host, + host: &headers::Host, cookies: &axum_extra::extract::CookieJar, error: E, ) -> Result { diff --git a/samples/server/petstore/rust-axum/output/ping-bearer-auth/src/server/mod.rs b/samples/server/petstore/rust-axum/output/ping-bearer-auth/src/server/mod.rs index d9847c001d41..d7b2075fbe72 100644 --- a/samples/server/petstore/rust-axum/output/ping-bearer-auth/src/server/mod.rs +++ b/samples/server/petstore/rust-axum/output/ping-bearer-auth/src/server/mod.rs @@ -1,17 +1,19 @@ use std::collections::HashMap; use axum::{body::Body, extract::*, response::Response, routing::*}; -use axum_extra::extract::{CookieJar, Host, Query as QueryExtra}; +use axum_extra::{ + TypedHeader, + extract::{CookieJar, Query as QueryExtra}, +}; use bytes::Bytes; +use headers::Host; use http::{HeaderMap, HeaderName, HeaderValue, Method, StatusCode, header::CONTENT_TYPE}; use tracing::error; use validator::{Validate, ValidationErrors}; -use crate::{header, types::*}; - #[allow(unused_imports)] use crate::{apis, models}; - +use crate::{header, types::*}; #[allow(unused_imports)] use crate::{ models::check_xss_map, models::check_xss_map_nested, models::check_xss_map_string, @@ -44,7 +46,7 @@ fn ping_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn ping_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, headers: HeaderMap, State(api_impl): State, diff --git a/samples/server/petstore/rust-axum/output/rust-axum-array-params-test/.openapi-generator/VERSION b/samples/server/petstore/rust-axum/output/rust-axum-array-params-test/.openapi-generator/VERSION index 2fb556b60635..909dcd0eca63 100644 --- a/samples/server/petstore/rust-axum/output/rust-axum-array-params-test/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-axum/output/rust-axum-array-params-test/.openapi-generator/VERSION @@ -1 +1 @@ -7.18.0-SNAPSHOT +7.19.0-SNAPSHOT diff --git a/samples/server/petstore/rust-axum/output/rust-axum-array-params-test/Cargo.toml b/samples/server/petstore/rust-axum/output/rust-axum-array-params-test/Cargo.toml index d8abd91128ec..529fc2e3dc4e 100644 --- a/samples/server/petstore/rust-axum/output/rust-axum-array-params-test/Cargo.toml +++ b/samples/server/petstore/rust-axum/output/rust-axum-array-params-test/Cargo.toml @@ -21,7 +21,11 @@ conversion = [ ammonia = "4" async-trait = "0.1" axum = { version = "0.8", features = ["multipart"] } -axum-extra = { version = "0.12", features = ["cookie", "query"] } +axum-extra = { version = "0.12", features = [ + "cookie", + "query", + "typed-header", +] } base64 = "0.22" bytes = "1" chrono = { version = "0.4", features = ["serde"] } @@ -30,6 +34,7 @@ frunk-enum-core = { version = "0.3", optional = true } frunk-enum-derive = { version = "0.3", optional = true } frunk_core = { version = "0.4", optional = true } frunk_derives = { version = "0.4", optional = true } +headers = "0.4" http = "1" lazy_static = "1" regex = "1" diff --git a/samples/server/petstore/rust-axum/output/rust-axum-array-params-test/README.md b/samples/server/petstore/rust-axum/output/rust-axum-array-params-test/README.md index f5c594ec30b0..ab5d9a4d2441 100644 --- a/samples/server/petstore/rust-axum/output/rust-axum-array-params-test/README.md +++ b/samples/server/petstore/rust-axum/output/rust-axum-array-params-test/README.md @@ -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.18.0-SNAPSHOT +- Generator version: 7.19.0-SNAPSHOT diff --git a/samples/server/petstore/rust-axum/output/rust-axum-array-params-test/src/apis/default.rs b/samples/server/petstore/rust-axum/output/rust-axum-array-params-test/src/apis/default.rs index 7d6df7c3c3a8..90289fc2103d 100644 --- a/samples/server/petstore/rust-axum/output/rust-axum-array-params-test/src/apis/default.rs +++ b/samples/server/petstore/rust-axum/output/rust-axum-array-params-test/src/apis/default.rs @@ -1,7 +1,8 @@ use async_trait::async_trait; use axum::extract::*; -use axum_extra::extract::{CookieJar, Host}; +use axum_extra::extract::CookieJar; use bytes::Bytes; +use headers::Host; use http::Method; use serde::{Deserialize, Serialize}; diff --git a/samples/server/petstore/rust-axum/output/rust-axum-array-params-test/src/apis/mod.rs b/samples/server/petstore/rust-axum/output/rust-axum-array-params-test/src/apis/mod.rs index be654b5f14ce..da9c9e1b91fa 100644 --- a/samples/server/petstore/rust-axum/output/rust-axum-array-params-test/src/apis/mod.rs +++ b/samples/server/petstore/rust-axum/output/rust-axum-array-params-test/src/apis/mod.rs @@ -8,7 +8,7 @@ pub trait ErrorHandler { async fn handle_error( &self, method: &::http::Method, - host: &axum_extra::extract::Host, + host: &headers::Host, cookies: &axum_extra::extract::CookieJar, error: E, ) -> Result { diff --git a/samples/server/petstore/rust-axum/output/rust-axum-array-params-test/src/server/mod.rs b/samples/server/petstore/rust-axum/output/rust-axum-array-params-test/src/server/mod.rs index 3c9a5c50ce19..9c9ff54d5a69 100644 --- a/samples/server/petstore/rust-axum/output/rust-axum-array-params-test/src/server/mod.rs +++ b/samples/server/petstore/rust-axum/output/rust-axum-array-params-test/src/server/mod.rs @@ -1,17 +1,19 @@ use std::collections::HashMap; use axum::{body::Body, extract::*, response::Response, routing::*}; -use axum_extra::extract::{CookieJar, Host, Query as QueryExtra}; +use axum_extra::{ + TypedHeader, + extract::{CookieJar, Query as QueryExtra}, +}; use bytes::Bytes; +use headers::Host; use http::{HeaderMap, HeaderName, HeaderValue, Method, StatusCode, header::CONTENT_TYPE}; use tracing::error; use validator::{Validate, ValidationErrors}; -use crate::{header, types::*}; - #[allow(unused_imports)] use crate::{apis, models}; - +use crate::{header, types::*}; #[allow(unused_imports)] use crate::{ models::check_xss_map, models::check_xss_map_nested, models::check_xss_map_string, @@ -43,7 +45,7 @@ fn endpoint_get_validation( #[tracing::instrument(skip_all)] async fn endpoint_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, QueryExtra(query_params): QueryExtra, State(api_impl): State, diff --git a/samples/server/petstore/rust-axum/output/rust-axum-header-uuid/.openapi-generator/VERSION b/samples/server/petstore/rust-axum/output/rust-axum-header-uuid/.openapi-generator/VERSION index 2fb556b60635..909dcd0eca63 100644 --- a/samples/server/petstore/rust-axum/output/rust-axum-header-uuid/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-axum/output/rust-axum-header-uuid/.openapi-generator/VERSION @@ -1 +1 @@ -7.18.0-SNAPSHOT +7.19.0-SNAPSHOT diff --git a/samples/server/petstore/rust-axum/output/rust-axum-header-uuid/Cargo.toml b/samples/server/petstore/rust-axum/output/rust-axum-header-uuid/Cargo.toml index 8a2d581a2896..52c494b8918d 100644 --- a/samples/server/petstore/rust-axum/output/rust-axum-header-uuid/Cargo.toml +++ b/samples/server/petstore/rust-axum/output/rust-axum-header-uuid/Cargo.toml @@ -21,7 +21,11 @@ conversion = [ ammonia = "4" async-trait = "0.1" axum = { version = "0.8", features = ["multipart"] } -axum-extra = { version = "0.12", features = ["cookie", "query"] } +axum-extra = { version = "0.12", features = [ + "cookie", + "query", + "typed-header", +] } base64 = "0.22" bytes = "1" chrono = { version = "0.4", features = ["serde"] } @@ -30,6 +34,7 @@ frunk-enum-core = { version = "0.3", optional = true } frunk-enum-derive = { version = "0.3", optional = true } frunk_core = { version = "0.4", optional = true } frunk_derives = { version = "0.4", optional = true } +headers = "0.4" http = "1" lazy_static = "1" regex = "1" diff --git a/samples/server/petstore/rust-axum/output/rust-axum-header-uuid/README.md b/samples/server/petstore/rust-axum/output/rust-axum-header-uuid/README.md index 24398d1dc101..cf76c3e4bb87 100644 --- a/samples/server/petstore/rust-axum/output/rust-axum-header-uuid/README.md +++ b/samples/server/petstore/rust-axum/output/rust-axum-header-uuid/README.md @@ -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.18.0-SNAPSHOT +- Generator version: 7.19.0-SNAPSHOT diff --git a/samples/server/petstore/rust-axum/output/rust-axum-header-uuid/src/apis/default.rs b/samples/server/petstore/rust-axum/output/rust-axum-header-uuid/src/apis/default.rs index dc6c4a3664ea..70b0284d285c 100644 --- a/samples/server/petstore/rust-axum/output/rust-axum-header-uuid/src/apis/default.rs +++ b/samples/server/petstore/rust-axum/output/rust-axum-header-uuid/src/apis/default.rs @@ -1,7 +1,8 @@ use async_trait::async_trait; use axum::extract::*; -use axum_extra::extract::{CookieJar, Host}; +use axum_extra::extract::CookieJar; use bytes::Bytes; +use headers::Host; use http::Method; use serde::{Deserialize, Serialize}; diff --git a/samples/server/petstore/rust-axum/output/rust-axum-header-uuid/src/apis/mod.rs b/samples/server/petstore/rust-axum/output/rust-axum-header-uuid/src/apis/mod.rs index be654b5f14ce..da9c9e1b91fa 100644 --- a/samples/server/petstore/rust-axum/output/rust-axum-header-uuid/src/apis/mod.rs +++ b/samples/server/petstore/rust-axum/output/rust-axum-header-uuid/src/apis/mod.rs @@ -8,7 +8,7 @@ pub trait ErrorHandler { async fn handle_error( &self, method: &::http::Method, - host: &axum_extra::extract::Host, + host: &headers::Host, cookies: &axum_extra::extract::CookieJar, error: E, ) -> Result { diff --git a/samples/server/petstore/rust-axum/output/rust-axum-header-uuid/src/server/mod.rs b/samples/server/petstore/rust-axum/output/rust-axum-header-uuid/src/server/mod.rs index bba91c17c5b8..fb5fee9e875d 100644 --- a/samples/server/petstore/rust-axum/output/rust-axum-header-uuid/src/server/mod.rs +++ b/samples/server/petstore/rust-axum/output/rust-axum-header-uuid/src/server/mod.rs @@ -1,17 +1,19 @@ use std::collections::HashMap; use axum::{body::Body, extract::*, response::Response, routing::*}; -use axum_extra::extract::{CookieJar, Host, Query as QueryExtra}; +use axum_extra::{ + TypedHeader, + extract::{CookieJar, Query as QueryExtra}, +}; use bytes::Bytes; +use headers::Host; use http::{HeaderMap, HeaderName, HeaderValue, Method, StatusCode, header::CONTENT_TYPE}; use tracing::error; use validator::{Validate, ValidationErrors}; -use crate::{header, types::*}; - #[allow(unused_imports)] use crate::{apis, models}; - +use crate::{header, types::*}; #[allow(unused_imports)] use crate::{ models::check_xss_map, models::check_xss_map_nested, models::check_xss_map_string, @@ -43,7 +45,7 @@ fn users_post_validation( #[tracing::instrument(skip_all)] async fn users_post( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, headers: HeaderMap, State(api_impl): State, diff --git a/samples/server/petstore/rust-axum/output/rust-axum-oneof/.openapi-generator/VERSION b/samples/server/petstore/rust-axum/output/rust-axum-oneof/.openapi-generator/VERSION index 2fb556b60635..909dcd0eca63 100644 --- a/samples/server/petstore/rust-axum/output/rust-axum-oneof/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-axum/output/rust-axum-oneof/.openapi-generator/VERSION @@ -1 +1 @@ -7.18.0-SNAPSHOT +7.19.0-SNAPSHOT diff --git a/samples/server/petstore/rust-axum/output/rust-axum-oneof/Cargo.toml b/samples/server/petstore/rust-axum/output/rust-axum-oneof/Cargo.toml index 841c72532a7a..78c4938cb55f 100644 --- a/samples/server/petstore/rust-axum/output/rust-axum-oneof/Cargo.toml +++ b/samples/server/petstore/rust-axum/output/rust-axum-oneof/Cargo.toml @@ -21,7 +21,11 @@ conversion = [ ammonia = "4" async-trait = "0.1" axum = { version = "0.8", features = ["multipart"] } -axum-extra = { version = "0.12", features = ["cookie", "query"] } +axum-extra = { version = "0.12", features = [ + "cookie", + "query", + "typed-header", +] } base64 = "0.22" bytes = "1" chrono = { version = "0.4", features = ["serde"] } @@ -30,6 +34,7 @@ frunk-enum-core = { version = "0.3", optional = true } frunk-enum-derive = { version = "0.3", optional = true } frunk_core = { version = "0.4", optional = true } frunk_derives = { version = "0.4", optional = true } +headers = "0.4" http = "1" lazy_static = "1" regex = "1" diff --git a/samples/server/petstore/rust-axum/output/rust-axum-oneof/README.md b/samples/server/petstore/rust-axum/output/rust-axum-oneof/README.md index ee887b2487fd..5a3b24b05fd4 100644 --- a/samples/server/petstore/rust-axum/output/rust-axum-oneof/README.md +++ b/samples/server/petstore/rust-axum/output/rust-axum-oneof/README.md @@ -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.18.0-SNAPSHOT +- Generator version: 7.19.0-SNAPSHOT diff --git a/samples/server/petstore/rust-axum/output/rust-axum-oneof/src/apis/default.rs b/samples/server/petstore/rust-axum/output/rust-axum-oneof/src/apis/default.rs index bb5318a667dc..6f1fbb5851eb 100644 --- a/samples/server/petstore/rust-axum/output/rust-axum-oneof/src/apis/default.rs +++ b/samples/server/petstore/rust-axum/output/rust-axum-oneof/src/apis/default.rs @@ -1,7 +1,8 @@ use async_trait::async_trait; use axum::extract::*; -use axum_extra::extract::{CookieJar, Host}; +use axum_extra::extract::CookieJar; use bytes::Bytes; +use headers::Host; use http::Method; use serde::{Deserialize, Serialize}; diff --git a/samples/server/petstore/rust-axum/output/rust-axum-oneof/src/apis/mod.rs b/samples/server/petstore/rust-axum/output/rust-axum-oneof/src/apis/mod.rs index be654b5f14ce..da9c9e1b91fa 100644 --- a/samples/server/petstore/rust-axum/output/rust-axum-oneof/src/apis/mod.rs +++ b/samples/server/petstore/rust-axum/output/rust-axum-oneof/src/apis/mod.rs @@ -8,7 +8,7 @@ pub trait ErrorHandler { async fn handle_error( &self, method: &::http::Method, - host: &axum_extra::extract::Host, + host: &headers::Host, cookies: &axum_extra::extract::CookieJar, error: E, ) -> Result { diff --git a/samples/server/petstore/rust-axum/output/rust-axum-oneof/src/server/mod.rs b/samples/server/petstore/rust-axum/output/rust-axum-oneof/src/server/mod.rs index 25a2d493f74f..b365c1ce2f14 100644 --- a/samples/server/petstore/rust-axum/output/rust-axum-oneof/src/server/mod.rs +++ b/samples/server/petstore/rust-axum/output/rust-axum-oneof/src/server/mod.rs @@ -1,17 +1,19 @@ use std::collections::HashMap; use axum::{body::Body, extract::*, response::Response, routing::*}; -use axum_extra::extract::{CookieJar, Host, Query as QueryExtra}; +use axum_extra::{ + TypedHeader, + extract::{CookieJar, Query as QueryExtra}, +}; use bytes::Bytes; +use headers::Host; use http::{HeaderMap, HeaderName, HeaderValue, Method, StatusCode, header::CONTENT_TYPE}; use tracing::error; use validator::{Validate, ValidationErrors}; -use crate::{header, types::*}; - #[allow(unused_imports)] use crate::{apis, models}; - +use crate::{header, types::*}; #[allow(unused_imports)] use crate::{ models::check_xss_map, models::check_xss_map_nested, models::check_xss_map_string, @@ -54,7 +56,7 @@ fn foo_validation( #[tracing::instrument(skip_all)] async fn foo( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, Json(body): Json, @@ -134,7 +136,7 @@ fn i211431_validation(body: Vec) -> std::result::Result<(Vec,), Valida #[tracing::instrument(skip_all)] async fn i211431( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, Json(body): Json>, @@ -218,7 +220,7 @@ fn i211432_validation(body: String) -> std::result::Result<(String,), Validation #[tracing::instrument(skip_all)] async fn i211432( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, Json(body): Json, @@ -301,7 +303,7 @@ fn i211433_validation(body: i32) -> std::result::Result<(i32,), ValidationErrors #[tracing::instrument(skip_all)] async fn i211433( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, Json(body): Json, diff --git a/samples/server/petstore/rust-axum/output/rust-axum-test/.openapi-generator/VERSION b/samples/server/petstore/rust-axum/output/rust-axum-test/.openapi-generator/VERSION index 2fb556b60635..909dcd0eca63 100644 --- a/samples/server/petstore/rust-axum/output/rust-axum-test/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-axum/output/rust-axum-test/.openapi-generator/VERSION @@ -1 +1 @@ -7.18.0-SNAPSHOT +7.19.0-SNAPSHOT diff --git a/samples/server/petstore/rust-axum/output/rust-axum-test/Cargo.toml b/samples/server/petstore/rust-axum/output/rust-axum-test/Cargo.toml index dbbeef639438..d4e8c9788daf 100644 --- a/samples/server/petstore/rust-axum/output/rust-axum-test/Cargo.toml +++ b/samples/server/petstore/rust-axum/output/rust-axum-test/Cargo.toml @@ -21,7 +21,11 @@ conversion = [ ammonia = "4" async-trait = "0.1" axum = { version = "0.8", features = ["multipart"] } -axum-extra = { version = "0.12", features = ["cookie", "query"] } +axum-extra = { version = "0.12", features = [ + "cookie", + "query", + "typed-header", +] } base64 = "0.22" bytes = "1" chrono = { version = "0.4", features = ["serde"] } @@ -30,6 +34,7 @@ frunk-enum-core = { version = "0.3", optional = true } frunk-enum-derive = { version = "0.3", optional = true } frunk_core = { version = "0.4", optional = true } frunk_derives = { version = "0.4", optional = true } +headers = "0.4" http = "1" lazy_static = "1" regex = "1" diff --git a/samples/server/petstore/rust-axum/output/rust-axum-test/README.md b/samples/server/petstore/rust-axum/output/rust-axum-test/README.md index 6a089aa963e4..78a4b7ec7845 100644 --- a/samples/server/petstore/rust-axum/output/rust-axum-test/README.md +++ b/samples/server/petstore/rust-axum/output/rust-axum-test/README.md @@ -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.18.0-SNAPSHOT +- Generator version: 7.19.0-SNAPSHOT diff --git a/samples/server/petstore/rust-axum/output/rust-axum-test/src/apis/default.rs b/samples/server/petstore/rust-axum/output/rust-axum-test/src/apis/default.rs index 08660f91101c..317ff60c5e95 100644 --- a/samples/server/petstore/rust-axum/output/rust-axum-test/src/apis/default.rs +++ b/samples/server/petstore/rust-axum/output/rust-axum-test/src/apis/default.rs @@ -1,7 +1,8 @@ use async_trait::async_trait; use axum::extract::*; -use axum_extra::extract::{CookieJar, Host}; +use axum_extra::extract::CookieJar; use bytes::Bytes; +use headers::Host; use http::Method; use serde::{Deserialize, Serialize}; diff --git a/samples/server/petstore/rust-axum/output/rust-axum-test/src/apis/mod.rs b/samples/server/petstore/rust-axum/output/rust-axum-test/src/apis/mod.rs index be654b5f14ce..da9c9e1b91fa 100644 --- a/samples/server/petstore/rust-axum/output/rust-axum-test/src/apis/mod.rs +++ b/samples/server/petstore/rust-axum/output/rust-axum-test/src/apis/mod.rs @@ -8,7 +8,7 @@ pub trait ErrorHandler { async fn handle_error( &self, method: &::http::Method, - host: &axum_extra::extract::Host, + host: &headers::Host, cookies: &axum_extra::extract::CookieJar, error: E, ) -> Result { diff --git a/samples/server/petstore/rust-axum/output/rust-axum-test/src/models.rs b/samples/server/petstore/rust-axum/output/rust-axum-test/src/models.rs index 5647097ae923..984471b8f2db 100644 --- a/samples/server/petstore/rust-axum/output/rust-axum-test/src/models.rs +++ b/samples/server/petstore/rust-axum/output/rust-axum-test/src/models.rs @@ -1149,3 +1149,177 @@ impl std::convert::TryFrom for header::IntoHeaderValue, +} + +impl FooUnnamedAllofUnderProperties { + #[allow(clippy::new_without_default, clippy::too_many_arguments)] + pub fn new() -> FooUnnamedAllofUnderProperties { + FooUnnamedAllofUnderProperties { name: None } + } +} + +/// Converts the FooUnnamedAllofUnderProperties value to the Query Parameters representation (style=form, explode=false) +/// specified in https://swagger.io/docs/specification/serialization/ +/// Should be implemented in a serde serializer +impl std::fmt::Display for FooUnnamedAllofUnderProperties { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + let params: Vec> = vec![ + self.name + .as_ref() + .map(|name| ["name".to_string(), name.to_string()].join(",")), + ]; + + write!( + f, + "{}", + params.into_iter().flatten().collect::>().join(",") + ) + } +} + +/// Converts Query Parameters representation (style=form, explode=false) to a FooUnnamedAllofUnderProperties value +/// as specified in https://swagger.io/docs/specification/serialization/ +/// Should be implemented in a serde deserializer +impl std::str::FromStr for FooUnnamedAllofUnderProperties { + type Err = String; + + fn from_str(s: &str) -> std::result::Result { + /// An intermediate representation of the struct to use for parsing. + #[derive(Default)] + #[allow(dead_code)] + struct IntermediateRep { + pub name: Vec, + } + + let mut intermediate_rep = IntermediateRep::default(); + + // Parse into intermediate representation + let mut string_iter = s.split(','); + let mut key_result = string_iter.next(); + + while key_result.is_some() { + let val = match string_iter.next() { + Some(x) => x, + None => { + return std::result::Result::Err( + "Missing value while parsing FooUnnamedAllofUnderProperties".to_string(), + ); + } + }; + + if let Some(key) = key_result { + #[allow(clippy::match_single_binding)] + match key { + #[allow(clippy::redundant_clone)] + "name" => intermediate_rep + .name + .push(::from_str(val).map_err(|x| x.to_string())?), + _ => { + return std::result::Result::Err( + "Unexpected key while parsing FooUnnamedAllofUnderProperties" + .to_string(), + ); + } + } + } + + // Get the next key + key_result = string_iter.next(); + } + + // Use the intermediate representation to return the struct + std::result::Result::Ok(FooUnnamedAllofUnderProperties { + name: intermediate_rep.name.into_iter().next(), + }) + } +} + +// Methods for converting between header::IntoHeaderValue and HeaderValue + +#[cfg(feature = "server")] +impl std::convert::TryFrom> + for HeaderValue +{ + type Error = String; + + fn try_from( + hdr_value: header::IntoHeaderValue, + ) -> std::result::Result { + let hdr_value = hdr_value.to_string(); + match HeaderValue::from_str(&hdr_value) { + std::result::Result::Ok(value) => std::result::Result::Ok(value), + std::result::Result::Err(e) => std::result::Result::Err(format!( + r#"Invalid header value for FooUnnamedAllofUnderProperties - value: {hdr_value} is invalid {e}"# + )), + } + } +} + +#[cfg(feature = "server")] +impl std::convert::TryFrom + for header::IntoHeaderValue +{ + type Error = String; + + fn try_from(hdr_value: HeaderValue) -> std::result::Result { + match hdr_value.to_str() { + std::result::Result::Ok(value) => { + match ::from_str(value) { + std::result::Result::Ok(value) => { + std::result::Result::Ok(header::IntoHeaderValue(value)) + } + std::result::Result::Err(err) => std::result::Result::Err(format!( + r#"Unable to convert header value '{value}' into FooUnnamedAllofUnderProperties - {err}"# + )), + } + } + std::result::Result::Err(e) => std::result::Result::Err(format!( + r#"Unable to convert header: {hdr_value:?} to string: {e}"# + )), + } + } +} + +#[derive(Debug, Clone, PartialEq, PartialOrd, serde::Serialize, serde::Deserialize)] +#[cfg_attr(feature = "conversion", derive(frunk::LabelledGeneric))] +pub struct FooUnnamedReference(pub i32); + +impl validator::Validate for FooUnnamedReference { + fn validate(&self) -> std::result::Result<(), validator::ValidationErrors> { + std::result::Result::Ok(()) + } +} + +impl std::convert::From for FooUnnamedReference { + fn from(x: i32) -> Self { + FooUnnamedReference(x) + } +} + +impl std::convert::From for i32 { + fn from(x: FooUnnamedReference) -> Self { + x.0 + } +} + +impl std::ops::Deref for FooUnnamedReference { + type Target = i32; + fn deref(&self) -> &i32 { + &self.0 + } +} + +impl std::ops::DerefMut for FooUnnamedReference { + fn deref_mut(&mut self) -> &mut i32 { + &mut self.0 + } +} diff --git a/samples/server/petstore/rust-axum/output/rust-axum-test/src/server/mod.rs b/samples/server/petstore/rust-axum/output/rust-axum-test/src/server/mod.rs index ecb9f0e235af..a73a55eecb90 100644 --- a/samples/server/petstore/rust-axum/output/rust-axum-test/src/server/mod.rs +++ b/samples/server/petstore/rust-axum/output/rust-axum-test/src/server/mod.rs @@ -1,17 +1,19 @@ use std::collections::HashMap; use axum::{body::Body, extract::*, response::Response, routing::*}; -use axum_extra::extract::{CookieJar, Host, Query as QueryExtra}; +use axum_extra::{ + TypedHeader, + extract::{CookieJar, Query as QueryExtra}, +}; use bytes::Bytes; +use headers::Host; use http::{HeaderMap, HeaderName, HeaderValue, Method, StatusCode, header::CONTENT_TYPE}; use tracing::error; use validator::{Validate, ValidationErrors}; -use crate::{header, types::*}; - #[allow(unused_imports)] use crate::{apis, models}; - +use crate::{header, types::*}; #[allow(unused_imports)] use crate::{ models::check_xss_map, models::check_xss_map_nested, models::check_xss_map_string, @@ -49,7 +51,7 @@ fn all_of_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn all_of_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -118,7 +120,7 @@ fn dummy_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn dummy_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -186,7 +188,7 @@ fn dummy_put_validation( #[tracing::instrument(skip_all)] async fn dummy_put( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, Json(body): Json, @@ -246,7 +248,7 @@ fn file_response_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn file_response_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -319,7 +321,7 @@ fn get_structured_yaml_validation() -> std::result::Result<(), ValidationErrors> #[tracing::instrument(skip_all)] async fn get_structured_yaml( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -392,7 +394,7 @@ fn html_post_validation(body: String) -> std::result::Result<(String,), Validati #[tracing::instrument(skip_all)] async fn html_post( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, body: String, @@ -465,7 +467,7 @@ fn post_yaml_validation(body: String) -> std::result::Result<(String,), Validati #[tracing::instrument(skip_all)] async fn post_yaml( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, body: String, @@ -525,7 +527,7 @@ fn raw_json_get_validation() -> std::result::Result<(), ValidationErrors> { #[tracing::instrument(skip_all)] async fn raw_json_get( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, ) -> Result @@ -608,7 +610,7 @@ fn solo_object_post_validation( #[tracing::instrument(skip_all)] async fn solo_object_post( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, Json(body): Json, diff --git a/samples/server/petstore/rust-axum/output/rust-axum-validation-test/.openapi-generator/VERSION b/samples/server/petstore/rust-axum/output/rust-axum-validation-test/.openapi-generator/VERSION index 2fb556b60635..909dcd0eca63 100644 --- a/samples/server/petstore/rust-axum/output/rust-axum-validation-test/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-axum/output/rust-axum-validation-test/.openapi-generator/VERSION @@ -1 +1 @@ -7.18.0-SNAPSHOT +7.19.0-SNAPSHOT diff --git a/samples/server/petstore/rust-axum/output/rust-axum-validation-test/Cargo.toml b/samples/server/petstore/rust-axum/output/rust-axum-validation-test/Cargo.toml index 041d1bd4468e..08702a1fa6a7 100644 --- a/samples/server/petstore/rust-axum/output/rust-axum-validation-test/Cargo.toml +++ b/samples/server/petstore/rust-axum/output/rust-axum-validation-test/Cargo.toml @@ -21,7 +21,11 @@ conversion = [ ammonia = "4" async-trait = "0.1" axum = { version = "0.8", features = ["multipart"] } -axum-extra = { version = "0.12", features = ["cookie", "query"] } +axum-extra = { version = "0.12", features = [ + "cookie", + "query", + "typed-header", +] } base64 = "0.22" bytes = "1" chrono = { version = "0.4", features = ["serde"] } @@ -30,6 +34,7 @@ frunk-enum-core = { version = "0.3", optional = true } frunk-enum-derive = { version = "0.3", optional = true } frunk_core = { version = "0.4", optional = true } frunk_derives = { version = "0.4", optional = true } +headers = "0.4" http = "1" lazy_static = "1" regex = "1" diff --git a/samples/server/petstore/rust-axum/output/rust-axum-validation-test/README.md b/samples/server/petstore/rust-axum/output/rust-axum-validation-test/README.md index d3cf4639f46d..7598653173f1 100644 --- a/samples/server/petstore/rust-axum/output/rust-axum-validation-test/README.md +++ b/samples/server/petstore/rust-axum/output/rust-axum-validation-test/README.md @@ -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.18.0-SNAPSHOT +- Generator version: 7.19.0-SNAPSHOT diff --git a/samples/server/petstore/rust-axum/output/rust-axum-validation-test/src/apis/default.rs b/samples/server/petstore/rust-axum/output/rust-axum-validation-test/src/apis/default.rs index 35fd5a37d51f..20b6c2666d72 100644 --- a/samples/server/petstore/rust-axum/output/rust-axum-validation-test/src/apis/default.rs +++ b/samples/server/petstore/rust-axum/output/rust-axum-validation-test/src/apis/default.rs @@ -1,7 +1,8 @@ use async_trait::async_trait; use axum::extract::*; -use axum_extra::extract::{CookieJar, Host}; +use axum_extra::extract::CookieJar; use bytes::Bytes; +use headers::Host; use http::Method; use serde::{Deserialize, Serialize}; diff --git a/samples/server/petstore/rust-axum/output/rust-axum-validation-test/src/apis/mod.rs b/samples/server/petstore/rust-axum/output/rust-axum-validation-test/src/apis/mod.rs index be654b5f14ce..da9c9e1b91fa 100644 --- a/samples/server/petstore/rust-axum/output/rust-axum-validation-test/src/apis/mod.rs +++ b/samples/server/petstore/rust-axum/output/rust-axum-validation-test/src/apis/mod.rs @@ -8,7 +8,7 @@ pub trait ErrorHandler { async fn handle_error( &self, method: &::http::Method, - host: &axum_extra::extract::Host, + host: &headers::Host, cookies: &axum_extra::extract::CookieJar, error: E, ) -> Result { diff --git a/samples/server/petstore/rust-axum/output/rust-axum-validation-test/src/server/mod.rs b/samples/server/petstore/rust-axum/output/rust-axum-validation-test/src/server/mod.rs index 93192f93b20d..30a831dfa273 100644 --- a/samples/server/petstore/rust-axum/output/rust-axum-validation-test/src/server/mod.rs +++ b/samples/server/petstore/rust-axum/output/rust-axum-validation-test/src/server/mod.rs @@ -1,17 +1,19 @@ use std::collections::HashMap; use axum::{body::Body, extract::*, response::Response, routing::*}; -use axum_extra::extract::{CookieJar, Host, Query as QueryExtra}; +use axum_extra::{ + TypedHeader, + extract::{CookieJar, Query as QueryExtra}, +}; use bytes::Bytes; +use headers::Host; use http::{HeaderMap, HeaderName, HeaderValue, Method, StatusCode, header::CONTENT_TYPE}; use tracing::error; use validator::{Validate, ValidationErrors}; -use crate::{header, types::*}; - #[allow(unused_imports)] use crate::{apis, models}; - +use crate::{header, types::*}; #[allow(unused_imports)] use crate::{ models::check_xss_map, models::check_xss_map_nested, models::check_xss_map_string, @@ -35,7 +37,7 @@ where #[tracing::instrument(skip_all)] async fn mail_put( method: Method, - host: Host, + TypedHeader(host): TypedHeader, cookies: CookieJar, State(api_impl): State, Json(body): Json,