Refactor deser side too

Author: cowtowncoder

datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/InstantDeserializer.java

@@ -200,12 +200,12 @@ protected InstantDeserializer(Class<T> supportedType,
      */
     @Deprecated()
     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
+            DateTimeFormatter formatter,
+            Function<TemporalAccessor, T> parsedToValue,
+            Function<FromIntegerArguments, T> fromMilliseconds,
+            Function<FromDecimalArguments, T> fromNanoseconds,
+            BiFunction<T, ZoneId, T> adjust,
+            boolean replaceZeroOffsetAsZ
     ) {
         this(supportedType, formatter, parsedToValue, fromMilliseconds, fromNanoseconds,
                 adjust, replaceZeroOffsetAsZ,
@@ -300,23 +300,10 @@ protected InstantDeserializer(InstantDeserializer<T> base,
     }
 
     /**
-     * Factory method to create a new deserializer instance with a custom {@link DateTimeFormatter}.
-     * This is primarily intended for {@link OffsetDateTime} and {@link ZonedDateTime} deserialization,
-     * allowing customization of parsing behavior (e.g., defaulting offset values or controlling nano-second precision).
-     *
-     * @param base Base deserializer to copy settings from (typically one of the static instances like
-     *             {@link #OFFSET_DATE_TIME}, {@link #ZONED_DATE_TIME}, or {@link #INSTANT})
-     * @param formatter Custom {@link DateTimeFormatter} to use for parsing
-     * @return New deserializer instance with the custom formatter
-     * @since 2.19
+     * NOTE: {@code public} since 2.21
      */
-    public static <T extends Temporal> InstantDeserializer<T> withCustomFormatter(
-            InstantDeserializer<T> base, DateTimeFormatter formatter) {
-        return new InstantDeserializer<>(base, formatter);
-    }
-
     @Override
-    protected InstantDeserializer<T> withDateFormat(DateTimeFormatter dtf) {
+    public InstantDeserializer<T> withDateFormat(DateTimeFormatter dtf) {
         if (dtf == _formatter) {
             return this;
         }

datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/ser/OffsetDateTimeSerializer.java

@@ -36,6 +36,20 @@ public OffsetDateTimeSerializer(OffsetDateTimeSerializer base, Boolean useTimest
     }
 
     /**
+     * Method for constructing a new {@code OffsetDateTimeSerializer} with settings
+     * of this serializer but with custom {@link DateTimeFormatter} overrides.
+     * Commonly used on {@code INSTANCE} like so:
+     *<pre>
+     *  DateTimeFormatter dtf = new DateTimeFormatterBuilder()
+     *          .append(DateTimeFormatter.ISO_LOCAL_DATE)
+     *          .appendLiteral('T')
+     *          // and so on
+     *          .toFormatter();
+     *  OffsetDateTimeSerializer ser = OffsetDateTimeSerializer.INSTANCE
+     *          .withFormatter(dtf);
+     *  // register via Module
+     *</pre>
+     *
      * @since 2.21
      */
     public OffsetDateTimeSerializer withFormatter(DateTimeFormatter formatter)

datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/deser/OffsetDateTimeDeserTest.java

@@ -13,12 +13,11 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Feature;
+
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.ObjectReader;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.databind.json.JsonMapper;
+
+import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.exc.MismatchedInputException;
 import com.fasterxml.jackson.datatype.jsr310.DecimalUtils;
 import com.fasterxml.jackson.datatype.jsr310.MockObjectConfiguration;
@@ -876,9 +875,9 @@ private static String offsetWithoutColon(String string){
     }
 
     /*
-    /**********************************************************
-    /* Tests for custom formatter (#376)
-    /**********************************************************
+    /**********************************************************************
+    /* Tests for custom formatter (modules-java8#376)
+    /**********************************************************************
      */
 
     @Test
@@ -897,12 +896,11 @@ public void testDeserializationWithCustomFormatter() throws Exception
 
         // Create custom deserializer with the custom formatter
         InstantDeserializer<OffsetDateTime> customDeserializer =
-                InstantDeserializer.withCustomFormatter(InstantDeserializer.OFFSET_DATE_TIME, customFormatter);
+                InstantDeserializer.OFFSET_DATE_TIME.withDateFormat(customFormatter);
 
         // Create a custom module to override the default deserializer
-        com.fasterxml.jackson.databind.module.SimpleModule customModule =
-                new com.fasterxml.jackson.databind.module.SimpleModule("CustomOffsetDateTimeModule");
-        customModule.addDeserializer(OffsetDateTime.class, customDeserializer);
+        SimpleModule customModule = new SimpleModule("CustomOffsetDateTimeModule")
+            .addDeserializer(OffsetDateTime.class, customDeserializer);
 
         // Add both JavaTimeModule (for other types) and our custom module
         // The custom module will override OffsetDateTime deserialization
@@ -949,11 +947,9 @@ public void testDeserializationWithCustomFormatterRoundTrip() throws Exception
                 .toFormatter();
 
         InstantDeserializer<OffsetDateTime> customDeserializer =
-                InstantDeserializer.withCustomFormatter(InstantDeserializer.OFFSET_DATE_TIME, customFormatter);
-
-        com.fasterxml.jackson.databind.module.SimpleModule customModule =
-                new com.fasterxml.jackson.databind.module.SimpleModule();
-        customModule.addDeserializer(OffsetDateTime.class, customDeserializer);
+                InstantDeserializer.OFFSET_DATE_TIME.withDateFormat(customFormatter);
+        SimpleModule customModule = new SimpleModule("CustomOffsetDateTimeModule")
+                .addDeserializer(OffsetDateTime.class, customDeserializer);
 
         ObjectMapper mapper = mapperBuilder()
                 .addModule(customModule)