[Rust-Axum] Adapt changes upon Host extractor sunset

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"

modules/openapi-generator/src/main/resources/rust-axum/apis-mod.mustache

@@ -91,7 +91,7 @@ pub trait ErrorHandler<E: std::fmt::Debug + Send + Sync + 'static = ()> {
     async fn handle_error(
         &self,
         method: &::http::Method,
-        host: &axum_extra::extract::Host,
+        host: &headers::Host,
         cookies: &axum_extra::extract::CookieJar,
         error: E
     ) -> Result<axum::response::Response, http::StatusCode> {

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};
 

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,
+};

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}}<I, A, E{{#havingAuthMethod}}, C{{/havingAuthMethod}}>(
   method: Method,
-  host: Host,
+  TypedHeader(host): TypedHeader<Host>,
   cookies: CookieJar,
 {{#headerParams.size}}
   headers: HeaderMap,

samples/server/petstore/rust-axum/output/apikey-authorization/.openapi-generator/VERSION

@@ -1 +1 @@
-7.18.0-SNAPSHOT
+7.19.0-SNAPSHOT

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"

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
 
 
 

samples/server/petstore/rust-axum/output/apikey-authorization/src/apis/mod.rs

@@ -85,7 +85,7 @@ pub trait ErrorHandler<E: std::fmt::Debug + Send + Sync + 'static = ()> {
     async fn handle_error(
         &self,
         method: &::http::Method,
-        host: &axum_extra::extract::Host,
+        host: &headers::Host,
         cookies: &axum_extra::extract::CookieJar,
         error: E,
     ) -> Result<axum::response::Response, http::StatusCode> {

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};
 

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<I, A, E, C>(
     method: Method,
-    host: Host,
+    TypedHeader(host): TypedHeader<Host>,
     cookies: CookieJar,
     headers: HeaderMap,
     Path(path_params): Path<models::GetPaymentMethodByIdPathParams>,
@@ -216,7 +218,7 @@ fn get_payment_methods_validation() -> std::result::Result<(), ValidationErrors>
 #[tracing::instrument(skip_all)]
 async fn get_payment_methods<I, A, E, C>(
     method: Method,
-    host: Host,
+    TypedHeader(host): TypedHeader<Host>,
     cookies: CookieJar,
     headers: HeaderMap,
     State(api_impl): State<I>,
@@ -365,7 +367,7 @@ fn post_make_payment_validation(
 #[tracing::instrument(skip_all)]
 async fn post_make_payment<I, A, E, C>(
     method: Method,
-    host: Host,
+    TypedHeader(host): TypedHeader<Host>,
     cookies: CookieJar,
     headers: HeaderMap,
     State(api_impl): State<I>,

samples/server/petstore/rust-axum/output/apikey-auths/.openapi-generator/VERSION

@@ -1 +1 @@
-7.18.0-SNAPSHOT
+7.19.0-SNAPSHOT

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"

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
 
 
 

samples/server/petstore/rust-axum/output/apikey-auths/src/apis/mod.rs

@@ -56,7 +56,7 @@ pub trait ErrorHandler<E: std::fmt::Debug + Send + Sync + 'static = ()> {
     async fn handle_error(
         &self,
         method: &::http::Method,
-        host: &axum_extra::extract::Host,
+        host: &headers::Host,
         cookies: &axum_extra::extract::CookieJar,
         error: E,
     ) -> Result<axum::response::Response, http::StatusCode> {

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};
 

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<I, A, E, C>(
     method: Method,
-    host: Host,
+    TypedHeader(host): TypedHeader<Host>,
     cookies: CookieJar,
     headers: HeaderMap,
     Path(path_params): Path<models::GetPaymentMethodByIdPathParams>,
@@ -163,7 +165,7 @@ fn get_payment_methods_validation() -> std::result::Result<(), ValidationErrors>
 #[tracing::instrument(skip_all)]
 async fn get_payment_methods<I, A, E, C>(
     method: Method,
-    host: Host,
+    TypedHeader(host): TypedHeader<Host>,
     cookies: CookieJar,
     headers: HeaderMap,
     State(api_impl): State<I>,
@@ -261,7 +263,7 @@ fn post_make_payment_validation(
 #[tracing::instrument(skip_all)]
 async fn post_make_payment<I, A, E, C>(
     method: Method,
-    host: Host,
+    TypedHeader(host): TypedHeader<Host>,
     cookies: CookieJar,
     headers: HeaderMap,
     State(api_impl): State<I>,

samples/server/petstore/rust-axum/output/multipart-v3/.openapi-generator/VERSION

@@ -1 +1 @@
-7.18.0-SNAPSHOT
+7.19.0-SNAPSHOT

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"

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
 
 
 

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};
 

samples/server/petstore/rust-axum/output/multipart-v3/src/apis/mod.rs

@@ -8,7 +8,7 @@ pub trait ErrorHandler<E: std::fmt::Debug + Send + Sync + 'static = ()> {
     async fn handle_error(
         &self,
         method: &::http::Method,
-        host: &axum_extra::extract::Host,
+        host: &headers::Host,
         cookies: &axum_extra::extract::CookieJar,
         error: E,
     ) -> Result<axum::response::Response, http::StatusCode> {

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<I, A, E>(
     method: Method,
-    host: Host,
+    TypedHeader(host): TypedHeader<Host>,
     cookies: CookieJar,
     State(api_impl): State<I>,
     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<I, A, E>(
     method: Method,
-    host: Host,
+    TypedHeader(host): TypedHeader<Host>,
     cookies: CookieJar,
     State(api_impl): State<I>,
     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<I, A, E>(
     method: Method,
-    host: Host,
+    TypedHeader(host): TypedHeader<Host>,
     cookies: CookieJar,
     State(api_impl): State<I>,
     body: axum::body::Body,

samples/server/petstore/rust-axum/output/openapi-v3/.openapi-generator/VERSION

@@ -1 +1 @@
-7.18.0-SNAPSHOT
+7.19.0-SNAPSHOT