Unverified Commit dc8d4436 authored by Harry Barber's avatar Harry Barber Committed by GitHub
Browse files

Move methods from Protocol to ServerProtocol (#1731)

parent f324240b

codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/protocols/AwsJson.kt

+1 −19
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ import software.amazon.smithy.rust.codegen.client.rustlang.asType 
import software.amazon.smithy.rust.codegen.client.rustlang.rust

import software.amazon.smithy.rust.codegen.client.rustlang.rustBlockTemplate

import software.amazon.smithy.rust.codegen.client.rustlang.rustTemplate

import software.amazon.smithy.rust.codegen.client.rustlang.writable

import software.amazon.smithy.rust.codegen.client.smithy.ClientCodegenContext

import software.amazon.smithy.rust.codegen.client.smithy.CoreCodegenContext

import software.amazon.smithy.rust.codegen.client.smithy.RuntimeType
@@ -130,7 +129,7 @@ class AwsJsonSerializerGenerator( 


open class AwsJson(

    val coreCodegenContext: CoreCodegenContext,

    private val awsJsonVersion: AwsJsonVersion,

    val awsJsonVersion: AwsJsonVersion,

) : Protocol {

    private val runtimeConfig = coreCodegenContext.runtimeConfig

    private val errorScope = arrayOf(
@@ -183,23 +182,6 @@ open class AwsJson( 
                *errorScope,

            )

        }



    /**

     * Returns the operation name as required by the awsJson1.x protocols.

     */

    override fun serverRouterRequestSpec(

        operationShape: OperationShape,

        operationName: String,

        serviceName: String,

        requestSpecModule: RuntimeType,

    ) = writable {

        rust("""String::from("$serviceName.$operationName")""")

    }



    override fun serverRouterRuntimeConstructor() = when (awsJsonVersion) {

        AwsJsonVersion.Json10 -> "new_aws_json_10_router"

        AwsJsonVersion.Json11 -> "new_aws_json_11_router"

    }

}



fun awsJsonFieldName(member: MemberShape): String = member.memberName

codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/protocols/AwsQuery.kt

+0 −14
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ import software.amazon.smithy.model.traits.HttpTrait 
import software.amazon.smithy.model.traits.TimestampFormatTrait

import software.amazon.smithy.rust.codegen.client.rustlang.CargoDependency

import software.amazon.smithy.rust.codegen.client.rustlang.RustModule

import software.amazon.smithy.rust.codegen.client.rustlang.Writable

import software.amazon.smithy.rust.codegen.client.rustlang.asType

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

import software.amazon.smithy.rust.codegen.client.rustlang.rustBlockTemplate
@@ -105,17 +104,4 @@ class AwsQueryProtocol(private val coreCodegenContext: CoreCodegenContext) : Pro 
                rust("#T::parse_generic_error(payload.as_ref())", awsQueryErrors)

            }

        }



    override fun serverRouterRequestSpec(

        operationShape: OperationShape,

        operationName: String,

        serviceName: String,

        requestSpecModule: RuntimeType,

    ): Writable {

        TODO("Not yet implemented")

    }



    override fun serverRouterRuntimeConstructor(): String {

        TODO("Not yet implemented")

    }

}

codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/protocols/Ec2Query.kt

+0 −14
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ import software.amazon.smithy.model.traits.HttpTrait 
import software.amazon.smithy.model.traits.TimestampFormatTrait

import software.amazon.smithy.rust.codegen.client.rustlang.CargoDependency

import software.amazon.smithy.rust.codegen.client.rustlang.RustModule

import software.amazon.smithy.rust.codegen.client.rustlang.Writable

import software.amazon.smithy.rust.codegen.client.rustlang.asType

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

import software.amazon.smithy.rust.codegen.client.rustlang.rustBlockTemplate
@@ -96,17 +95,4 @@ class Ec2QueryProtocol(private val coreCodegenContext: CoreCodegenContext) : Pro 
                rust("#T::parse_generic_error(payload.as_ref())", ec2QueryErrors)

            }

        }



    override fun serverRouterRequestSpec(

        operationShape: OperationShape,

        operationName: String,

        serviceName: String,

        requestSpecModule: RuntimeType,

    ): Writable {

        TODO("Not yet implemented")

    }



    override fun serverRouterRuntimeConstructor(): String {

        TODO("Not yet implemented")

    }

}

codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/protocols/Protocol.kt

+0 −24
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import software.amazon.smithy.model.shapes.ShapeId 
import software.amazon.smithy.model.shapes.StructureShape

import software.amazon.smithy.model.traits.TimestampFormatTrait

import software.amazon.smithy.model.traits.Trait

import software.amazon.smithy.rust.codegen.client.rustlang.Writable

import software.amazon.smithy.rust.codegen.client.smithy.CoreCodegenContext

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

import software.amazon.smithy.rust.codegen.client.smithy.generators.protocol.ProtocolGenerator
@@ -74,29 +73,6 @@ interface Protocol { 
     * there are no response headers or statuses available to further inform the error parsing.

     */

    fun parseEventStreamGenericError(operationShape: OperationShape): RuntimeType



    /**

     * Returns a writable for the `RequestSpec` for an operation.

     */

    fun serverRouterRequestSpec(

        operationShape: OperationShape,

        operationName: String,

        serviceName: String,

        requestSpecModule: RuntimeType,

    ): Writable



    /**

     * Returns the name of the constructor to be used on the `Router` type, to instantiate a `Router` using this

     * protocol.

     */

    fun serverRouterRuntimeConstructor(): String



    /**

     * In some protocols, such as restJson1,

     * when there is no modeled body input, content type must not be set and the body must be empty.

     * Returns a boolean indicating whether to perform this check.

     */

    fun serverContentTypeCheckNoModeledInput(): Boolean = false

}



typealias ProtocolMap<C> = Map<ShapeId, ProtocolGeneratorFactory<ProtocolGenerator, C>>

codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/protocols/RestJson.kt

+0 −13
Original line number Diff line number Diff line
@@ -16,13 +16,11 @@ import software.amazon.smithy.model.traits.StreamingTrait 
import software.amazon.smithy.model.traits.TimestampFormatTrait

import software.amazon.smithy.rust.codegen.client.rustlang.CargoDependency

import software.amazon.smithy.rust.codegen.client.rustlang.RustModule

import software.amazon.smithy.rust.codegen.client.rustlang.Writable

import software.amazon.smithy.rust.codegen.client.rustlang.asType

import software.amazon.smithy.rust.codegen.client.rustlang.rustTemplate

import software.amazon.smithy.rust.codegen.client.smithy.ClientCodegenContext

import software.amazon.smithy.rust.codegen.client.smithy.CoreCodegenContext

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

import software.amazon.smithy.rust.codegen.client.smithy.generators.http.RestRequestSpecGenerator

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

import software.amazon.smithy.rust.codegen.client.smithy.protocols.parse.JsonParserGenerator

import software.amazon.smithy.rust.codegen.client.smithy.protocols.parse.StructuredDataParserGenerator
@@ -141,17 +139,6 @@ open class RestJson(val coreCodegenContext: CoreCodegenContext) : Protocol { 
                *errorScope,

            )

        }



    override fun serverRouterRequestSpec(

        operationShape: OperationShape,

        operationName: String,

        serviceName: String,

        requestSpecModule: RuntimeType,

    ): Writable = RestRequestSpecGenerator(httpBindingResolver, requestSpecModule).generate(operationShape)



    override fun serverRouterRuntimeConstructor() = "new_rest_json_router"



    override fun serverContentTypeCheckNoModeledInput() = true

}



fun restJsonFieldName(member: MemberShape): String {