fix: properly parse timestamps when format override is applied to tar…

…get shapes
smithy-lang · Oct 11, 2022 · 7e8a5b1 · 7e8a5b1
1 parent 0a1eeda
commit 7e8a5b1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/.changes/cccb2f1d-b607-4b8d-9f26-5ff172fffa1d.json b/.changes/cccb2f1d-b607-4b8d-9f26-5ff172fffa1d.json
@@ -0,0 +1,8 @@
+{
+    "id": "cccb2f1d-b607-4b8d-9f26-5ff172fffa1d",
+    "type": "bugfix",
+    "description": "Properly parse timestamps when format override is applied to target shapes",
+    "issues": [
+        "awslabs/smithy-kotlin#714"
+    ]
+}
diff --git a/...otlin/software/amazon/smithy/kotlin/codegen/rendering/serde/DeserializeStructGenerator.kt b/...otlin/software/amazon/smithy/kotlin/codegen/rendering/serde/DeserializeStructGenerator.kt
@@ -541,10 +541,8 @@ open class DeserializeStructGenerator(
 
             target.type == ShapeType.TIMESTAMP -> {
                 writer.addImport(RuntimeTypes.Core.Instant)
-                val tsFormat = shape
-                    .getTrait(TimestampFormatTrait::class.java)
-                    .map { it.format }
-                    .orElse(defaultTimestampFormat)
+                val trait = shape.getTrait<TimestampFormatTrait>() ?: target.getTrait()
+                val tsFormat = trait?.format ?: defaultTimestampFormat
 
                 when (tsFormat) {
                     TimestampFormatTrait.Format.EPOCH_SECONDS -> "deserializeString().let { Instant.fromEpochSeconds(it) }"