Merge pull request #21 from spotify/format-dates-with-millis

Format ISO8601 dates with milliseconds.
spotify · Jul 6, 2023 · 708732c · 708732c
2 parents 220534d + 5a8181c
commit 708732c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/OpenFeature/src/main/java/dev/openfeature/sdk/Value.kt b/OpenFeature/src/main/java/dev/openfeature/sdk/Value.kt
@@ -53,6 +53,7 @@ sealed interface Value {
         override fun equals(other: Any?): kotlin.Boolean {
             return other is Null
         }
+
         override fun hashCode(): Int {
             return javaClass.hashCode()
         }
@@ -73,14 +74,21 @@ object ValueSerializer : JsonContentPolymorphicSerializer<Value>(Value::class) {
     }
 }
 
+@SuppressLint("SimpleDateFormat")
 object DateSerializer : KSerializer<Date> {
-    @SuppressLint("SimpleDateFormat")
-    private val df = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").apply { timeZone = TimeZone.getTimeZone("UTC") }
+    private val dateFormatter =
+        SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'").apply { timeZone = TimeZone.getTimeZone("UTC") }
+    private val fallbackDateFormatter =
+        SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").apply { timeZone = TimeZone.getTimeZone("UTC") }
     override val descriptor = PrimitiveSerialDescriptor("Instant", PrimitiveKind.STRING)
-    override fun serialize(encoder: Encoder, value: Date) = encoder.encodeString(df.format(value))
-    override fun deserialize(decoder: Decoder): Date = try {
-        df.parse(decoder.decodeString()) ?: throw IllegalArgumentException("unable to parse ${decoder.decodeString()}")
-    } catch (e: Exception) {
-        throw IllegalArgumentException(e)
+    override fun serialize(encoder: Encoder, value: Date) = encoder.encodeString(dateFormatter.format(value))
+    override fun deserialize(decoder: Decoder): Date = with(decoder.decodeString()) {
+        try {
+            dateFormatter.parse(this)
+                ?: throw IllegalArgumentException("unable to parse $this")
+        } catch (e: Exception) {
+            fallbackDateFormatter.parse(this)
+                ?: throw IllegalArgumentException("unable to parse $this")
+        }
     }
 }
diff --git a/OpenFeature/src/test/java/dev/openfeature/sdk/ValueTests.kt b/OpenFeature/src/test/java/dev/openfeature/sdk/ValueTests.kt
@@ -48,8 +48,12 @@ class ValueTests {
 
     @Test
     fun testStructShouldConvertToStruct() {
-        val value = Value.Structure(mapOf("field1" to Value.Integer(3), "field2" to Value.String("test")))
-        Assert.assertEquals(value.asStructure(), mapOf("field1" to Value.Integer(3), "field2" to Value.String("test")))
+        val value =
+            Value.Structure(mapOf("field1" to Value.Integer(3), "field2" to Value.String("test")))
+        Assert.assertEquals(
+            value.asStructure(),
+            mapOf("field1" to Value.Integer(3), "field2" to Value.String("test"))
+        )
     }
 
     @Test
@@ -82,7 +86,7 @@ class ValueTests {
 
     @Test
     fun testJsonDecode() {
-        val stringInstant = "2023-03-01T14:01:46Z"
+        val stringInstant = "2023-03-01T14:01:46.321Z"
         val json = "{" +
             "  \"structure\": {" +
             "    \"null\": {}," +