Skip to content
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

Jump to bottom

chore: upgrade smithy to 1.17.0 #521

Merged
merged 3 commits into from
Feb 8, 2022
+13 −6
Merged

chore: upgrade smithy to 1.17.0 #521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c8f9fd
chore: upgrade smithy to 1.17.0
aajtodd Feb 7, 2022
919a9e1
fix(codegen): ignore jsonName trait for awsJson protocols
aajtodd Feb 7, 2022
2208ef6
fix runtime type reference; update to snapshot version of smithy-kotlin
aajtodd Feb 7, 2022
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
2 changes: 1 addition & 1 deletion ...en/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/PresignerGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ class PresignerGenerator : KotlinIntegration {
writer.addImport(RuntimeTypes.Http.QueryParameters)
writer.addImport(RuntimeTypes.Http.toByteStream)
writer.addImport(RuntimeTypes.Core.Content.decodeToString)
writer.addImport(RuntimeTypes.Http.splitAsQueryParameters)
writer.addImport(RuntimeTypes.Http.Util.splitAsQueryParameters)
writer.write("""httpRequestBuilder.body.toByteStream()?.decodeToString()?.splitAsQueryParameters() ?: QueryParameters.Empty,""")
}
}
Expand Down
2 changes: 1 addition & 1 deletion .../smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/protocols/AwsJson1_0.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import software.amazon.smithy.model.shapes.*
* @see AwsHttpBindingProtocolGenerator
*/
class AwsJson1_0 : JsonHttpBindingProtocolGenerator() {

override val protocol: ShapeId = AwsJson1_0Trait.ID
override val supportsJsonNameTrait: Boolean = false

override fun getDefaultHttpMiddleware(ctx: ProtocolGenerator.GenerationContext): List<ProtocolMiddleware> {
val httpMiddleware = super.getDefaultHttpMiddleware(ctx)
Expand Down
1 change: 1 addition & 0 deletions .../smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/protocols/AwsJson1_1.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import software.amazon.smithy.model.shapes.ShapeId
*/
class AwsJson1_1 : JsonHttpBindingProtocolGenerator() {
override val protocol: ShapeId = AwsJson1_1Trait.ID
override val supportsJsonNameTrait: Boolean = false

override fun getDefaultHttpMiddleware(ctx: ProtocolGenerator.GenerationContext): List<ProtocolMiddleware> {
val httpMiddleware = super.getDefaultHttpMiddleware(ctx)
Expand Down
10 changes: 8 additions & 2 deletions ...src/main/kotlin/aws/sdk/kotlin/codegen/protocols/json/JsonHttpBindingProtocolGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,17 @@ abstract class JsonHttpBindingProtocolGenerator : AwsHttpBindingProtocolGenerato

override val defaultTimestampFormat: TimestampFormatTrait.Format = TimestampFormatTrait.Format.EPOCH_SECONDS

/**
* Flag indicating if the jsonName trait is supported or not. When true the trait is processed when generating
* serializers and deserializers. When false the member name is used.
*/
open val supportsJsonNameTrait: Boolean = true

override fun structuredDataParser(ctx: ProtocolGenerator.GenerationContext): StructuredDataParserGenerator =
JsonParserGenerator(this)
JsonParserGenerator(this, supportsJsonNameTrait = supportsJsonNameTrait)

override fun structuredDataSerializer(ctx: ProtocolGenerator.GenerationContext): StructuredDataSerializerGenerator =
JsonSerializerGenerator(this)
JsonSerializerGenerator(this, supportsJsonNameTrait = supportsJsonNameTrait)

override fun renderDeserializeErrorDetails(
ctx: ProtocolGenerator.GenerationContext,
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ org.gradle.jvmargs=-Xmx6g -XX:MaxPermSize=6g -XX:MaxMetaspaceSize=1G
sdkVersion=0.12.1-SNAPSHOT

# codegen
smithyVersion=1.13.1
smithyVersion=1.17.0
smithyGradleVersion=0.5.3
# smithy-kotlin codegen and runtime are versioned together
smithyKotlinVersion=0.7.7
smithyKotlinVersion=0.7.8-SNAPSHOT

# kotlin
kotlinVersion=1.6.10
Expand Down