Merge pull request #1481 from stainless-sdks/timezoneless-offset-datetimes

allow no timezone in offset datetime

Author: sd-st

lithic-java-core/src/main/kotlin/com/lithic/api/core/ObjectMappers.kt

@@ -24,6 +24,7 @@ import java.io.InputStream
 import java.time.DateTimeException
 import java.time.LocalDate
 import java.time.LocalDateTime
+import java.time.OffsetDateTime
 import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter
 import java.time.temporal.ChronoField
@@ -37,6 +38,7 @@ fun jsonMapper(): JsonMapper =
             SimpleModule()
                 .addSerializer(InputStreamSerializer)
                 .addDeserializer(LocalDateTime::class.java, LenientLocalDateTimeDeserializer())
+                .addDeserializer(OffsetDateTime::class.java, LenientOffsetDateTimeDeserializer())
         )
         .withCoercionConfig(LogicalType.Boolean) {
             it.setCoercion(CoercionInputShape.Integer, CoercionAction.Fail)
@@ -165,3 +167,31 @@ private class LenientLocalDateTimeDeserializer :
         }
     }
 }
+
+/**
+ * A deserializer that can deserialize [OffsetDateTime], assuming UTC when a timezone isn't given.
+ */
+private class LenientOffsetDateTimeDeserializer :
+    StdDeserializer<OffsetDateTime>(OffsetDateTime::class.java) {
+    override fun logicalType(): LogicalType = LogicalType.DateTime
+
+    override fun deserialize(p: JsonParser, context: DeserializationContext?): OffsetDateTime {
+        val exceptions = mutableListOf<Exception>()
+
+        try {
+            return OffsetDateTime.parse(p.text)
+        } catch (e: DateTimeException) {
+            exceptions.add(e)
+        }
+
+        try {
+            return OffsetDateTime.parse(p.text + 'Z')
+        } catch (e: DateTimeException) {
+            exceptions.add(e)
+        }
+
+        throw JsonParseException(p, "Cannot parse `OffsetDateTime` from value: ${p.text}").apply {
+            exceptions.forEach { addSuppressed(it) }
+        }
+    }
+}

lithic-java-core/src/test/kotlin/com/lithic/api/core/ObjectMappersTest.kt

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.exc.MismatchedInputException
 import com.fasterxml.jackson.module.kotlin.readValue
 import java.time.LocalDateTime
+import java.time.OffsetDateTime
 import kotlin.reflect.KClass
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.catchThrowable
@@ -99,4 +100,19 @@ internal class ObjectMappersTest {
 
         assertDoesNotThrow { jsonMapper().readValue<LocalDateTime>(json) }
     }
+
+    enum class LenientOffsetDateTimeTestCase(val string: String) {
+        DATE_TIME("1998-04-21T04:00:00"),
+        ZONED_DATE_TIME_1("1998-04-21T04:00:00+03:00"),
+        ZONED_DATE_TIME_2("1998-04-21T04:00:00Z"),
+    }
+
+    @ParameterizedTest
+    @EnumSource
+    fun readOffsetDateTime_lenient(testCase: LenientOffsetDateTimeTestCase) {
+        val jsonMapper = jsonMapper()
+        val json = jsonMapper.writeValueAsString(testCase.string)
+
+        assertDoesNotThrow { jsonMapper().readValue<OffsetDateTime>(json) }
+    }
 }