fix nats-io#1125 NatsJetStreamMetaData timestamp parsed with incorrec…

…t timezone unable to convert back to UTC
mrmx · Apr 21, 2024 · f391add · f391add
1 parent 4aab962
commit f391add
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/src/main/java/io/nats/client/impl/NatsJetStreamMetaData.java b/src/main/java/io/nats/client/impl/NatsJetStreamMetaData.java
@@ -13,9 +13,11 @@
 
 package io.nats.client.impl;
 
+import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.OffsetDateTime;
 import java.time.ZoneId;
+import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 
 /**
@@ -103,9 +105,10 @@ else if (parts.length >= 11) {
             // not so clever way to separate nanos from seconds
             long tsi = Long.parseLong(parts[streamIndex + 5]);
             long seconds = tsi / NANO_FACTOR;
-            int nanos = (int) (tsi - ((tsi / NANO_FACTOR) * NANO_FACTOR));
-            LocalDateTime ltd = LocalDateTime.ofEpochSecond(seconds, nanos, OffsetDateTime.now().getOffset());
-            timestamp = ZonedDateTime.of(ltd, ZoneId.systemDefault()); // I think this is safe b/c the zone should match local
+            int nanos = (int) (tsi - (seconds * NANO_FACTOR));
+            Instant utcInstant = Instant.ofEpochSecond(seconds, nanos);
+            OffsetDateTime utcOffsetDT = OffsetDateTime.ofInstant(utcInstant, ZoneOffset.UTC);
+            timestamp = utcOffsetDT.atZoneSameInstant(ZoneId.systemDefault());
 
             this.pending = hasPending ? Long.parseLong(parts[streamIndex + 6]) : -1L;
         }

diff --git a/src/test/java/io/nats/client/impl/NatsJetStreamMetaDataTests.java b/src/test/java/io/nats/client/impl/NatsJetStreamMetaDataTests.java
@@ -14,6 +14,8 @@
 package io.nats.client.impl;
 
 import io.nats.client.Message;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -52,9 +54,13 @@ private void validateMeta(boolean hasPending, boolean hasDomainHashToken, NatsJe
         assertEquals(2, meta.streamSequence());
         assertEquals(3, meta.consumerSequence());
 
-        assertEquals(2020, meta.timestamp().getYear());
-        assertEquals(6, meta.timestamp().getMinute());
-        assertEquals(113260000, meta.timestamp().getNano());
+        ZonedDateTime localTs = meta.timestamp();
+        assertEquals(2020, localTs.getYear());
+        assertEquals(6, localTs.getMinute());
+        assertEquals(113260000, localTs.getNano());
+
+        ZonedDateTime utcTs = localTs.withZoneSameInstant(ZoneId.of("UTC"));
+        assertEquals(0, utcTs.getHour());
 
         assertEquals(hasPending ? 4L : -1L, meta.pendingCount());