Merge branch '2.16'

FasterXML · Nov 12, 2023 · 99efd87 · 99efd87
2 parents b56b7f5 + 79d0379
commit 99efd87
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 7 deletions.
diff --git a/datetime/src/main/java/tools/jackson/datatype/jsr310/JavaTimeFeature.java b/datetime/src/main/java/tools/jackson/datatype/jsr310/JavaTimeFeature.java
@@ -10,9 +10,14 @@
 public enum JavaTimeFeature implements JacksonFeature
 {
     /**
-     * Placeholder
+     * Feature that determines whether {@link java.time.ZoneId} is normalized
+     * (via call to {@code java.time.ZoneId#normalized()}) when deserializing
+     * types like {@link java.time.ZonedDateTime}.
+     *<p>
+     * Default setting is enabled, for backwards-compatibility with
+     * Jackson 2.15.
      */
-    BOGUS(false);
+    NORMALIZE_DESERIALIZED_ZONE_ID(true);
 
     /**
      * Whether feature is enabled or disabled by default.

diff --git a/datetime/src/main/java/tools/jackson/datatype/jsr310/deser/InstantDeserializer.java b/datetime/src/main/java/tools/jackson/datatype/jsr310/deser/InstantDeserializer.java
@@ -65,7 +65,8 @@ public class InstantDeserializer<T extends Temporal>
             a -> Instant.ofEpochMilli(a.value),
             a -> Instant.ofEpochSecond(a.integer, a.fraction),
             null,
-            true // yes, replace zero offset with Z
+            true, // yes, replace zero offset with Z
+            true // default: yes, normalize ZoneId
     );
 
     public static final InstantDeserializer<OffsetDateTime> OFFSET_DATE_TIME = new InstantDeserializer<>(
@@ -74,7 +75,8 @@ public class InstantDeserializer<T extends Temporal>
             a -> OffsetDateTime.ofInstant(Instant.ofEpochMilli(a.value), a.zoneId),
             a -> OffsetDateTime.ofInstant(Instant.ofEpochSecond(a.integer, a.fraction), a.zoneId),
             (d, z) -> (d.isEqual(OffsetDateTime.MIN) || d.isEqual(OffsetDateTime.MAX) ? d : d.withOffsetSameInstant(z.getRules().getOffset(d.toLocalDateTime()))),
-            true // yes, replace zero offset with Z
+            true, // yes, replace zero offset with Z
+            true // default: yes, normalize ZoneId
     );
 
     public static final InstantDeserializer<ZonedDateTime> ZONED_DATE_TIME = new InstantDeserializer<>(
@@ -83,7 +85,8 @@ public class InstantDeserializer<T extends Temporal>
             a -> ZonedDateTime.ofInstant(Instant.ofEpochMilli(a.value), a.zoneId),
             a -> ZonedDateTime.ofInstant(Instant.ofEpochSecond(a.integer, a.fraction), a.zoneId),
             ZonedDateTime::withZoneSameInstant,
-            false // keep zero offset and Z separate since zones explicitly supported
+            false, // keep zero offset and Z separate since zones explicitly supported
+            true // default: yes, normalize ZoneId
     );
 
     protected final Function<FromIntegerArguments, T> fromMilliseconds;
@@ -115,13 +118,21 @@ public class InstantDeserializer<T extends Temporal>
      */
     protected final Boolean _readTimestampsAsNanosOverride;
 
+    /**
+     * Flag set from
+     * {@link com.fasterxml.jackson.datatype.jsr310.JavaTimeFeature#NORMALIZE_DESERIALIZED_ZONE_ID} to
+     * determine whether {@link ZoneId} is to be normalized during deserialization.
+     */
+    protected final boolean _normalizeZoneId;
+
     protected InstantDeserializer(Class<T> supportedType,
             DateTimeFormatter formatter,
             Function<TemporalAccessor, T> parsedToValue,
             Function<FromIntegerArguments, T> fromMilliseconds,
             Function<FromDecimalArguments, T> fromNanoseconds,
             BiFunction<T, ZoneId, T> adjust,
-            boolean replaceZeroOffsetAsZ)
+            boolean replaceZeroOffsetAsZ,
+            boolean normalizeZoneId)
     {
         super(supportedType, formatter);
         this.parsedToValue = parsedToValue;
@@ -131,6 +142,7 @@ protected InstantDeserializer(Class<T> supportedType,
         this.replaceZeroOffsetAsZ = replaceZeroOffsetAsZ;
         this._adjustToContextTZOverride = null;
         this._readTimestampsAsNanosOverride = null;
+        _normalizeZoneId = normalizeZoneId;
     }
 
     @SuppressWarnings("unchecked")
@@ -144,6 +156,7 @@ protected InstantDeserializer(InstantDeserializer<T> base, DateTimeFormatter f)
         replaceZeroOffsetAsZ = (_formatter == DateTimeFormatter.ISO_INSTANT);
         _adjustToContextTZOverride = base._adjustToContextTZOverride;
         _readTimestampsAsNanosOverride = base._readTimestampsAsNanosOverride;
+        _normalizeZoneId = base._normalizeZoneId;
     }
 
     @SuppressWarnings("unchecked")
@@ -157,6 +170,7 @@ protected InstantDeserializer(InstantDeserializer<T> base, Boolean adjustToConte
         replaceZeroOffsetAsZ = base.replaceZeroOffsetAsZ;
         _adjustToContextTZOverride = adjustToContextTimezoneOverride;
         _readTimestampsAsNanosOverride = base._readTimestampsAsNanosOverride;
+        _normalizeZoneId = base._normalizeZoneId;
     }
 
     @SuppressWarnings("unchecked")
@@ -170,6 +184,7 @@ protected InstantDeserializer(InstantDeserializer<T> base, DateTimeFormatter f,
         replaceZeroOffsetAsZ = (_formatter == DateTimeFormatter.ISO_INSTANT);
         _adjustToContextTZOverride = base._adjustToContextTZOverride;
         _readTimestampsAsNanosOverride = base._readTimestampsAsNanosOverride;
+        _normalizeZoneId = base._normalizeZoneId;
     }
 
     /**
@@ -190,6 +205,7 @@ protected InstantDeserializer(InstantDeserializer<T> base,
         replaceZeroOffsetAsZ = base.replaceZeroOffsetAsZ;
         _adjustToContextTZOverride = adjustToContextTimezoneOverride;
         _readTimestampsAsNanosOverride = readTimestampsAsNanosOverride;
+        _normalizeZoneId = base._normalizeZoneId;
     }
 
     @Override
@@ -363,7 +379,11 @@ private ZoneId getZone(DeserializationContext context)
         // Instants are always in UTC, so don't waste compute cycles
         // Normalizing the zone to prevent discrepancies.
         // See https://github.com/FasterXML/jackson-modules-java8/pull/267 for details
-        return (_valueClass == Instant.class) ? null : context.getTimeZone().toZoneId().normalized();
+        if (_valueClass == Instant.class) {
+            return null;
+        }
+        ZoneId zoneId = context.getTimeZone().toZoneId();
+        return _normalizeZoneId ? zoneId.normalized() : zoneId;
     }
 
     private String replaceZeroOffsetAsZIfNecessary(String text)