Skip to content

Commit 47efb44

Browse files
authored
feat: improve coding style of DDBMapper auto-generated schemas (#1522)
1 parent e71ffe6 commit 47efb44

File tree

3 files changed

+21
-13
lines changed

3 files changed

+21
-13
lines changed
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"id": "5fa3154d-1f42-4b98-9ad1-ef8ef1ad5fbc",
3+
"type": "feature",
4+
"description": "Improve the coding style of DynamoDB Mapper auto-generated schemas",
5+
"issues": [
6+
"https://github.com/awslabs/aws-sdk-kotlin/issues/1521"
7+
]
8+
}

hll/dynamodb-mapper/dynamodb-mapper-schema-codegen/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/codegen/annotations/rendering/SchemaRenderer.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ internal class SchemaRenderer(
161161

162162
// converter
163163
renderValueConverter(prop.type.resolve())
164-
write("")
164+
write(",")
165165
}
166166
}
167167

@@ -291,7 +291,7 @@ internal class SchemaRenderer(
291291

292292
write("@#T", Types.Smithy.ExperimentalApi)
293293
withBlock("#Lobject #L : #T {", "}", ctx.attributes.visibility, schemaName, schemaType) {
294-
write("override val converter : #1T = #1T", itemConverter)
294+
write("override val converter: #1T = #1T", itemConverter)
295295
write("override val partitionKey: #T = #T(#S)", MapperTypes.Items.keySpec(partitionKeyProp.keySpec), partitionKeyProp.keySpecType, partitionKeyName)
296296
if (sortKeyProp != null) {
297297
write("override val sortKey: #T = #T(#S)", MapperTypes.Items.keySpec(sortKeyProp.keySpec), sortKeyProp.keySpecType, sortKeyName!!)

hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/plugins/SchemaGeneratorPluginTest.kt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -106,25 +106,25 @@ class SchemaGeneratorPluginTest {
106106
"id",
107107
User::id,
108108
UserBuilder::id::set,
109-
IntConverter
109+
IntConverter,
110110
),
111111
AttributeDescriptor(
112112
"fName",
113113
User::givenName,
114114
UserBuilder::givenName::set,
115-
StringConverter
115+
StringConverter,
116116
),
117117
AttributeDescriptor(
118118
"lName",
119119
User::surname,
120120
UserBuilder::surname::set,
121-
StringConverter
121+
StringConverter,
122122
),
123123
AttributeDescriptor(
124124
"age",
125125
User::age,
126126
UserBuilder::age::set,
127-
IntConverter
127+
IntConverter,
128128
),
129129
),
130130
)
@@ -136,7 +136,7 @@ class SchemaGeneratorPluginTest {
136136
schemaContents,
137137
"""
138138
object UserSchema : ItemSchema.PartitionKey<User, Int> {
139-
override val converter : UserConverter = UserConverter
139+
override val converter: UserConverter = UserConverter
140140
override val partitionKey: KeySpec<Number> = aws.sdk.kotlin.hll.dynamodbmapper.items.KeySpec.Number("id")
141141
}
142142
""".trimIndent(),
@@ -173,25 +173,25 @@ class SchemaGeneratorPluginTest {
173173
"id",
174174
BuilderNotRequired::id,
175175
BuilderNotRequired::id::set,
176-
IntConverter
176+
IntConverter,
177177
),
178178
AttributeDescriptor(
179179
"fName",
180180
BuilderNotRequired::givenName,
181181
BuilderNotRequired::givenName::set,
182-
StringConverter
182+
StringConverter,
183183
),
184184
AttributeDescriptor(
185185
"lName",
186186
BuilderNotRequired::surname,
187187
BuilderNotRequired::surname::set,
188-
StringConverter
188+
StringConverter,
189189
),
190190
AttributeDescriptor(
191191
"age",
192192
BuilderNotRequired::age,
193193
BuilderNotRequired::age::set,
194-
IntConverter
194+
IntConverter,
195195
),
196196
),
197197
)
@@ -414,7 +414,7 @@ class SchemaGeneratorPluginTest {
414414
schemaContents,
415415
"""
416416
public object CustomUserSchema : ItemSchema.PartitionKey<CustomUser, Int> {
417-
override val converter : MyCustomUserConverter = MyCustomUserConverter
417+
override val converter: MyCustomUserConverter = MyCustomUserConverter
418418
override val partitionKey: KeySpec<Number> = aws.sdk.kotlin.hll.dynamodbmapper.items.KeySpec.Number("id")
419419
}
420420
""".trimIndent(),
@@ -570,7 +570,7 @@ class SchemaGeneratorPluginTest {
570570
schemaContents,
571571
"""
572572
object RenamedPartitionKeySchema : ItemSchema.PartitionKey<RenamedPartitionKey, Int> {
573-
override val converter : RenamedPartitionKeyConverter = RenamedPartitionKeyConverter
573+
override val converter: RenamedPartitionKeyConverter = RenamedPartitionKeyConverter
574574
override val partitionKey: KeySpec<Number> = aws.sdk.kotlin.hll.dynamodbmapper.items.KeySpec.Number("user_id")
575575
}
576576
""".trimIndent(),

0 commit comments

Comments
 (0)