Unverified Commit 5f075609 authored by Julian Antonielli's avatar Julian Antonielli Committed by GitHub
Browse files

Move `MakeOperationGenerator`, `ResponseBindingGenerator`, and... 

Move `MakeOperationGenerator`, `ResponseBindingGenerator`, and `RequestBindingGenerator` to `codegen-client` (#2132)

* Rename `MakeOperationGenerator` -> `ClientMakeOperationGenerator`

* Introduce `MakeOperationGenerator` interface

* Remove `MakeOperationGenerator` from `ProtocolGenerator`

* Move `MakeOperationGenerator` to `codegen-client`

* Rename `ClientMakeOperationGenerator` -> `MakeOperationGenerator`

* Move `RequestBindingGenerator` to `codegen-client`

* Move `ResponseBindingGenerator` to `codegen-client`

* Fix outdated imports
parent a84e61af

aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/AwsPresigningDecorator.kt

+1 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import software.amazon.smithy.rust.codegen.client.smithy.ClientCodegenContext 
import software.amazon.smithy.rust.codegen.client.smithy.customize.ClientCodegenDecorator

import software.amazon.smithy.rust.codegen.client.smithy.generators.client.FluentClientCustomization

import software.amazon.smithy.rust.codegen.client.smithy.generators.client.FluentClientSection

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

import software.amazon.smithy.rust.codegen.core.rustlang.RustWriter

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

import software.amazon.smithy.rust.codegen.core.rustlang.docs
@@ -35,7 +36,6 @@ import software.amazon.smithy.rust.codegen.core.smithy.RuntimeType 
import software.amazon.smithy.rust.codegen.core.smithy.customize.OperationCustomization

import software.amazon.smithy.rust.codegen.core.smithy.customize.OperationSection

import software.amazon.smithy.rust.codegen.core.smithy.generators.error.errorSymbol

import software.amazon.smithy.rust.codegen.core.smithy.generators.protocol.MakeOperationGenerator

import software.amazon.smithy.rust.codegen.core.smithy.protocols.HttpBoundProtocolPayloadGenerator

import software.amazon.smithy.rust.codegen.core.util.cloneOperation

import software.amazon.smithy.rust.codegen.core.util.expectTrait

codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/generators/EndpointTraitBindingGenerator.kt

+1 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ package software.amazon.smithy.rust.codegen.client.smithy.generators 
import software.amazon.smithy.model.Model

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

import software.amazon.smithy.model.traits.EndpointTrait

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

import software.amazon.smithy.rust.codegen.core.rustlang.RustWriter

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

import software.amazon.smithy.rust.codegen.core.rustlang.rustBlock
@@ -16,7 +17,6 @@ import software.amazon.smithy.rust.codegen.core.smithy.RuntimeConfig 
import software.amazon.smithy.rust.codegen.core.smithy.RuntimeType

import software.amazon.smithy.rust.codegen.core.smithy.RustSymbolProvider

import software.amazon.smithy.rust.codegen.core.smithy.generators.OperationBuildError

import software.amazon.smithy.rust.codegen.core.smithy.generators.http.rustFormatString

import software.amazon.smithy.rust.codegen.core.smithy.isOptional

import software.amazon.smithy.rust.codegen.core.util.inputShape

codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/generators/http/RequestBindingGenerator.kt→codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/generators/http/RequestBindingGenerator.kt

+2 −3
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 * SPDX-License-Identifier: Apache-2.0

 */



package software.amazon.smithy.rust.codegen.core.smithy.generators.http

package software.amazon.smithy.rust.codegen.client.smithy.generators.http



import software.amazon.smithy.codegen.core.Symbol

import software.amazon.smithy.model.knowledge.HttpBinding
@@ -27,6 +27,7 @@ import software.amazon.smithy.rust.codegen.core.smithy.CodegenContext 
import software.amazon.smithy.rust.codegen.core.smithy.RuntimeType

import software.amazon.smithy.rust.codegen.core.smithy.generators.OperationBuildError

import software.amazon.smithy.rust.codegen.core.smithy.generators.builderSymbol

import software.amazon.smithy.rust.codegen.core.smithy.generators.http.HttpBindingGenerator

import software.amazon.smithy.rust.codegen.core.smithy.generators.operationBuildError

import software.amazon.smithy.rust.codegen.core.smithy.isOptional

import software.amazon.smithy.rust.codegen.core.smithy.protocols.Protocol
@@ -50,8 +51,6 @@ fun SmithyPattern.rustFormatString(prefix: String, separator: String): String { 
    return base.dq()

}



// TODO(https://github.com/awslabs/smithy-rs/issues/1901) Move to `codegen-client` and update docs.

//  `MakeOperationGenerator` needs to be moved to `codegen-client` first, which is not easy.

/**

 * Generates methods to serialize and deserialize requests based on the HTTP trait. Specifically:

 * 1. `fn update_http_request(builder: http::request::Builder) -> Builder`

codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/generators/http/ResponseBindingGenerator.kt→codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/generators/http/ResponseBindingGenerator.kt

+2 −3
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 * SPDX-License-Identifier: Apache-2.0

 */



package software.amazon.smithy.rust.codegen.core.smithy.generators.http

package software.amazon.smithy.rust.codegen.client.smithy.generators.http



import software.amazon.smithy.codegen.core.Symbol

import software.amazon.smithy.model.shapes.OperationShape
@@ -12,11 +12,10 @@ import software.amazon.smithy.rust.codegen.core.rustlang.RustWriter 
import software.amazon.smithy.rust.codegen.core.smithy.CodegenContext

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

import software.amazon.smithy.rust.codegen.core.smithy.generators.builderSymbol

import software.amazon.smithy.rust.codegen.core.smithy.generators.http.HttpBindingGenerator

import software.amazon.smithy.rust.codegen.core.smithy.protocols.HttpBindingDescriptor

import software.amazon.smithy.rust.codegen.core.smithy.protocols.Protocol



// TODO(https://github.com/awslabs/smithy-rs/issues/1901) Move to `codegen-client` and update docs.

//  `MakeOperationGenerator` needs to be moved to `codegen-client` first, which is not easy.

class ResponseBindingGenerator(

    protocol: Protocol,

    private val codegenContext: CodegenContext,

codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/generators/protocol/ClientProtocolGenerator.kt

+5 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ import software.amazon.smithy.rust.codegen.core.smithy.customize.OperationSectio 
import software.amazon.smithy.rust.codegen.core.smithy.customize.writeCustomizations

import software.amazon.smithy.rust.codegen.core.smithy.generators.BuilderGenerator

import software.amazon.smithy.rust.codegen.core.smithy.generators.implBlock

import software.amazon.smithy.rust.codegen.core.smithy.generators.protocol.MakeOperationGenerator

import software.amazon.smithy.rust.codegen.core.smithy.generators.protocol.ProtocolGenerator

import software.amazon.smithy.rust.codegen.core.smithy.generators.protocol.ProtocolTraitImplGenerator

import software.amazon.smithy.rust.codegen.core.smithy.protocols.Protocol
@@ -28,9 +27,13 @@ import software.amazon.smithy.rust.codegen.core.util.inputShape 
open class ClientProtocolGenerator(

    codegenContext: CodegenContext,

    private val protocol: Protocol,

    /**

     * Operations generate a `make_operation(&config)` method to build a `aws_smithy_http::Operation` that can be dispatched

     * This is the serializer side of request dispatch

     */

    private val makeOperationGenerator: MakeOperationGenerator,

    private val traitGenerator: ProtocolTraitImplGenerator,

) : ProtocolGenerator(codegenContext, protocol, makeOperationGenerator, traitGenerator) {

) : ProtocolGenerator(codegenContext, protocol, traitGenerator) {

    /**

     * Render all code required for serializing requests and deserializing responses for the operation

     *