Commit 58eddb8f authored by Andy Wilkinson's avatar Andy Wilkinson

Become compatible with Jackson 2.10 while remaining 2.9 compatible

See gh-17999
parent 65917890
......@@ -165,6 +165,7 @@ public class ConfigurationPropertiesReportEndpoint implements ApplicationContext
protected void configureObjectMapper(ObjectMapper mapper) {
mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
mapper.configure(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS, false);
mapper.configure(MapperFeature.USE_STD_BEAN_NAMING, true);
mapper.setSerializationInclusion(Include.NON_NULL);
applyConfigurationPropertiesFilter(mapper);
......
......@@ -31,9 +31,9 @@ import com.fasterxml.jackson.databind.ObjectMapper;
*/
public class JacksonJsonParser extends AbstractJsonParser {
private static final TypeReference<?> MAP_TYPE = new MapTypeReference();
private static final MapTypeReference MAP_TYPE = new MapTypeReference();
private static final TypeReference<?> LIST_TYPE = new ListTypeReference();
private static final ListTypeReference LIST_TYPE = new ListTypeReference();
private ObjectMapper objectMapper; // Late binding
......
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