chore: optimize codegen for size round1 (#533)

Author: aajtodd

runtime/protocol/http/common/src/aws/smithy/kotlin/runtime/http/operation/SdkHttpOperation.kt

@@ -56,7 +56,7 @@ class SdkHttpOperation<I, O>(
     }
 
     companion object {
-        fun <I, O> build(block: SdkHttpOperationBuilder<I, O>.() -> Unit): SdkHttpOperation<I, O> =
+        inline fun <I, O> build(block: SdkHttpOperationBuilder<I, O>.() -> Unit): SdkHttpOperation<I, O> =
             SdkHttpOperationBuilder<I, O>().apply(block).build()
     }
 }
@@ -109,4 +109,4 @@ class SdkHttpOperationBuilder<I, O> {
 /**
  * Configure HTTP operation context elements
  */
-fun <I, O> SdkHttpOperationBuilder<I, O>.context(block: HttpOperationContext.Builder.() -> Unit) = context.apply(block)
+inline fun <I, O> SdkHttpOperationBuilder<I, O>.context(block: HttpOperationContext.Builder.() -> Unit) = context.apply(block)

runtime/serde/common/src/aws/smithy/kotlin/runtime/serde/Deserializer.kt

@@ -62,7 +62,7 @@ interface Deserializer {
      *
      * @param descriptor SdkObjectDescriptor the structure descriptor
      */
-    suspend fun deserializeStruct(descriptor: SdkObjectDescriptor): FieldIterator
+    fun deserializeStruct(descriptor: SdkObjectDescriptor): FieldIterator
 
     /**
      * Begin deserialization of a list type. Use the returned [ElementIterator] to drive
@@ -73,7 +73,7 @@ interface Deserializer {
      *
      * @param descriptor SdkFieldDescriptor the structure descriptor
      */
-    suspend fun deserializeList(descriptor: SdkFieldDescriptor): ElementIterator
+    fun deserializeList(descriptor: SdkFieldDescriptor): ElementIterator
 
     /**
      * Begin deserialization of a map type. Use the returned [EntryIterator] to drive
@@ -84,7 +84,7 @@ interface Deserializer {
      *
      * @param descriptor SdkFieldDescriptor the structure descriptor
      */
-    suspend fun deserializeMap(descriptor: SdkFieldDescriptor): EntryIterator
+    fun deserializeMap(descriptor: SdkFieldDescriptor): EntryIterator
 
     /**
      * Iterator over raw elements in a collection
@@ -94,12 +94,12 @@ interface Deserializer {
          * Advance to the next element. Returns false when no more elements are in the list
          * or the document has been read completely.
          */
-        suspend fun hasNextElement(): Boolean
+        fun hasNextElement(): Boolean
 
         /**
          * Returns true if the next token contains a value, or false otherwise.
          */
-        suspend fun nextHasValue(): Boolean
+        fun nextHasValue(): Boolean
     }
 
     /**
@@ -110,17 +110,17 @@ interface Deserializer {
          * Advance to the next element. Returns false when no more elements are in the map
          * or the document has been read completely.
          */
-        suspend fun hasNextEntry(): Boolean
+        fun hasNextEntry(): Boolean
 
         /**
          * Read the next key
          */
-        suspend fun key(): String
+        fun key(): String
 
         /**
          * Returns true if the next token contains a value, or false otherwise.
          */
-        suspend fun nextHasValue(): Boolean
+        fun nextHasValue(): Boolean
     }
 
     /**
@@ -130,12 +130,12 @@ interface Deserializer {
         /**
          * Returns the index of the next field found, null if fields exhausted, or [UNKNOWN_FIELD].
          */
-        suspend fun findNextFieldIndex(): Int?
+        fun findNextFieldIndex(): Int?
 
         /**
          * Skip the next field value recursively. Meant for discarding unknown fields
          */
