Skip to content

feat: generate default generic client implementations #1468

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
0marperez wants to merge 4 commits into
base: main
Choose a base branch
from
+81 −74
Open

feat: generate default generic client implementations #1468

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
79e3206
feat: generate default generic client implementations
0marperez Dec 13, 2025
678d6fe
feedback
0marperez Dec 15, 2025
ab1e277
feedback: refactor tests as well
0marperez Dec 15, 2025
0b75526
lint
0marperez Dec 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changes/ece99a81-4736-43df-a20e-9a367e36370b.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"id": "ece99a81-4736-43df-a20e-9a367e36370b",
"type": "feature",
"description": "Start generating default implementations for generic clients"
}
1 change: 0 additions & 1 deletion ...ces/META-INF/services/software.amazon.smithy.kotlin.codegen.integration.KotlinIntegration
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
software.amazon.smithy.kotlin.codegen.aws.SdkProtocolGeneratorSupplier
software.amazon.smithy.kotlin.codegen.aws.customization.RegionSupport
software.amazon.smithy.kotlin.codegen.aws.middleware.ClockSkew
1 change: 1 addition & 0 deletions ...degen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/AwsQueryTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

package software.amazon.smithy.kotlin.codegen.aws.protocols

import software.amazon.smithy.kotlin.codegen.protocols.AwsQuery
import software.amazon.smithy.kotlin.codegen.test.*
import kotlin.test.Test

Expand Down
1 change: 1 addition & 0 deletions ...egen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/RestJson1Test.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

package software.amazon.smithy.kotlin.codegen.aws.protocols

import software.amazon.smithy.kotlin.codegen.protocols.RestJson1
import software.amazon.smithy.kotlin.codegen.test.*
import kotlin.test.Test

Expand Down
1 change: 1 addition & 0 deletions ...odegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/RestXmlTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

package software.amazon.smithy.kotlin.codegen.aws.protocols

import software.amazon.smithy.kotlin.codegen.protocols.RestXml
import software.amazon.smithy.kotlin.codegen.test.*
import kotlin.test.Test

Expand Down
1 change: 1 addition & 0 deletions ...egen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/RpcV2CborTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
package software.amazon.smithy.kotlin.codegen.aws.protocols

import io.kotest.matchers.string.shouldNotContain
import software.amazon.smithy.kotlin.codegen.protocols.RpcV2Cbor
import software.amazon.smithy.kotlin.codegen.test.*
import kotlin.test.Test

Expand Down
3 changes: 2 additions & 1 deletion ...re/amazon/smithy/kotlin/codegen/aws/protocols/core/AwsHttpBindingProtocolGeneratorTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
package software.amazon.smithy.kotlin.codegen.aws.protocols.core

import software.amazon.smithy.codegen.core.Symbol
import software.amazon.smithy.kotlin.codegen.aws.protocols.json.AwsJsonHttpBindingResolver
import software.amazon.smithy.kotlin.codegen.core.KotlinWriter
import software.amazon.smithy.kotlin.codegen.model.expectShape
import software.amazon.smithy.kotlin.codegen.protocols.core.AwsHttpBindingProtocolGenerator
import software.amazon.smithy.kotlin.codegen.protocols.json.AwsJsonHttpBindingResolver
Copy link
Contributor

@ianbotsf ianbotsf Dec 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correctness: Unit test classes should be in the same package and module as the units they test.

import software.amazon.smithy.kotlin.codegen.rendering.protocol.HttpBindingResolver
import software.amazon.smithy.kotlin.codegen.rendering.protocol.ProtocolGenerator
import software.amazon.smithy.kotlin.codegen.rendering.serde.*
Expand Down
1 change: 1 addition & 0 deletions ...oftware/amazon/smithy/kotlin/codegen/aws/protocols/json/AwsJsonHttpBindingResolverTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
package software.amazon.smithy.kotlin.codegen.aws.protocols.json

