feat: big number support (#875)

ianbotsf · web-flow · commit ef67792960ec · 2023-06-26T07:51:17.000-07:00
diff --git a/.changes/97f4f92d-5f3e-4d01-9e58-d967318fa198.json b/.changes/97f4f92d-5f3e-4d01-9e58-d967318fa198.json
@@ -0,0 +1,8 @@
+{
+    "id": "97f4f92d-5f3e-4d01-9e58-d967318fa198",
+    "type": "feature",
+    "description": "Add support for `BigInteger` and `BigDecimal` in Smithy models",
+    "issues": [
+        "awslabs/smithy-kotlin#213"
+    ]
+}
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinSymbolProvider.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinSymbolProvider.kt
@@ -85,12 +85,9 @@ class KotlinSymbolProvider(private val model: Model, private val settings: Kotli
     private fun numberShape(shape: Shape, typeName: String, defaultValue: String): Symbol =
         createSymbolBuilder(shape, typeName, namespace = "kotlin").defaultValue(defaultValue).build()
 
-    override fun bigIntegerShape(shape: BigIntegerShape?): Symbol = createBigSymbol(shape, "BigInteger")
+    override fun bigIntegerShape(shape: BigIntegerShape?): Symbol = RuntimeTypes.Core.Content.BigInteger
 
-    override fun bigDecimalShape(shape: BigDecimalShape?): Symbol = createBigSymbol(shape, "BigDecimal")
-
-    private fun createBigSymbol(shape: Shape?, symbolName: String): Symbol =
-        createSymbolBuilder(shape, symbolName, namespace = "java.math", nullable = true).build()
+    override fun bigDecimalShape(shape: BigDecimalShape?): Symbol = RuntimeTypes.Core.Content.BigDecimal
 
     override fun stringShape(shape: StringShape): Symbol = if (shape.isEnum) {
         createEnumSymbol(shape)
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/RuntimeTypes.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/RuntimeTypes.kt
@@ -99,6 +99,8 @@ object RuntimeTypes {
         val ClientException = symbol("ClientException")
 
         object Content : RuntimeTypePackage(KotlinDependency.CORE, "content") {
+            val BigDecimal = symbol("BigDecimal")
+            val BigInteger = symbol("BigInteger")
             val ByteArrayContent = symbol("ByteArrayContent")
             val ByteStream = symbol("ByteStream")
             val buildDocument = symbol("buildDocument")
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/serde/DeserializeStructGenerator.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/serde/DeserializeStructGenerator.kt
@@ -560,6 +560,8 @@ open class DeserializeStructGenerator(
             target.type == ShapeType.LONG -> "deserializeLong()"
             target.type == ShapeType.FLOAT -> "deserializeFloat()"
             target.type == ShapeType.DOUBLE -> "deserializeDouble()"
+            target.type == ShapeType.BIG_INTEGER -> "deserializeBigInteger()"
+            target.type == ShapeType.BIG_DECIMAL -> "deserializeBigDecimal()"
             target.type == ShapeType.DOCUMENT -> "deserializeDocument()"
 
             target.type == ShapeType.BLOB -> {
diff --git a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinDelegatorTest.kt b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinDelegatorTest.kt
@@ -75,7 +75,7 @@ class KotlinDelegatorTest {
         KotlinCodegenPlugin().execute(context)
 
         val contents = manifest.getFileString("src/main/kotlin/com/test/model/GetFooRequest.kt").get()
-        contents.shouldContain("import java.math.BigInteger")
+        contents.shouldContain("import aws.smithy.kotlin.runtime.content.BigInteger")
         // ensure symbol wasn't imported as an alias by default
         contents.shouldNotContain("as BigInteger")
     }
diff --git a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/core/SymbolProviderTest.kt b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/core/SymbolProviderTest.kt
@@ -544,7 +544,7 @@ class SymbolProviderTest {
 
         val provider: SymbolProvider = KotlinCodegenPlugin.createSymbolProvider(model, rootNamespace = "foo.bar")
         val bigSymbol = provider.toSymbol(member)
-        assertEquals("java.math", bigSymbol.namespace)
+        assertEquals("aws.smithy.kotlin.runtime.content", bigSymbol.namespace)
         assertEquals("null", bigSymbol.defaultValue())
         assertEquals(true, bigSymbol.isNullable)
         assertEquals(type, bigSymbol.name)
diff --git a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/serde/DeserializeStructGeneratorTest.kt b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/serde/DeserializeStructGeneratorTest.kt
@@ -21,9 +21,8 @@ class DeserializeStructGeneratorTest {
         operations = listOf("Foo"),
     ).trimIndent()
 
-    // TODO ~ Support BigInteger and BigDecimal Types
     @ParameterizedTest
-    @ValueSource(strings = ["String", "Boolean", "Byte", "Short", "Integer", "Long", "Float", "Double"/*, "BigInteger", "BigDecimal"*/])
+    @ValueSource(strings = ["String", "Boolean", "Byte", "Short", "Integer", "Long", "Float", "Double", "BigInteger", "BigDecimal"])
     fun `it deserializes a structure with a simple fields`(memberType: String) {
         val model = (
             modelPrefix + """            
diff --git a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/serde/SerializeStructGeneratorTest.kt b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/serde/SerializeStructGeneratorTest.kt
@@ -21,9 +21,8 @@ class SerializeStructGeneratorTest {
         operations = listOf("Foo"),
     ).trimIndent()
 
-    // TODO ~ Support BigInteger and BigDecimal Types - https://github.com/awslabs/smithy-kotlin/issues/213
     @ParameterizedTest
-    @ValueSource(strings = ["String", "Boolean", "Byte", "Short", "Integer", "Long", "Float", "Double"/*, "BigInteger", "BigDecimal"*/])
+    @ValueSource(strings = ["String", "Boolean", "Byte", "Short", "Integer", "Long", "Float", "Double", "BigInteger", "BigDecimal"])
     fun `it serializes a structure with a simple fields`(memberType: String) {
         val model = (
             modelPrefix + """            
diff --git a/docs/design/kotlin-smithy-sdk.md b/docs/design/kotlin-smithy-sdk.md
@@ -38,8 +38,8 @@ hard keywords (e.g., "null" will be escaped as `` `null` ``).
 | `long`       | `Long`
 | `float`      | `Float`
 | `double`     | `Double`
-| `bigInteger` | *undecided (see [#213](https://github.com/awslabs/smithy-kotlin/issues/213))
-| `bigDecimal` | *undecided (see [#213](https://github.com/awslabs/smithy-kotlin/issues/213))
+| `bigInteger` | *custom type provided by client runtime (type aliased to `java.math.BigInteger` on JVM)
+| `bigDecimal` | *custom type provided by client runtime (type aliased to `java.math.BigDecimal` on JVM)
 | `timestamp`  | *custom type provided by client runtime
 | `document`   | *custom type provided by client runtime
 
diff --git a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/content/BigDecimal.kt b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/content/BigDecimal.kt
@@ -0,0 +1,9 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package aws.smithy.kotlin.runtime.content
+
+public expect class BigDecimal(value: String) : Number {
+    public fun toPlainString(): String
+}
diff --git a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/content/BigInteger.kt b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/content/BigInteger.kt
@@ -0,0 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package aws.smithy.kotlin.runtime.content
+
+public expect class BigInteger(value: String) : Number
diff --git a/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/content/BigDecimalTest.kt b/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/content/BigDecimalTest.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package aws.smithy.kotlin.runtime.content
+
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertFails
+
+class BigDecimalTest {
+    @Test
+    fun testBigDecimal() {
+        val reallyPreciseNumberString = "0.340282366920938463463374607431768211456" // 128 bits of magnitude
+        val reallyPreciseNumber = BigDecimal(reallyPreciseNumberString)
+        assertEquals(reallyPreciseNumberString, reallyPreciseNumber.toPlainString())
+    }
+
+    @Test
+    fun testBadBigDecimal() {
+        assertFails { BigDecimal("1234567890.1234567890foo") }
+    }
+}
diff --git a/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/content/BigIntegerTest.kt b/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/content/BigIntegerTest.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package aws.smithy.kotlin.runtime.content
+
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertFails
+
+class BigIntegerTest {
+    @Test
+    fun testBigInteger() {
+        val reallyBigNumberString = "340282366920938463463374607431768211456" // 128-bit number
+        val reallyBigNumber = BigInteger(reallyBigNumberString)
+        assertEquals(reallyBigNumberString, reallyBigNumber.toString())
+    }
+
+    @Test
+    fun testBadBigInteger() {
+        assertFails { BigInteger("1234567890foo1234567890") }
+    }
+}
diff --git a/runtime/runtime-core/jvm/src/aws/smithy/kotlin/runtime/content/BigDecimalJVM.kt b/runtime/runtime-core/jvm/src/aws/smithy/kotlin/runtime/content/BigDecimalJVM.kt
@@ -0,0 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package aws.smithy.kotlin.runtime.content
+
+public actual typealias BigDecimal = java.math.BigDecimal
diff --git a/runtime/runtime-core/jvm/src/aws/smithy/kotlin/runtime/content/BigIntegerJVM.kt b/runtime/runtime-core/jvm/src/aws/smithy/kotlin/runtime/content/BigIntegerJVM.kt
@@ -0,0 +1,7 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package aws.smithy.kotlin.runtime.content
+
+public actual typealias BigInteger = java.math.BigInteger
diff --git a/runtime/serde/api/serde.api b/runtime/serde/api/serde.api
@@ -64,6 +64,8 @@ public abstract interface class aws/smithy/kotlin/runtime/serde/MapSerializer :
 }
 
 public abstract interface class aws/smithy/kotlin/runtime/serde/PrimitiveDeserializer {
+	public abstract fun deserializeBigDecimal ()Ljava/math/BigDecimal;
+	public abstract fun deserializeBigInteger ()Ljava/math/BigInteger;
 	public abstract fun deserializeBoolean ()Z
 	public abstract fun deserializeByte ()B
 	public abstract fun deserializeDocument ()Laws/smithy/kotlin/runtime/content/Document;
@@ -77,6 +79,8 @@ public abstract interface class aws/smithy/kotlin/runtime/serde/PrimitiveDeseria
 }
 
 public abstract interface class aws/smithy/kotlin/runtime/serde/PrimitiveSerializer {
+	public abstract fun serializeBigDecimal (Ljava/math/BigDecimal;)V
+	public abstract fun serializeBigInteger (Ljava/math/BigInteger;)V
 	public abstract fun serializeBoolean (Z)V
 	public abstract fun serializeByte (B)V
 	public abstract fun serializeChar (C)V
@@ -250,6 +254,8 @@ public abstract interface class aws/smithy/kotlin/runtime/serde/StructSerializer
 	public abstract fun field (Laws/smithy/kotlin/runtime/serde/SdkFieldDescriptor;Laws/smithy/kotlin/runtime/serde/SdkSerializable;)V
 	public abstract fun field (Laws/smithy/kotlin/runtime/serde/SdkFieldDescriptor;Laws/smithy/kotlin/runtime/time/Instant;Laws/smithy/kotlin/runtime/time/TimestampFormat;)V
 	public abstract fun field (Laws/smithy/kotlin/runtime/serde/SdkFieldDescriptor;Ljava/lang/String;)V
+	public abstract fun field (Laws/smithy/kotlin/runtime/serde/SdkFieldDescriptor;Ljava/math/BigDecimal;)V
+	public abstract fun field (Laws/smithy/kotlin/runtime/serde/SdkFieldDescriptor;Ljava/math/BigInteger;)V
 	public abstract fun field (Laws/smithy/kotlin/runtime/serde/SdkFieldDescriptor;S)V
 	public abstract fun field (Laws/smithy/kotlin/runtime/serde/SdkFieldDescriptor;Z)V
 	public abstract fun listField (Laws/smithy/kotlin/runtime/serde/SdkFieldDescriptor;Lkotlin/jvm/functions/Function1;)V
diff --git a/runtime/serde/common/src/aws/smithy/kotlin/runtime/serde/Deserializer.kt b/runtime/serde/common/src/aws/smithy/kotlin/runtime/serde/Deserializer.kt
@@ -4,6 +4,8 @@
  */
 package aws.smithy.kotlin.runtime.serde
 
+import aws.smithy.kotlin.runtime.content.BigDecimal
+import aws.smithy.kotlin.runtime.content.BigInteger
 import aws.smithy.kotlin.runtime.content.Document
 
 /**
@@ -182,6 +184,16 @@ public interface PrimitiveDeserializer {
      */
     public fun deserializeDouble(): Double
 
+    /**
+     * Deserialize and return the next token as a [BigInteger]
+     */
+    public fun deserializeBigInteger(): BigInteger
+
+    /**
+     * Deserialize and return the next token as a [BigDecimal]
+     */
+    public fun deserializeBigDecimal(): BigDecimal
+
     /**
      * Deserialize and return the next token as a [String]
      */
diff --git a/runtime/serde/common/src/aws/smithy/kotlin/runtime/serde/Serializer.kt b/runtime/serde/common/src/aws/smithy/kotlin/runtime/serde/Serializer.kt
@@ -3,6 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 package aws.smithy.kotlin.runtime.serde
+
+import aws.smithy.kotlin.runtime.content.BigDecimal
+import aws.smithy.kotlin.runtime.content.BigInteger
 import aws.smithy.kotlin.runtime.content.Document
 import aws.smithy.kotlin.runtime.time.Instant
 import aws.smithy.kotlin.runtime.time.TimestampFormat
@@ -112,6 +115,24 @@ public interface StructSerializer : PrimitiveSerializer {
      */
     public fun field(descriptor: SdkFieldDescriptor, value: Double)
 
+    /**
+     * Writes the field name given in the descriptor, and then
+     * serializes value.
+     *
+     * @param descriptor
+     * @param value
+     */
+    public fun field(descriptor: SdkFieldDescriptor, value: BigInteger)
+
+    /**
+     * Writes the field name given in the descriptor, and then
+     * serializes value.
+     *
+     * @param descriptor
+     * @param value
+     */
+    public fun field(descriptor: SdkFieldDescriptor, value: BigDecimal)
+
     /**
      * Writes the field name given in the descriptor, and then
      * serializes value.
@@ -389,6 +410,20 @@ public interface PrimitiveSerializer {
      */
     public fun serializeDouble(value: Double)
 
+    /**
+     * Serializes the given value.
+     *
+     * @param value
+     */
+    public fun serializeBigInteger(value: BigInteger)
+
+    /**
+     * Serializes the given value.
+     *
+     * @param value
+     */
+    public fun serializeBigDecimal(value: BigDecimal)
+
     /**
      * Serializes the given value.
      *
diff --git a/runtime/serde/serde-form-url/common/src/aws/smithy/kotlin/runtime/serde/formurl/FormUrlSerializer.kt b/runtime/serde/serde-form-url/common/src/aws/smithy/kotlin/runtime/serde/formurl/FormUrlSerializer.kt
@@ -5,6 +5,8 @@
 
 package aws.smithy.kotlin.runtime.serde.formurl
 
+import aws.smithy.kotlin.runtime.content.BigDecimal
+import aws.smithy.kotlin.runtime.content.BigInteger
 import aws.smithy.kotlin.runtime.content.Document
 import aws.smithy.kotlin.runtime.io.SdkBuffer
 import aws.smithy.kotlin.runtime.serde.*
@@ -46,6 +48,9 @@ private class FormUrlSerializer(
     override fun serializeLong(value: Long) = write { commonWriteNumber(value) }
     override fun serializeFloat(value: Float) = write { commonWriteNumber(value) }
     override fun serializeDouble(value: Double) = write { commonWriteNumber(value) }
+    override fun serializeBigInteger(value: BigInteger) = write { commonWriteNumber(value) }
+    override fun serializeBigDecimal(value: BigDecimal) = write(value.toPlainString())
+
     override fun serializeString(value: String) = write(value)
 
     override fun serializeInstant(value: Instant, format: TimestampFormat) {
@@ -125,6 +130,14 @@ private class FormUrlStructSerializer(
         serializeDouble(value)
     }
 
+    override fun field(descriptor: SdkFieldDescriptor, value: BigInteger) = writeField(descriptor) {
+        serializeBigInteger(value)
+    }
+
+    override fun field(descriptor: SdkFieldDescriptor, value: BigDecimal) = writeField(descriptor) {
+        serializeBigDecimal(value)
+    }
+
     override fun field(descriptor: SdkFieldDescriptor, value: String) = writeField(descriptor) {
         serializeString(value)
     }
@@ -216,6 +229,8 @@ private class FormUrlListSerializer(
     override fun serializeLong(value: Long) = writePrefixed { commonWriteNumber(value) }
     override fun serializeFloat(value: Float) = writePrefixed { commonWriteNumber(value) }
     override fun serializeDouble(value: Double) = writePrefixed { commonWriteNumber(value) }
+    override fun serializeBigInteger(value: BigInteger) = writePrefixed { commonWriteNumber(value) }
+    override fun serializeBigDecimal(value: BigDecimal) = writePrefixed { writeUtf8(value.toPlainString()) }
     override fun serializeString(value: String) = writePrefixed { writeUtf8(value.urlEncodeComponent()) }
     override fun serializeInstant(value: Instant, format: TimestampFormat) = writePrefixed { writeUtf8(value.format(format)) }
 
diff --git a/runtime/serde/serde-json/api/serde-json.api b/runtime/serde/serde-json/api/serde-json.api
@@ -1,6 +1,8 @@
 public final class aws/smithy/kotlin/runtime/serde/json/JsonDeserializer : aws/smithy/kotlin/runtime/serde/Deserializer, aws/smithy/kotlin/runtime/serde/Deserializer$ElementIterator, aws/smithy/kotlin/runtime/serde/Deserializer$EntryIterator, aws/smithy/kotlin/runtime/serde/PrimitiveDeserializer {
 	public static final field Companion Laws/smithy/kotlin/runtime/serde/json/JsonDeserializer$Companion;
 	public fun <init> ([B)V
+	public fun deserializeBigDecimal ()Ljava/math/BigDecimal;
+	public fun deserializeBigInteger ()Ljava/math/BigInteger;
 	public fun deserializeBoolean ()Z
 	public fun deserializeByte ()B
 	public fun deserializeDocument ()Laws/smithy/kotlin/runtime/content/Document;
@@ -68,13 +70,17 @@ public final class aws/smithy/kotlin/runtime/serde/json/JsonSerializer : aws/smi
 	public fun field (Laws/smithy/kotlin/runtime/serde/SdkFieldDescriptor;Laws/smithy/kotlin/runtime/serde/SdkSerializable;)V
 	public fun field (Laws/smithy/kotlin/runtime/serde/SdkFieldDescriptor;Laws/smithy/kotlin/runtime/time/Instant;Laws/smithy/kotlin/runtime/time/TimestampFormat;)V
 	public fun field (Laws/smithy/kotlin/runtime/serde/SdkFieldDescriptor;Ljava/lang/String;)V
+	public fun field (Laws/smithy/kotlin/runtime/serde/SdkFieldDescriptor;Ljava/math/BigDecimal;)V
+	public fun field (Laws/smithy/kotlin/runtime/serde/SdkFieldDescriptor;Ljava/math/BigInteger;)V
 	public fun field (Laws/smithy/kotlin/runtime/serde/SdkFieldDescriptor;S)V
 	public fun field (Laws/smithy/kotlin/runtime/serde/SdkFieldDescriptor;Z)V
 	public fun listEntry (Ljava/lang/String;Laws/smithy/kotlin/runtime/serde/SdkFieldDescriptor;Lkotlin/jvm/functions/Function1;)V
 	public fun listField (Laws/smithy/kotlin/runtime/serde/SdkFieldDescriptor;Lkotlin/jvm/functions/Function1;)V
 	public fun mapEntry (Ljava/lang/String;Laws/smithy/kotlin/runtime/serde/SdkFieldDescriptor;Lkotlin/jvm/functions/Function1;)V
 	public fun mapField (Laws/smithy/kotlin/runtime/serde/SdkFieldDescriptor;Lkotlin/jvm/functions/Function1;)V
 	public fun nullField (Laws/smithy/kotlin/runtime/serde/SdkFieldDescriptor;)V
+	public fun serializeBigDecimal (Ljava/math/BigDecimal;)V
+	public fun serializeBigInteger (Ljava/math/BigInteger;)V
 	public fun serializeBoolean (Z)V
 	public fun serializeByte (B)V
 	public fun serializeChar (C)V
@@ -120,6 +126,8 @@ public abstract interface class aws/smithy/kotlin/runtime/serde/json/JsonStreamW
 	public abstract fun writeValue (J)V
 	public abstract fun writeValue (Ljava/lang/Number;)V
 	public abstract fun writeValue (Ljava/lang/String;)V
+	public abstract fun writeValue (Ljava/math/BigDecimal;)V
+	public abstract fun writeValue (Ljava/math/BigInteger;)V
 	public abstract fun writeValue (S)V
 	public abstract fun writeValue (Z)V
 }
diff --git a/runtime/serde/serde-json/common/src/aws/smithy/kotlin/runtime/serde/json/JsonDeserializer.kt b/runtime/serde/serde-json/common/src/aws/smithy/kotlin/runtime/serde/json/JsonDeserializer.kt
@@ -4,6 +4,8 @@
  */
 package aws.smithy.kotlin.runtime.serde.json
 
+import aws.smithy.kotlin.runtime.content.BigDecimal
+import aws.smithy.kotlin.runtime.content.BigInteger
 import aws.smithy.kotlin.runtime.content.Document
 import aws.smithy.kotlin.runtime.serde.*
 
@@ -34,6 +36,10 @@ public class JsonDeserializer(payload: ByteArray) : Deserializer, Deserializer.E
 
     override fun deserializeDouble(): Double = nextNumberValue { it.toDouble() }
 
+    override fun deserializeBigInteger(): BigInteger = nextNumberValue(::BigInteger)
+
+    override fun deserializeBigDecimal(): BigDecimal = nextNumberValue(::BigDecimal)
+
     // deserializes the next token as a number with the maximum discernible precision
     private fun deserializeNumber(): Number =
         nextNumberValue { if (it.contains('.')) it.toDouble() else it.toLong() }
diff --git a/runtime/serde/serde-json/common/src/aws/smithy/kotlin/runtime/serde/json/JsonEncoder.kt b/runtime/serde/serde-json/common/src/aws/smithy/kotlin/runtime/serde/json/JsonEncoder.kt
diff --git a/runtime/serde/serde-json/common/src/aws/smithy/kotlin/runtime/serde/json/JsonSerializer.kt b/runtime/serde/serde-json/common/src/aws/smithy/kotlin/runtime/serde/json/JsonSerializer.kt
diff --git a/runtime/serde/serde-json/common/src/aws/smithy/kotlin/runtime/serde/json/JsonStreamWriter.kt b/runtime/serde/serde-json/common/src/aws/smithy/kotlin/runtime/serde/json/JsonStreamWriter.kt
diff --git a/runtime/serde/serde-json/common/test/aws/smithy/kotlin/runtime/serde/json/JsonDeserializerTest.kt b/runtime/serde/serde-json/common/test/aws/smithy/kotlin/runtime/serde/json/JsonDeserializerTest.kt
diff --git a/runtime/serde/serde-xml/api/serde-xml.api b/runtime/serde/serde-xml/api/serde-xml.api
diff --git a/runtime/serde/serde-xml/common/src/aws/smithy/kotlin/runtime/serde/xml/XmlDeserializer.kt b/runtime/serde/serde-xml/common/src/aws/smithy/kotlin/runtime/serde/xml/XmlDeserializer.kt
diff --git a/runtime/serde/serde-xml/common/src/aws/smithy/kotlin/runtime/serde/xml/XmlPrimitiveDeserializer.kt b/runtime/serde/serde-xml/common/src/aws/smithy/kotlin/runtime/serde/xml/XmlPrimitiveDeserializer.kt
diff --git a/runtime/serde/serde-xml/common/src/aws/smithy/kotlin/runtime/serde/xml/XmlSerializer.kt b/runtime/serde/serde-xml/common/src/aws/smithy/kotlin/runtime/serde/xml/XmlSerializer.kt
diff --git a/tests/codegen/waiter-tests/model/waiter-operations.smithy b/tests/codegen/waiter-tests/model/waiter-operations.smithy
diff --git a/tests/compile/src/test/resources/kitchen-sink-model.smithy b/tests/compile/src/test/resources/kitchen-sink-model.smithy

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ class KotlinDelegatorTest {`
`75`	`75`	`KotlinCodegenPlugin().execute(context)`
`76`	`76`
`77`	`77`	`val contents = manifest.getFileString("src/main/kotlin/com/test/model/GetFooRequest.kt").get()`
`78`		`- contents.shouldContain("import java.math.BigInteger")`
	`78`	`+ contents.shouldContain("import aws.smithy.kotlin.runtime.content.BigInteger")`
`79`	`79`	`// ensure symbol wasn't imported as an alias by default`
`80`	`80`	`contents.shouldNotContain("as BigInteger")`
`81`	`81`	`}`