Fix #6239: honor explicit NUMBER_INT/NUMBER_FLOAT shape for java.time nanoseconds (ser + deser) (#6238)

Author: cowtowncoder

release-notes/VERSION

@@ -85,6 +85,9 @@ Versions: 3.x (for earlier see VERSION-2.x)
  (fix by @cowtowncoder, w/ Claude code)
 #6233: Serialize `Month` as Enum name with `@JsonFormat(shape = STRING)`
  (fix by @pjfanning)
+#6239: Explicit `JsonFormat.Shape.NUMBER_INT`/`NUMBER_FLOAT` not honored for
+  nanosecond handling of `java.time` values (serialization, deserialization)
+ (fix by @cowtowncoder, w/ Claude code)
 
 3.2.4 (not yet released)
 

src/main/java/tools/jackson/databind/cfg/DateTimeFeature.java

@@ -127,6 +127,14 @@ public enum DateTimeFeature implements DatatypeFeature
      * If disabled, standard millisecond timestamps are assumed.
      * This is the counterpart to {@link DateTimeFeature#WRITE_DATE_TIMESTAMPS_AS_NANOSECONDS}.
      *<p>
+     * This is the global default: it may be overridden per-type or per-property with
+     * {@code @JsonFormat} (or config override), either by explicit
+     * {@code JsonFormat.Feature.READ_DATE_TIMESTAMPS_AS_NANOSECONDS}, or
+     * (if no such feature is specified) by explicit numeric shape:
+     * {@code JsonFormat.Shape.NUMBER_INT} means timestamps are read as milliseconds,
+     * {@code JsonFormat.Shape.NUMBER_FLOAT} that they are read as nanoseconds
+     * (since 3.3).
+     *<p>
      * Feature used to be one of {@link tools.jackson.databind.DeserializationFeature}s
      * in Jackson 2.x but was moved here in 3.0.
      *<p>
@@ -238,6 +246,14 @@ public enum DateTimeFeature implements DatatypeFeature
      * If disabled, standard millisecond timestamps are assumed.
      * This is the counterpart to {@link DateTimeFeature#READ_DATE_TIMESTAMPS_AS_NANOSECONDS}.
      *<p>
+     * This is the global default: it may be overridden per-type or per-property with
+     * {@code @JsonFormat} (or config override), either by explicit
+     * {@code JsonFormat.Feature.WRITE_DATE_TIMESTAMPS_AS_NANOSECONDS}, or
+     * (if no such feature is specified) by explicit numeric shape:
+     * {@code JsonFormat.Shape.NUMBER_INT} means timestamps are written as milliseconds,
+     * {@code JsonFormat.Shape.NUMBER_FLOAT} that they are written as nanoseconds
+     * (since 3.3).
+     *<p>
      * Feature used to be one of {@link tools.jackson.databind.SerializationFeature}s
      * in Jackson 2.x but was moved here in 3.0.
      *<p>

src/main/java/tools/jackson/databind/ext/javatime/deser/DurationDeserializer.java

@@ -117,8 +117,7 @@ public ValueDeserializer<?> createContextual(DeserializationContext ctxt,
                                     pattern, DurationUnitConverter.descForAllowed()));
                 }
             }
