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

Rename `ServerHttpProtocolGenerator` to `ServerHttpBoundProtocolGenerator` (#1251) 

And `ServerHttpProtocolImplGenerator` to
`ServerHttpBoundProtocolTraitImplGenerator`.

The client-side classes are named `HttpBoundProtocolGenerator` and
`HttpBoundProtocolTraitImplGenerator`, so the server-side clases should
just add the "Server" prefix and not deviate from the naming convention.
parent 86680c26

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

+3 −3
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ import software.amazon.smithy.rust.codegen.rustlang.rustBlockTemplate 
import software.amazon.smithy.rust.codegen.rustlang.rustTemplate

import software.amazon.smithy.rust.codegen.server.smithy.ServerCargoDependency

import software.amazon.smithy.rust.codegen.server.smithy.ServerRuntimeType

import software.amazon.smithy.rust.codegen.server.smithy.protocols.ServerHttpProtocolGenerator

import software.amazon.smithy.rust.codegen.server.smithy.protocols.ServerHttpBoundProtocolGenerator

import software.amazon.smithy.rust.codegen.smithy.CodegenContext

import software.amazon.smithy.rust.codegen.smithy.RuntimeType

import software.amazon.smithy.rust.codegen.smithy.generators.error.errorSymbol
@@ -62,8 +62,8 @@ class ServerOperationHandlerGenerator( 
        operations.map { operation ->

            val operationName = symbolProvider.toSymbol(operation).name

            val inputName = "crate::input::${operationName}Input"

            val inputWrapperName = "crate::operation::$operationName${ServerHttpProtocolGenerator.OPERATION_INPUT_WRAPPER_SUFFIX}"

            val outputWrapperName = "crate::operation::$operationName${ServerHttpProtocolGenerator.OPERATION_OUTPUT_WRAPPER_SUFFIX}"

            val inputWrapperName = "crate::operation::$operationName${ServerHttpBoundProtocolGenerator.OPERATION_INPUT_WRAPPER_SUFFIX}"

            val outputWrapperName = "crate::operation::$operationName${ServerHttpBoundProtocolGenerator.OPERATION_OUTPUT_WRAPPER_SUFFIX}"

            val fnSignature = if (state) {

                "impl<B, Fun, Fut, S> #{ServerOperationHandler}::Handler<B, $serverCrate::Extension<S>, $inputName> for Fun"

            } else {

codegen-server/src/main/kotlin/software/amazon/smithy/rust/codegen/server/smithy/generators/protocol/ServerProtocolTestGenerator.kt

+4 −4
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import software.amazon.smithy.rust.codegen.rustlang.rustBlock 
import software.amazon.smithy.rust.codegen.rustlang.rustTemplate

import software.amazon.smithy.rust.codegen.rustlang.withBlock

import software.amazon.smithy.rust.codegen.server.smithy.ServerCargoDependency

import software.amazon.smithy.rust.codegen.server.smithy.protocols.ServerHttpProtocolGenerator

import software.amazon.smithy.rust.codegen.server.smithy.protocols.ServerHttpBoundProtocolGenerator

import software.amazon.smithy.rust.codegen.smithy.CodegenContext

import software.amazon.smithy.rust.codegen.smithy.RuntimeType

import software.amazon.smithy.rust.codegen.smithy.generators.Instantiator
@@ -67,7 +67,7 @@ class ServerProtocolTestGenerator( 
    private val symbolProvider = codegenContext.symbolProvider

    private val operationSymbol = symbolProvider.toSymbol(operationShape)

    private val operationIndex = OperationIndex.of(codegenContext.model)

    private val operationImplementationName = "${operationSymbol.name}${ServerHttpProtocolGenerator.OPERATION_OUTPUT_WRAPPER_SUFFIX}"

    private val operationImplementationName = "${operationSymbol.name}${ServerHttpBoundProtocolGenerator.OPERATION_OUTPUT_WRAPPER_SUFFIX}"

    private val operationErrorName = "crate::error::${operationSymbol.name}Error"



    private val instantiator = with(codegenContext) {
@@ -313,7 +313,7 @@ class ServerProtocolTestGenerator( 
            renderHttpRequest(uri.get(), headers, body.orNull(), queryParams, host.orNull())

        }



        val operationName = "${operationSymbol.name}${ServerHttpProtocolGenerator.OPERATION_INPUT_WRAPPER_SUFFIX}"

        val operationName = "${operationSymbol.name}${ServerHttpBoundProtocolGenerator.OPERATION_INPUT_WRAPPER_SUFFIX}"

        rustTemplate(

            """

            use #{AxumCore}::extract::FromRequest;
@@ -378,7 +378,7 @@ class ServerProtocolTestGenerator( 
        instantiator.render(rustWriter, inputShape, httpRequestTestCase.params)

        rustWriter.write(";")



        val operationName = "${operationSymbol.name}${ServerHttpProtocolGenerator.OPERATION_INPUT_WRAPPER_SUFFIX}"

        val operationName = "${operationSymbol.name}${ServerHttpBoundProtocolGenerator.OPERATION_INPUT_WRAPPER_SUFFIX}"

        rustWriter.rustTemplate(

            """

            use #{AxumCore}::extract::FromRequest;

codegen-server/src/main/kotlin/software/amazon/smithy/rust/codegen/server/smithy/protocols/ServerHttpProtocolGenerator.kt→codegen-server/src/main/kotlin/software/amazon/smithy/rust/codegen/server/smithy/protocols/ServerHttpBoundProtocolGenerator.kt

+5 −5
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ import java.util.logging.Logger 
 * and overrides by creating a protocol factory inheriting from this class and feeding it to the [ServerProtocolLoader].

 * See `ServerRestJson.kt` for more info.

 */

class ServerHttpProtocolGenerator(

class ServerHttpBoundProtocolGenerator(

    codegenContext: CodegenContext,

    protocol: Protocol,

) : ProtocolGenerator(
@@ -83,7 +83,7 @@ class ServerHttpProtocolGenerator( 
        public = true,

        includeDefaultPayloadHeaders = true

    ),

    ServerHttpProtocolImplGenerator(codegenContext, protocol),

    ServerHttpBoundProtocolTraitImplGenerator(codegenContext, protocol),

) {

    // Define suffixes for operation input / output / error wrappers

    companion object {
@@ -96,7 +96,7 @@ class ServerHttpProtocolGenerator( 
 * Generate all operation input parsers and output serializers for streaming and

 * non-streaming types.

 */

private class ServerHttpProtocolImplGenerator(

private class ServerHttpBoundProtocolTraitImplGenerator(

    private val codegenContext: CodegenContext,

    private val protocol: Protocol,

) : ProtocolTraitImplGenerator {
@@ -151,7 +151,7 @@ private class ServerHttpProtocolImplGenerator( 
        operationShape: OperationShape

    ) {

        val operationName = symbolProvider.toSymbol(operationShape).name

        val inputName = "${operationName}${ServerHttpProtocolGenerator.OPERATION_INPUT_WRAPPER_SUFFIX}"

        val inputName = "${operationName}${ServerHttpBoundProtocolGenerator.OPERATION_INPUT_WRAPPER_SUFFIX}"



        // Implement Axum `FromRequest` trait for input types.

        rustTemplate(
@@ -186,7 +186,7 @@ private class ServerHttpProtocolImplGenerator( 


        // Implement Axum `IntoResponse` for output types.



        val outputName = "${operationName}${ServerHttpProtocolGenerator.OPERATION_OUTPUT_WRAPPER_SUFFIX}"

        val outputName = "${operationName}${ServerHttpBoundProtocolGenerator.OPERATION_OUTPUT_WRAPPER_SUFFIX}"

        val errorSymbol = operationShape.errorSymbol(symbolProvider)



        if (operationShape.errors.isNotEmpty()) {

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

+3 −3
Original line number Diff line number Diff line
@@ -16,11 +16,11 @@ import software.amazon.smithy.rust.codegen.smithy.protocols.RestJson 
 * RestJson1 server-side protocol factory. This factory creates the [ServerHttpProtocolGenerator]

 * with RestJson1 specific configurations.

 */

class ServerRestJsonFactory : ProtocolGeneratorFactory<ServerHttpProtocolGenerator> {

class ServerRestJsonFactory : ProtocolGeneratorFactory<ServerHttpBoundProtocolGenerator> {

    override fun protocol(codegenContext: CodegenContext): Protocol = RestJson(codegenContext)



    override fun buildProtocolGenerator(codegenContext: CodegenContext): ServerHttpProtocolGenerator =

        ServerHttpProtocolGenerator(codegenContext, RestJson(codegenContext))

    override fun buildProtocolGenerator(codegenContext: CodegenContext): ServerHttpBoundProtocolGenerator =

        ServerHttpBoundProtocolGenerator(codegenContext, RestJson(codegenContext))



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

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

+3 −3
Original line number Diff line number Diff line
@@ -17,11 +17,11 @@ import software.amazon.smithy.rust.codegen.smithy.protocols.RestXml 
 * with RestXml specific configurations.

 */

class ServerRestXmlFactory(private val generator: (CodegenContext) -> Protocol = { RestXml(it) }) :

    ProtocolGeneratorFactory<ServerHttpProtocolGenerator> {

    ProtocolGeneratorFactory<ServerHttpBoundProtocolGenerator> {

    override fun protocol(codegenContext: CodegenContext): Protocol = generator(codegenContext)



    override fun buildProtocolGenerator(codegenContext: CodegenContext): ServerHttpProtocolGenerator =

        ServerHttpProtocolGenerator(codegenContext, RestXml(codegenContext))

    override fun buildProtocolGenerator(codegenContext: CodegenContext): ServerHttpBoundProtocolGenerator =

        ServerHttpBoundProtocolGenerator(codegenContext, RestXml(codegenContext))



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