Merge branch '2.19'

Author: cowtowncoder

datetime/src/main/java/tools/jackson/datatype/jsr310/deser/InstantDeserializer.java

@@ -29,10 +29,7 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 
-import tools.jackson.core.JacksonException;
-import tools.jackson.core.JsonParser;
-import tools.jackson.core.JsonToken;
-import tools.jackson.core.JsonTokenId;
+import tools.jackson.core.*;
 import tools.jackson.core.io.NumberInput;
 import tools.jackson.core.util.JacksonFeatureSet;
 import tools.jackson.databind.BeanProperty;
@@ -356,8 +353,13 @@ protected boolean shouldReadTimestampsAsNanoseconds(DeserializationContext conte
     protected int _countPeriods(String str)
     {
         int commas = 0;
-        for (int i = 0, end = str.length(); i < end; ++i) {
-            int ch = str.charAt(i);
+        int i = 0;
+        int ch = str.charAt(i);
+        if (ch == '-' || ch == '+') {
+            ++i;
+        }
+        for (int end = str.length(); i < end; ++i) {
+            ch = str.charAt(i);
             if (ch < '0' || ch > '9') {
                 if (ch == '.') {
                     ++commas;

datetime/src/test/java/tools/jackson/datatype/jsr310/deser/InstantDeser291Test.java

@@ -0,0 +1,55 @@
+package tools.jackson.datatype.jsr310.deser;
+
+import java.time.Instant;
+import java.util.Locale;
+
+import org.junit.jupiter.api.Test;
+
+import tools.jackson.core.json.JsonReadFeature;
+import tools.jackson.databind.ObjectReader;
+import tools.jackson.databind.exc.InvalidFormatException;
+import tools.jackson.databind.json.JsonMapper;
+import tools.jackson.datatype.jsr310.JavaTimeFeature;
+import tools.jackson.datatype.jsr310.JavaTimeModule;
+import tools.jackson.datatype.jsr310.ModuleTestBase;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+// [modules-java8#291] InstantDeserializer fails to parse negative numeric timestamp strings for
+//   pre-1970 values.
+public class InstantDeser291Test 
+    extends ModuleTestBase
+{
+    private final JsonMapper MAPPER = JsonMapper.builder()
+        .defaultLocale(Locale.ENGLISH)
+        .addModule(new JavaTimeModule()
+            .enable(JavaTimeFeature.ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS))
+        .build();
+    private final ObjectReader READER = MAPPER.readerFor(Instant.class);
+
+    private static final Instant INSTANT_3_SEC_AFTER_EPOC = Instant.ofEpochSecond(3);
+    private static final Instant INSTANT_3_SEC_BEFORE_EPOC = Instant.ofEpochSecond(-3);
+
+    private static final String STR_3_SEC = "\"3.000000000\"";
+    private static final String STR_POSITIVE_3 = "\"+3.000000000\"";
+    private static final String STR_NEGATIVE_3 = "\"-3.000000000\"";
+
+    /**
+     * Baseline that always succeeds, even before resolution of issue 291
+     * @throws Exception
+     */
+    @Test
+    public void testNormalNumericalString() throws Exception {
+        assertEquals(INSTANT_3_SEC_AFTER_EPOC, READER.readValue(STR_3_SEC));
+    }
+
+    @Test
+    public void testNegativeNumericalString() throws Exception {
+        assertEquals(INSTANT_3_SEC_BEFORE_EPOC, READER.readValue(STR_NEGATIVE_3));
+    }
+
+    @Test
+    public void testAllowedPlusSignNumericalString() throws Exception {
+        assertEquals(INSTANT_3_SEC_AFTER_EPOC, READER.readValue(STR_POSITIVE_3));
+    }
+}

release-notes/CREDITS-2.x

@@ -209,6 +209,11 @@ Joo Hyuk Kim (@JooHyukKim)
   `WRITE_DURATIONS_AS_TIMESTAMPS` enabled
   (2.19.0)
 
+Kevin Mahon (@Strongbeard)
+ * Fixed #291: `InstantDeserializer` fails to parse negative numeric timestamp strings
+   for pre-1970 values
+  (2.18.4)
+
 Joey Muia (@jmuia)
  * Reported #337: Negative `Duration` does not round-trip properly with
   `WRITE_DURATIONS_AS_TIMESTAMPS` enabled

release-notes/VERSION-2.x

@@ -20,7 +20,14 @@ Modules:
   is not time-zone aware
  (contributed by Henning P)
 
-2.18.3 (not yet released)
+2.18.4 (not yet released)
+
+#291: `InstantDeserializer` fails to parse negative numeric timestamp strings
+  for pre-1970 values
+ (reported by @advorako)
+ (fixed by Kevin M)
+
+2.18.3 (28-Feb-2025)
 
 #333: `ZonedDateTime` serialization with `@JsonFormat.pattern` never uses it
   while `WRITE_DATES_WITH_ZONE_ID` enabled