import software.amazon.smithy.kotlin.codegen.model.expectShape
import software.amazon.smithy.kotlin.codegen.protocols.json.AwsJsonHttpBindingResolver
import software.amazon.smithy.kotlin.codegen.test.newTestContext
import software.amazon.smithy.kotlin.codegen.test.toSmithyModel
import software.amazon.smithy.model.knowledge.HttpBinding
Expand Down
1 change: 1 addition & 0 deletions ...n/smithy/kotlin/codegen/aws/protocols/json/AwsJsonProtocolSerdeDescriptorGeneratorTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

package software.amazon.smithy.kotlin.codegen.aws.protocols.json

import software.amazon.smithy.kotlin.codegen.protocols.json.AwsJsonProtocolSerdeDescriptorGenerator
import software.amazon.smithy.kotlin.codegen.test.*
import software.amazon.smithy.model.shapes.ShapeId
import kotlin.test.Test
Expand Down
1 change: 1 addition & 0 deletions ...are/amazon/smithy/kotlin/codegen/aws/protocols/xml/RestXmlSerdeDescriptorGeneratorTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

package software.amazon.smithy.kotlin.codegen.aws.protocols.xml

import software.amazon.smithy.kotlin.codegen.protocols.xml.RestXmlSerdeDescriptorGenerator
import software.amazon.smithy.kotlin.codegen.test.*
import software.amazon.smithy.model.shapes.ShapeId
import kotlin.test.Test
Expand Down
16 changes: 5 additions & 11 deletions ...degen/aws/SdkProtocolGeneratorSupplier.kt → ...tlin/codegen/ProtocolGeneratorSupplier.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,18 @@
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
* SPDX-License-Identifier: Apache-2.0
*/
package software.amazon.smithy.kotlin.codegen.aws

import software.amazon.smithy.kotlin.codegen.aws.protocols.*
package software.amazon.smithy.kotlin.codegen

import software.amazon.smithy.kotlin.codegen.integration.KotlinIntegration
import software.amazon.smithy.kotlin.codegen.protocols.*
import software.amazon.smithy.kotlin.codegen.rendering.protocol.ProtocolGenerator

