Skip to content

Commit ac24d5a

Browse files
0marperez0marperez
committed
feedback round 3?
1 parent 32aae24 commit ac24d5a

File tree

28 files changed

+801
-605
lines changed

28 files changed

+801
-605
lines changed

‎gradle/libs.versions.toml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,6 @@ smithy-kotlin-telemetry-provider-micrometer = { module = "aws.smithy.kotlin:tele
9292
smithy-kotlin-telemetry-provider-otel = { module = "aws.smithy.kotlin:telemetry-provider-otel", version.ref = "smithy-kotlin-runtime-version" }
9393
smithy-kotlin-test-suite = { module = "aws.smithy.kotlin:test-suite", version.ref = "smithy-kotlin-runtime-version" }
9494
smithy-kotlin-testing = { module = "aws.smithy.kotlin:testing", version.ref = "smithy-kotlin-runtime-version" }
95-
smithy-kotlin-http-test-jvm = { module = "aws.smithy.kotlin:http-test-jvm", version.ref = "smithy-kotlin-runtime-version" }
96-
smithy-kotlin-testing-jvm = { module = "aws.smithy.kotlin:testing-jvm", version.ref = "smithy-kotlin-runtime-version" }
9795

9896
smithy-kotlin-codegen = { module = "software.amazon.smithy.kotlin:smithy-kotlin-codegen", version.ref = "smithy-kotlin-codegen-version" }
9997
smithy-kotlin-codegen-testutils = { module = "software.amazon.smithy.kotlin:smithy-kotlin-codegen-testutils", version.ref = "smithy-kotlin-codegen-version" }

‎hll/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ val projectsToIgnore = listOf(
113113
"dynamodb-mapper-schema-codegen",
114114
"dynamodb-mapper-schema-generator-plugin-test",
115115

116-
"s3-transfer-manager-codegen", // TODO: Disable publishing ?
116+
"s3-transfer-manager-codegen",
117117
).filter { it in subprojects.map { it.name }.toSet() } // Some projects may not be in the build depending on bootstrapping
118118

119119
apiValidation {

‎hll/s3-transfer-manager-codegen/src/main/kotlin/aws/sdk/kotlin/hll/s3transfermanager/codegen/mappings/Mappings.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
package aws.sdk.kotlin.hll.s3transfermanager.codegen.mappings
77

8-
import aws.sdk.kotlin.hll.s3transfermanager.codegen.mappings.uploadfile.uploadFileConversions
9-
import aws.sdk.kotlin.hll.s3transfermanager.codegen.mappings.uploadfile.uploadFileIoMappings
8+
import aws.sdk.kotlin.hll.s3transfermanager.codegen.mappings.uploadObject.uploadObjectConversions
9+
import aws.sdk.kotlin.hll.s3transfermanager.codegen.mappings.uploadObject.uploadObjectIoMappings
1010

11-
internal val ioMappings = uploadFileIoMappings
12-
internal val conversionMappings = uploadFileConversions
11+
internal val ioMappings = uploadObjectIoMappings
12+
internal val conversionMappings = uploadObjectConversions

‎hll/s3-transfer-manager-codegen/src/main/kotlin/aws/sdk/kotlin/hll/s3transfermanager/codegen/mappings/uploadfile/Converters.kt‎ renamed to ‎hll/s3-transfer-manager-codegen/src/main/kotlin/aws/sdk/kotlin/hll/s3transfermanager/codegen/mappings/uploadObject/Converters.kt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package aws.sdk.kotlin.hll.s3transfermanager.codegen.mappings.uploadfile
6+
package aws.sdk.kotlin.hll.s3transfermanager.codegen.mappings.uploadObject
77

88
import aws.sdk.kotlin.hll.codegen.model.TypeRef
99
import aws.sdk.kotlin.hll.s3transfermanager.codegen.mappings.ConversionMapping
1010

11-
internal val uploadFileConversions = listOf(
11+
internal val uploadObjectConversions = listOf(
1212
ConversionMapping(
1313
source = TypeRef(
1414
"aws.sdk.kotlin.services.s3.model",
1515
"PutObjectResponse",
1616
),
1717
destination = TypeRef(
1818
"aws.sdk.kotlin.hll.s3transfermanager.model",
19-
"UploadFileResponse",
19+
"UploadObjectResponse",
2020
),
2121
setOf(
2222
"bucketKeyEnabled",
@@ -44,7 +44,7 @@ internal val uploadFileConversions = listOf(
4444
),
4545
destination = TypeRef(
4646
"aws.sdk.kotlin.hll.s3transfermanager.model",
47-
"UploadFileResponse",
47+
"UploadObjectResponse",
4848
),
4949
setOf(
5050
"bucketKeyEnabled",
@@ -65,7 +65,7 @@ internal val uploadFileConversions = listOf(
6565
ConversionMapping(
6666
source = TypeRef(
6767
"aws.sdk.kotlin.hll.s3transfermanager.model",
68-
"UploadFileRequest",
68+
"UploadObjectRequest",
6969
),
7070
destination = TypeRef(
7171
"aws.sdk.kotlin.services.s3.model",
@@ -86,6 +86,7 @@ internal val uploadFileConversions = listOf(
8686
"contentDisposition",
8787
"contentEncoding",
8888
"contentLanguage",
89+
"contentLength",
8990
"contentType",
9091
"expectedBucketOwner",
9192
"expires",
@@ -111,12 +112,11 @@ internal val uploadFileConversions = listOf(
111112
"tagging",
112113
"websiteRedirectLocation",
113114
),
114-
additionalLogic = "contentLength = [email protected]?.contentLength",
115115
),
116116
ConversionMapping(
117117
source = TypeRef(
118118
"aws.sdk.kotlin.hll.s3transfermanager.model",
119-
"UploadFileRequest",
119+
"UploadObjectRequest",
120120
),
121121
destination = TypeRef(
122122
"aws.sdk.kotlin.services.s3.model",
@@ -158,7 +158,7 @@ internal val uploadFileConversions = listOf(
158158
ConversionMapping(
159159
source = TypeRef(
160160
"aws.sdk.kotlin.hll.s3transfermanager.model",
161-
"UploadFileRequest",
161+
"UploadObjectRequest",
162162
),
163163
destination = TypeRef(
164164
"aws.sdk.kotlin.services.s3.model",
@@ -205,7 +205,7 @@ internal val uploadFileConversions = listOf(
205205
ConversionMapping(
206206
source = TypeRef(
207207
"aws.sdk.kotlin.hll.s3transfermanager.model",
208-
"UploadFileRequest",
208+
"UploadObjectRequest",
209209
),
210210
destination = TypeRef(
211211
"aws.sdk.kotlin.services.s3.model",

‎hll/s3-transfer-manager-codegen/src/main/kotlin/aws/sdk/kotlin/hll/s3transfermanager/codegen/mappings/uploadfile/IO.kt‎ renamed to ‎hll/s3-transfer-manager-codegen/src/main/kotlin/aws/sdk/kotlin/hll/s3transfermanager/codegen/mappings/uploadObject/IO.kt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package aws.sdk.kotlin.hll.s3transfermanager.codegen.mappings.uploadfile
6+
package aws.sdk.kotlin.hll.s3transfermanager.codegen.mappings.uploadObject
77

88
import aws.sdk.kotlin.hll.s3transfermanager.codegen.mappings.IoMapping
99
import aws.sdk.kotlin.hll.s3transfermanager.codegen.mappings.MappingType
1010

11-
internal val uploadFileIoMappings = listOf(
11+
internal val uploadObjectIoMappings = listOf(
1212
IoMapping(
1313
MappingType.REQUEST,
14-
"UploadFileRequest",
14+
"UploadObjectRequest",
1515
"putObject",
1616
setOf(
1717
"acl",
@@ -28,6 +28,7 @@ internal val uploadFileIoMappings = listOf(
2828
"contentDisposition",
2929
"contentEncoding",
3030
"contentLanguage",
31+
"contentLength",
3132
"contentType",
3233
"expectedBucketOwner",
3334
"expires",
@@ -56,7 +57,7 @@ internal val uploadFileIoMappings = listOf(
5657
),
5758
IoMapping(
5859
MappingType.RESPONSE,
59-
"UploadFileResponse",
60+
"UploadObjectResponse",
6061
"putObject",
6162
setOf(
6263
"bucketKeyEnabled",

‎hll/s3-transfer-manager-codegen/src/main/kotlin/aws/sdk/kotlin/hll/s3transfermanager/codegen/renderers/ConversionRenderer.kt‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,24 @@ internal class ConversionRenderer(
2121
conversions.forEach { conversion ->
2222
val functionName = "to${conversion.destination.shortName}"
2323

24-
imports += ImportDirective(conversion.source)
25-
imports += ImportDirective(conversion.destination)
26-
2724
conversion.additionalImports.forEach {
2825
imports += ImportDirective(it)
2926
}
3027

3128
withBlock(
32-
"internal fun ${conversion.source.shortName}.$functionName(${conversion.additionalParameters.joinToString(", ")}): ${conversion.destination.shortName} = ${conversion.destination.shortName} {",
29+
"internal fun #1T.#2L(#3L): #4T = #4T {",
3330
"}",
31+
conversion.source,
32+
functionName,
33+
conversion.additionalParameters.joinToString(", "),
34+
conversion.destination,
3435
) {
3536
conversion.members.forEach { member ->
36-
write("$member = this@$functionName.$member")
37+
write(
38+
"#1L = this@#2L.#1L",
39+
member,
40+
functionName,
41+
)
3742
}
3843
write(conversion.additionalLogic)
3944
}

‎hll/s3-transfer-manager-codegen/src/main/kotlin/aws/sdk/kotlin/hll/s3transfermanager/codegen/renderers/IoRenderer.kt‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,10 @@
55

66
package aws.sdk.kotlin.hll.s3transfermanager.codegen.renderers
77

8-
import aws.sdk.kotlin.hll.codegen.core.ImportDirective
9-
import aws.sdk.kotlin.hll.codegen.model.TypeRef
108
import aws.sdk.kotlin.hll.codegen.rendering.RenderContext
119
import aws.sdk.kotlin.hll.codegen.rendering.RendererBase
1210
import aws.sdk.kotlin.hll.s3transfermanager.codegen.mappings.IoMapping
1311
import aws.sdk.kotlin.hll.s3transfermanager.codegen.utils.operationMembers
14-
import aws.sdk.kotlin.hll.s3transfermanager.codegen.utils.renderMember
1512
import com.google.devtools.ksp.processing.Resolver
1613

1714
/**
@@ -32,20 +29,16 @@ internal class IoRenderer(
3229
)
3330

3431
withBlock(
35-
"public class $className private constructor(builder: Builder) {",
32+
"public class #L private constructor(builder: Builder) {",
3633
"}",
34+
className,
3735
) {
3836
members.forEach { member ->
39-
val memberType = member.type as TypeRef
40-
41-
imports += ImportDirective(memberType) // Type: SomeType
42-
memberType.genericArgs.forEach { genericArg ->
43-
imports += ImportDirective(genericArg as TypeRef) // Type: Map<SomeType, SomeType>
44-
}
45-
4637
member.kDocs?.let { write(it) } // FIXME: KSP isn't detecting KDocs
4738
write(
48-
"public val ${member.name}: ${member.type.renderMember()}? = builder.${member.name}",
39+
"public val #1L: #2T = builder.#1L",
40+
member.name,
41+
member.type,
4942
)
5043
}
5144
blankLine()
@@ -54,7 +47,10 @@ internal class IoRenderer(
5447
"public companion object {",
5548
"}",
5649
) {
57-
write("public operator fun invoke(block: Builder.() -> Unit): $className = Builder().apply(block).build()")
50+
write(
51+
"public operator fun invoke(block: Builder.() -> Unit): #L = Builder().apply(block).build()",
52+
className,
53+
)
5854
}
5955
blankLine()
6056

@@ -64,13 +60,18 @@ internal class IoRenderer(
6460
) {
6561
members.forEach { member ->
6662
write(
67-
"public var ${member.name}: ${(member.type as TypeRef).renderMember()}? = null",
63+
"public var #L: #T = null",
64+
member.name,
65+
member.type,
6866
)
6967
}
7068
blankLine()
7169

7270
write("@PublishedApi")
73-
write("internal fun build(): $className = $className(this)")
71+
write(
72+
"internal fun build(): #1L = #1L(this)",
73+
className,
74+
)
7475
}
7576
}
7677
}

0 commit comments

Comments
 (0)