Merge branch '2.10'

Author: cowtowncoder

datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/JavaTimeModule.java

@@ -88,10 +88,13 @@
  * </pre>
  *<p>
  * Most {@code java.time} types are serialized as numbers (integers or decimals as appropriate) if the
- * {@link com.fasterxml.jackson.databind.SerializationFeature#WRITE_DATES_AS_TIMESTAMPS} feature is enabled, and otherwise are serialized in
- * standard <a href="http://en.wikipedia.org/wiki/ISO_8601" target="_blank">ISO-8601</a> string representation. ISO-8601 specifies formats
- * for representing offset dates and times, zoned dates and times, local dates and times, periods, durations, zones, and more. All
- * {@code java.time} types have built-in translation to and from ISO-8601 formats.
+ * {@link com.fasterxml.jackson.databind.SerializationFeature#WRITE_DATES_AS_TIMESTAMPS} feature is enabled
+ * (or, for {@link Duration}, {@link com.fasterxml.jackson.databind.SerializationFeature#WRITE_DURATIONS_AS_TIMESTAMPS}),
+ * and otherwise are serialized in standard
+ * <a href="http://en.wikipedia.org/wiki/ISO_8601" target="_blank">ISO-8601</a> string representation.
+ * ISO-8601 specifies formats for representing offset dates and times, zoned dates and times,
+ * local dates and times, periods, durations, zones, and more. All {@code java.time} types
+ * have built-in translation to and from ISO-8601 formats.
  * <p>
  * Granularity of timestamps is controlled through the companion features
  * {@link com.fasterxml.jackson.databind.SerializationFeature#WRITE_DATE_TIMESTAMPS_AS_NANOSECONDS} and
@@ -149,7 +152,6 @@ public JavaTimeModule()
         addDeserializer(ZoneId.class, JSR310StringParsableDeserializer.ZONE_ID);
         addDeserializer(ZoneOffset.class, JSR310StringParsableDeserializer.ZONE_OFFSET);
 
-        
         // then serializers:
         addSerializer(Duration.class, DurationSerializer.INSTANCE);
         addSerializer(Instant.class, InstantSerializer.INSTANCE);

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

@@ -20,8 +20,10 @@
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
+
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonIntegerFormatVisitor;
@@ -34,6 +36,11 @@
 
 /**
  * Serializer for Java 8 temporal {@link Duration}s.
+ *<p>
+ * NOTE: since 2.10, {@link SerializationFeature#WRITE_DURATIONS_AS_TIMESTAMPS}
+ * determines global default used for determining if serialization should use
+ * numeric (timestamps) or textual representation. Before this,
+ * {@link SerializationFeature#WRITE_DATES_AS_TIMESTAMPS} was used.
  *
  * @author Nick Williams
  * @since 2.2
@@ -63,7 +70,13 @@ protected DurationSerializer withFormat(DateTimeFormatter dtf,
             Boolean useTimestamp, JsonFormat.Shape shape) {
         return new DurationSerializer(this, dtf, useTimestamp);
     }
-    
+
+    // @since 2.10
+    @Override
+    protected SerializationFeature getTimestampsFeature() {
+        return SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS;
+    }
+
     @Override
     public void serialize(Duration duration, JsonGenerator generator,
             SerializerProvider provider) throws IOException

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

@@ -171,6 +171,20 @@ protected void _acceptTimestampVisitor(JsonFormatVisitorWrapper visitor, JavaTyp
         }
     }
 
+    /**
+     * Overridable method that determines {@link SerializationFeature} that is used as
+     * the global default in determining if date/time value serialized should use numeric
+     * format ("timestamp") or not.
+     *<p>
+     * Note that this feature is just the baseline setting and may be overridden on per-type
+     * or per-property basis.
+     *
+     * @since 2.10
+     */
+    protected SerializationFeature getTimestampsFeature() {
+        return SerializationFeature.WRITE_DATES_AS_TIMESTAMPS;
+    }
+
     protected boolean useTimestamp(SerializerProvider provider) {
         if (_useTimestamp != null) {
             return _useTimestamp.booleanValue();
@@ -184,7 +198,7 @@ protected boolean useTimestamp(SerializerProvider provider) {
             }
         }
         // assume that explicit formatter definition implies use of textual format
-        return _formatter == null && provider.isEnabled(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+        return (_formatter == null) && provider.isEnabled(getTimestampsFeature());
     }
 
     protected boolean _useTimestampExplicitOnly(SerializerProvider provider) {

datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/TestDurationSerialization.java

@@ -27,7 +27,7 @@ public void testSerializationAsTimestampNanoseconds01() throws Exception
     {
         Duration duration = Duration.ofSeconds(60L, 0);
         String value = WRITER
-                .with(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
+                .with(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
                 .with(SerializationFeature.WRITE_DATE_TIMESTAMPS_AS_NANOSECONDS)
                 .writeValueAsString(duration);
 
@@ -40,7 +40,7 @@ public void testSerializationAsTimestampNanoseconds02() throws Exception
     {
         Duration duration = Duration.ofSeconds(13498L, 8374);
         String value = WRITER
-                .with(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
+                .with(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
                 .with(SerializationFeature.WRITE_DATE_TIMESTAMPS_AS_NANOSECONDS)
                 .writeValueAsString(duration);
 
@@ -53,7 +53,7 @@ public void testSerializationAsTimestampMilliseconds01() throws Exception
     {
         Duration duration = Duration.ofSeconds(60L, 0);
         String value = WRITER
-                .with(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
+                .with(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
                 .without(SerializationFeature.WRITE_DATE_TIMESTAMPS_AS_NANOSECONDS)
                 .writeValueAsString(duration);
 
@@ -66,7 +66,7 @@ public void testSerializationAsTimestampMilliseconds02() throws Exception
     {
         Duration duration = Duration.ofSeconds(13498L, 8374);
         String value = WRITER
-                .with(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
+                .with(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
                 .without(SerializationFeature.WRITE_DATE_TIMESTAMPS_AS_NANOSECONDS)
                 .writeValueAsString(duration);
 
@@ -79,7 +79,7 @@ public void testSerializationAsTimestampMilliseconds03() throws Exception
     {
         Duration duration = Duration.ofSeconds(13498L, 837481723);
         String value = WRITER
-                .with(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
+                .with(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
                 .without(SerializationFeature.WRITE_DATE_TIMESTAMPS_AS_NANOSECONDS)
                 .writeValueAsString(duration);
 
@@ -92,7 +92,7 @@ public void testSerializationAsString01() throws Exception
     {
         Duration duration = Duration.ofSeconds(60L, 0);
         String value = WRITER
-                .without(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
+                .without(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
                 .writeValueAsString(duration);
 
         assertNotNull("The value should not be null.", value);
@@ -104,7 +104,7 @@ public void testSerializationAsString02() throws Exception
     {
         Duration duration = Duration.ofSeconds(13498L, 8374);
         String value = WRITER
-                .without(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
+                .without(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
                 .writeValueAsString(duration);
 
         assertNotNull("The value should not be null.", value);
@@ -115,7 +115,7 @@ public void testSerializationAsString02() throws Exception
     public void testSerializationWithTypeInfo01() throws Exception
     {
         ObjectMapper mapper = newMapperBuilder()
-                .enable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS,
+                .enable(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS,
                         SerializationFeature.WRITE_DATE_TIMESTAMPS_AS_NANOSECONDS)
                 .addMixIn(TemporalAmount.class, MockObjectConfiguration.class)
                 .build();
@@ -131,7 +131,7 @@ public void testSerializationWithTypeInfo01() throws Exception
     public void testSerializationWithTypeInfo02() throws Exception
     {
         ObjectMapper mapper = newMapperBuilder()
-                .enable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
+                .enable(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
                 .disable(SerializationFeature.WRITE_DATE_TIMESTAMPS_AS_NANOSECONDS)
                 .addMixIn(TemporalAmount.class, MockObjectConfiguration.class)
                 .build();
@@ -147,7 +147,7 @@ public void testSerializationWithTypeInfo02() throws Exception
     public void testSerializationWithTypeInfo03() throws Exception
     {
         ObjectMapper mapper = newMapperBuilder()
-                .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
+                .disable(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
                 .addMixIn(TemporalAmount.class, MockObjectConfiguration.class)
                 .build();
         Duration duration = Duration.ofSeconds(13498L, 8374);

release-notes/CREDITS renamed to release-notes/CREDITS-2.x

@@ -36,3 +36,8 @@ Sonny Gill (sonnygill@github)
   #67: `ParameterNamesModule` does not deserialize with a single parameter
     constructor when using `SnakeCase` `PropertyNamingStrategy`
    (2.9.6)
+
+Kezhu Wang (kezhuw@github)
+  #75: Use `SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS` for configuring
+    `Duration` serialization
+   (2.10.0)

release-notes/VERSION

@@ -1,8 +1,13 @@
 Project: jackson-modules-java8
+Versions: 3.x (for earlier, see VERSION-2.x)
 Modules:
-  jackson-module-parameter-names
-  jackson-datatype-jdk8
   jackson-datatype-jsr310
+  jackson-datatype-jdk8 (deprecated, no functionality as of 3.0)
+  jackson-module-parameter-names (deprecated, no functionality as of 3.0)
+
+Contains Date/Time types introduced in Java 8. With Jackson 2.x was separate
+module since baseline JDK was not yet Java 8. With Jackson 3.0 kept separate
+due to number of types.
 
 ------------------------------------------------------------------------
 === Releases ===
@@ -15,77 +20,3 @@ Modules:
 - Deprecate "paramater names" and "datatypes" modules as functionality
   now included directly in `jackson-databind`
 - Remove legacy `JSR310Module`
-
-2.9.6 (12-Jun-2018)
-
-#65: Use `DeserializationContext.handleWeirdXxxValue()` for datetime deserializers
- (contributed by Semyon L)
-#67: `ParameterNamesModule` does not deserialize with a single parameter
-   constructor when using `SnakeCase` `PropertyNamingStrategy`
- (reported by Sonny G)
-
-2.9.5 (26-Mar-2018)
-
-#98: `OffsetDateTime` with `@JsonFormat(without=...)` doesn't seem to work
- (reported by ayush-veem@github)
-
-2.9.4 (24-Jan-2018)
-
-No changes since 2.9.3
-
-2.9.3 (09-Dec-2017)
-
-#46: Double array serialization of `LocalDate` stored as an object with
-  wrapper object typing enabled
- (reported by unintended@github)
-- Improve error reporting for `LocalDateTime`, `LocalTime`, `OffsetTime` for
-  timestamp input (JSON integer value)
-
-2.9.2 (14-Oct-2017)
-2.9.1 (07-Sep-2017)
-
-No changes since 2.9.0
-
-2.9.0 (30-Jul-2017)
-
-#3: (datatype) Add Serialization Support for Streams
- (contributed by Julien B)
-#20: (datetime) Allow `LocalDate` to be serialized/deserialized as number (epoch day)
- (contributed by João C)
-#21: (datetime) `DeserializationFeature.UNWRAP_SINGLE_VALUE_ARRAYS` not respected
- (contributed by JP Moresmau)
-
-2.8.10 (not yet released)
-
-#33: `Jdk8Serializer.findReferenceSerializer()` leads to `StackOverflowError` in 2.8.9
- (reported by Mikko T)
-
-2.8.9 (12-Jun-2017)
-
-No changes since 2.8.8
-
-2.8.8 (05-Apr-2017)
-
-#13: (datatype) `configureAbsentsAsNulls` not working for primitive optionals
-  like `OptionalInt`
- (reported by Louis-Rémi P)
-#15: (datatype) Optional<Long> and OptionalLong deserialization are not consistent
-  when deserializing from String
- (reported by Louis-Rémi P)
-#17: (datatype) Cached `Optional` serializer does not apply annotations for POJO properties
- (reported by codicusmaximus@github)
-#18: (datetime) `InstantDeserializer` is not working with offset of zero `+00:00` and `+00`
- (contributed by kevinjom@github)
-
-2.8.7 (21-Feb-2017)
-2.8.6 (12-Jan-2017)
-
-No changes since 2.8.5
-
-2.8.5 (14-Nov-2016)
-
-The very first release from this repository!
-
-#89: If the JsonFormat pattern is all numeric, the `InstantDeserializer` will
-  do the wrong thing
- (reported, contributed fix, by ubik2@github)

release-notes/VERSION-2.x

@@ -0,0 +1,91 @@
+Project: jackson-modules-java8
+Modules:
+  jackson-module-parameter-names
+  jackson-datatype-jdk8
+  jackson-datatype-jsr310
+
+------------------------------------------------------------------------
+=== Releases ===
+------------------------------------------------------------------------
+
+2.10.0 (not yet released)
+
+#75: Use `SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS` for configuring
+ `Duration` serialization
+ (suggested by Kezhu W)
+
+2.9.7 (not yet released)
+
+2.9.6 (12-Jun-2018)
+
+#65: Use `DeserializationContext.handleWeirdXxxValue()` for datetime deserializers
+ (contributed by Semyon L)
+#67: `ParameterNamesModule` does not deserialize with a single parameter
+   constructor when using `SnakeCase` `PropertyNamingStrategy`
+ (reported by Sonny G)
+
+2.9.5 (26-Mar-2018)
+
+#98: `OffsetDateTime` with `@JsonFormat(without=...)` doesn't seem to work
+ (reported by ayush-veem@github)
+
+2.9.4 (24-Jan-2018)
+
+No changes since 2.9.3
+
+2.9.3 (09-Dec-2017)
+
+#46: Double array serialization of `LocalDate` stored as an object with
+  wrapper object typing enabled
+ (reported by unintended@github)
+- Improve error reporting for `LocalDateTime`, `LocalTime`, `OffsetTime` for
+  timestamp input (JSON integer value)
+
+2.9.2 (14-Oct-2017)
+2.9.1 (07-Sep-2017)
+
+No changes since 2.9.0
+
+2.9.0 (30-Jul-2017)
+
+#3: (datatype) Add Serialization Support for Streams
+ (contributed by Julien B)
+#20: (datetime) Allow `LocalDate` to be serialized/deserialized as number (epoch day)
+ (contributed by João C)
+#21: (datetime) `DeserializationFeature.UNWRAP_SINGLE_VALUE_ARRAYS` not respected
+ (contributed by JP Moresmau)
+
+2.8.10 (not yet released)
+
+#33: `Jdk8Serializer.findReferenceSerializer()` leads to `StackOverflowError` in 2.8.9
+ (reported by Mikko T)
+
+2.8.9 (12-Jun-2017)
+
+No changes since 2.8.8
+
+2.8.8 (05-Apr-2017)
+
+#13: (datatype) `configureAbsentsAsNulls` not working for primitive optionals
+  like `OptionalInt`
+ (reported by Louis-Rémi P)
+#15: (datatype) Optional<Long> and OptionalLong deserialization are not consistent
+  when deserializing from String
+ (reported by Louis-Rémi P)
+#17: (datatype) Cached `Optional` serializer does not apply annotations for POJO properties
+ (reported by codicusmaximus@github)
+#18: (datetime) `InstantDeserializer` is not working with offset of zero `+00:00` and `+00`
+ (contributed by kevinjom@github)
+
+2.8.7 (21-Feb-2017)
+2.8.6 (12-Jan-2017)
+
+No changes since 2.8.5
+
+2.8.5 (14-Nov-2016)
+
+The very first release from this repository!
+
+#89: If the JsonFormat pattern is all numeric, the `InstantDeserializer` will
+  do the wrong thing
+ (reported, contributed fix, by ubik2@github)