refactor: cleanup public symbols and rename transform package (#971)

.changes/40f4af9b-316c-4d95-a4d4-9b7787feba1d.json

@@ -0,0 +1,5 @@
+{
+    "id": "40f4af9b-316c-4d95-a4d4-9b7787feba1d",
+    "type": "misc",
+    "description": "Refactor codegen to place serialization and deserialization code into the `serde` package rather than the `transform` package."
+}

.changes/4a39b540-3048-4f2c-b13e-9ff6a8975896.json

@@ -0,0 +1,5 @@
+{
+    "id": "4a39b540-3048-4f2c-b13e-9ff6a8975896",
+    "type": "misc",
+    "description": "Relocate `TlsVersion` to the `net` package."
+}

.changes/ef3ee209-71da-4e92-9cf8-85b446d32bb0.json

@@ -0,0 +1,5 @@
+{
+    "id": "ef3ee209-71da-4e92-9cf8-85b446d32bb0",
+    "type": "misc",
+    "description": "Make `ByteArrayContent` and friends `internal` and force consumers to go through companion object convenience functions."
+}

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/KotlinSettings.kt

@@ -50,6 +50,12 @@ data class KotlinSettings(
          * Derive a subpackage namespace from the root package name
          */
         fun subpackage(subpackageName: String): String = "$name.$subpackageName"
+
+        /**
+         * The package namespace for generated serialization/deserialization support
+         */
+        val serde: String
+            get() = subpackage("serde")
     }
 
     /**

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/RuntimeTypes.kt

@@ -19,7 +19,6 @@ object RuntimeTypes {
         val HttpBody = symbol("HttpBody")
         val HttpCall = symbol("HttpCall")
         val HttpMethod = symbol("HttpMethod")
-        val ByteArrayContent = symbol("ByteArrayContent", subpackage = "content")
         val readAll = symbol("readAll")
         val toByteStream = symbol("toByteStream")
         val toHttpBody = symbol("toHttpBody")
@@ -109,7 +108,6 @@ object RuntimeTypes {
             val buildDocument = symbol("buildDocument")
             val decodeToString = symbol("decodeToString")
             val Document = symbol("Document")
-            val StringContent = symbol("StringContent")
             val toByteArray = symbol("toByteArray")
         }
 

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ShapeValueGenerator.kt

@@ -97,12 +97,6 @@ class ShapeValueGenerator(
     }
 
     private fun primitiveDeclaration(writer: KotlinWriter, shape: Shape, block: () -> Unit) {
-        val blobHandlingSymbols = listOf(
-            RuntimeTypes.Core.Content.ByteArrayContent,
-            RuntimeTypes.Core.Content.ByteStream,
-            RuntimeTypes.Core.Content.StringContent,
-            RuntimeTypes.Core.Content.toByteArray,
-        )
         val suffix = when {
             shape.isEnum -> {
                 val symbol = symbolProvider.toSymbol(shape)
@@ -112,8 +106,7 @@ class ShapeValueGenerator(
 
             shape.type == ShapeType.BLOB -> {
                 if (shape.hasTrait<StreamingTrait>()) {
-                    writer.addImport(blobHandlingSymbols)
-                    writer.writeInline("StringContent(")
+                    writer.writeInline("#T.fromString(", RuntimeTypes.Core.Content.ByteStream)
                     ")"
                 } else {
                     // blob params are spit out as strings

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpBindingProtocolGenerator.kt

@@ -155,15 +155,14 @@ abstract class HttpBindingProtocolGenerator : ProtocolGenerator {
         val serializerSymbol = buildSymbol {
             definitionFile = "${op.serializerName()}.kt"
             name = op.serializerName()
-            namespace = "${ctx.settings.pkg.name}.transform"
+            namespace = ctx.settings.pkg.serde
 
             reference(inputSymbol, SymbolReference.ContextOption.DECLARE)
         }
         val operationSerializerSymbols = setOf(
             RuntimeTypes.Http.HttpBody,
             RuntimeTypes.Http.HttpMethod,
             RuntimeTypes.HttpClient.Operation.HttpSerialize,
-            RuntimeTypes.Http.ByteArrayContent,
             RuntimeTypes.Http.Request.HttpRequestBuilder,
             RuntimeTypes.Http.Request.url,
         )
@@ -265,7 +264,7 @@ abstract class HttpBindingProtocolGenerator : ProtocolGenerator {
             val sdg = structuredDataSerializer(ctx)
             val opBodySerializerFn = sdg.operationSerializer(ctx, op, documentMembers)
             writer.write("val payload = #T(context, input)", opBodySerializerFn)
-            writer.write("builder.body = #T(payload)", RuntimeTypes.Http.ByteArrayContent)
+            writer.write("builder.body = #T.fromBytes(payload)", RuntimeTypes.Http.HttpBody)
         }
 
         resolver.determineRequestContentType(op)?.let { contentType ->
@@ -428,7 +427,7 @@ abstract class HttpBindingProtocolGenerator : ProtocolGenerator {
                 if (isBinaryStream) {
                     writer.write("builder.body = input.#L.#T() ?: #T.Empty", memberName, RuntimeTypes.Http.toHttpBody, RuntimeTypes.Http.HttpBody)
                 } else {
-                    writer.write("builder.body = #T(input.#L)", RuntimeTypes.Http.ByteArrayContent, memberName)
+                    writer.write("builder.body = #T.fromBytes(input.#L)", RuntimeTypes.Http.HttpBody, memberName)
                 }
             }
 
@@ -438,20 +437,20 @@ abstract class HttpBindingProtocolGenerator : ProtocolGenerator {
                 } else {
                     memberName
                 }
-                writer.write("builder.body = #T(input.#L.#T())", RuntimeTypes.Http.ByteArrayContent, contents, KotlinTypes.Text.encodeToByteArray)
+                writer.write("builder.body = #T.fromBytes(input.#L.#T())", RuntimeTypes.Http.HttpBody, contents, KotlinTypes.Text.encodeToByteArray)
             }
 
             ShapeType.ENUM ->
                 writer.write(
-                    "builder.body = #T(input.#L.value.#T())",
-                    RuntimeTypes.Http.ByteArrayContent,
+                    "builder.body = #T.fromBytes(input.#L.value.#T())",
+                    RuntimeTypes.Http.HttpBody,
                     memberName,
                     KotlinTypes.Text.encodeToByteArray,
                 )
             ShapeType.INT_ENUM ->
                 writer.write(
-                    "builder.body = #T(input.#L.value.toString().#T())",
-                    RuntimeTypes.Http.ByteArrayContent,
+                    "builder.body = #T.fromBytes(input.#L.value.toString().#T())",
+                    RuntimeTypes.Http.HttpBody,
                     memberName,
                     KotlinTypes.Text.encodeToByteArray,
                 )
@@ -460,7 +459,7 @@ abstract class HttpBindingProtocolGenerator : ProtocolGenerator {
                 val sdg = structuredDataSerializer(ctx)
                 val payloadSerializerFn = sdg.payloadSerializer(ctx, binding.member)
                 writer.write("val payload = #T(input.#L)", payloadSerializerFn, memberName)
-                writer.write("builder.body = #T(payload)", RuntimeTypes.Http.ByteArrayContent)
+                writer.write("builder.body = #T.fromBytes(payload)", RuntimeTypes.Http.HttpBody)
             }
 
             else ->
@@ -487,7 +486,7 @@ abstract class HttpBindingProtocolGenerator : ProtocolGenerator {
             val definitionFileName = op.deserializerName().replaceFirstChar(Char::uppercaseChar)
             definitionFile = "$definitionFileName.kt"
             name = op.deserializerName()
-            namespace = ctx.settings.pkg.subpackage("transform")
+            namespace = ctx.settings.pkg.serde
 
             reference(outputSymbol, SymbolReference.ContextOption.DECLARE)
         }
@@ -542,7 +541,7 @@ abstract class HttpBindingProtocolGenerator : ProtocolGenerator {
             val deserializerName = "${outputSymbol.name}Deserializer"
             definitionFile = "$deserializerName.kt"
             name = deserializerName
-            namespace = ctx.settings.pkg.subpackage("transform")
+            namespace = ctx.settings.pkg.serde
             reference(outputSymbol, SymbolReference.ContextOption.DECLARE)
         }
 
@@ -996,7 +995,7 @@ fun OperationShape.errorHandlerName(): String = "throw${capitalizedDefaultName()
  */
 fun OperationShape.errorHandler(settings: KotlinSettings, block: SymbolRenderer): Symbol = buildSymbol {
     name = errorHandlerName()
-    namespace = "${settings.pkg.name}.transform"
+    namespace = settings.pkg.serde
     // place error handler in same file as operation deserializer
     definitionFile = "${deserializerName()}.kt"
     renderBy = block

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpProtocolClientGenerator.kt

@@ -127,9 +127,9 @@ abstract class HttpProtocolClientGenerator(
     }
 
     protected open fun importSymbols(writer: KotlinWriter) {
-        writer.addImport("${ctx.settings.pkg.name}.model", "*")
+        writer.addImport(ctx.settings.pkg.subpackage("model"), "*")
         if (TopDownIndex(ctx.model).getContainedOperations(ctx.service).isNotEmpty()) {
-            writer.addImport("${ctx.settings.pkg.name}.transform", "*")
+            writer.addImport(ctx.settings.pkg.serde, "*")
         }
 
         val defaultClientSymbols = setOf(

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpProtocolUnitTestResponseGenerator.kt

@@ -159,7 +159,7 @@ open class HttpProtocolUnitTestResponseGenerator protected constructor(builder:
             when (target) {
                 is BlobShape -> {
                     val suffix = if (target.hasTrait<StreamingTrait>()) {
-                        "?.toByteArray()"
+                        writer.format("?.#T()", RuntimeTypes.Core.Content.toByteArray)
                     } else {
                         ""
                     }

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/serde/SerdeExt.kt

@@ -42,8 +42,8 @@ fun OperationShape.bodySerializer(
     block: SymbolRenderer,
 ): Symbol = buildSymbol {
     name = bodySerializerName()
-    namespace = "${settings.pkg.name}.transform"
-    // place body serializer in same file as operation serializer implementaiton
+    namespace = settings.pkg.serde
+    // place body serializer in same file as operation serializer implementation
     definitionFile = "${serializerName()}.kt"
     renderBy = block
 }
@@ -68,7 +68,7 @@ fun OperationShape.bodyDeserializer(
     block: SymbolRenderer,
 ): Symbol = buildSymbol {
     name = bodyDeserializerName()
-    namespace = "${settings.pkg.name}.transform"
+    namespace = settings.pkg.serde
     // place body serializer in same file as operation serializer implementation
     definitionFile = "${deserializerName()}.kt"
     renderBy = block
@@ -95,7 +95,7 @@ fun Shape.documentSerializer(
 
     return buildSymbol {
         name = "$base$suffix"
-        namespace = settings.pkg.subpackage("transform")
+        namespace = settings.pkg.serde
         definitionFile = "${symbol.name}DocumentSerializer.kt"
         reference(symbol, SymbolReference.ContextOption.DECLARE)
         renderBy = block
@@ -123,7 +123,7 @@ fun Shape.documentDeserializer(
 
     return buildSymbol {
         name = "$base$suffix"
-        namespace = settings.pkg.subpackage("transform")
+        namespace = settings.pkg.serde
         definitionFile = "${symbol.name}DocumentDeserializer.kt"
         reference(symbol, SymbolReference.ContextOption.DECLARE)
         renderBy = block
@@ -141,7 +141,7 @@ fun Symbol.errorDeserializerName(): String = "deserialize" + StringUtils.capital
  */
 fun Symbol.errorDeserializer(settings: KotlinSettings, block: SymbolRenderer): Symbol = buildSymbol {
     name = errorDeserializerName()
-    namespace = "${settings.pkg.name}.transform"
+    namespace = settings.pkg.serde
     val symbol = this@errorDeserializer
     // place it in the same file as the exception deserializer, e.g. for HTTP protocols this will be in
     // same file as HttpDeserialize
@@ -163,7 +163,7 @@ fun Shape.payloadDeserializer(
     val suffix = mangledSuffix(members)
     return buildSymbol {
         name = "$base$suffix"
-        namespace = settings.pkg.subpackage("transform")
+        namespace = settings.pkg.serde
         definitionFile = "${symbol.name}PayloadDeserializer.kt"
         reference(symbol, SymbolReference.ContextOption.DECLARE)
         renderBy = block
@@ -183,7 +183,7 @@ fun Shape.payloadSerializer(
     val suffix = mangledSuffix(members)
     return buildSymbol {
         name = "$base$suffix"
-        namespace = "${settings.pkg.name}.transform"
+        namespace = settings.pkg.serde
         definitionFile = "${symbol.name}PayloadSerializer.kt"
         reference(symbol, SymbolReference.ContextOption.DECLARE)
         renderBy = block

codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/IdempotentTokenGeneratorTest.kt

@@ -13,22 +13,22 @@ import kotlin.test.Test
 class IdempotentTokenGeneratorTest {
     private val defaultModel: Model = javaClass.getResource("idempotent-token-test-model.smithy").toSmithyModel()
 
-    private fun getTransformFileContents(filename: String): String {
+    private fun getSerdeFileContents(filename: String): String {
         val (ctx, manifest, generator) = defaultModel.newTestContext()
         generator.generateProtocolClient(ctx)
         ctx.delegator.flushWriters()
-        return manifest.getTransformFileContents(filename)
+        return manifest.getSerdeFileContents(filename)
     }
 
     // Assume a specific file path to retrieve a file from the manifest
-    private fun MockManifest.getTransformFileContents(filename: String, packageNamespace: String = TestModelDefault.NAMESPACE): String {
+    private fun MockManifest.getSerdeFileContents(filename: String, packageNamespace: String = TestModelDefault.NAMESPACE): String {
         val packageNamespaceExpr = packageNamespace.replace('.', '/')
-        return expectFileString("src/main/kotlin/$packageNamespaceExpr/transform/$filename")
+        return expectFileString("src/main/kotlin/$packageNamespaceExpr/serde/$filename")
     }
 
     @Test
     fun `it serializes operation payload inputs with idempotency token trait`() {
-        val contents = getTransformFileContents("AllocateWidgetOperationSerializer.kt")
+        val contents = getSerdeFileContents("AllocateWidgetOperationSerializer.kt")
         contents.assertBalancedBracesAndParens()
         val expectedContents = """
             internal class AllocateWidgetOperationSerializer: HttpSerialize<AllocateWidgetRequest> {
@@ -41,7 +41,7 @@ class IdempotentTokenGeneratorTest {
                     }
             
                     val payload = serializeAllocateWidgetOperationBody(context, input)
-                    builder.body = ByteArrayContent(payload)
+                    builder.body = HttpBody.fromBytes(payload)
                     if (builder.body !is HttpBody.Empty) {
                         builder.headers.setMissing("Content-Type", "application/json")
                     }
@@ -54,7 +54,7 @@ class IdempotentTokenGeneratorTest {
 
     @Test
     fun `it serializes operation query inputs with idempotency token trait`() {
-        val contents = getTransformFileContents("AllocateWidgetQueryOperationSerializer.kt")
+        val contents = getSerdeFileContents("AllocateWidgetQueryOperationSerializer.kt")
         contents.assertBalancedBracesAndParens()
         val expectedContents = """
 internal class AllocateWidgetQueryOperationSerializer: HttpSerialize<AllocateWidgetQueryRequest> {
@@ -78,7 +78,7 @@ internal class AllocateWidgetQueryOperationSerializer: HttpSerialize<AllocateWid
 
     @Test
     fun `it serializes operation header inputs with idempotency token trait`() {
-        val contents = getTransformFileContents("AllocateWidgetHeaderOperationSerializer.kt")
+        val contents = getSerdeFileContents("AllocateWidgetHeaderOperationSerializer.kt")
         contents.assertBalancedBracesAndParens()
         val expectedContents = """
 internal class AllocateWidgetHeaderOperationSerializer: HttpSerialize<AllocateWidgetHeaderRequest> {