Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MappingJackson2JsonView/MessageConverter calls non-deprecated Jackson 2.1+ createGenerator API

Browse Source 
Also removing workaround for https://github.com/FasterXML/jackson-databind/issues/12 (fixed in 2.1+)

Issue: SPR-11262
This commit is contained in:
Juergen Hoeller
2014-07-09 21:23:09 +02:00
parent a6a86b8025
commit 777085bbfc
4 changed files with 56 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-webmvc/src/test/java/org/springframework/web/servlet/view/json/MappingJackson2JsonViewTests.java
View File

@@ -323,7 +323,7 @@ public class MappingJackson2JsonViewTests {
model.put("foo", "bar");
request.addParameter("otherparam", "value");
request.addParameter("custom", "jsonpCallback");
view.setJsonpParameterNames(Arrays.asList("jsonp", "callback", "custom"));
view.setJsonpParameterNames(new LinkedHashSet(Arrays.asList("jsonp", "callback", "custom")));
view.render(model, request, response);
@@ -338,8 +338,14 @@ public class MappingJackson2JsonViewTests {
assertEquals("application/json", response.getContentType());
}
public interface MyJacksonView1 {};
public interface MyJacksonView2 {};
public interface MyJacksonView1 {
}
public interface MyJacksonView2 {
}
@SuppressWarnings("unused")
public static class TestBeanSimple {
@@ -378,7 +384,6 @@ public class MappingJackson2JsonViewTests {
@JsonSerialize(using=TestBeanSimpleSerializer.class)
public static class TestBeanSimpleAnnotated extends TestBeanSimple {
}