Unverified Commit cd056302 authored by david-perez's avatar david-perez Committed by GitHub
Browse files

Use the `SymbolProvider` and `Model` directly from the Smithy plugins (#1438) 

Despite all the decorators and protocols that we have, there aren't any
`RustCodegenDecorator`s or `ProtocolGeneratorFactory`s that are
modifying the base symbol provider that the Smithy plugin provides. So
we can use directly the base symbol provider everywhere and remove the
methods from these interfaces to make the code a little bit simpler.

Likewise, there isn't a single `ProtocolGeneratorFactory` that
transforms the base model that the Smithy plugin provides.
parent b1d50b56

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

+2 −5
Original line number Diff line number Diff line
@@ -60,11 +60,8 @@ class PythonServerCodegenVisitor( 
            )

                .protocolFor(context.model, service)

        protocolGeneratorFactory = generator

        model = generator.transformModel(codegenDecorator.transformModel(service, baseModel))

        val baseProvider = PythonCodegenServerPlugin.baseSymbolProvider(model, service, symbolVisitorConfig)

        // Override symbolProvider.

        symbolProvider =

            codegenDecorator.symbolProvider(generator.symbolProvider(model, baseProvider))

        model = codegenDecorator.transformModel(service, baseModel)

        symbolProvider = PythonCodegenServerPlugin.baseSymbolProvider(model, service, symbolVisitorConfig)



        // Override `codegenContext` which carries the symbolProvider.

        codegenContext = ServerCodegenContext(model, symbolProvider, service, protocol, settings)

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

+2 −4
Original line number Diff line number Diff line
@@ -82,10 +82,8 @@ open class ServerCodegenVisitor( 
            )

                .protocolFor(context.model, service)

        protocolGeneratorFactory = generator

        model = generator.transformModel(codegenDecorator.transformModel(service, baseModel))

        val baseProvider = RustCodegenServerPlugin.baseSymbolProvider(model, service, symbolVisitorConfig)

        symbolProvider =

            codegenDecorator.symbolProvider(generator.symbolProvider(model, baseProvider))

        model = codegenDecorator.transformModel(service, baseModel)

        symbolProvider = RustCodegenServerPlugin.baseSymbolProvider(model, service, symbolVisitorConfig)



        codegenContext = ServerCodegenContext(

            model,

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

+0 −3
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 


package software.amazon.smithy.rust.codegen.server.smithy.protocols



import software.amazon.smithy.model.Model

import software.amazon.smithy.model.shapes.OperationShape

import software.amazon.smithy.model.traits.ErrorTrait

import software.amazon.smithy.rust.codegen.rustlang.Writable
@@ -38,8 +37,6 @@ class ServerAwsJsonFactory(private val version: AwsJsonVersion) : 
    override fun buildProtocolGenerator(codegenContext: ServerCodegenContext): ServerHttpBoundProtocolGenerator =

        ServerHttpBoundProtocolGenerator(codegenContext, protocol(codegenContext))



    override fun transformModel(model: Model): Model = model



    override fun support(): ProtocolSupport {

        return ProtocolSupport(

            /* Client support */

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

+0 −3
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 


package software.amazon.smithy.rust.codegen.server.smithy.protocols



import software.amazon.smithy.model.Model

import software.amazon.smithy.rust.codegen.smithy.ServerCodegenContext

import software.amazon.smithy.rust.codegen.smithy.generators.protocol.ProtocolSupport

import software.amazon.smithy.rust.codegen.smithy.protocols.Protocol
@@ -22,8 +21,6 @@ class ServerRestJsonFactory : ProtocolGeneratorFactory<ServerHttpBoundProtocolGe 
    override fun buildProtocolGenerator(codegenContext: ServerCodegenContext): ServerHttpBoundProtocolGenerator =

        ServerHttpBoundProtocolGenerator(codegenContext, RestJson(codegenContext))



    override fun transformModel(model: Model): Model = model



    override fun support(): ProtocolSupport {

        return ProtocolSupport(

            /* Client support */

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

+0 −3
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 


package software.amazon.smithy.rust.codegen.server.smithy.protocols



import software.amazon.smithy.model.Model

import software.amazon.smithy.rust.codegen.smithy.ServerCodegenContext

import software.amazon.smithy.rust.codegen.smithy.generators.protocol.ProtocolSupport

import software.amazon.smithy.rust.codegen.smithy.protocols.Protocol
@@ -22,8 +21,6 @@ class ServerRestXmlFactory : ProtocolGeneratorFactory<ServerHttpBoundProtocolGen 
    override fun buildProtocolGenerator(codegenContext: ServerCodegenContext): ServerHttpBoundProtocolGenerator =

        ServerHttpBoundProtocolGenerator(codegenContext, RestXml(codegenContext))



    override fun transformModel(model: Model): Model = model



    override fun support(): ProtocolSupport {

        return ProtocolSupport(

            /* Client support */