Add additional default semantics

smithy-lang · Oct 2, 2023 · 9e7b6c1 · 9e7b6c1
1 parent 5129c1f
commit 9e7b6c1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/...ain/kotlin/software/amazon/smithy/rust/codegen/core/smithy/generators/BuilderGenerator.kt b/...ain/kotlin/software/amazon/smithy/rust/codegen/core/smithy/generators/BuilderGenerator.kt
@@ -416,6 +416,8 @@ class BuilderGenerator(
                                 ")?",
                             ) { missingRequiredField(memberName) }
                         }
+                    } else if (member.isRequired && default != null) {
+                        rust(".or_else(|| Some((#T)()))", default.expr)
                     }
                 }
             }

diff --git a/...kotlin/software/amazon/smithy/rust/codegen/core/smithy/generators/BuilderGeneratorTest.kt b/...kotlin/software/amazon/smithy/rust/codegen/core/smithy/generators/BuilderGeneratorTest.kt
@@ -177,12 +177,24 @@ internal class BuilderGeneratorTest {
               @default(true)
               @required
               defaultDocument: Document
+
+              @clientOptional
+              @required
+              @default([])
+              requiredButOptional: StringList
+
+              @default(1)
+              @clientOptional
+              @required
+              reqOptInt: OneDefault
+
             }
             list StringList {
                 member: String
             }
             @default(1)
             integer OneDefault
+
         """.asSmithyModel(smithyVersion = "2.0")
 
         val provider = testSymbolProvider(
@@ -207,6 +219,7 @@ internal class BuilderGeneratorTest {
                     assert_eq!(s.an_actually_required_field(), 5);
                     assert_eq!(s.no_default(), None);
                     assert_eq!(s.default_document().as_bool().unwrap(), true);
+                    assert_eq!(s.required_but_optional, Some(vec![]));
                     """,
                     "Struct" to provider.toSymbol(shape),
                 )