Skip to content

Commit 5f94fc3

Browse files
ianbotsfianbotsf
authored
feat: refresh converter interfaces (#1731)
1 parent 2a2107e commit 5f94fc3

File tree

83 files changed

+1671
-2030
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+1671
-2030
lines changed

‎hll/dynamodb-mapper/dynamodb-mapper-codegen/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/codegen/model/MapperTypes.kt‎

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -84,69 +84,69 @@ public object MapperTypes {
8484
public object Values {
8585
public fun valueConverter(value: Type): TypeRef = TypeRef(MapperPkg.Hl.Values, "ValueConverter", genericArgs = listOf(value))
8686
public val ItemToValueConverter: TypeRef = TypeRef(MapperPkg.Hl.Values, "ItemToValueConverter")
87-
public val NullableConverter: TypeRef = TypeRef(MapperPkg.Hl.Values, "NullableConverter")
87+
public val NullableValueConverter: TypeRef = TypeRef(MapperPkg.Hl.Values, "NullableValueConverter")
8888

8989
public object Collections {
90-
public val ListConverter: TypeRef = TypeRef(MapperPkg.Hl.CollectionValues, "ListConverter")
91-
public val MapConverter: TypeRef = TypeRef(MapperPkg.Hl.CollectionValues, "MapConverter")
92-
93-
public val StringSetConverter: TypeRef = TypeRef(MapperPkg.Hl.CollectionValues, "StringSetConverter")
94-
public val CharSetConverter: TypeRef = TypeRef(MapperPkg.Hl.CollectionValues, "CharSetConverter")
95-
public val CharArraySetConverter: TypeRef = TypeRef(MapperPkg.Hl.CollectionValues, "CharArraySetConverter")
96-
97-
public val ByteSetConverter: TypeRef = TypeRef(MapperPkg.Hl.CollectionValues, "ByteSetConverter")
98-
public val DoubleSetConverter: TypeRef = TypeRef(MapperPkg.Hl.CollectionValues, "DoubleSetConverter")
99-
public val FloatSetConverter: TypeRef = TypeRef(MapperPkg.Hl.CollectionValues, "FloatSetConverter")
100-
public val IntSetConverter: TypeRef = TypeRef(MapperPkg.Hl.CollectionValues, "IntSetConverter")
101-
public val LongSetConverter: TypeRef = TypeRef(MapperPkg.Hl.CollectionValues, "LongSetConverter")
102-
public val ShortSetConverter: TypeRef = TypeRef(MapperPkg.Hl.CollectionValues, "ShortSetConverter")
103-
104-
public val UByteSetConverter: TypeRef = TypeRef(MapperPkg.Hl.CollectionValues, "UByteSetConverter")
105-
public val UIntSetConverter: TypeRef = TypeRef(MapperPkg.Hl.CollectionValues, "UIntSetConverter")
106-
public val ULongSetConverter: TypeRef = TypeRef(MapperPkg.Hl.CollectionValues, "ULongSetConverter")
107-
public val UShortSetConverter: TypeRef = TypeRef(MapperPkg.Hl.CollectionValues, "UShortSetConverter")
90+
public val ListValueConverter: TypeRef = TypeRef(MapperPkg.Hl.CollectionValues, "ListValueConverter")
91+
public val MapValueConverter: TypeRef = TypeRef(MapperPkg.Hl.CollectionValues, "MapValueConverter")
92+
93+
public val StringSetValueConverter: TypeRef = TypeRef(MapperPkg.Hl.CollectionValues, "StringSetValueConverter")
94+
public val CharSetValueConverter: TypeRef = TypeRef(MapperPkg.Hl.CollectionValues, "CharSetValueConverter")
95+
public val CharArraySetValueConverter: TypeRef = TypeRef(MapperPkg.Hl.CollectionValues, "CharArraySetValueConverter")
96+
97+
public val ByteSetValueConverter: TypeRef = TypeRef(MapperPkg.Hl.CollectionValues, "NumberSetValueConverters.Byte")
98+
public val DoubleSetValueConverter: TypeRef = TypeRef(MapperPkg.Hl.CollectionValues, "NumberSetValueConverters.Double")
99+
public val FloatSetValueConverter: TypeRef = TypeRef(MapperPkg.Hl.CollectionValues, "NumberSetValueConverters.Float")
100+
public val IntSetValueConverter: TypeRef = TypeRef(MapperPkg.Hl.CollectionValues, "NumberSetValueConverters.Int")
101+
public val LongSetValueConverter: TypeRef = TypeRef(MapperPkg.Hl.CollectionValues, "NumberSetValueConverters.Long")
102+
public val ShortSetValueConverter: TypeRef = TypeRef(MapperPkg.Hl.CollectionValues, "NumberSetValueConverters.Short")
103+
104+
public val UByteSetValueConverter: TypeRef = TypeRef(MapperPkg.Hl.CollectionValues, "NumberSetValueConverters.UByte")
105+
public val UIntSetValueConverter: TypeRef = TypeRef(MapperPkg.Hl.CollectionValues, "NumberSetValueConverters.UInt")
106+
public val ULongSetValueConverter: TypeRef = TypeRef(MapperPkg.Hl.CollectionValues, "NumberSetValueConverters.ULong")
107+
public val UShortSetValueConverter: TypeRef = TypeRef(MapperPkg.Hl.CollectionValues, "NumberSetValueConverters.UShort")
108108
}
109109

110110
public object Scalars {
111-
public fun enumConverter(enumType: Type): TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "EnumConverter", genericArgs = listOf(enumType))
112-
113-
public val BooleanConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "BooleanConverter")
114-
public val StringConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "StringConverter")
115-
public val CharConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "CharConverter")
116-
public val CharArrayConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "CharArrayConverter")
117-
118-
public val ByteConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "ByteConverter")
119-
public val ByteArrayConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "ByteArrayConverter")
120-
public val DoubleConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "DoubleConverter")
121-
public val FloatConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "FloatConverter")
122-
public val IntConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "IntConverter")
123-
public val LongConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "LongConverter")
124-
public val ShortConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "ShortConverter")
125-
public val UByteConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "UByteConverter")
126-
public val UIntConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "UIntConverter")
127-
public val ULongConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "ULongConverter")
128-
public val UShortConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "UShortConverter")
111+
public fun enumValueConverter(enumType: Type): TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "EnumValueConverter", genericArgs = listOf(enumType))
112+
113+
public val BooleanValueConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "BooleanValueConverter")
114+
public val ByteArrayValueConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "ByteArrayValueConverter")
115+
public val StringValueConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "StringValueConverter")
116+
public val CharValueConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "CharValueConverter")
117+
public val CharArrayValueConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "CharArrayValueConverter")
118+
119+
public val ByteValueConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "NumberValueConverters.Byte")
120+
public val DoubleValueConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "NumberValueConverters.Double")
121+
public val FloatValueConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "NumberValueConverters.Float")
122+
public val IntValueConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "NumberValueConverters.Int")
123+
public val LongValueConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "NumberValueConverters.Long")
124+
public val ShortValueConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "NumberValueConverters.Short")
125+
public val UByteValueConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "NumberValueConverters.UByte")
126+
public val UIntValueConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "NumberValueConverters.UInt")
127+
public val ULongValueConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "NumberValueConverters.ULong")
128+
public val UShortValueConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "NumberValueConverters.UShort")
129129

