Marked Jackson 1.x support classes as deprecated

jhoeller · jhoeller · commit 8b3afda6f493 · 2013-10-04T22:52:47.000+02:00
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJacksonMessageConverter.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJacksonMessageConverter.java
@@ -43,12 +43,15 @@
  * Converts from a {@link TextMessage} or {@link BytesMessage} to an object.
  *
  * <p><b>NOTE:</b> Requires Jackson 1.8 or higher, as of Spring 4.0.
+ * At the same time, we strongly recommend a migration to Jackson 2.x!
  *
  * @author Mark Pollack
  * @author Dave Syer
  * @author Juergen Hoeller
  * @since 3.1
+ * @deprecated Please migrate to {@link MappingJackson2MessageConverter} for Jackson 2.x.
  */
+@Deprecated
 public class MappingJacksonMessageConverter implements MessageConverter, BeanClassLoaderAware {
 
 	/**
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/JacksonObjectMapperFactoryBean.java b/spring-web/src/main/java/org/springframework/http/converter/json/JacksonObjectMapperFactoryBean.java
@@ -80,11 +80,14 @@
  * </pre>
  *
  * <p><b>NOTE:</b> Requires Jackson 1.8 or higher, as of Spring 4.0.
+ * At the same time, we strongly recommend a migration to Jackson 2.x!
  *
  * @author <a href="mailto:dmitry.katsubo@gmail.com">Dmitry Katsubo</a>
  * @author Rossen Stoyanchev
  * @since 3.2
+ * @deprecated Please migrate to {@link Jackson2ObjectMapperFactoryBean} for Jackson 2.x.
  */
+@Deprecated
 public class JacksonObjectMapperFactoryBean implements FactoryBean<ObjectMapper>, InitializingBean {
 
 	private ObjectMapper objectMapper;
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java
@@ -26,6 +26,7 @@
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.map.SerializationConfig;
 import org.codehaus.jackson.type.JavaType;
+
 import org.springframework.http.HttpInputMessage;
 import org.springframework.http.HttpOutputMessage;
 import org.springframework.http.MediaType;
@@ -45,11 +46,14 @@
  * {@link #setSupportedMediaTypes supportedMediaTypes} property.
  *
  * <p><b>NOTE:</b> Requires Jackson 1.8 or higher, as of Spring 4.0.
+ * At the same time, we strongly recommend a migration to Jackson 2.x!
  *
  * @author Arjen Poutsma
  * @author Juergen Hoeller
  * @since 3.0
+ * @deprecated Please migrate to {@link MappingJackson2HttpMessageConverter} for Jackson 2.x.
  */
+@Deprecated
 public class MappingJacksonHttpMessageConverter extends AbstractHttpMessageConverter<Object>
 		implements GenericHttpMessageConverter<Object> {
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJacksonJsonView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJacksonJsonView.java
@@ -50,7 +50,9 @@
  * @author Rossen Stoyanchev
  * @author Juergen Hoeller
  * @since 3.0
+ * @deprecated Please migrate to {@link MappingJackson2JsonView} for Jackson 2.x.
  */
+@Deprecated
 public class MappingJacksonJsonView extends AbstractView {
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -80,11 +80,14 @@`
`80`	`80`	`* </pre>`
`81`	`81`	`*`
`82`	`82`	`* <p><b>NOTE:</b> Requires Jackson 1.8 or higher, as of Spring 4.0.`
	`83`	`+ * At the same time, we strongly recommend a migration to Jackson 2.x!`
`83`	`84`	`*`
`84`	`85`	`* @author <a href="mailto:dmitry.katsubo@gmail.com">Dmitry Katsubo</a>`
`85`	`86`	`* @author Rossen Stoyanchev`
`86`	`87`	`* @since 3.2`
	`88`	`+ * @deprecated Please migrate to {@link Jackson2ObjectMapperFactoryBean} for Jackson 2.x.`
`87`	`89`	`*/`
	`90`	`+@Deprecated`
`88`	`91`	`public class JacksonObjectMapperFactoryBean implements FactoryBean<ObjectMapper>, InitializingBean {`
`89`	`92`
`90`	`93`	`private ObjectMapper objectMapper;`