Fix FasterXML#165

Author: cowtowncoder

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

@@ -31,6 +31,7 @@
 import com.fasterxml.jackson.datatype.jsr310.DecimalUtils;
 
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.time.Duration;
 import java.time.format.DateTimeFormatter;
 
@@ -81,9 +82,20 @@ public void serialize(Duration duration, JsonGenerator generator, SerializerProv
     {
         if (useTimestamp(provider)) {
             if (useNanoseconds(provider)) {
-                generator.writeNumber(DecimalUtils.toBigDecimal(
-                        duration.getSeconds(), duration.getNano()
-                ));
+                // 20-Oct-2020, tatu: [modules-java8#165] Need to take care of
+                //    negative values too, and without work-around values
+                //    returned are wonky wrt conversions
+                BigDecimal bd;
+                if (duration.isNegative()) {
+                    duration = duration.abs();
+                    bd = DecimalUtils.toBigDecimal(duration.getSeconds(),
+                            duration.getNano())
+                        .negate();
+                } else {
+                    bd = DecimalUtils.toBigDecimal(duration.getSeconds(),
+                            duration.getNano());
+                }
+                generator.writeNumber(bd);
             } else {
                 generator.writeNumber(duration.toMillis());
             }

datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/ser/DurationSerTest.java

@@ -32,8 +32,6 @@ public void testSerializationAsTimestampNanoseconds01() throws Exception
                 .with(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
                 .with(SerializationFeature.WRITE_DATE_TIMESTAMPS_AS_NANOSECONDS)
                 .writeValueAsString(duration);
-
-        assertNotNull("The value should not be null.", value);
         assertEquals("The value is not correct.", "60"+NO_NANOSECS_SUFFIX, value);
     }
 
@@ -45,34 +43,47 @@ public void testSerializationAsTimestampNanoseconds02() throws Exception
                 .with(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
                 .with(SerializationFeature.WRITE_DATE_TIMESTAMPS_AS_NANOSECONDS)
                 .writeValueAsString(duration);
-
-        assertNotNull("The value should not be null.", value);
         assertEquals("The value is not correct.", "13498.000008374", value);
     }
 
+    // [modules-java8#165]
+    @Test
+    public void testSerializationAsTimestampNanoseconds03() throws Exception
+    {
+        ObjectWriter w = WRITER
+                .with(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
+                .with(SerializationFeature.WRITE_DATE_TIMESTAMPS_AS_NANOSECONDS);
+
+        // 20-Oct-2020, tatu: Very weird, but "use nanoseconds" actually results
+        //   in unit being seconds, with fractions (with nanosec precision)
+        String value = w.writeValueAsString(Duration.ofMillis(1L));
+        assertEquals("The value is not correct.", "0.001000000", value);
+
+        value = w.writeValueAsString(Duration.ofMillis(-1L));
+        assertEquals("The value is not correct.", "-0.001000000", value);
+    }
+    
     @Test
     public void testSerializationAsTimestampMilliseconds01() throws Exception
     {
-        Duration duration = Duration.ofSeconds(60L, 0);
-        String value = WRITER
+        final ObjectWriter w = WRITER
                 .with(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
-                .without(SerializationFeature.WRITE_DATE_TIMESTAMPS_AS_NANOSECONDS)
-                .writeValueAsString(duration);
+                .without(SerializationFeature.WRITE_DATE_TIMESTAMPS_AS_NANOSECONDS);
+        String value = w.writeValueAsString(Duration.ofSeconds(45L, 0));
+        assertEquals("The value is not correct.", "45000", value);
 
-        assertNotNull("The value should not be null.", value);
-        assertEquals("The value is not correct.", "60000", value);
+        // and with negative value too
+        value = w.writeValueAsString(Duration.ofSeconds(-32L, 0));
+        assertEquals("The value is not correct.", "-32000", value);
     }
 
     @Test
     public void testSerializationAsTimestampMilliseconds02() throws Exception
     {
-        Duration duration = Duration.ofSeconds(13498L, 8374);
         String value = WRITER
                 .with(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
                 .without(SerializationFeature.WRITE_DATE_TIMESTAMPS_AS_NANOSECONDS)
-                .writeValueAsString(duration);
-
-        assertNotNull("The value should not be null.", value);
+                .writeValueAsString(Duration.ofSeconds(13498L, 8374));
         assertEquals("The value is not correct.", "13498000", value);
     }
 
@@ -84,8 +95,6 @@ public void testSerializationAsTimestampMilliseconds03() throws Exception
                 .with(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
                 .without(SerializationFeature.WRITE_DATE_TIMESTAMPS_AS_NANOSECONDS)
                 .writeValueAsString(duration);
-
-        assertNotNull("The value should not be null.", value);
         assertEquals("The value is not correct.", "13498837", value);
     }
 
@@ -96,8 +105,6 @@ public void testSerializationAsString01() throws Exception
         String value = WRITER
                 .without(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
                 .writeValueAsString(duration);
-
-        assertNotNull("The value should not be null.", value);
         assertEquals("The value is not correct.", '"' + duration.toString() + '"', value);
     }
 
@@ -108,51 +115,49 @@ public void testSerializationAsString02() throws Exception
         String value = WRITER
                 .without(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
                 .writeValueAsString(duration);
-
-        assertNotNull("The value should not be null.", value);
         assertEquals("The value is not correct.", '"' + duration.toString() + '"', value);
     }
 
     @Test
     public void testSerializationWithTypeInfo01() throws Exception
     {
-        ObjectMapper mapper = newMapper(); // need new to add mix-ins:
-        mapper.configure(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS, true);
-        mapper.configure(SerializationFeature.WRITE_DATE_TIMESTAMPS_AS_NANOSECONDS, true);
-        mapper.addMixIn(TemporalAmount.class, MockObjectConfiguration.class);
+        ObjectMapper mapper = mapperBuilder()
+                .addMixIn(TemporalAmount.class, MockObjectConfiguration.class)
+                .enable(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
+                .enable(SerializationFeature.WRITE_DATE_TIMESTAMPS_AS_NANOSECONDS)
+                .build();
         Duration duration = Duration.ofSeconds(13498L, 8374);
         String value = mapper.writeValueAsString(duration);
 
-        assertNotNull("The value should not be null.", value);
         assertEquals("The value is not correct.",
                 "[\"" + Duration.class.getName() + "\",13498.000008374]", value);
     }
 
     @Test
     public void testSerializationWithTypeInfo02() throws Exception
     {
-        ObjectMapper mapper = newMapper(); // need new to add mix-ins:
-        mapper.configure(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS, true);
-        mapper.configure(SerializationFeature.WRITE_DATE_TIMESTAMPS_AS_NANOSECONDS, false);
-        mapper.addMixIn(TemporalAmount.class, MockObjectConfiguration.class);
+        ObjectMapper mapper = mapperBuilder()
+                .addMixIn(TemporalAmount.class, MockObjectConfiguration.class)
+                .enable(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
+                .disable(SerializationFeature.WRITE_DATE_TIMESTAMPS_AS_NANOSECONDS)
+                .build();
         Duration duration = Duration.ofSeconds(13498L, 837481723);
         String value = mapper.writeValueAsString(duration);
 
-        assertNotNull("The value should not be null.", value);
         assertEquals("The value is not correct.",
                 "[\"" + Duration.class.getName() + "\",13498837]", value);
     }
 
     @Test
     public void testSerializationWithTypeInfo03() throws Exception
     {
-        ObjectMapper mapper = newMapper(); // need new to add mix-ins:
-        mapper.configure(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS, false);
-        mapper.addMixIn(TemporalAmount.class, MockObjectConfiguration.class);
+        ObjectMapper mapper = mapperBuilder()
+                .addMixIn(TemporalAmount.class, MockObjectConfiguration.class)
+                .disable(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
+                .build();
         Duration duration = Duration.ofSeconds(13498L, 8374);
         String value = mapper.writeValueAsString(duration);
 
-        assertNotNull("The value should not be null.", value);
         assertEquals("The value is not correct.",
                 "[\"" + Duration.class.getName() + "\",\"" + duration.toString() + "\"]", value);
     }

release-notes/CREDITS-2.x

@@ -104,6 +104,10 @@ Samantha Williamson (samwill@github)
   * Contributed fix to #148: Allow strict `LocalDate` parsing
    (2.11.0)
 
+Joni Syri (jpsyri@github)
+  * Reported #165: Problem in serializing negative Duration values
+   (2.12.0)
+
 Moritz Orth ([email protected])
   * Reported and suggested fix for #166: Cannot deserialize OffsetDateTime.MIN and
    OffsetDateTime.MAX with ADJUST_DATES_TO_CONTEXT_TIME_ZONE enabled
@@ -128,3 +132,4 @@ Oriol Barcelona (obarcelonap@github)
   * Contributed fix for #184: `DurationDeserializer` should use `@JsonFormat.pattern`
     (and config override) to support configurable `ChronoUnit`
    (2.12.0)
+

release-notes/VERSION-2.x

@@ -10,6 +10,8 @@ Modules:
 
 2.12.0 (not yet released)
 
+#165: Problem in serializing negative Duration values
+ (reported by Joni S)
 #166: Cannot deserialize `OffsetDateTime.MIN` or `OffsetDateTime.MAX` with
    `ADJUST_DATES_TO_CONTEXT_TIME_ZONE` enabled
  (reported, fix suggested by Moritz O)