130130
public val BooleanToStringConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "BooleanToStringConverter")
131-
public val CharArrayToStringConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "TextConverters.CharArrayToStringConverter")
132-
public val CharToStringConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "TextConverters.CharToStringConverter")
133-
public val StringToStringConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "TextConverters.StringToStringConverter")
134-
public val ByteToStringConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "NumberConverters.ByteToStringConverter")
135-
public val DoubleToStringConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "NumberConverters.DoubleToStringConverter")
136-
public val FloatToStringConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "NumberConverters.FloatToStringConverter")
137-
public val IntToStringConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "NumberConverters.IntToStringConverter")
138-
public val LongToStringConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "NumberConverters.LongToStringConverter")
139-
public val ShortToStringConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "NumberConverters.ShortToStringConverter")
140-
public val UByteToStringConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "NumberConverters.UByteToStringConverter")
141-
public val UIntToStringConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "NumberConverters.UIntToStringConverter")
142-
public val ULongToStringConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "NumberConverters.ULongToStringConverter")
143-
public val UShortToStringConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "NumberConverters.UShortToStringConverter")
131+
public val CharArrayToStringConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "TextConverters.CharArrayToString")
132+
public val CharToStringConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "TextConverters.CharToString")
133+
public val StringToStringConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "TextConverters.String")
134+
public val ByteToStringConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "NumberToStringConverters.Byte")
135+
public val DoubleToStringConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "NumberToStringConverters.Double")
136+
public val FloatToStringConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "NumberToStringConverters.Float")
137+
public val IntToStringConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "NumberToStringConverters.Int")
138+
public val LongToStringConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "NumberToStringConverters.Long")
139+
public val ShortToStringConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "NumberToStringConverters.Short")
140+
public val UByteToStringConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "NumberToStringConverters.UByte")
141+
public val UIntToStringConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "NumberToStringConverters.UInt")
142+
public val ULongToStringConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "NumberToStringConverters.ULong")
143+
public val UShortToStringConverter: TypeRef = TypeRef(MapperPkg.Hl.ScalarValues, "NumberToStringConverters.UShort")
144144
}
145145

