Skip to content

[Rust-Axum] Dynamically set the types of integer literals #20133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 25, 2024
Merged

[Rust-Axum] Dynamically set the types of integer literals #20133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b54f76e
Dynamically set the types of integer literals
Victoria-Casasampere-BeeTheData Nov 14, 2024
5b53d57
Change the literal limits from i32 to adaptive limits
Victoria-Casasampere-BeeTheData Nov 19, 2024
a69aa55
Remove length literal types
Victoria-Casasampere-BeeTheData Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions modules/openapi-generator/src/main/resources/rust-axum/models.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ use crate::{models, types::*};
{{/pattern}}
{{#maximum}}
{{#minimum}}
range(min = {{minimum}}, max = {{maximum}}),
range(min = {{minimum}}{{{dataType}}}, max = {{maximum}}{{{dataType}}}),
{{/minimum}}
{{^minimum}}
range(max = {{maximum}}),
range(max = {{maximum}}{{{dataType}}}),
{{/minimum}}
{{/maximum}}
{{#minimum}}
{{^maximum}}
range(min = {{minimum}}),
range(min = {{minimum}}{{{dataType}}}),
{{/maximum}}
{{/minimum}}
{{#maxItems}}
Expand Down Expand Up @@ -136,15 +136,15 @@ use crate::{models, types::*};
{{/pattern}}
{{#maximum}}
{{#minimum}}
range(min = {{minimum}}, max = {{maximum}}),
range(min = {{minimum}}{{{dataType}}}, max = {{maximum}}{{{dataType}}}),
{{/minimum}}
{{^minimum}}
range(max = {{maximum}}),
range(max = {{maximum}}{{{dataType}}}),
{{/minimum}}
{{/maximum}}
{{#minimum}}
{{^maximum}}
range(min = {{minimum}}),
range(min = {{minimum}}{{{dataType}}}),
{{/maximum}}
{{/minimum}}
{{#maxItems}}
Expand Down Expand Up @@ -240,15 +240,15 @@ use crate::{models, types::*};
{{/pattern}}
{{#maximum}}
{{#minimum}}
range(min = {{minimum}}, max = {{maximum}}),
range(min = {{minimum}}{{{dataType}}}, max = {{maximum}}{{{dataType}}}),
{{/minimum}}
{{^minimum}}
range(max = {{maximum}}),
range(max = {{maximum}}{{{dataType}}}),
{{/minimum}}
{{/maximum}}
{{#minimum}}
{{^maximum}}
range(min = {{minimum}}),
range(min = {{minimum}}{{{dataType}}}),
{{/maximum}}
{{/minimum}}
{{#maxItems}}
Expand Down Expand Up @@ -644,15 +644,15 @@ pub struct {{{classname}}} {
{{/pattern}}
{{#maximum}}
{{#minimum}}
range(min = {{minimum}}, max = {{maximum}}),
range(min = {{minimum}}{{{dataType}}}, max = {{maximum}}{{{dataType}}}),
{{/minimum}}
{{^minimum}}
range(max = {{maximum}}),
range(max = {{maximum}}{{{dataType}}}),
{{/minimum}}
{{/maximum}}
{{#minimum}}
{{^maximum}}
range(min = {{minimum}}),
range(min = {{minimum}}{{{dataType}}}),
{{/maximum}}
{{/minimum}}
{{#maxItems}}
Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/rust-axum/output/apikey-auths/.openapi-generator/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.10.0-SNAPSHOT
7.11.0-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/server/petstore/rust-axum/output/apikey-auths/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ server, you can easily generate a server stub.
To see how to make this your own, look here: [README]((https://openapi-generator.tech))

- API version: 1.0.0
- Generator version: 7.10.0-SNAPSHOT
- Generator version: 7.11.0-SNAPSHOT



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

- API version: 1.0.7
- Generator version: 7.10.0-SNAPSHOT
- Generator version: 7.11.0-SNAPSHOT



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

- API version: 1.0.7
- Generator version: 7.10.0-SNAPSHOT
- Generator version: 7.11.0-SNAPSHOT



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

- API version: 0.0.1
- Generator version: 7.10.0-SNAPSHOT
- Generator version: 7.11.0-SNAPSHOT



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

- API version: 1.0.0
- Generator version: 7.10.0-SNAPSHOT
- Generator version: 7.11.0-SNAPSHOT



Expand Down
22 changes: 11 additions & 11 deletions ...r/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/models.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ pub struct DeleteOrderPathParams {
#[cfg_attr(feature = "conversion", derive(frunk::LabelledGeneric))]
pub struct GetOrderByIdPathParams {
/// ID of pet that needs to be fetched
#[validate(range(min = 1, max = 5))]
#[validate(range(min = 1i64, max = 5i64))]
pub order_id: i64,
}

Expand Down Expand Up @@ -2739,12 +2739,12 @@ impl std::convert::TryFrom<HeaderValue> for header::IntoHeaderValue<EnumTest> {
#[cfg_attr(feature = "conversion", derive(frunk::LabelledGeneric))]
pub struct FormatTest {
#[serde(rename = "integer")]
#[validate(range(min = 10, max = 100))]
#[validate(range(min = 10u8, max = 100u8))]
#[serde(skip_serializing_if = "Option::is_none")]
pub integer: Option<u8>,

#[serde(rename = "int32")]
#[validate(range(min = 20, max = 200))]
#[validate(range(min = 20u8, max = 200u8))]
#[serde(skip_serializing_if = "Option::is_none")]
pub int32: Option<u8>,

Expand All @@ -2753,16 +2753,16 @@ pub struct FormatTest {
pub int64: Option<i64>,

#[serde(rename = "number")]
#[validate(range(min = 32.1, max = 543.2))]
#[validate(range(min = 32.1f64, max = 543.2f64))]
pub number: f64,

#[serde(rename = "float")]
#[validate(range(min = 54.3, max = 987.6))]
#[validate(range(min = 54.3f32, max = 987.6f32))]
#[serde(skip_serializing_if = "Option::is_none")]
pub float: Option<f32>,

#[serde(rename = "double")]
#[validate(range(min = 67.8, max = 123.4))]
#[validate(range(min = 67.8f64, max = 123.4f64))]
#[serde(skip_serializing_if = "Option::is_none")]
pub double: Option<f64>,

Expand Down Expand Up @@ -5522,13 +5522,13 @@ impl std::convert::TryFrom<HeaderValue> for header::IntoHeaderValue<Tag> {
pub struct TestEndpointParametersRequest {
/// None
#[serde(rename = "integer")]
#[validate(range(min = 10, max = 100))]
#[validate(range(min = 10u8, max = 100u8))]
#[serde(skip_serializing_if = "Option::is_none")]
pub integer: Option<u8>,

/// None
#[serde(rename = "int32")]
#[validate(range(min = 20, max = 200))]
#[validate(range(min = 20u8, max = 200u8))]
#[serde(skip_serializing_if = "Option::is_none")]
pub int32: Option<u8>,

Expand All @@ -5539,18 +5539,18 @@ pub struct TestEndpointParametersRequest {

/// None
#[serde(rename = "number")]
#[validate(range(min = 32.1, max = 543.2))]
#[validate(range(min = 32.1f64, max = 543.2f64))]
pub number: f64,

/// None
#[serde(rename = "float")]
#[validate(range(max = 987.6))]
#[validate(range(max = 987.6f32))]
#[serde(skip_serializing_if = "Option::is_none")]
pub float: Option<f32>,

/// None
#[serde(rename = "double")]
#[validate(range(min = 67.8, max = 123.4))]
#[validate(range(min = 67.8f64, max = 123.4f64))]
pub double: f64,

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

- API version: 1.0.0
- Generator version: 7.10.0-SNAPSHOT
- Generator version: 7.11.0-SNAPSHOT



Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/rust-axum/output/petstore/src/models.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ pub struct DeleteOrderPathParams {
#[cfg_attr(feature = "conversion", derive(frunk::LabelledGeneric))]
pub struct GetOrderByIdPathParams {
/// ID of pet that needs to be fetched
#[validate(range(min = 1, max = 5))]
#[validate(range(min = 1i64, max = 5i64))]
pub order_id: i64,
}

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

- API version: 1.0
- Generator version: 7.10.0-SNAPSHOT
- Generator version: 7.11.0-SNAPSHOT



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

- API version: 0.1.9
- Generator version: 7.10.0-SNAPSHOT
- Generator version: 7.11.0-SNAPSHOT



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

- API version: 2.3.4
- Generator version: 7.10.0-SNAPSHOT
- Generator version: 7.11.0-SNAPSHOT



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

- API version: 0.0.1
- Generator version: 7.10.0-SNAPSHOT
- Generator version: 7.11.0-SNAPSHOT



Expand Down
Loading