[Rust-Axum] BugFix: handling non-lowercase Header in Request/Response (#20178)

linxGnu · web-flow · commit 19e21416ed7d · 2024-11-26T18:39:29.000+08:00
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
@@ -89,7 +89,7 @@ where
     // Header parameters
     let header_params = {
   {{/-first}}
-                let header_{{{paramName}}} = headers.get(HeaderName::from_static("{{{baseName}}}"));
+                let header_{{{paramName}}} = headers.get(HeaderName::from_static("{{{nameInLowerCase}}}"));
 
                 let header_{{{paramName}}} = match header_{{{paramName}}} {
                     Some(v) => match header::IntoHeaderValue::<{{{dataType}}}>::try_from((*v).clone()) {
@@ -272,7 +272,7 @@ where
                                                     {
                                                       let mut response_headers = response.headers_mut().unwrap();
                                                       response_headers.insert(
-                                                          HeaderName::from_static("{{{baseName}}}"),
+                                                          HeaderName::from_static("{{{nameInLowerCase}}}"),
                                                           {{name}}
                                                       );
                                                     }
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
@@ -602,7 +602,7 @@ where
 {
     // Header parameters
     let header_params = {
-        let header_x_header = headers.get(HeaderName::from_static("X-Header"));
+        let header_x_header = headers.get(HeaderName::from_static("x-header"));
 
         let header_x_header = match header_x_header {
             Some(v) => match header::IntoHeaderValue::<String>::try_from((*v).clone()) {
@@ -1471,7 +1471,7 @@ where
 
                 {
                     let mut response_headers = response.headers_mut().unwrap();
-                    response_headers.insert(HeaderName::from_static("Success-Info"), success_info);
+                    response_headers.insert(HeaderName::from_static("success-info"), success_info);
                 }
                 if let Some(bool_header) = bool_header {
                     let bool_header = match header::IntoHeaderValue(bool_header).try_into() {
@@ -1486,7 +1486,7 @@ where
                     {
                         let mut response_headers = response.headers_mut().unwrap();
                         response_headers
-                            .insert(HeaderName::from_static("Bool-Header"), bool_header);
+                            .insert(HeaderName::from_static("bool-header"), bool_header);
                     }
                 }
                 if let Some(object_header) = object_header {
@@ -1502,7 +1502,7 @@ where
                     {
                         let mut response_headers = response.headers_mut().unwrap();
                         response_headers
-                            .insert(HeaderName::from_static("Object-Header"), object_header);
+                            .insert(HeaderName::from_static("object-header"), object_header);
                     }
                 }
                 let mut response = response.status(200);
@@ -1544,7 +1544,7 @@ where
                     {
                         let mut response_headers = response.headers_mut().unwrap();
                         response_headers
-                            .insert(HeaderName::from_static("Further-Info"), further_info);
+                            .insert(HeaderName::from_static("further-info"), further_info);
                     }
                 }
                 if let Some(failure_info) = failure_info {
@@ -1560,7 +1560,7 @@ where
                     {
                         let mut response_headers = response.headers_mut().unwrap();
                         response_headers
-                            .insert(HeaderName::from_static("Failure-Info"), failure_info);
+                            .insert(HeaderName::from_static("failure-info"), failure_info);
                     }
                 }
                 let mut response = response.status(412);
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
@@ -2693,7 +2693,7 @@ where
                     {
                         let mut response_headers = response.headers_mut().unwrap();
                         response_headers
-                            .insert(HeaderName::from_static("X-Rate-Limit"), x_rate_limit);
+                            .insert(HeaderName::from_static("x-rate-limit"), x_rate_limit);
                     }
                 }
                 if let Some(x_expires_after) = x_expires_after {
@@ -2710,7 +2710,7 @@ where
                     {
                         let mut response_headers = response.headers_mut().unwrap();
                         response_headers
-                            .insert(HeaderName::from_static("X-Expires-After"), x_expires_after);
+                            .insert(HeaderName::from_static("x-expires-after"), x_expires_after);
                     }
                 }
                 let mut response = response.status(200);
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
@@ -1517,7 +1517,7 @@ where
 
                     {
                         let mut response_headers = response.headers_mut().unwrap();
-                        response_headers.insert(HeaderName::from_static("Set-Cookie"), set_cookie);
+                        response_headers.insert(HeaderName::from_static("set-cookie"), set_cookie);
                     }
                 }
                 if let Some(x_rate_limit) = x_rate_limit {
@@ -1533,7 +1533,7 @@ where
                     {
                         let mut response_headers = response.headers_mut().unwrap();
                         response_headers
-                            .insert(HeaderName::from_static("X-Rate-Limit"), x_rate_limit);
+                            .insert(HeaderName::from_static("x-rate-limit"), x_rate_limit);
                     }
                 }
                 if let Some(x_expires_after) = x_expires_after {
@@ -1550,7 +1550,7 @@ where
                     {
                         let mut response_headers = response.headers_mut().unwrap();
                         response_headers
-                            .insert(HeaderName::from_static("X-Expires-After"), x_expires_after);
+                            .insert(HeaderName::from_static("x-expires-after"), x_expires_after);
                     }
                 }
                 let mut response = response.status(200);

Original file line number	Diff line number	Diff line change
`@@ -602,7 +602,7 @@ where`
`602`	`602`	`{`
`603`	`603`	`// Header parameters`
`604`	`604`	`let header_params = {`
`605`		`- let header_x_header = headers.get(HeaderName::from_static("X-Header"));`
	`605`	`+ let header_x_header = headers.get(HeaderName::from_static("x-header"));`
`606`	`606`
`607`	`607`	`let header_x_header = match header_x_header {`
`608`	`608`	`Some(v) => match header::IntoHeaderValue::<String>::try_from((*v).clone()) {`
`@@ -1471,7 +1471,7 @@ where`
`1471`	`1471`
`1472`	`1472`	`{`
`1473`	`1473`	`let mut response_headers = response.headers_mut().unwrap();`
`1474`		`- response_headers.insert(HeaderName::from_static("Success-Info"), success_info);`
	`1474`	`+ response_headers.insert(HeaderName::from_static("success-info"), success_info);`
`1475`	`1475`	`}`
`1476`	`1476`	`if let Some(bool_header) = bool_header {`
`1477`	`1477`	`let bool_header = match header::IntoHeaderValue(bool_header).try_into() {`
`@@ -1486,7 +1486,7 @@ where`
`1486`	`1486`	`{`
`1487`	`1487`	`let mut response_headers = response.headers_mut().unwrap();`
`1488`	`1488`	`response_headers`
`1489`		`- .insert(HeaderName::from_static("Bool-Header"), bool_header);`
	`1489`	`+ .insert(HeaderName::from_static("bool-header"), bool_header);`
`1490`	`1490`	`}`
`1491`	`1491`	`}`
`1492`	`1492`	`if let Some(object_header) = object_header {`
`@@ -1502,7 +1502,7 @@ where`
`1502`	`1502`	`{`
`1503`	`1503`	`let mut response_headers = response.headers_mut().unwrap();`
`1504`	`1504`	`response_headers`
`1505`		`- .insert(HeaderName::from_static("Object-Header"), object_header);`
	`1505`	`+ .insert(HeaderName::from_static("object-header"), object_header);`
`1506`	`1506`	`}`
`1507`	`1507`	`}`
`1508`	`1508`	`let mut response = response.status(200);`
`@@ -1544,7 +1544,7 @@ where`
`1544`	`1544`	`{`
`1545`	`1545`	`let mut response_headers = response.headers_mut().unwrap();`
`1546`	`1546`	`response_headers`
`1547`		`- .insert(HeaderName::from_static("Further-Info"), further_info);`
	`1547`	`+ .insert(HeaderName::from_static("further-info"), further_info);`
`1548`	`1548`	`}`
`1549`	`1549`	`}`
`1550`	`1550`	`if let Some(failure_info) = failure_info {`
`@@ -1560,7 +1560,7 @@ where`
`1560`	`1560`	`{`
`1561`	`1561`	`let mut response_headers = response.headers_mut().unwrap();`
`1562`	`1562`	`response_headers`
`1563`		`- .insert(HeaderName::from_static("Failure-Info"), failure_info);`
	`1563`	`+ .insert(HeaderName::from_static("failure-info"), failure_info);`
`1564`	`1564`	`}`
`1565`	`1565`	`}`
`1566`	`1566`	`let mut response = response.status(412);`
Original file line number	Diff line number	Diff line change
`@@ -2693,7 +2693,7 @@ where`
`2693`	`2693`	`{`
`2694`	`2694`	`let mut response_headers = response.headers_mut().unwrap();`
`2695`	`2695`	`response_headers`
`2696`		`- .insert(HeaderName::from_static("X-Rate-Limit"), x_rate_limit);`
	`2696`	`+ .insert(HeaderName::from_static("x-rate-limit"), x_rate_limit);`
`2697`	`2697`	`}`
`2698`	`2698`	`}`
`2699`	`2699`	`if let Some(x_expires_after) = x_expires_after {`
`@@ -2710,7 +2710,7 @@ where`
`2710`	`2710`	`{`
`2711`	`2711`	`let mut response_headers = response.headers_mut().unwrap();`
`2712`	`2712`	`response_headers`
`2713`		`- .insert(HeaderName::from_static("X-Expires-After"), x_expires_after);`
	`2713`	`+ .insert(HeaderName::from_static("x-expires-after"), x_expires_after);`
`2714`	`2714`	`}`
`2715`	`2715`	`}`
`2716`	`2716`	`let mut response = response.status(200);`
Original file line number	Diff line number	Diff line change
`@@ -1517,7 +1517,7 @@ where`
`1517`	`1517`
`1518`	`1518`	`{`
`1519`	`1519`	`let mut response_headers = response.headers_mut().unwrap();`
`1520`		`- response_headers.insert(HeaderName::from_static("Set-Cookie"), set_cookie);`
	`1520`	`+ response_headers.insert(HeaderName::from_static("set-cookie"), set_cookie);`
`1521`	`1521`	`}`
`1522`	`1522`	`}`
`1523`	`1523`	`if let Some(x_rate_limit) = x_rate_limit {`
`@@ -1533,7 +1533,7 @@ where`
`1533`	`1533`	`{`
`1534`	`1534`	`let mut response_headers = response.headers_mut().unwrap();`
`1535`	`1535`	`response_headers`
`1536`		`- .insert(HeaderName::from_static("X-Rate-Limit"), x_rate_limit);`
	`1536`	`+ .insert(HeaderName::from_static("x-rate-limit"), x_rate_limit);`
`1537`	`1537`	`}`
`1538`	`1538`	`}`
`1539`	`1539`	`if let Some(x_expires_after) = x_expires_after {`
`@@ -1550,7 +1550,7 @@ where`
`1550`	`1550`	`{`
`1551`	`1551`	`let mut response_headers = response.headers_mut().unwrap();`
`1552`	`1552`	`response_headers`
`1553`		`- .insert(HeaderName::from_static("X-Expires-After"), x_expires_after);`
	`1553`	`+ .insert(HeaderName::from_static("x-expires-after"), x_expires_after);`
`1554`	`1554`	`}`
`1555`	`1555`	`}`
`1556`	`1556`	`let mut response = response.status(200);`