Skip to content

Commit ce3ee3a

Browse files
committed
Update
1 parent a9515ce commit ce3ee3a

File tree

5 files changed

+17
-18
lines changed

5 files changed

+17
-18
lines changed

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1116,19 +1116,21 @@ impl std::fmt::Display for {{{classname}}} {
11161116
{{^isPrimitiveType}}
11171117
// Skipping {{baseName}} in query parameter serialization
11181118
{{/isPrimitiveType}}
1119-
{{^isByteArray}}{{^isBinary}}{{^isMap}}
1120-
{{#isPrimitiveType}}
1119+
{{^isByteArray}}{{^isBinary}}{{^isMap}}{{#isPrimitiveType}}
11211120
{{#required}}
11221121
Some("{{{baseName}}}".to_string()),
11231122
{{^isArray}}
11241123
{{#isNullable}}
1125-
// Skipping {{baseName}} in query parameter serialization
1124+
Some(self.{{{name}}}.as_ref().map_or("null".to_string(), |x| x.to_string())),
11261125
{{/isNullable}}
11271126
{{^isNullable}}
11281127
Some(self.{{{name}}}.to_string()),
11291128
{{/isNullable}}
11301129
{{/isArray}}
11311130
{{#isArray}}
1131+
{{#isNullable}}
1132+
Some(self.{{{name}}}.as_ref().map_or("null".to_string(), |x| x.iter().map(|x| x.to_string()).collect::<Vec<_>>().join(","))),
1133+
{{/isNullable}}
11321134
{{^isNullable}}
11331135
Some(self.{{{name}}}.iter().map(|x| x.to_string()).collect::<Vec<_>>().join(",")),
11341136
{{/isNullable}}
@@ -1156,7 +1158,8 @@ impl std::fmt::Display for {{{classname}}} {
11561158
{{/isArray}}
11571159
].join(",")
11581160
}),
1159-
{{/required}}{{/isPrimitiveType}}{{/isMap}}{{/isBinary}}{{/isByteArray}}
1161+
{{/required}}
1162+
{{/isPrimitiveType}}{{/isMap}}{{/isBinary}}{{/isByteArray}}
11601163
{{/vars}}
11611164
];
11621165

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ impl std::fmt::Display for MultipartRelatedRequest {
9696
let params: Vec<Option<String>> = vec![
9797
// Skipping object_field in query parameter serialization
9898

99-
10099
// Skipping optional_binary_field in query parameter serialization
101100
// Skipping optional_binary_field in query parameter serialization
102101

samples/server/petstore/rust-axum/output/openapi-v3/src/models.rs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -907,10 +907,8 @@ impl std::fmt::Display for AnyOfProperty {
907907
let params: Vec<Option<String>> = vec![
908908
// Skipping requiredAnyOf in query parameter serialization
909909

910-
911910
// Skipping optionalAnyOf in query parameter serialization
912911

913-
914912
];
915913

916914
write!(
@@ -1927,7 +1925,11 @@ impl std::fmt::Display for NullableTest {
19271925
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
19281926
let params: Vec<Option<String>> = vec![
19291927
Some("nullable".to_string()),
1930-
// Skipping nullable in query parameter serialization
1928+
Some(
1929+
self.nullable
1930+
.as_ref()
1931+
.map_or("null".to_string(), |x| x.to_string()),
1932+
),
19311933
self.nullable_with_null_default
19321934
.as_ref()
19331935
.map(|nullable_with_null_default| {
@@ -2522,16 +2524,12 @@ impl std::fmt::Display for ObjectUntypedProps {
25222524
let params: Vec<Option<String>> = vec![
25232525
// Skipping required_untyped in query parameter serialization
25242526

2525-
25262527
// Skipping required_untyped_nullable in query parameter serialization
25272528

2528-
25292529
// Skipping not_required_untyped in query parameter serialization
25302530

2531-
25322531
// Skipping not_required_untyped_nullable in query parameter serialization
25332532

2534-
25352533
];
25362534

25372535
write!(

samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/models.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -843,7 +843,6 @@ impl std::fmt::Display for ArrayOfArrayOfNumberOnly {
843843
let params: Vec<Option<String>> = vec![
844844
// Skipping ArrayArrayNumber in query parameter serialization
845845

846-
847846
];
848847

849848
write!(
@@ -3637,10 +3636,8 @@ impl std::fmt::Display for MixedPropertiesAndAdditionalPropertiesClass {
36373636
let params: Vec<Option<String>> = vec![
36383637
// Skipping uuid in query parameter serialization
36393638

3640-
36413639
// Skipping dateTime in query parameter serialization
36423640

3643-
36443641
// Skipping map in query parameter serialization
36453642
// Skipping map in query parameter serialization
36463643

@@ -4243,7 +4240,6 @@ impl std::fmt::Display for ObjectContainingObjectWithOnlyAdditionalProperties {
42434240
let params: Vec<Option<String>> = vec![
42444241
// Skipping inner in query parameter serialization
42454242

4246-
42474243
];
42484244

42494245
write!(

samples/server/petstore/rust-axum/output/rust-axum-test/src/models.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,11 @@ impl std::fmt::Display for FooANullableContainer {
100100
.join(",")
101101
}),
102102
Some("RequiredNullableThing".to_string()),
103-
// Skipping RequiredNullableThing in query parameter serialization
103+
Some(
104+
self.required_nullable_thing
105+
.as_ref()
106+
.map_or("null".to_string(), |x| x.to_string()),
107+
),
104108
];
105109

106110
write!(
@@ -879,7 +883,6 @@ impl std::fmt::Display for FooObjectOfObjects {
879883
let params: Vec<Option<String>> = vec![
880884
// Skipping inner in query parameter serialization
881885

882-
883886
];
884887

885888
write!(

0 commit comments

Comments
 (0)