add ISO_8601_FULL timestamp format for untruncated precision

smithy-lang · Aug 7, 2024 · cb86fcd · cb86fcd
1 parent 1f05008
commit cb86fcd
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 0 deletions.
diff --git a/.changes/29e93882-7346-4a2f-bbcd-1cdf478a3b10.json b/.changes/29e93882-7346-4a2f-bbcd-1cdf478a3b10.json
@@ -0,0 +1,5 @@
+{
+    "id": "29e93882-7346-4a2f-bbcd-1cdf478a3b10",
+    "type": "feature",
+    "description": "Add new `ISO_8601_FULL` timestamp format for untruncated precision"
+}
diff --git a/runtime/runtime-core/api/runtime-core.api b/runtime/runtime-core/api/runtime-core.api
@@ -2211,6 +2211,7 @@ public final class aws/smithy/kotlin/runtime/time/TimestampFormat : java/lang/En
 	public static final field ISO_8601 Laws/smithy/kotlin/runtime/time/TimestampFormat;
 	public static final field ISO_8601_CONDENSED Laws/smithy/kotlin/runtime/time/TimestampFormat;
 	public static final field ISO_8601_CONDENSED_DATE Laws/smithy/kotlin/runtime/time/TimestampFormat;
+	public static final field ISO_8601_FULL Laws/smithy/kotlin/runtime/time/TimestampFormat;
 	public static final field RFC_5322 Laws/smithy/kotlin/runtime/time/TimestampFormat;
 	public static fun getEntries ()Lkotlin/enums/EnumEntries;
 	public static fun valueOf (Ljava/lang/String;)Laws/smithy/kotlin/runtime/time/TimestampFormat;

diff --git a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/time/TimestampFormat.kt b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/time/TimestampFormat.kt
@@ -27,6 +27,11 @@ public enum class TimestampFormat {
      */
     ISO_8601_CONDENSED_DATE,
 
+    /**
+     * ISO-8601/RFC5399 timestamp including fractional seconds at arbitrary (i.e., untruncated) precision
+     */
+    ISO_8601_FULL,
+
     /**
      * RFC-5322/2822/822 IMF timestamp
      * See: https://tools.ietf.org/html/rfc5322

diff --git a/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/time/InstantTest.kt b/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/time/InstantTest.kt
@@ -37,6 +37,7 @@ class InstantTest {
         val expectedIso8601: String,
         val expectedIso8601Cond: String,
         val expectedIso8601CondDate: String,
+        val expectedIso8601Full: String = expectedIso8601,
     )
 
     private val iso8601Tests = listOf(
@@ -80,6 +81,16 @@ class InstantTest {
         Iso8601FmtTest(1604605357, 0, "2020-11-05T19:42:37Z", "20201105T194237Z", "20201105"),
         Iso8601FmtTest(1604558257, 0, "2020-11-05T06:37:37Z", "20201105T063737Z", "20201105"),
         Iso8601FmtTest(1604650057, 0, "2020-11-06T08:07:37Z", "20201106T080737Z", "20201106"),
+
+        // Test full-precision ISO 8601
+        Iso8601FmtTest(
+            1604604157,
+            123_456_789,
+            "2020-11-05T19:22:37.123456Z",
+            "20201105T192237Z",
+            "20201105",
+            "2020-11-05T19:22:37.123456789Z",
+        ),
     )
 
     private val iso8601Forms = mapOf(

diff --git a/runtime/runtime-core/jvm/src/aws/smithy/kotlin/runtime/time/InstantJVM.kt b/runtime/runtime-core/jvm/src/aws/smithy/kotlin/runtime/time/InstantJVM.kt
@@ -69,6 +69,7 @@ public actual class Instant(internal val value: jtInstant) : Comparable<Instant>
         TimestampFormat.ISO_8601 -> ISO_INSTANT.format(value.truncatedTo(ChronoUnit.MICROS))
         TimestampFormat.ISO_8601_CONDENSED -> ISO_8601_CONDENSED.format(value)
         TimestampFormat.ISO_8601_CONDENSED_DATE -> ISO_8601_CONDENSED_DATE.format(value)
+        TimestampFormat.ISO_8601_FULL -> ISO_INSTANT.format(value)
         TimestampFormat.RFC_5322 -> RFC_5322_FIXED_DATE_TIME.format(ZonedDateTime.ofInstant(value, ZoneOffset.UTC))
         TimestampFormat.EPOCH_SECONDS -> {
             val sb = StringBuffer("$epochSeconds")

diff --git a/runtime/serde/common/src/aws/smithy/kotlin/runtime/serde/Parsers.kt b/runtime/serde/common/src/aws/smithy/kotlin/runtime/serde/Parsers.kt
@@ -43,6 +43,7 @@ public fun String.parseBigDecimal(): Result<BigDecimal> = parse(::BigDecimal)
 private fun String.toTimestamp(fmt: TimestampFormat): Instant = when (fmt) {
     TimestampFormat.ISO_8601_CONDENSED,
     TimestampFormat.ISO_8601_CONDENSED_DATE,
+    TimestampFormat.ISO_8601_FULL,
     TimestampFormat.ISO_8601,
     -> Instant.fromIso8601(this)
 

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
@@ -297,6 +297,7 @@ public class JsonSerializer :
             TimestampFormat.ISO_8601,
             TimestampFormat.ISO_8601_CONDENSED,
             TimestampFormat.ISO_8601_CONDENSED_DATE,
+            TimestampFormat.ISO_8601_FULL,
             TimestampFormat.RFC_5322,
             -> jsonWriter.writeValue(value.format(format))
         }