fix: fix modeled/implied default values for byte and short types (#876)

Author: ianbotsf

.changes/282d596e-a121-40e3-80d3-2f2a90aa4e5d.json

@@ -0,0 +1,5 @@
+{
+    "id": "282d596e-a121-40e3-80d3-2f2a90aa4e5d",
+    "type": "bugfix",
+    "description": "Fix modeled/implied default values for byte and short types"
+}

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

@@ -68,21 +68,21 @@ class KotlinSymbolProvider(private val model: Model, private val settings: Kotli
 
     override fun toMemberName(shape: MemberShape): String = escaper.escapeMemberName(shape.defaultName())
 
-    override fun byteShape(shape: ByteShape): Symbol = numberShape(shape, "Byte")
+    override fun byteShape(shape: ByteShape): Symbol = numberShape(shape, "Byte", "0.toByte()")
 
-    override fun integerShape(shape: IntegerShape): Symbol = numberShape(shape, "Int")
+    override fun integerShape(shape: IntegerShape): Symbol = numberShape(shape, "Int", "0")
 
     override fun intEnumShape(shape: IntEnumShape): Symbol = createEnumSymbol(shape)
 
-    override fun shortShape(shape: ShortShape): Symbol = numberShape(shape, "Short")
+    override fun shortShape(shape: ShortShape): Symbol = numberShape(shape, "Short", "0.toShort()")
 
     override fun longShape(shape: LongShape): Symbol = numberShape(shape, "Long", "0L")
 
     override fun floatShape(shape: FloatShape): Symbol = numberShape(shape, "Float", "0f")
 
     override fun doubleShape(shape: DoubleShape): Symbol = numberShape(shape, "Double", "0.0")
 
-    private fun numberShape(shape: Shape, typeName: String, defaultValue: String = "0"): Symbol =
+    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")
@@ -281,6 +281,8 @@ class KotlinSymbolProvider(private val model: Model, private val settings: Kotli
         is LongShape -> "${value}L"
         is FloatShape -> "${value}f"
         is DoubleShape -> if (value.matches("[0-9]*\\.[0-9]+".toRegex())) value else "$value.0"
+        is ShortShape -> "$value.toShort()"
+        is ByteShape -> "$value.toByte()"
         else -> value
     }
 

codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/core/SymbolProviderTest.kt

@@ -63,11 +63,11 @@ class SymbolProviderTest {
         "Integer, null, true",
         "PrimitiveInteger, 0, false",
         "Short, null, true",
-        "PrimitiveShort, 0, false",
+        "PrimitiveShort, 0.toShort(), false",
         "Long, null, true",
         "PrimitiveLong, 0L, false",
         "Byte, null, true",
-        "PrimitiveByte, 0, false",
+        "PrimitiveByte, 0.toByte(), false",
         "Float, null, true",
         "PrimitiveFloat, 0f, false",
         "Double, null, true",
@@ -176,10 +176,10 @@ class SymbolProviderTest {
     @CsvSource(
         "long,100,100L",
         "integer,5,5",
-        "short,32767,32767",
+        "short,32767,32767.toShort()",
         "float,3.14159,3.14159f",
         "double,2.71828,2.71828",
-        "byte,10,10",
+        "byte,10,10.toByte()",
         "string,\"hello\",\"hello\"",
         "blob,\"abcdefg\",\"abcdefg\"",
         "boolean,true,true",

codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/serde/SerializeStructGeneratorTest.kt

@@ -47,9 +47,9 @@ class SerializeStructGeneratorTest {
     @ParameterizedTest(name = "{index} ==> ''{0}''")
     @CsvSource(
         "PrimitiveInteger, 0, 0",
-        "PrimitiveShort, 0, 0",
+        "PrimitiveShort, 0.toShort(), 0",
         "PrimitiveLong, 0L, 0",
-        "PrimitiveByte, 0, 0",
+        "PrimitiveByte, 0.toByte(), 0",
         "PrimitiveFloat, 0f, 0",
         "PrimitiveDouble, 0.0, 0",
         "PrimitiveBoolean, false, false",