Restore compatibility with Jackson 2.1

sdeleuze · sdeleuze · commit 89cc8e04014f · 2015-06-26T02:18:29.000+02:00
Issue: SPR-12501
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java
@@ -208,13 +208,14 @@ public Object read(Type type, Class<?> contextClass, HttpInputMessage inputMessa
 		return readJavaType(javaType, inputMessage);
 	}
 
+	@SuppressWarnings("deprecation")
 	private Object readJavaType(JavaType javaType, HttpInputMessage inputMessage) {
 		try {
 			if (inputMessage instanceof MappingJacksonInputMessage) {
 				Class<?> deserializationView = ((MappingJacksonInputMessage)inputMessage).getDeserializationView();
 				if (deserializationView != null) {
 					return this.objectMapper.readerWithView(deserializationView)
-							.forType(javaType).readValue(inputMessage.getBody());
+							.withType(javaType).readValue(inputMessage.getBody());
 				}
 			}
 			return this.objectMapper.readValue(inputMessage.getBody(), javaType);

Original file line number	Diff line number	Diff line change
`@@ -208,13 +208,14 @@ public Object read(Type type, Class<?> contextClass, HttpInputMessage inputMessa`
`208`	`208`	`return readJavaType(javaType, inputMessage);`
`209`	`209`	`}`
`210`	`210`
	`211`	`+ @SuppressWarnings("deprecation")`
`211`	`212`	`private Object readJavaType(JavaType javaType, HttpInputMessage inputMessage) {`
`212`	`213`	`try {`
`213`	`214`	`if (inputMessage instanceof MappingJacksonInputMessage) {`
`214`	`215`	`Class<?> deserializationView = ((MappingJacksonInputMessage)inputMessage).getDeserializationView();`
`215`	`216`	`if (deserializationView != null) {`
`216`	`217`	`return this.objectMapper.readerWithView(deserializationView)`
`217`		`- .forType(javaType).readValue(inputMessage.getBody());`
	`218`	`+ .withType(javaType).readValue(inputMessage.getBody());`
`218`	`219`	`}`
`219`	`220`	`}`
`220`	`221`	`return this.objectMapper.readValue(inputMessage.getBody(), javaType);`