-            timestampsAsNanosOverride =
-                format.getFeature(JsonFormat.Feature.READ_DATE_TIMESTAMPS_AS_NANOSECONDS);
+            timestampsAsNanosOverride = _findReadTimestampsAsNanosOverride(format);
         }
         if (leniency != _isLenient
             || !Objects.equals(unitConverter, _durationUnitConverter)

src/main/java/tools/jackson/databind/ext/javatime/deser/InstantDeserializer.java

@@ -238,8 +238,7 @@ protected JSR310DateTimeDeserializerBase<?> _withFormatOverrides(Deserialization
                 property, formatOverrides);
         Boolean adjustToContextTZOverride = formatOverrides.getFeature(
             JsonFormat.Feature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE);
-        Boolean readTimestampsAsNanosOverride = formatOverrides.getFeature(
-            JsonFormat.Feature.READ_DATE_TIMESTAMPS_AS_NANOSECONDS);
+        Boolean readTimestampsAsNanosOverride = _findReadTimestampsAsNanosOverride(formatOverrides);
         if (!Objects.equals(adjustToContextTZOverride, deser._adjustToContextTZOverride)
             || !Objects.equals(readTimestampsAsNanosOverride, deser._readTimestampsAsNanosOverride)) {
             return new InstantDeserializer<>(deser, deser._isLenient, deser._formatter,

src/main/java/tools/jackson/databind/ext/javatime/deser/JSR310DeserializerBase.java

@@ -20,6 +20,8 @@
 import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import tools.jackson.core.JacksonException;
 import tools.jackson.core.JsonParser;
 import tools.jackson.core.JsonToken;
@@ -76,6 +78,32 @@ protected JSR310DeserializerBase(JSR310DeserializerBase<T> base, Boolean lenienc
 
     protected abstract JSR310DeserializerBase<T> withLeniency(Boolean leniency);
 
+    /**
+     * Helper method for resolving per-property override for reading numeric timestamps
+     * as nanoseconds (or not): explicit
+     * {@link JsonFormat.Feature#READ_DATE_TIMESTAMPS_AS_NANOSECONDS} has precedence;
+     * if not defined, explicit numeric shape is used ({@link JsonFormat.Shape#NUMBER_INT}
+     * meaning "not as nanoseconds", {@link JsonFormat.Shape#NUMBER_FLOAT} "as nanoseconds")
+     * to match handling on serialization side.
+     * Returns {@code null} if neither is defined (to use global default).
+     *
+     * @since 3.3
+     */
+    protected static Boolean _findReadTimestampsAsNanosOverride(JsonFormat.Value format) {
+        Boolean b = format.getFeature(JsonFormat.Feature.READ_DATE_TIMESTAMPS_AS_NANOSECONDS);
+        if (b == null) {
+            // [databind#6239]: match `JSR310FormattedSerializerBase.useNanoseconds()`
+            switch (format.getShape()) {
+            case NUMBER_INT:
+                return Boolean.FALSE;
+            case NUMBER_FLOAT:
+                return Boolean.TRUE;
+            default:
+            }
+        }
+        return b;
+    }
+
     /**
      * @return {@code true} if lenient handling is enabled; {code false} if not (strict mode)
      */

src/main/java/tools/jackson/databind/ext/javatime/deser/LocalDateTimeDeserializer.java

@@ -86,8 +86,7 @@ protected JSR310DateTimeDeserializerBase<?> _withFormatOverrides(Deserialization
     {
         LocalDateTimeDeserializer deser = (LocalDateTimeDeserializer)
             super._withFormatOverrides(ctxt, property, formatOverrides);
-        Boolean readTimestampsAsNanosOverride = formatOverrides.getFeature(
-            JsonFormat.Feature.READ_DATE_TIMESTAMPS_AS_NANOSECONDS);
+        Boolean readTimestampsAsNanosOverride = _findReadTimestampsAsNanosOverride(formatOverrides);
         if (!Objects.equals(readTimestampsAsNanosOverride, deser._readTimestampsAsNanosOverride)) {
             return new LocalDateTimeDeserializer(deser, deser._isLenient, deser._formatter,
                 deser._shape, readTimestampsAsNanosOverride);

src/main/java/tools/jackson/databind/ext/javatime/deser/LocalTimeDeserializer.java

@@ -93,8 +93,7 @@ protected JSR310DateTimeDeserializerBase<?> _withFormatOverrides(Deserialization
     {
         LocalTimeDeserializer deser = (LocalTimeDeserializer)
             super._withFormatOverrides(ctxt, property, formatOverrides);
-        Boolean readTimestampsAsNanosOverride = formatOverrides.getFeature(
-            JsonFormat.Feature.READ_DATE_TIMESTAMPS_AS_NANOSECONDS);
+        Boolean readTimestampsAsNanosOverride = _findReadTimestampsAsNanosOverride(formatOverrides);
         if (!Objects.equals(readTimestampsAsNanosOverride, deser._readTimestampsAsNanosOverride)) {
             return new LocalTimeDeserializer(deser, deser._isLenient, deser._formatter,
                 deser._shape, readTimestampsAsNanosOverride);

src/main/java/tools/jackson/databind/ext/javatime/deser/OffsetTimeDeserializer.java

@@ -87,8 +87,7 @@ protected JSR310DateTimeDeserializerBase<?> _withFormatOverrides(Deserialization
     {
         OffsetTimeDeserializer deser = (OffsetTimeDeserializer)
             super._withFormatOverrides(ctxt, property, formatOverrides);
-        Boolean readTimestampsAsNanosOverride = formatOverrides.getFeature(
-            JsonFormat.Feature.READ_DATE_TIMESTAMPS_AS_NANOSECONDS);
+        Boolean readTimestampsAsNanosOverride = _findReadTimestampsAsNanosOverride(formatOverrides);
         if (!Objects.equals(readTimestampsAsNanosOverride, deser._readTimestampsAsNanosOverride)) {
             return new OffsetTimeDeserializer(deser, deser._isLenient, deser._formatter,
                 deser._shape, readTimestampsAsNanosOverride);

src/main/java/tools/jackson/databind/ext/javatime/ser/DurationSerializer.java

@@ -69,7 +69,13 @@ protected DurationSerializer(DurationSerializer base, DateTimeFormatter dtf,
 
     protected DurationSerializer(DurationSerializer base, DateTimeFormatter dtf,
             Boolean useTimestamp, Boolean useNanoseconds) {
-        super(base, dtf, useTimestamp, useNanoseconds, null);
+        this(base, dtf, useTimestamp, useNanoseconds, null);
+    }
+
+    // @since 3.3
+    protected DurationSerializer(DurationSerializer base, DateTimeFormatter dtf,
+            Boolean useTimestamp, Boolean useNanoseconds, JsonFormat.Shape shape) {
+        super(base, dtf, useTimestamp, useNanoseconds, shape);
     }
 
     protected DurationSerializer(DurationSerializer base, DurationUnitConverter converter) {
@@ -80,7 +86,7 @@ protected DurationSerializer(DurationSerializer base, DurationUnitConverter conv
     @Override
     protected DurationSerializer withFormat(DateTimeFormatter dtf,
             Boolean useTimestamp, JsonFormat.Shape shape) {
-        return new DurationSerializer(this, dtf, useTimestamp);
+        return new DurationSerializer(this, dtf, useTimestamp, null, shape);
     }
 
     protected DurationSerializer withConverter(DurationUnitConverter converter) {
@@ -179,7 +185,7 @@ protected JsonToken serializationShape(SerializationContext ctxt) {
 
     @Override
     protected JSR310FormattedSerializerBase<?> withFeatures(Boolean writeZoneId, Boolean writeNanoseconds) {
-        return new DurationSerializer(this, _formatter, _useTimestamp, writeNanoseconds);
+        return new DurationSerializer(this, _formatter, _useTimestamp, writeNanoseconds, _shape);
     }
 
     @Override

src/main/java/tools/jackson/databind/ext/javatime/ser/LocalDateTimeSerializer.java

@@ -49,13 +49,19 @@ public LocalDateTimeSerializer(DateTimeFormatter f) {
 
     protected LocalDateTimeSerializer(LocalDateTimeSerializer base, DateTimeFormatter dtf,
             Boolean useTimestamp, Boolean useNanoseconds) {
-        super(base, dtf, useTimestamp, useNanoseconds, null);
+        this(base, dtf, useTimestamp, useNanoseconds, null);
+    }
+
+    // @since 3.3
+    protected LocalDateTimeSerializer(LocalDateTimeSerializer base, DateTimeFormatter dtf,
+            Boolean useTimestamp, Boolean useNanoseconds, JsonFormat.Shape shape) {
+        super(base, dtf, useTimestamp, useNanoseconds, shape);
     }
 
     @Override
     protected JSR310FormattedSerializerBase<LocalDateTime> withFormat(DateTimeFormatter f,
             Boolean useTimestamp, JsonFormat.Shape shape) {
-        return new LocalDateTimeSerializer(this, f, useTimestamp, _useNanoseconds);
+        return new LocalDateTimeSerializer(this, f, useTimestamp, _useNanoseconds, shape);
     }
 
     protected DateTimeFormatter _defaultFormatter() {
@@ -155,6 +161,6 @@ protected JsonToken serializationShape(SerializationContext ctxt) {
 
     @Override
     protected JSR310FormattedSerializerBase<?> withFeatures(Boolean writeZoneId, Boolean writeNanoseconds) {
-        return new LocalDateTimeSerializer(this, _formatter, _useTimestamp, writeNanoseconds);
+        return new LocalDateTimeSerializer(this, _formatter, _useTimestamp, writeNanoseconds, _shape);
     }
 }