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

feat: default trait implementation #927

Merged
merged 10 commits into from
Jun 16, 2023
+5 −4
Merged

feat: default trait implementation #927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b20ec7f
Tickle CI
lauzadis May 24, 2023
b5a4dab
Rename `boxed` to `nullable`
lauzadis May 25, 2023
b301613
ktlint
lauzadis May 25, 2023
d8403b4
Merge branch 'main' of github.com:awslabs/aws-sdk-kotlin into feat-de…
lauzadis May 25, 2023
e8e74a9
Merge branch 'main' of github.com:awslabs/aws-sdk-kotlin into feat-de…
lauzadis May 26, 2023
ae283e8
Merge branch 'main' of github.com:awslabs/aws-sdk-kotlin into feat-de…
lauzadis Jun 5, 2023
7373180
CI
lauzadis Jun 7, 2023
6630b9a
Merge branch 'main' of github.com:awslabs/aws-sdk-kotlin into feat-de…
lauzadis Jun 7, 2023
5c883f6
Fix failing tests
lauzadis Jun 7, 2023
cb796a7
Merge branch 'main' of github.com:awslabs/aws-sdk-kotlin into feat-de…
lauzadis Jun 16, 2023
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
4 changes: 2 additions & 2 deletions ...-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/AwsServiceConfigIntegration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import software.amazon.smithy.kotlin.codegen.integration.KotlinIntegration
import software.amazon.smithy.kotlin.codegen.integration.SectionWriterBinding
import software.amazon.smithy.kotlin.codegen.lang.KotlinTypes
import software.amazon.smithy.kotlin.codegen.model.asNullable
import software.amazon.smithy.kotlin.codegen.model.boxed
import software.amazon.smithy.kotlin.codegen.model.knowledge.AwsSignatureVersion4
import software.amazon.smithy.kotlin.codegen.model.nullable
import software.amazon.smithy.kotlin.codegen.rendering.*
import software.amazon.smithy.kotlin.codegen.rendering.util.ConfigProperty
import software.amazon.smithy.kotlin.codegen.rendering.util.ConfigPropertyType
Expand All @@ -22,7 +22,7 @@ class AwsServiceConfigIntegration : KotlinIntegration {
companion object {
val RegionProp: ConfigProperty = ConfigProperty {
name = "region"
symbol = KotlinTypes.String.toBuilder().boxed().build()
symbol = KotlinTypes.String.toBuilder().nullable().build()
baseClass = AwsRuntimeTypes.Core.Client.AwsSdkClientConfig
useNestedBuilderBaseClass()
documentation = """
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/kotlin/aws/sdk/kotlin/codegen/protocols/eventstream/EventStreamParserGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ class EventStreamParserGenerator(
else -> throw CodegenException("unsupported eventHeader shape: member=$hdrBinding; targetShape=$target")
}

val defaultValuePostfix = if (targetSymbol.isNotBoxed && targetSymbol.defaultValue() != null) {
val defaultValuePostfix = if (targetSymbol.isNotNullable && targetSymbol.defaultValue() != null) {
" ?: ${targetSymbol.defaultValue()}"
} else {
""
Expand Down
2 changes: 1 addition & 1 deletion ...ws-kotlin-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/customization/BoxServicesTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class BoxServicesTest {
structure Other {}

integer NotBoxedField
""".prependNamespaceAndService(operations = listOf("Foo")).toSmithyModel()
""".prependNamespaceAndService(version = "1", operations = listOf("Foo")).toSmithyModel()

val ctx = model.newTestContext()
val transformed = BoxServices().preprocessModel(model, ctx.generationCtx.settings)
Expand Down
1 change: 1 addition & 0 deletions ...n/src/test/kotlin/aws/sdk/kotlin/codegen/customization/RemoveEventStreamOperationsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class RemoveEventStreamOperationsTest {
input: BlobInput
}
structure BlobInput {
@required
blob: StreamingBlob
}
@streaming
Expand Down