fix(client): preserve time zone in lenient date-time parsing

Author: stainless-app[bot]

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

@@ -25,7 +25,7 @@ import java.time.DateTimeException
 import java.time.LocalDate
 import java.time.LocalDateTime
 import java.time.OffsetDateTime
-import java.time.ZonedDateTime
+import java.time.ZoneId
 import java.time.format.DateTimeFormatter
 import java.time.temporal.ChronoField
 
@@ -157,14 +157,15 @@ private class LenientOffsetDateTimeDeserializer :
                 val temporal = formatter.parse(p.text)
 
                 return when {
-                        !temporal.isSupported(ChronoField.HOUR_OF_DAY) ->
-                            LocalDate.from(temporal).atStartOfDay()
-                        !temporal.isSupported(ChronoField.OFFSET_SECONDS) ->
-                            LocalDateTime.from(temporal)
-                        else -> ZonedDateTime.from(temporal).toLocalDateTime()
-                    }
-                    .atZone(context.timeZone.toZoneId())
-                    .toOffsetDateTime()
+                    !temporal.isSupported(ChronoField.HOUR_OF_DAY) ->
+                        LocalDate.from(temporal)
+                            .atStartOfDay()
+                            .atZone(ZoneId.of("UTC"))
+                            .toOffsetDateTime()
+                    !temporal.isSupported(ChronoField.OFFSET_SECONDS) ->
+                        LocalDateTime.from(temporal).atZone(ZoneId.of("UTC")).toOffsetDateTime()
+                    else -> OffsetDateTime.from(temporal)
+                }
             } catch (e: DateTimeException) {
                 exceptions.add(e)
             }

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

@@ -3,12 +3,14 @@ package com.withorb.api.core
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.exc.MismatchedInputException
 import com.fasterxml.jackson.module.kotlin.readValue
+import java.time.LocalDate
+import java.time.LocalTime
 import java.time.OffsetDateTime
+import java.time.ZoneOffset
 import kotlin.reflect.KClass
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.catchThrowable
 import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.assertDoesNotThrow
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.EnumSource
 import org.junitpioneer.jupiter.cartesian.CartesianTest
@@ -72,11 +74,34 @@ internal class ObjectMappersTest {
         }
     }
 
-    enum class LenientOffsetDateTimeTestCase(val string: String) {
-        DATE("1998-04-21"),
-        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"),
+    enum class LenientOffsetDateTimeTestCase(
+        val string: String,
+        val expectedOffsetDateTime: OffsetDateTime,
+    ) {
+        DATE(
+            "1998-04-21",
+            expectedOffsetDateTime =
+                OffsetDateTime.of(LocalDate.of(1998, 4, 21), LocalTime.of(0, 0), ZoneOffset.UTC),
+        ),
+        DATE_TIME(
+            "1998-04-21T04:00:00",
+            expectedOffsetDateTime =
+                OffsetDateTime.of(LocalDate.of(1998, 4, 21), LocalTime.of(4, 0), ZoneOffset.UTC),
+        ),
+        ZONED_DATE_TIME_1(
+            "1998-04-21T04:00:00+03:00",
+            expectedOffsetDateTime =
+                OffsetDateTime.of(
+                    LocalDate.of(1998, 4, 21),
+                    LocalTime.of(4, 0),
+                    ZoneOffset.ofHours(3),
+                ),
+        ),
+        ZONED_DATE_TIME_2(
+            "1998-04-21T04:00:00Z",
+            expectedOffsetDateTime =
+                OffsetDateTime.of(LocalDate.of(1998, 4, 21), LocalTime.of(4, 0), ZoneOffset.UTC),
+        ),
     }
 
     @ParameterizedTest
@@ -85,6 +110,8 @@ internal class ObjectMappersTest {
         val jsonMapper = jsonMapper()
         val json = jsonMapper.writeValueAsString(testCase.string)
 
-        assertDoesNotThrow { jsonMapper().readValue<OffsetDateTime>(json) }
+        val offsetDateTime = jsonMapper().readValue<OffsetDateTime>(json)
+
+        assertThat(offsetDateTime).isEqualTo(testCase.expectedOffsetDateTime)
     }
 }