Move jackson-datatype-jsr310 into jackson-databind

src/main/java/module-info.java

@@ -35,6 +35,11 @@
     exports tools.jackson.databind.deser.std;
     exports tools.jackson.databind.exc;
     exports tools.jackson.databind.ext;
+    exports tools.jackson.databind.ext.datetime;
+    exports tools.jackson.databind.ext.datetime.deser;
+    exports tools.jackson.databind.ext.datetime.deser.key;
+    exports tools.jackson.databind.ext.datetime.ser;
+    exports tools.jackson.databind.ext.datetime.ser.key;
     exports tools.jackson.databind.ext.jdk8;
     // Needed by Ion module for SqlDate deserializer:
     exports tools.jackson.databind.ext.sql;

src/main/java/tools/jackson/databind/JacksonModule.java

@@ -5,8 +5,10 @@
 import java.util.function.UnaryOperator;
 
 import tools.jackson.core.*;
+import tools.jackson.core.util.JacksonFeatureSet;
 import tools.jackson.databind.cfg.MapperBuilder;
 import tools.jackson.databind.cfg.MutableConfigOverride;
+import tools.jackson.databind.ext.datetime.JavaTimeFeature;
 import tools.jackson.databind.deser.*;
 import tools.jackson.databind.jsontype.NamedType;
 import tools.jackson.databind.ser.Serializers;
@@ -146,6 +148,9 @@ public static interface SetupContext
         public boolean isEnabled(TokenStreamFactory.Feature f);
         public boolean isEnabled(StreamReadFeature f);
         public boolean isEnabled(StreamWriteFeature f);
+        public boolean isEnabled(JavaTimeFeature f);
+
+        public JacksonFeatureSet<JavaTimeFeature> getJavaTimeFeatures();
 
         /*
         /******************************************************************

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

@@ -13,8 +13,11 @@
 
 import tools.jackson.core.*;
 import tools.jackson.core.util.DefaultPrettyPrinter;
+import tools.jackson.core.util.JacksonFeatureSet;
 import tools.jackson.core.util.Snapshottable;
 import tools.jackson.databind.*;
+import tools.jackson.databind.ext.datetime.JavaTimeFeature;
+import tools.jackson.databind.ext.datetime.JavaTimeInitializer;
 import tools.jackson.databind.deser.*;
 import tools.jackson.databind.introspect.*;
 import tools.jackson.databind.jsontype.*;
@@ -241,6 +244,12 @@ public abstract class MapperBuilder<M extends ObjectMapper,
      */
     protected int _formatWriteFeatures;
 
+    /**
+     * States of {@link JavaTimeFeature}s to enable/disable.
+     */
+    protected JacksonFeatureSet<JavaTimeFeature> _javaTimeFeatures =
+            JacksonFeatureSet.fromDefaults(JavaTimeFeature.values());
+
     /*
     /**********************************************************************
     /* Transient state
@@ -419,8 +428,9 @@ public MapperBuilderState saveStateApplyModules()
     {
         if (_savedState == null) {
             _savedState = _saveState();
+            ModuleContextBase ctxt = _constructModuleContext();
+            JavaTimeInitializer.getInstance().setupModule(ctxt);
             if (_modules != null) {
-                ModuleContextBase ctxt = _constructModuleContext();
                 _modules.values().forEach(m -> m.setupModule(ctxt));
                 // and since context may buffer some changes, ensure those are flushed:
                 ctxt.applyChanges(this);
@@ -493,6 +503,14 @@ public boolean isEnabled(StreamWriteFeature f) {
         return f.enabledIn(_streamWriteFeatures);
     }
 
+    public boolean isEnabled(JavaTimeFeature f) {
+        return _javaTimeFeatures.isEnabled(f);
+    }
+
+    public JacksonFeatureSet<JavaTimeFeature> getJavaTimeFeatures() {
+        return _javaTimeFeatures;
+    }
+
     public DatatypeFeatures datatypeFeatures() {
         return _datatypeFeatures;
     }

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

@@ -4,8 +4,10 @@
 import java.util.function.UnaryOperator;
 
 import tools.jackson.core.*;
+import tools.jackson.core.util.JacksonFeatureSet;
 import tools.jackson.databind.*;
 import tools.jackson.databind.JacksonModule.SetupContext;
+import tools.jackson.databind.ext.datetime.JavaTimeFeature;
 import tools.jackson.databind.deser.*;
 import tools.jackson.databind.jsontype.NamedType;
 import tools.jackson.databind.ser.SerializerFactory;
@@ -125,6 +127,16 @@ public boolean isEnabled(StreamWriteFeature f) {
         return _builder.isEnabled(f);
     }
 
+    @Override
+    public boolean isEnabled(JavaTimeFeature f) {
+        return _builder.isEnabled(f);
+    }
+
+    @Override
+    public JacksonFeatureSet<JavaTimeFeature> getJavaTimeFeatures() {
+        return _builder.getJavaTimeFeatures();
+    }
+
     /*
     /**********************************************************************
     /* Mutators for adding deserializers, related

src/main/java/tools/jackson/databind/ext/datetime/JavaTimeFeature.java

@@ -0,0 +1,77 @@
+package tools.jackson.databind.ext.datetime;
+
+import tools.jackson.core.util.JacksonFeature;
+
+/**
+ * Configurable on/off features for Java 8 Date/Time module ({@link JavaTimeInitializer}).
+ *
+ * @since 2.16
+ */
+public enum JavaTimeFeature implements JacksonFeature
+{
+    /**
+     * 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.
+     */
+    NORMALIZE_DESERIALIZED_ZONE_ID(true),
+
+    /**
+     * Feature that determines whether the {@link java.util.TimeZone} of the
+     * {@link tools.jackson.databind.DeserializationContext} is used
+     * when leniently deserializing {@link java.time.LocalDate} or
+     * {@link java.time.LocalDateTime} from the UTC/ISO instant format.
+     * <p>
+     * Default setting is disabled, for backwards-compatibility with
+     * Jackson 2.18.
+     *
+     * @since 2.19
+     */
+    USE_TIME_ZONE_FOR_LENIENT_DATE_PARSING(false),
+
+    /**
+     * Feature that controls whether stringified numbers (Strings that without
+     * quotes would be legal JSON Numbers) may be interpreted as
+     * timestamps (enabled) or not (disabled), in case where there is an
+     * explicitly defined pattern ({@code DateTimeFormatter}) for value.
+     * <p>
+     * Note that when the default pattern is used (no custom pattern defined),
+     * stringified numbers are always accepted as timestamps regardless of
+     * this feature.
+     */
+    ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS(false),
+
+    /**
+     * Feature that determines whether {@link java.time.Month} is serialized
+     * and deserialized as using a zero-based index (FALSE) or a one-based index (TRUE).
+     * For example, "1" would be serialized/deserialized as Month.JANUARY if TRUE and Month.FEBRUARY if FALSE.
+     *<p>
+     * Default setting is false, meaning that Month is serialized/deserialized as a zero-based index.
+     */
+    ONE_BASED_MONTHS(false)
+    ;
+
+  /**
+     * Whether feature is enabled or disabled by default.
+     */
+    private final boolean _defaultState;
+
+    private final int _mask;
+
+    JavaTimeFeature(boolean enabledByDefault) {
+        _defaultState = enabledByDefault;
+        _mask = (1 << ordinal());
+    }
+
+    @Override
+    public boolean enabledByDefault() { return _defaultState; }
+
+    @Override
+    public boolean enabledIn(int flags) { return (flags & _mask) != 0; }
+
+    @Override
+    public int getMask() { return _mask; }
+}