146146
public object SmithyTypes {
147-
public val DefaultInstantConverter: TypeRef = TypeRef(MapperPkg.Hl.SmithyTypeValues, "InstantConverter.Default")
148-
public val UrlConverter: TypeRef = TypeRef(MapperPkg.Hl.SmithyTypeValues, "UrlConverter")
149-
public val DefaultDocumentConverter: TypeRef = TypeRef(MapperPkg.Hl.SmithyTypeValues, "DocumentConverter.Default")
147+
public val DefaultInstantValueConverter: TypeRef = TypeRef(MapperPkg.Hl.SmithyTypeValues, "InstantValueConverter.Default")
148+
public val UrlValueConverter: TypeRef = TypeRef(MapperPkg.Hl.SmithyTypeValues, "UrlValueConverter")
149+
public val DefaultDocumentValueConverter: TypeRef = TypeRef(MapperPkg.Hl.SmithyTypeValues, "DocumentValueConverter.Default")
150150
}
151151
}
152152

‎hll/dynamodb-mapper/dynamodb-mapper-ops-codegen/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/codegen/operations/rendering/OperationRenderer.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,17 +106,17 @@ internal class OperationRenderer(
106106
requestMembers(MemberCodegenBehavior.PassThrough) { write("#L = this@convert.#L", name, highLevel.name) }
107107
requestMembers(MemberCodegenBehavior.MapKeys) {
108108
write(
109-
"this@convert.#L?.let { #L = schema.converter.convertTo(it, schema.keyAttributeNames).#T(schema.keyAttributeNames) }",
109+
"this@convert.#L?.let { #L = schema.converter.convertRight(it).#T(schema.keyAttributeNames) }",
110110
highLevel.name,
111111
name,
112112
MapperTypes.Model.intersectKeys,
113113
)
114114
}
115115
requestMembers(MemberCodegenBehavior.MapAll) {
116-
write("this@convert.#L?.let { #L = schema.converter.convertTo(it) }", highLevel.name, name)
116+
write("this@convert.#L?.let { #L = schema.converter.convertRight(it) }", highLevel.name, name)
117117
}
118118
requestMembers(MemberCodegenBehavior.ListMapAll) {
119-
write("#L = this@convert.#L?.map { schema.converter.convertTo(it) }", name, highLevel.name)
119+
write("#L = this@convert.#L?.map { schema.converter.convertRight(it) }", name, highLevel.name)
120120
}
121121
requestMembers(MemberCodegenBehavior.Hoist) { write("this.#1L = #1L", name) }
122122

@@ -168,7 +168,7 @@ internal class OperationRenderer(
168168

169169
responseMembers(MemberCodegenBehavior.MapKeys, MemberCodegenBehavior.MapAll) {
170170
write(
171-
"#L = this@convert.#L?.#T()?.let(schema.converter::convertFrom)",
171+
"#L = this@convert.#L?.#T()?.let(schema.converter::convertLeft)",
172172
highLevel.name,
173173
name,
174174
MapperTypes.Model.toItem,
@@ -177,7 +177,7 @@ internal class OperationRenderer(
177177

178178
responseMembers(MemberCodegenBehavior.ListMapAll) {
179179
write(
180-
"#L = this@convert.#L?.map { schema.converter.convertFrom(it.#T()) }",
180+
"#L = this@convert.#L?.map { schema.converter.convertLeft(it.#T()) }",
181181
highLevel.name,
182182
name,
183183
MapperTypes.Model.toItem,

0 commit comments

Comments
 (0)