Commit 8c8ee324 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge pull request #19352 from filiphr

* pr/19352:
  Disable SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS by default

Closes gh-19352
parents 2171e7a4 bb5c151e
...@@ -88,6 +88,7 @@ public class JacksonAutoConfiguration { ...@@ -88,6 +88,7 @@ public class JacksonAutoConfiguration {
static { static {
Map<Object, Boolean> featureDefaults = new HashMap<>(); Map<Object, Boolean> featureDefaults = new HashMap<>();
featureDefaults.put(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false); featureDefaults.put(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
featureDefaults.put(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS, false);
FEATURE_DEFAULTS = Collections.unmodifiableMap(featureDefaults); FEATURE_DEFAULTS = Collections.unmodifiableMap(featureDefaults);
} }
......
...@@ -19,6 +19,7 @@ package org.springframework.boot.autoconfigure.jackson; ...@@ -19,6 +19,7 @@ package org.springframework.boot.autoconfigure.jackson;
import java.io.IOException; import java.io.IOException;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.Duration;
import java.util.Date; import java.util.Date;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
...@@ -378,6 +379,15 @@ class JacksonAutoConfigurationTests { ...@@ -378,6 +379,15 @@ class JacksonAutoConfigurationTests {
}); });
} }
@Test
void writeDurationAsTimestampsDefault() {
this.contextRunner.run((context) -> {
ObjectMapper mapper = context.getBean(ObjectMapper.class);
Duration duration = Duration.ofHours(2);
assertThat(mapper.writeValueAsString(duration)).isEqualTo("\"PT2H\"");
});
}
@Test @Test
void writeWithVisibility() { void writeWithVisibility() {
this.contextRunner this.contextRunner
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment