diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpMapperProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpMapperProperties.java index 24353f23d5f..c25ba4a32dd 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpMapperProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpMapperProperties.java @@ -18,6 +18,7 @@ package org.springframework.boot.autoconfigure.web; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.boot.autoconfigure.jackson.JacksonProperties; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.http.converter.HttpMessageConverter; @@ -26,6 +27,8 @@ import com.fasterxml.jackson.databind.SerializationFeature; /** * Configuration properties to configure {@link HttpMessageConverter}s. * + * @deprecated pleas use {@link JacksonProperties} instead + * * @author Dave Syer * @author Piotr Maj * @author Sebastien Deleuze diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpMessageConvertersAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpMessageConvertersAutoConfiguration.java index aab9c2913d5..833a0e94f17 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpMessageConvertersAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpMessageConvertersAutoConfiguration.java @@ -71,6 +71,8 @@ public class HttpMessageConvertersAutoConfiguration { @SuppressWarnings("deprecation") protected static class MappingJackson2HttpMessageConverterConfiguration { + // This can be removed when the deprecated class is removed (the ObjectMapper will + // already have all the correct properties). @Autowired private HttpMapperProperties properties = new HttpMapperProperties();