-        suspend fun skipValue()
+        fun skipValue()
 
         companion object {
             /**
@@ -153,60 +153,60 @@ interface PrimitiveDeserializer {
     /**
      * Deserialize and return the next token as a [Byte]
      */
-    suspend fun deserializeByte(): Byte
+    fun deserializeByte(): Byte
 
     /**
      * Deserialize and return the next token as an [Int]
      */
-    suspend fun deserializeInt(): Int
+    fun deserializeInt(): Int
 
     /**
      * Deserialize and return the next token as a [Short]
      */
-    suspend fun deserializeShort(): Short
+    fun deserializeShort(): Short
 
     /**
      * Deserialize and return the next token as a [Long]
      */
-    suspend fun deserializeLong(): Long
+    fun deserializeLong(): Long
 
     /**
      * Deserialize and return the next token as a [Float]
      */
-    suspend fun deserializeFloat(): Float
+    fun deserializeFloat(): Float
 
     /**
      * Deserialize and return the next token as a [Double]
      */
-    suspend fun deserializeDouble(): Double
+    fun deserializeDouble(): Double
 
     /**
      * Deserialize and return the next token as a [String]
      */
-    suspend fun deserializeString(): String
+    fun deserializeString(): String
 
     /**
      * Deserialize and return the next token as a [Boolean]
      */
-    suspend fun deserializeBoolean(): Boolean
+    fun deserializeBoolean(): Boolean
 
     /**
      * Consume the next token if represents a null value. Always returns null.
      */
-    suspend fun deserializeNull(): Nothing?
+    fun deserializeNull(): Nothing?
 }
 