/**
* Integration that registers protocol generators this package provides
* Integration that registers protocol generators
*/
class SdkProtocolGeneratorSupplier : KotlinIntegration {
/**
* Gets the sort order of the customization from -128 to 127, with lowest
* executed first.
*
* @return Returns the sort order, defaults to -10.
*/
class ProtocolGeneratorSupplier : KotlinIntegration {
override val order: Byte = -10

override val protocolGenerators: List<ProtocolGenerator> =
listOf(
AwsJson1_0(),
Expand Down
12 changes: 6 additions & 6 deletions ...otlin/codegen/aws/protocols/AwsJson1_0.kt → ...hy/kotlin/codegen/protocols/AwsJson1_0.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
* SPDX-License-Identifier: Apache-2.0
*/
package software.amazon.smithy.kotlin.codegen.aws.protocols
package software.amazon.smithy.kotlin.codegen.protocols

import software.amazon.smithy.aws.traits.protocols.AwsJson1_0Trait
import software.amazon.smithy.kotlin.codegen.aws.protocols.core.AwsHttpBindingProtocolGenerator
import software.amazon.smithy.kotlin.codegen.aws.protocols.json.AwsJsonHttpBindingResolver
import software.amazon.smithy.kotlin.codegen.aws.protocols.json.AwsJsonProtocolMiddleware
import software.amazon.smithy.kotlin.codegen.aws.protocols.json.AwsJsonProtocolParserGenerator
import software.amazon.smithy.kotlin.codegen.aws.protocols.json.JsonHttpBindingProtocolGenerator
import software.amazon.smithy.kotlin.codegen.protocols.core.AwsHttpBindingProtocolGenerator
import software.amazon.smithy.kotlin.codegen.protocols.json.AwsJsonHttpBindingResolver
import software.amazon.smithy.kotlin.codegen.protocols.json.AwsJsonProtocolMiddleware
import software.amazon.smithy.kotlin.codegen.protocols.json.AwsJsonProtocolParserGenerator
import software.amazon.smithy.kotlin.codegen.protocols.json.JsonHttpBindingProtocolGenerator
import software.amazon.smithy.kotlin.codegen.rendering.protocol.HttpBindingResolver
import software.amazon.smithy.kotlin.codegen.rendering.protocol.ProtocolGenerator
import software.amazon.smithy.kotlin.codegen.rendering.protocol.ProtocolMiddleware
Expand Down
12 changes: 6 additions & 6 deletions ...otlin/codegen/aws/protocols/AwsJson1_1.kt → ...hy/kotlin/codegen/protocols/AwsJson1_1.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
* SPDX-License-Identifier: Apache-2.0
*/

package software.amazon.smithy.kotlin.codegen.aws.protocols
package software.amazon.smithy.kotlin.codegen.protocols

import software.amazon.smithy.aws.traits.protocols.AwsJson1_1Trait
import software.amazon.smithy.kotlin.codegen.aws.protocols.core.AwsHttpBindingProtocolGenerator
import software.amazon.smithy.kotlin.codegen.aws.protocols.json.AwsJsonHttpBindingResolver
import software.amazon.smithy.kotlin.codegen.aws.protocols.json.AwsJsonProtocolMiddleware
import software.amazon.smithy.kotlin.codegen.aws.protocols.json.AwsJsonProtocolParserGenerator
import software.amazon.smithy.kotlin.codegen.aws.protocols.json.JsonHttpBindingProtocolGenerator
import software.amazon.smithy.kotlin.codegen.protocols.core.AwsHttpBindingProtocolGenerator
import software.amazon.smithy.kotlin.codegen.protocols.json.AwsJsonHttpBindingResolver
import software.amazon.smithy.kotlin.codegen.protocols.json.AwsJsonProtocolMiddleware
import software.amazon.smithy.kotlin.codegen.protocols.json.AwsJsonProtocolParserGenerator
import software.amazon.smithy.kotlin.codegen.protocols.json.JsonHttpBindingProtocolGenerator
import software.amazon.smithy.kotlin.codegen.rendering.protocol.HttpBindingResolver
import software.amazon.smithy.kotlin.codegen.rendering.protocol.ProtocolGenerator
import software.amazon.smithy.kotlin.codegen.rendering.protocol.ProtocolMiddleware
Expand Down
10 changes: 5 additions & 5 deletions .../kotlin/codegen/aws/protocols/AwsQuery.kt → ...ithy/kotlin/codegen/protocols/AwsQuery.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,10 @@
* SPDX-License-Identifier: Apache-2.0
*/

package software.amazon.smithy.kotlin.codegen.aws.protocols
package software.amazon.smithy.kotlin.codegen.protocols

import software.amazon.smithy.aws.traits.protocols.AwsQueryErrorTrait
import software.amazon.smithy.aws.traits.protocols.AwsQueryTrait
import software.amazon.smithy.kotlin.codegen.aws.protocols.core.AbstractQueryFormUrlSerializerGenerator
import software.amazon.smithy.kotlin.codegen.aws.protocols.core.AwsHttpBindingProtocolGenerator
import software.amazon.smithy.kotlin.codegen.aws.protocols.core.QueryHttpBindingProtocolGenerator
import software.amazon.smithy.kotlin.codegen.aws.protocols.formurl.QuerySerdeFormUrlDescriptorGenerator
import software.amazon.smithy.kotlin.codegen.core.KotlinWriter
import software.amazon.smithy.kotlin.codegen.core.RenderingContext
import software.amazon.smithy.kotlin.codegen.core.RuntimeTypes
Expand All @@ -19,6 +15,10 @@ import software.amazon.smithy.kotlin.codegen.lang.KotlinTypes
import software.amazon.smithy.kotlin.codegen.model.buildSymbol
import software.amazon.smithy.kotlin.codegen.model.getTrait
import software.amazon.smithy.kotlin.codegen.model.hasTrait
import software.amazon.smithy.kotlin.codegen.protocols.core.AbstractQueryFormUrlSerializerGenerator
import software.amazon.smithy.kotlin.codegen.protocols.core.AwsHttpBindingProtocolGenerator
import software.amazon.smithy.kotlin.codegen.protocols.core.QueryHttpBindingProtocolGenerator
import software.amazon.smithy.kotlin.codegen.protocols.formurl.QuerySerdeFormUrlDescriptorGenerator
import software.amazon.smithy.kotlin.codegen.rendering.protocol.ProtocolGenerator
import software.amazon.smithy.kotlin.codegen.rendering.protocol.toRenderingContext
import software.amazon.smithy.kotlin.codegen.rendering.serde.FormUrlSerdeDescriptorGenerator
Expand Down
8 changes: 4 additions & 4 deletions .../kotlin/codegen/aws/protocols/Ec2Query.kt → ...ithy/kotlin/codegen/protocols/Ec2Query.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
* SPDX-License-Identifier: Apache-2.0
*/
package software.amazon.smithy.kotlin.codegen.aws.protocols
package software.amazon.smithy.kotlin.codegen.protocols

import software.amazon.smithy.aws.traits.protocols.Ec2QueryNameTrait
import software.amazon.smithy.aws.traits.protocols.Ec2QueryTrait
import software.amazon.smithy.codegen.core.Symbol
import software.amazon.smithy.kotlin.codegen.aws.protocols.core.AbstractQueryFormUrlSerializerGenerator
import software.amazon.smithy.kotlin.codegen.aws.protocols.core.QueryHttpBindingProtocolGenerator
import software.amazon.smithy.kotlin.codegen.aws.protocols.formurl.QuerySerdeFormUrlDescriptorGenerator
import software.amazon.smithy.kotlin.codegen.core.KotlinWriter
import software.amazon.smithy.kotlin.codegen.core.RenderingContext
import software.amazon.smithy.kotlin.codegen.core.RuntimeTypes
import software.amazon.smithy.kotlin.codegen.core.withBlock
import software.amazon.smithy.kotlin.codegen.model.buildSymbol
import software.amazon.smithy.kotlin.codegen.model.getTrait
import software.amazon.smithy.kotlin.codegen.model.isNullable
import software.amazon.smithy.kotlin.codegen.protocols.core.AbstractQueryFormUrlSerializerGenerator
import software.amazon.smithy.kotlin.codegen.protocols.core.QueryHttpBindingProtocolGenerator
import software.amazon.smithy.kotlin.codegen.protocols.formurl.QuerySerdeFormUrlDescriptorGenerator
import software.amazon.smithy.kotlin.codegen.rendering.protocol.ProtocolGenerator
import software.amazon.smithy.kotlin.codegen.rendering.protocol.toRenderingContext
import software.amazon.smithy.kotlin.codegen.rendering.serde.*
Expand Down
8 changes: 4 additions & 4 deletions ...kotlin/codegen/aws/protocols/RestJson1.kt → ...thy/kotlin/codegen/protocols/RestJson1.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
* SPDX-License-Identifier: Apache-2.0
*/
package software.amazon.smithy.kotlin.codegen.aws.protocols
package software.amazon.smithy.kotlin.codegen.protocols

import software.amazon.smithy.aws.traits.protocols.RestJson1Trait
import software.amazon.smithy.kotlin.codegen.aws.protocols.core.AwsHttpBindingProtocolGenerator
import software.amazon.smithy.kotlin.codegen.aws.protocols.json.AwsJsonProtocolParserGenerator
import software.amazon.smithy.kotlin.codegen.aws.protocols.json.JsonHttpBindingProtocolGenerator
import software.amazon.smithy.kotlin.codegen.core.KotlinWriter
import software.amazon.smithy.kotlin.codegen.core.RuntimeTypes
import software.amazon.smithy.kotlin.codegen.core.defaultName
import software.amazon.smithy.kotlin.codegen.core.withBlock
import software.amazon.smithy.kotlin.codegen.protocols.core.AwsHttpBindingProtocolGenerator
import software.amazon.smithy.kotlin.codegen.protocols.json.AwsJsonProtocolParserGenerator
import software.amazon.smithy.kotlin.codegen.protocols.json.JsonHttpBindingProtocolGenerator
import software.amazon.smithy.kotlin.codegen.rendering.protocol.*
import software.amazon.smithy.kotlin.codegen.rendering.serde.StructuredDataParserGenerator
import software.amazon.smithy.model.Model
Expand Down
9 changes: 5 additions & 4 deletions ...y/kotlin/codegen/aws/protocols/RestXml.kt → ...mithy/kotlin/codegen/protocols/RestXml.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
* SPDX-License-Identifier: Apache-2.0
*/

package software.amazon.smithy.kotlin.codegen.aws.protocols
package software.amazon.smithy.kotlin.codegen.protocols

import software.amazon.smithy.aws.traits.protocols.RestXmlTrait
import software.amazon.smithy.codegen.core.Symbol
import software.amazon.smithy.kotlin.codegen.aws.protocols.core.AwsHttpBindingProtocolGenerator
import software.amazon.smithy.kotlin.codegen.aws.protocols.xml.RestXmlSerdeDescriptorGenerator
import software.amazon.smithy.kotlin.codegen.core.KotlinWriter
import software.amazon.smithy.kotlin.codegen.core.RuntimeTypes
import software.amazon.smithy.kotlin.codegen.core.withBlock
import software.amazon.smithy.kotlin.codegen.model.*
import software.amazon.smithy.kotlin.codegen.protocols.core.AwsHttpBindingProtocolGenerator
import software.amazon.smithy.kotlin.codegen.protocols.xml.RestXmlSerdeDescriptorGenerator
import software.amazon.smithy.kotlin.codegen.rendering.protocol.*
import software.amazon.smithy.kotlin.codegen.rendering.serde.*
import software.amazon.smithy.model.Model
Expand Down Expand Up @@ -223,7 +223,8 @@ class RestXmlSerializerGenerator(
shape: Shape,
members: List<MemberShape>,
writer: KotlinWriter,
): XmlSerdeDescriptorGenerator = RestXmlSerdeDescriptorGenerator(ctx.toRenderingContext(protocolGenerator, shape, writer), members)
): XmlSerdeDescriptorGenerator =
RestXmlSerdeDescriptorGenerator(ctx.toRenderingContext(protocolGenerator, shape, writer), members)

override fun payloadSerializer(
ctx: ProtocolGenerator.GenerationContext,
Expand Down
6 changes: 3 additions & 3 deletions ...kotlin/codegen/aws/protocols/RpcV2Cbor.kt → ...thy/kotlin/codegen/protocols/RpcV2Cbor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
* SPDX-License-Identifier: Apache-2.0
*/
package software.amazon.smithy.kotlin.codegen.aws.protocols
package software.amazon.smithy.kotlin.codegen.protocols

import software.amazon.smithy.kotlin.codegen.aws.protocols.core.AwsHttpBindingProtocolGenerator
import software.amazon.smithy.kotlin.codegen.aws.protocols.core.StaticHttpBindingResolver
import software.amazon.smithy.kotlin.codegen.core.KotlinWriter
import software.amazon.smithy.kotlin.codegen.core.RuntimeTypes
import software.amazon.smithy.kotlin.codegen.model.*
import software.amazon.smithy.kotlin.codegen.model.traits.SyntheticClone
import software.amazon.smithy.kotlin.codegen.protocols.core.AwsHttpBindingProtocolGenerator
import software.amazon.smithy.kotlin.codegen.protocols.core.StaticHttpBindingResolver
import software.amazon.smithy.kotlin.codegen.rendering.protocol.*
import software.amazon.smithy.kotlin.codegen.rendering.serde.CborParserGenerator
import software.amazon.smithy.kotlin.codegen.rendering.serde.CborSerializerGenerator
Expand Down
6 changes: 3 additions & 3 deletions ...s/core/AwsHttpBindingProtocolGenerator.kt → ...s/core/AwsHttpBindingProtocolGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
* SPDX-License-Identifier: Apache-2.0
*/
package software.amazon.smithy.kotlin.codegen.aws.protocols.core
package software.amazon.smithy.kotlin.codegen.protocols.core
Copy link
Contributor

@lauzadis lauzadis Dec 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did this and other packages change?

Copy link
Contributor Author

@0marperez 0marperez Dec 15, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because we refactored the protocols core and others from smithy-aws-kotlin-codegen into smithy-kotlin-codegen

Copy link
Contributor

@lauzadis lauzadis Dec 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you clarify why we need to move the AWS protocols from smithy-aws-kotlin-codegen to smithy-kotlin-codegen? IIRC this was an intentional split to separate AWS protocols from generic Smithy ones (CBOR). Customers could still add a dependency on the smithy-aws-kotlin-codegen module if they want to use an AWS protocol

Copy link
Contributor Author

@0marperez 0marperez Dec 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem becomes circular dependencies between the two modules. The "default generic client" integration needs to be in smithy-kotlin-codegen. smithy-aws-kotlin-codegen already depends on smithy-kotlin-codegen. So when the integration needs to use the smithy-aws-kotlin-codegen protocols a circular dependency happens.

Copy link
Contributor

@lauzadis lauzadis Dec 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should find a way to work around the circular dependency without relocating our AWS protocols. It was a design decision to keep them separate, if we no longer think that's the right choice, then we should have a discussion offline about moving them


import software.amazon.smithy.aws.traits.protocols.AwsQueryCompatibleTrait
import software.amazon.smithy.codegen.core.Symbol
import software.amazon.smithy.kotlin.codegen.aws.protocols.eventstream.EventStreamParserGenerator
import software.amazon.smithy.kotlin.codegen.aws.protocols.eventstream.EventStreamSerializerGenerator
import software.amazon.smithy.kotlin.codegen.core.*
import software.amazon.smithy.kotlin.codegen.integration.SectionId
import software.amazon.smithy.kotlin.codegen.integration.SectionKey
import software.amazon.smithy.kotlin.codegen.lang.KotlinTypes
import software.amazon.smithy.kotlin.codegen.model.buildSymbol
import software.amazon.smithy.kotlin.codegen.model.hasTrait
import software.amazon.smithy.kotlin.codegen.protocols.eventstream.EventStreamParserGenerator
import software.amazon.smithy.kotlin.codegen.protocols.eventstream.EventStreamSerializerGenerator
import software.amazon.smithy.kotlin.codegen.rendering.ExceptionBaseClassGenerator
import software.amazon.smithy.kotlin.codegen.rendering.protocol.*
import software.amazon.smithy.model.shapes.OperationShape
Expand Down
2 changes: 1 addition & 1 deletion ...core/QueryHttpBindingProtocolGenerator.kt → ...core/QueryHttpBindingProtocolGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
* SPDX-License-Identifier: Apache-2.0
*/
package software.amazon.smithy.kotlin.codegen.aws.protocols.core
package software.amazon.smithy.kotlin.codegen.protocols.core

import software.amazon.smithy.codegen.core.Symbol
import software.amazon.smithy.kotlin.codegen.core.KotlinWriter
Expand Down
2 changes: 1 addition & 1 deletion ...otocols/core/StaticHttpBindingResolver.kt → ...otocols/core/StaticHttpBindingResolver.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package software.amazon.smithy.kotlin.codegen.aws.protocols.core
package software.amazon.smithy.kotlin.codegen.protocols.core

import software.amazon.smithy.kotlin.codegen.model.expectTrait
import software.amazon.smithy.kotlin.codegen.model.hasTrait
Expand Down
2 changes: 1 addition & 1 deletion ...eventstream/EventStreamParserGenerator.kt → ...eventstream/EventStreamParserGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package software.amazon.smithy.kotlin.codegen.aws.protocols.eventstream
package software.amazon.smithy.kotlin.codegen.protocols.eventstream

import software.amazon.smithy.codegen.core.CodegenException
import software.amazon.smithy.codegen.core.Symbol
Expand Down
2 changes: 1 addition & 1 deletion ...tstream/EventStreamSerializerGenerator.kt → ...tstream/EventStreamSerializerGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package software.amazon.smithy.kotlin.codegen.aws.protocols.eventstream
package software.amazon.smithy.kotlin.codegen.protocols.eventstream

import software.amazon.smithy.codegen.core.CodegenException
import software.amazon.smithy.codegen.core.Symbol
Expand Down
2 changes: 1 addition & 1 deletion ...l/QuerySerdeFormUrlDescriptorGenerator.kt → ...l/QuerySerdeFormUrlDescriptorGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
* SPDX-License-Identifier: Apache-2.0
*/
package software.amazon.smithy.kotlin.codegen.aws.protocols.formurl
package software.amazon.smithy.kotlin.codegen.protocols.formurl

import software.amazon.smithy.kotlin.codegen.core.RenderingContext
import software.amazon.smithy.kotlin.codegen.core.RuntimeTypes
Expand Down
4 changes: 2 additions & 2 deletions ...tocols/json/AwsJsonHttpBindingResolver.kt → ...tocols/json/AwsJsonHttpBindingResolver.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* SPDX-License-Identifier: Apache-2.0
*/

package software.amazon.smithy.kotlin.codegen.aws.protocols.json
package software.amazon.smithy.kotlin.codegen.protocols.json

import software.amazon.smithy.kotlin.codegen.aws.protocols.core.StaticHttpBindingResolver
import software.amazon.smithy.kotlin.codegen.protocols.core.StaticHttpBindingResolver
import software.amazon.smithy.model.Model
import software.amazon.smithy.model.pattern.UriPattern
import software.amazon.smithy.model.shapes.ServiceShape
Expand Down
2 changes: 1 addition & 1 deletion ...otocols/json/AwsJsonProtocolMiddleware.kt → ...otocols/json/AwsJsonProtocolMiddleware.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package software.amazon.smithy.kotlin.codegen.aws.protocols.json
package software.amazon.smithy.kotlin.codegen.protocols.json

import software.amazon.smithy.kotlin.codegen.core.KotlinWriter
import software.amazon.smithy.kotlin.codegen.core.RuntimeTypes
Expand Down
2 changes: 1 addition & 1 deletion ...ls/json/AwsJsonProtocolParserGenerator.kt → ...ls/json/AwsJsonProtocolParserGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package software.amazon.smithy.kotlin.codegen.aws.protocols.json
package software.amazon.smithy.kotlin.codegen.protocols.json

import software.amazon.smithy.kotlin.codegen.core.KotlinWriter
import software.amazon.smithy.kotlin.codegen.rendering.protocol.ProtocolGenerator
Expand Down
2 changes: 1 addition & 1 deletion ...wsJsonProtocolSerdeDescriptorGenerator.kt → ...wsJsonProtocolSerdeDescriptorGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package software.amazon.smithy.kotlin.codegen.aws.protocols.json
package software.amazon.smithy.kotlin.codegen.protocols.json

import software.amazon.smithy.kotlin.codegen.core.RenderingContext
import software.amazon.smithy.kotlin.codegen.core.RuntimeTypes
Expand Down
4 changes: 2 additions & 2 deletions .../json/JsonHttpBindingProtocolGenerator.kt → .../json/JsonHttpBindingProtocolGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
* SPDX-License-Identifier: Apache-2.0
*/

package software.amazon.smithy.kotlin.codegen.aws.protocols.json
package software.amazon.smithy.kotlin.codegen.protocols.json

import software.amazon.smithy.kotlin.codegen.aws.protocols.core.AwsHttpBindingProtocolGenerator
import software.amazon.smithy.kotlin.codegen.core.KotlinWriter
import software.amazon.smithy.kotlin.codegen.core.RuntimeTypes
import software.amazon.smithy.kotlin.codegen.protocols.core.AwsHttpBindingProtocolGenerator
import software.amazon.smithy.kotlin.codegen.rendering.protocol.ProtocolGenerator
import software.amazon.smithy.kotlin.codegen.rendering.serde.*
import software.amazon.smithy.model.shapes.OperationShape
Expand Down
Loading
Loading