Skip to content

Commit 58eddb8

Browse files
committed
Become compatible with Jackson 2.10 while remaining 2.9 compatible
See gh-17999
1 parent 6591789 commit 58eddb8

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ private Map<String, Object> safeSerialize(ObjectMapper mapper, Object bean, Stri
165165
protected void configureObjectMapper(ObjectMapper mapper) {
166166
mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
167167
mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
168+
mapper.configure(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS, false);
168169
mapper.configure(MapperFeature.USE_STD_BEAN_NAMING, true);
169170
mapper.setSerializationInclusion(Include.NON_NULL);
170171
applyConfigurationPropertiesFilter(mapper);

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/json/JacksonJsonParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
*/
3232
public class JacksonJsonParser extends AbstractJsonParser {
3333

34-
private static final TypeReference<?> MAP_TYPE = new MapTypeReference();
34+
private static final MapTypeReference MAP_TYPE = new MapTypeReference();
3535

36-
private static final TypeReference<?> LIST_TYPE = new ListTypeReference();
36+
private static final ListTypeReference LIST_TYPE = new ListTypeReference();
3737

3838
private ObjectMapper objectMapper; // Late binding
3939

0 commit comments

Comments
 (0)