ModelModule to ServerRustModule.model

Author: Fahad Zubair

codegen-server/python/src/main/kotlin/software/amazon/smithy/rust/codegen/server/python/smithy/PythonServerCodegenVisitor.kt

@@ -78,6 +78,7 @@ class PythonServerCodegenVisitor(
             serviceShape: ServiceShape,
             symbolVisitorConfig: SymbolVisitorConfig,
             publicConstrainedTypes: Boolean,
+            includeConstraintShapeProvider: Boolean,
         ) = RustServerCodegenPythonPlugin.baseSymbolProvider(model, serviceShape, symbolVisitorConfig, publicConstrainedTypes)
 
         val serverSymbolProviders = ServerSymbolProviders.from(

codegen-server/src/main/kotlin/software/amazon/smithy/rust/codegen/server/smithy/ConstrainedShapeSymbolProvider.kt

@@ -24,6 +24,7 @@ import software.amazon.smithy.model.traits.LengthTrait
 import software.amazon.smithy.rust.codegen.core.rustlang.RustModule
 import software.amazon.smithy.rust.codegen.core.rustlang.RustReservedWords
 import software.amazon.smithy.rust.codegen.core.rustlang.RustType
+import software.amazon.smithy.rust.codegen.core.rustlang.Visibility
 import software.amazon.smithy.rust.codegen.core.smithy.RustSymbolProvider
 import software.amazon.smithy.rust.codegen.core.smithy.WrappingSymbolProvider
 import software.amazon.smithy.rust.codegen.core.smithy.contextName

codegen-server/src/main/kotlin/software/amazon/smithy/rust/codegen/server/smithy/ConstraintViolationSymbolProvider.kt

@@ -101,7 +101,7 @@ class ConstraintViolationSymbolProvider(
             Pair(overriddenMemberModule.second, RustReservedWords.escapeIfNeeded(name).toSnakeCase())
         } else {
             // Need to use the context name so we get the correct name for maps.
-            Pair(ModelsModule, RustReservedWords.escapeIfNeeded(this.contextName(serviceShape)).toSnakeCase())
+            Pair(ServerRustModule.Model, RustReservedWords.escapeIfNeeded(this.contextName(serviceShape)).toSnakeCase())
         }
 
         return RustModule.new(

codegen-server/src/main/kotlin/software/amazon/smithy/rust/codegen/server/smithy/Constraints.kt

@@ -32,8 +32,6 @@ import software.amazon.smithy.rust.codegen.core.rustlang.RustReservedWords
 import software.amazon.smithy.rust.codegen.core.rustlang.Visibility
 import software.amazon.smithy.rust.codegen.core.smithy.CodegenContext
 import software.amazon.smithy.rust.codegen.core.smithy.DirectedWalker
-import software.amazon.smithy.rust.codegen.core.smithy.ModelsModule
-import software.amazon.smithy.rust.codegen.core.smithy.contextName
 import software.amazon.smithy.rust.codegen.core.smithy.isOptional
 import software.amazon.smithy.rust.codegen.core.smithy.module
 import software.amazon.smithy.rust.codegen.core.util.UNREACHABLE
@@ -212,11 +210,11 @@ fun Shape.getParentAndInlineModuleForConstrainedMember(symbolProvider: SymbolPro
             val innerModule = RustModule.new(
                     name = name,
                     visibility = Visibility.PUBCRATE,
-                    parent = ModelsModule,
+                    parent = ServerRustModule.Model,
                     inline = true,
                 )
 
-            Pair(ModelsModule, innerModule)
+            Pair(ServerRustModule.Model, innerModule)
         }
     }
 }

codegen-server/src/main/kotlin/software/amazon/smithy/rust/codegen/server/smithy/ServerCodegenVisitor.kt

@@ -295,7 +295,7 @@ open class ServerCodegenVisitor(
     ) {
         if (codegenContext.settings.codegenConfig.publicConstrainedTypes || shape.isReachableFromOperationInput()) {
             val serverBuilderGenerator = ServerBuilderGenerator(codegenContext, shape, validationExceptionConversionGenerator)
-            serverBuilderGenerator.render(writer)
+            serverBuilderGenerator.render(rustCrate, writer)
             // FZ Rebase mine
             // val serverBuilderGenerator = ServerBuilderGenerator(codegenContext, shape)
             // serverBuilderGenerator.render(rustCrate, writer)
@@ -498,7 +498,8 @@ open class ServerCodegenVisitor(
             rustCrate.withModuleOrWithStructureBuilderModule(ServerRustModule.Model, shape, codegenContext) {
                 ConstrainedNumberGenerator(codegenContext, 
                     rustCrate.createInlineModuleCreator(),
-                    shape, 
+                    this,
+                    shape,
                     validationExceptionConversionGenerator,
                 ).render()
             }

codegen-server/src/main/kotlin/software/amazon/smithy/rust/codegen/server/smithy/UnconstrainedShapeSymbolProvider.kt

@@ -21,7 +21,6 @@ import software.amazon.smithy.rust.codegen.core.rustlang.RustReservedWords
 import software.amazon.smithy.rust.codegen.core.rustlang.RustType
 import software.amazon.smithy.rust.codegen.core.rustlang.Visibility
 import software.amazon.smithy.rust.codegen.core.smithy.Default
-import software.amazon.smithy.rust.codegen.core.smithy.ModelsModule
 import software.amazon.smithy.rust.codegen.core.smithy.RustSymbolProvider
 import software.amazon.smithy.rust.codegen.core.smithy.WrappingSymbolProvider
 import software.amazon.smithy.rust.codegen.core.smithy.contextName

codegen-server/src/main/kotlin/software/amazon/smithy/rust/codegen/server/smithy/testutil/ServerTestHelpers.kt

@@ -121,7 +121,7 @@ fun serverTestCodegenContext(
 /**
  * In tests, we frequently need to generate a struct, a builder, and an impl block to access said builder.
  */
-fun StructureShape.serverRenderWithModelBuilder(model: Model, symbolProvider: RustSymbolProvider, writer: RustWriter) {
+fun StructureShape.serverRenderWithModelBuilder(rustCrate: RustCrate, model: Model, symbolProvider: RustSymbolProvider, writer: RustWriter) {
     StructureGenerator(model, symbolProvider, writer, this, emptyList()).render()
     val serverCodegenContext = serverTestCodegenContext(model)
     // Note that this always uses `ServerBuilderGenerator` and _not_ `ServerBuilderGeneratorWithoutPublicConstrainedTypes`,

codegen-server/src/test/kotlin/software/amazon/smithy/rust/codegen/server/smithy/ConstraintsMemberShapeTest.kt

@@ -1,6 +1,7 @@
 package software.amazon.smithy.rust.codegen.server.smithy
 
 import org.junit.jupiter.api.Test
+import software.amazon.smithy.codegen.core.ReservedWordSymbolProvider
 import software.amazon.smithy.model.Model
 import software.amazon.smithy.model.shapes.ShapeId
 import software.amazon.smithy.model.traits.RequiredTrait
@@ -20,11 +21,16 @@ import software.amazon.smithy.rust.codegen.core.testutil.unitTest
 import software.amazon.smithy.rust.codegen.core.util.runCommand
 import software.amazon.smithy.rust.codegen.core.util.toPascalCase
 import software.amazon.smithy.rust.codegen.core.util.toSnakeCase
+import software.amazon.smithy.rust.codegen.server.smithy.customizations.CustomValidationExceptionWithReasonDecorator
+import software.amazon.smithy.rust.codegen.server.smithy.customizations.ServerRequiredCustomizations
+import software.amazon.smithy.rust.codegen.server.smithy.customizations.SmithyValidationExceptionDecorator
 import software.amazon.smithy.rust.codegen.server.smithy.customize.CombinedServerCodegenDecorator
 import software.amazon.smithy.rust.codegen.server.smithy.testutil.serverTestCodegenContext
 import software.amazon.smithy.rust.codegen.server.smithy.testutil.serverTestSymbolProvider
 import java.io.File
 import java.nio.file.Path
+import java.util.logging.Level
+import java.util.logging.Logger
 
 class ConstraintsMemberShapeTest {
     private val outputModelOnly = """

codegen-server/src/test/kotlin/software/amazon/smithy/rust/codegen/server/smithy/RustCrateInlineModuleComposingWriterTest.kt

@@ -8,10 +8,6 @@ import software.amazon.smithy.rust.codegen.core.rustlang.Visibility
 import software.amazon.smithy.rust.codegen.core.rustlang.comment
 import software.amazon.smithy.rust.codegen.core.rustlang.rust
 import software.amazon.smithy.rust.codegen.core.rustlang.rustBlock
-import software.amazon.smithy.rust.codegen.core.rustlang.rustTemplate
-import software.amazon.smithy.rust.codegen.core.smithy.InputsModule
-import software.amazon.smithy.rust.codegen.core.smithy.ModelsModule
-import software.amazon.smithy.rust.codegen.core.smithy.OutputsModule
 import software.amazon.smithy.rust.codegen.core.smithy.RuntimeConfig
 import software.amazon.smithy.rust.codegen.core.smithy.RuntimeCrateLocation
 import software.amazon.smithy.rust.codegen.core.smithy.RustCrate
@@ -105,15 +101,15 @@ class RustCrateInlineModuleComposingWriterTest {
     @Test
     fun `simple inline module works`() {
         val testProject = TestWorkspace.testProject(serverTestSymbolProvider(model))
-        val moduleA = createTestInlineModule(ModelsModule, "a")
-        testProject.withModule(ModelsModule) {
+        val moduleA = createTestInlineModule(ServerRustModule.Model, "a")
+        testProject.withModule(ServerRustModule.Model) {
             testProject.getInlineModuleWriter().withInlineModule(this, moduleA) {
                 helloWorld(this, "a")
             }
         }
 
         testProject.getInlineModuleWriter().render()
-        testProject.withModule(ModelsModule) {
+        testProject.withModule(ServerRustModule.Model) {
             this.unitTest("test_a") {
                 rust("crate::model::a::hello_world();")
             }
@@ -144,13 +140,13 @@ class RustCrateInlineModuleComposingWriterTest {
             "i" to createTestOrphanInlineModule("i"),
         )
 
-        modules["b"] = createTestInlineModule(ModelsModule, "b")
+        modules["b"] = createTestInlineModule(ServerRustModule.Model, "b")
         modules["c"] = createTestInlineModule(modules["b"]!!, "c")
-        modules["f"] = createTestInlineModule(OutputsModule, "f")
+        modules["f"] = createTestInlineModule(ServerRustModule.Output, "f")
         modules["g"] = createTestInlineModule(modules["f"]!!, "g")
-        modules["h"] = createTestInlineModule(OutputsModule, "h")
+        modules["h"] = createTestInlineModule(ServerRustModule.Output, "h")
 
-        testProject.withModule(ModelsModule) {
+        testProject.withModule(ServerRustModule.Model) {
             testProject.getInlineModuleWriter().withInlineModule(this, modules["a"]!!) {
                 helloWorld(this, "a")
             }
@@ -173,13 +169,13 @@ class RustCrateInlineModuleComposingWriterTest {
 
         // Write directly to an inline module without specifying the immediate parent. crate::model::b::c
         // should have a `hello_world` fn in it now.
-        testProject.withModule(ModelsModule) {
+        testProject.withModule(ServerRustModule.Model) {
             testProject.getInlineModuleWriter().withInlineModuleHierarchy(this, modules["c"]!!) {
                 helloWorld(this, "c")
             }
         }
         // Write to a different top level module to confirm that works.
-        testProject.withModule(InputsModule) {
+        testProject.withModule(ServerRustModule.Model) {
             testProject.getInlineModuleWriter().withInlineModuleHierarchy(this, modules["e"]!!) {
                 helloWorld(this, "e")
             }
@@ -200,12 +196,12 @@ class RustCrateInlineModuleComposingWriterTest {
 
         // It should work even if the inner descendent module was added using `withInlineModuleHierarchy` and then
         // code is added to the intermediate module using `withInlineModuleHierarchyUsingCrate`
-        testProject.withModule(OutputsModule) {
+        testProject.withModule(ServerRustModule.Output) {
             testProject.getInlineModuleWriter().withInlineModuleHierarchy(this, modules["h"]!!) {
                 testProject.getInlineModuleWriter().withInlineModuleHierarchy(this, modules["i"]!!) {
                     helloWorld(this, "i")
                 }
-                testProject.withModule(ModelsModule) {
+                testProject.withModule(ServerRustModule.Model) {
                     // While writing to output::h::i, it should be able to a completely different module
                     testProject.getInlineModuleWriter().withInlineModuleHierarchy(this, modules["b"]!!) {
                         rustBlock("pub fn some_other_writer_wrote_this()") {
@@ -222,7 +218,7 @@ class RustCrateInlineModuleComposingWriterTest {
         // Render all of the code.
         testProject.getInlineModuleWriter().render()
 
-        testProject.withModule(ModelsModule) {
+        testProject.withModule(ServerRustModule.Model) {
             this.unitTest("test_a") {
                 rust("crate::model::a::hello_world();")
                 rust("crate::model::a::bye_world();")

codegen-server/src/test/kotlin/software/amazon/smithy/rust/codegen/server/smithy/generators/ConstrainedBlobGeneratorTest.kt

@@ -74,6 +74,7 @@ class ConstrainedBlobGeneratorTest {
             ConstrainedBlobGenerator(
                 codegenContext,
                 this.createTestInlineModuleCreator(),
+                this,
                 constrainedBlobShape,
                 SmithyValidationExceptionConversionGenerator(codegenContext),
             ).render()
@@ -133,6 +134,7 @@ class ConstrainedBlobGeneratorTest {
         ConstrainedBlobGenerator(
             codegenContext,
             writer.createTestInlineModuleCreator(),
+            writer,
             constrainedBlobShape,
             SmithyValidationExceptionConversionGenerator(codegenContext),
         ).render()