-suspend fun Deserializer.deserializeStruct(descriptor: SdkObjectDescriptor, block: suspend Deserializer.FieldIterator.() -> Unit) {
+inline fun Deserializer.deserializeStruct(descriptor: SdkObjectDescriptor, block: Deserializer.FieldIterator.() -> Unit) {
     val deserializer = deserializeStruct(descriptor)
     block(deserializer)
 }
 
-suspend fun <T> Deserializer.deserializeList(descriptor: SdkFieldDescriptor, block: suspend Deserializer.ElementIterator.() -> T): T {
+inline fun <T> Deserializer.deserializeList(descriptor: SdkFieldDescriptor, block: Deserializer.ElementIterator.() -> T): T {
     val deserializer = deserializeList(descriptor)
     return block(deserializer)
 }
 
-suspend fun <T> Deserializer.deserializeMap(descriptor: SdkFieldDescriptor, block: suspend Deserializer.EntryIterator.() -> T): T {
+inline fun <T> Deserializer.deserializeMap(descriptor: SdkFieldDescriptor, block: Deserializer.EntryIterator.() -> T): T {
     val deserializer = deserializeMap(descriptor)
     return block(deserializer)
 }

runtime/serde/common/src/aws/smithy/kotlin/runtime/serde/SdkObjectDescriptor.kt

@@ -7,40 +7,29 @@ package aws.smithy.kotlin.runtime.serde
 /**
  * Metadata container for all fields of an object/class
  */
-class SdkObjectDescriptor private constructor(builder: BuilderImpl) : SdkFieldDescriptor(
+class SdkObjectDescriptor private constructor(builder: Builder) : SdkFieldDescriptor(
     kind = SerialKind.Struct, traits = builder.traits
 ) {
     val fields: List<SdkFieldDescriptor> = builder.fields
 
     companion object {
-        fun build(block: DslBuilder.() -> Unit): SdkObjectDescriptor = BuilderImpl().apply(block).build()
+        inline fun build(block: Builder.() -> Unit): SdkObjectDescriptor = Builder().apply(block).build()
     }
 
-    interface DslBuilder {
-        /**
-         * Declare a field belonging to this object
-         */
-        fun field(field: SdkFieldDescriptor)
-        /**
-         * Declare a trait belonging to this object
-         */
-        fun trait(trait: FieldTrait)
-        fun build(): SdkObjectDescriptor
-    }
-
-    private class BuilderImpl : DslBuilder {
-        val fields: MutableList<SdkFieldDescriptor> = mutableListOf()
-        val traits: MutableSet<FieldTrait> = mutableSetOf()
+    class Builder {
+        internal val fields: MutableList<SdkFieldDescriptor> = mutableListOf()
+        internal val traits: MutableSet<FieldTrait> = mutableSetOf()
 
-        override fun field(field: SdkFieldDescriptor) {
+        fun field(field: SdkFieldDescriptor) {
             field.index = fields.size
             fields.add(field)
         }
 
-        override fun trait(trait: FieldTrait) {
+        fun trait(trait: FieldTrait) {
             traits.add(trait)
         }
 
-        override fun build(): SdkObjectDescriptor = SdkObjectDescriptor(this)
+        @PublishedApi
+        internal fun build(): SdkObjectDescriptor = SdkObjectDescriptor(this)
     }
 }

runtime/serde/common/src/aws/smithy/kotlin/runtime/serde/SdkSerializable.kt

@@ -26,4 +26,5 @@ private data class SdkSerializableLambda<T>(
     }
 }
 
+// FIXME - this causes backing classes to be generated behind the scenes and contributes to the overall jar size
 fun <T> asSdkSerializable(input: T, serializeFn: SerializeFn<T>): SdkSerializable = SdkSerializableLambda(input, serializeFn)

runtime/serde/serde-json/common/src/aws/smithy/kotlin/runtime/serde/json/JsonDeserializer.kt

@@ -21,21 +21,21 @@ class JsonDeserializer(payload: ByteArray) : Deserializer, Deserializer.ElementI
     // deserializing a single byte isn't common in JSON - we are going to assume that bytes are represented
     // as numbers and user understands any truncation issues. `deserializeByte` is more common in binary
     // formats (e.g. protobufs) where the binary encoding stores metadata in a single byte (e.g. flags or headers)
-    override suspend fun deserializeByte(): Byte = nextNumberValue { it.toByteOrNull() ?: it.toDouble().toInt().toByte() }
+    override fun deserializeByte(): Byte = nextNumberValue { it.toByteOrNull() ?: it.toDouble().toInt().toByte() }
 
-    override suspend fun deserializeInt(): Int = nextNumberValue { it.toIntOrNull() ?: it.toDouble().toInt() }
+    override fun deserializeInt(): Int = nextNumberValue { it.toIntOrNull() ?: it.toDouble().toInt() }
 
-    override suspend fun deserializeShort(): Short = nextNumberValue { it.toShortOrNull() ?: it.toDouble().toInt().toShort() }
+    override fun deserializeShort(): Short = nextNumberValue { it.toShortOrNull() ?: it.toDouble().toInt().toShort() }
 
-    override suspend fun deserializeLong(): Long = nextNumberValue { it.toLongOrNull() ?: it.toDouble().toLong() }
+    override fun deserializeLong(): Long = nextNumberValue { it.toLongOrNull() ?: it.toDouble().toLong() }
 
-    override suspend fun deserializeFloat(): Float = deserializeDouble().toFloat()
+    override fun deserializeFloat(): Float = deserializeDouble().toFloat()
 
-    override suspend fun deserializeDouble(): Double = nextNumberValue { it.toDouble() }
+    override fun deserializeDouble(): Double = nextNumberValue { it.toDouble() }
 
     // assert the next token is a Number and execute [block] with the raw value as a string. Returns result
     // of executing the block. This is mostly so that numeric conversions can keep as much precision as possible
-    private suspend fun <T> nextNumberValue(block: (value: String) -> T): T {
+    private fun <T> nextNumberValue(block: (value: String) -> T): T {
         val token = reader.nextToken()
         return when {
             token is JsonToken.Number -> block(token.value)
@@ -44,7 +44,7 @@ class JsonDeserializer(payload: ByteArray) : Deserializer, Deserializer.ElementI
         }
     }
 
-    override suspend fun deserializeString(): String =
+    override fun deserializeString(): String =
         // allow for tokens to be consumed as string even when the next token isn't a quoted string
         when (val token = reader.nextToken()) {
             is JsonToken.String -> token.value
@@ -53,17 +53,17 @@ class JsonDeserializer(payload: ByteArray) : Deserializer, Deserializer.ElementI
             else -> throw DeserializationException("$token cannot be deserialized as type String")
         }
 
-    override suspend fun deserializeBoolean(): Boolean {
+    override fun deserializeBoolean(): Boolean {
         val token = reader.nextTokenOf<JsonToken.Bool>()
         return token.value
     }
 
-    override suspend fun deserializeNull(): Nothing? {
+    override fun deserializeNull(): Nothing? {
         reader.nextTokenOf<JsonToken.Null>()
         return null
     }
 
-    override suspend fun deserializeStruct(descriptor: SdkObjectDescriptor): Deserializer.FieldIterator =
+    override fun deserializeStruct(descriptor: SdkObjectDescriptor): Deserializer.FieldIterator =
         when (reader.peek()) {
             JsonToken.BeginObject -> {
                 reader.nextTokenOf<JsonToken.BeginObject>()
@@ -73,24 +73,24 @@ class JsonDeserializer(payload: ByteArray) : Deserializer, Deserializer.ElementI
             else -> throw DeserializationException("Unexpected token type ${reader.peek()}")
         }
 
-    override suspend fun deserializeList(descriptor: SdkFieldDescriptor): Deserializer.ElementIterator {
+    override fun deserializeList(descriptor: SdkFieldDescriptor): Deserializer.ElementIterator {
         reader.nextTokenOf<JsonToken.BeginArray>()
         return this
     }
 
-    override suspend fun deserializeMap(descriptor: SdkFieldDescriptor): Deserializer.EntryIterator {
+    override fun deserializeMap(descriptor: SdkFieldDescriptor): Deserializer.EntryIterator {
         reader.nextTokenOf<JsonToken.BeginObject>()
         return this
     }
 
-    override suspend fun key(): String {
+    override fun key(): String {
         val token = reader.nextTokenOf<JsonToken.Name>()
         return token.value
     }
 
-    override suspend fun nextHasValue(): Boolean = reader.peek() != JsonToken.Null
+    override fun nextHasValue(): Boolean = reader.peek() != JsonToken.Null
 
-    override suspend fun hasNextEntry(): Boolean =
+    override fun hasNextEntry(): Boolean =
         when (reader.peek()) {
             JsonToken.EndObject -> {
                 // consume the token
@@ -102,7 +102,7 @@ class JsonDeserializer(payload: ByteArray) : Deserializer, Deserializer.ElementI
             else -> true
         }
 
-    override suspend fun hasNextElement(): Boolean =
+    override fun hasNextElement(): Boolean =
         when (reader.peek()) {
             JsonToken.EndArray -> {
                 // consume the token
@@ -116,9 +116,9 @@ class JsonDeserializer(payload: ByteArray) : Deserializer, Deserializer.ElementI
 
 // Represents the deserialization of a null object.
 private class JsonNullFieldIterator(deserializer: JsonDeserializer) : Deserializer.FieldIterator, Deserializer by deserializer, PrimitiveDeserializer by deserializer {
-    override suspend fun findNextFieldIndex(): Int? = null
+    override fun findNextFieldIndex(): Int? = null
 
-    override suspend fun skipValue() {
+    override fun skipValue() {
         throw DeserializationException("This should not be called during deserialization.")
     }
 }
@@ -129,7 +129,7 @@ private class JsonFieldIterator(
     deserializer: JsonDeserializer
 ) : Deserializer.FieldIterator, Deserializer by deserializer, PrimitiveDeserializer by deserializer {
 
-    override suspend fun findNextFieldIndex(): Int? {
+    override fun findNextFieldIndex(): Int? {
         val candidate = when (reader.peek()) {
             JsonToken.EndObject -> {
                 // consume the token
@@ -161,7 +161,7 @@ private class JsonFieldIterator(
         return candidate
     }
 
-    override suspend fun skipValue() {
+    override fun skipValue() {
         // stream reader skips the *next* token
         reader.skipNext()
     }

runtime/serde/serde-json/common/src/aws/smithy/kotlin/runtime/serde/json/JsonLexer.kt

@@ -62,16 +62,16 @@ internal class JsonLexer(
     private val state = StateManager()
     private var idx = 0
 
-    override suspend fun nextToken(): JsonToken {
+    override fun nextToken(): JsonToken {
         val next = peek()
         peeked = null
         state.update()
         return next
     }
 
-    override suspend fun peek(): JsonToken = peeked ?: doPeek().also { peeked = it }
+    override fun peek(): JsonToken = peeked ?: doPeek().also { peeked = it }
 
-    override suspend fun skipNext() {
+    override fun skipNext() {
         val startDepth = state.size
         nextToken()
         while (state.size > startDepth) {

runtime/serde/serde-json/common/src/aws/smithy/kotlin/runtime/serde/json/JsonStreamReader.kt

@@ -14,17 +14,17 @@ interface JsonStreamReader {
     /**
      * Grab the next token in the stream
      */
-    suspend fun nextToken(): JsonToken
+    fun nextToken(): JsonToken
 
     /**
      * Recursively skip the next token. Meant for discarding unwanted/unrecognized properties in a JSON document
      */
-    suspend fun skipNext()
+    fun skipNext()
 
     /**
      * Peek at the next token type
      */
-    suspend fun peek(): JsonToken
+    fun peek(): JsonToken
 }
 
 /*
@@ -34,7 +34,7 @@ interface JsonStreamReader {
 fun jsonStreamReader(payload: ByteArray): JsonStreamReader = JsonLexer(payload)
 
 // return the next token and require that it be of type [TExpected] or else throw an exception
-internal suspend inline fun <reified TExpected : JsonToken> JsonStreamReader.nextTokenOf(): TExpected {
+internal inline fun <reified TExpected : JsonToken> JsonStreamReader.nextTokenOf(): TExpected {
     val token = this.nextToken()
     requireToken<TExpected>(token)
     return token as TExpected