Set Jackson FAIL_ON_UNKNOWN_PROPERTIES property to false by default

sdeleuze · sdeleuze · commit 42aef5f5dcc9 · 2014-09-30T05:18:15.000+02:00
Issue: SPR-11891
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java
@@ -384,6 +384,9 @@ public <T extends ObjectMapper> T build() {
 			this.objectMapper.registerModule(module);
 		}
 
+		if(!features.containsKey(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)) {
+			configureFeature(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		}
 		for (Object feature : this.features.keySet()) {
 			configureFeature(feature, this.features.get(feature));
 		}
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java
@@ -413,6 +413,9 @@ public void afterPropertiesSet() {
 			this.objectMapper.registerModule(module);
 		}
 
+		if(!features.containsKey(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)) {
+			configureFeature(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		}
 		for (Object feature : this.features.keySet()) {
 			configureFeature(feature, this.features.get(feature));
 		}
diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java
@@ -81,7 +81,7 @@ public void defaultProperties() {
 		ObjectMapper objectMapper = Jackson2ObjectMapperBuilder.json().build();
 		assertNotNull(objectMapper);
 		assertTrue(objectMapper.isEnabled(MapperFeature.DEFAULT_VIEW_INCLUSION));
-		assertTrue(objectMapper.isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES));
+		assertFalse(objectMapper.isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES));
 		assertTrue(objectMapper.isEnabled(MapperFeature.AUTO_DETECT_FIELDS));
 		assertTrue(objectMapper.isEnabled(MapperFeature.AUTO_DETECT_GETTERS));
 		assertTrue(objectMapper.isEnabled(MapperFeature.AUTO_DETECT_SETTERS));
@@ -241,7 +241,7 @@ public void completeSetup() {
 
 		assertFalse(objectMapper.getSerializationConfig().isEnabled(MapperFeature.AUTO_DETECT_GETTERS));
 		assertTrue(objectMapper.getDeserializationConfig().isEnabled(MapperFeature.DEFAULT_VIEW_INCLUSION));
-		assertTrue(objectMapper.getDeserializationConfig().isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES));
+		assertFalse(objectMapper.getDeserializationConfig().isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES));
 		assertFalse(objectMapper.getDeserializationConfig().isEnabled(MapperFeature.AUTO_DETECT_FIELDS));
 		assertFalse(objectMapper.getFactory().isEnabled(JsonParser.Feature.AUTO_CLOSE_SOURCE));
 		assertFalse(objectMapper.getFactory().isEnabled(JsonGenerator.Feature.QUOTE_FIELD_NAMES));
diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java
@@ -260,7 +260,7 @@ public void completeSetup() {
 
 		assertFalse(objectMapper.getSerializationConfig().isEnabled(MapperFeature.AUTO_DETECT_GETTERS));
 		assertTrue(objectMapper.getDeserializationConfig().isEnabled(MapperFeature.DEFAULT_VIEW_INCLUSION));
-		assertTrue(objectMapper.getDeserializationConfig().isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES));
+		assertFalse(objectMapper.getDeserializationConfig().isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES));
 		assertFalse(objectMapper.getDeserializationConfig().isEnabled(MapperFeature.AUTO_DETECT_FIELDS));
 		assertFalse(objectMapper.getFactory().isEnabled(JsonParser.Feature.AUTO_CLOSE_SOURCE));
 		assertFalse(objectMapper.getFactory().isEnabled(JsonGenerator.Feature.QUOTE_FIELD_NAMES));
diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java
@@ -146,12 +146,13 @@ public void readInvalidJson() throws IOException {
 		converter.read(MyBean.class, inputMessage);
 	}
 
-	@Test(expected = HttpMessageNotReadableException.class)
+	@Test
 	public void readValidJsonWithUnknownProperty() throws IOException {
 		String body = "{\"string\":\"string\",\"unknownProperty\":\"value\"}";
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8"));
 		inputMessage.getHeaders().setContentType(new MediaType("application", "json"));
 		converter.read(MyBean.class, inputMessage);
+		// Assert no HttpMessageNotReadableException is thrown
 	}
 
 	@Test
diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/MappingJackson2XmlHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/MappingJackson2XmlHttpMessageConverterTests.java
@@ -102,12 +102,13 @@ public void readInvalidXml() throws IOException {
 		converter.read(MyBean.class, inputMessage);
 	}
 
-	@Test(expected = HttpMessageNotReadableException.class)
+	@Test
 	public void readValidXmlWithUnknownProperty() throws IOException {
 		String body = "<MyBean><string>string</string><unknownProperty>value</unknownProperty></MyBean>";
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8"));
 		inputMessage.getHeaders().setContentType(new MediaType("application", "xml"));
 		converter.read(MyBean.class, inputMessage);
+		// Assert no HttpMessageNotReadableException is thrown
 	}
 
 	@Test
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java
@@ -175,7 +175,7 @@ public void testDefaultConfig() throws Exception {
 				ObjectMapper objectMapper = ((AbstractJackson2HttpMessageConverter)converter).getObjectMapper();
 				assertTrue(objectMapper.getDeserializationConfig().isEnabled(MapperFeature.DEFAULT_VIEW_INCLUSION));
 				assertTrue(objectMapper.getSerializationConfig().isEnabled(MapperFeature.DEFAULT_VIEW_INCLUSION));
-				assertTrue(objectMapper.getDeserializationConfig().isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES));
+				assertFalse(objectMapper.getDeserializationConfig().isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES));
 				if(converter instanceof MappingJackson2XmlHttpMessageConverter) {
 					assertEquals(XmlMapper.class, objectMapper.getClass());
 				}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java
@@ -162,12 +162,9 @@ public void requestMappingHandlerAdapter() throws Exception {
 		assertEquals(1, adapter.getMessageConverters().size());
 		assertEquals(MappingJackson2HttpMessageConverter.class, adapter.getMessageConverters().get(0).getClass());
 		ObjectMapper objectMapper = ((MappingJackson2HttpMessageConverter)adapter.getMessageConverters().get(0)).getObjectMapper();
-		assertTrue(objectMapper.getDeserializationConfig()
-				.isEnabled(MapperFeature.DEFAULT_VIEW_INCLUSION));
-		assertTrue(objectMapper.getSerializationConfig()
-				.isEnabled(MapperFeature.DEFAULT_VIEW_INCLUSION));
-		assertTrue(objectMapper.getDeserializationConfig()
-				.isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES));
+		assertTrue(objectMapper.getDeserializationConfig().isEnabled(MapperFeature.DEFAULT_VIEW_INCLUSION));
+		assertTrue(objectMapper.getSerializationConfig().isEnabled(MapperFeature.DEFAULT_VIEW_INCLUSION));
+		assertFalse(objectMapper.getDeserializationConfig().isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES));
 
 		DirectFieldAccessor fieldAccessor = new DirectFieldAccessor(adapter);
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java
@@ -164,7 +164,7 @@ public void requestMappingHandlerAdapter() throws Exception {
 				ObjectMapper objectMapper = ((AbstractJackson2HttpMessageConverter)converter).getObjectMapper();
 				assertTrue(objectMapper.getDeserializationConfig().isEnabled(MapperFeature.DEFAULT_VIEW_INCLUSION));
 				assertTrue(objectMapper.getSerializationConfig().isEnabled(MapperFeature.DEFAULT_VIEW_INCLUSION));
-				assertTrue(objectMapper.getDeserializationConfig().isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES));
+				assertFalse(objectMapper.getDeserializationConfig().isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES));
 				if(converter instanceof MappingJackson2XmlHttpMessageConverter) {
 					assertEquals(XmlMapper.class, objectMapper.getClass());
 				}

Original file line number	Diff line number	Diff line change
`@@ -384,6 +384,9 @@ public <T extends ObjectMapper> T build() {`
`384`	`384`	`this.objectMapper.registerModule(module);`
`385`	`385`	`}`
`386`	`386`
	`387`	`+ if(!features.containsKey(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)) {`
	`388`	`+ configureFeature(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);`
	`389`	`+ }`
`387`	`390`	`for (Object feature : this.features.keySet()) {`
`388`	`391`	`configureFeature(feature, this.features.get(feature));`
`389`	`392`	`}`
Original file line number	Diff line number	Diff line change
`@@ -413,6 +413,9 @@ public void afterPropertiesSet() {`
`413`	`413`	`this.objectMapper.registerModule(module);`
`414`	`414`	`}`
`415`	`415`
	`416`	`+ if(!features.containsKey(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)) {`
	`417`	`+ configureFeature(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);`
	`418`	`+ }`
`416`	`419`	`for (Object feature : this.features.keySet()) {`
`417`	`420`	`configureFeature(feature, this.features.get(feature));`
`418`	`421`	`}`
Original file line number	Diff line number	Diff line change
`@@ -146,12 +146,13 @@ public void readInvalidJson() throws IOException {`
`146`	`146`	`converter.read(MyBean.class, inputMessage);`
`147`	`147`	`}`
`148`	`148`
`149`		`- @Test(expected = HttpMessageNotReadableException.class)`
	`149`	`+ @Test`
`150`	`150`	`public void readValidJsonWithUnknownProperty() throws IOException {`
`151`	`151`	`String body = "{\"string\":\"string\",\"unknownProperty\":\"value\"}";`
`152`	`152`	`MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8"));`
`153`	`153`	`inputMessage.getHeaders().setContentType(new MediaType("application", "json"));`
`154`	`154`	`converter.read(MyBean.class, inputMessage);`
	`155`	`+ // Assert no HttpMessageNotReadableException is thrown`
`155`	`156`	`}`
`156`	`157`
`157`	`158`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -102,12 +102,13 @@ public void readInvalidXml() throws IOException {`
`102`	`102`	`converter.read(MyBean.class, inputMessage);`
`103`	`103`	`}`
`104`	`104`
`105`		`- @Test(expected = HttpMessageNotReadableException.class)`
	`105`	`+ @Test`
`106`	`106`	`public void readValidXmlWithUnknownProperty() throws IOException {`
`107`	`107`	`String body = "<MyBean><string>string</string><unknownProperty>value</unknownProperty></MyBean>";`
`108`	`108`	`MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8"));`
`109`	`109`	`inputMessage.getHeaders().setContentType(new MediaType("application", "xml"));`
`110`	`110`	`converter.read(MyBean.class, inputMessage);`
	`111`	`+ // Assert no HttpMessageNotReadableException is thrown`
`111`	`112`	`}`
`112`	`113`
`113`	`114`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ public void testDefaultConfig() throws Exception {`
`175`	`175`	`ObjectMapper objectMapper = ((AbstractJackson2HttpMessageConverter)converter).getObjectMapper();`
`176`	`176`	`assertTrue(objectMapper.getDeserializationConfig().isEnabled(MapperFeature.DEFAULT_VIEW_INCLUSION));`
`177`	`177`	`assertTrue(objectMapper.getSerializationConfig().isEnabled(MapperFeature.DEFAULT_VIEW_INCLUSION));`
`178`		`- assertTrue(objectMapper.getDeserializationConfig().isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES));`
	`178`	`+ assertFalse(objectMapper.getDeserializationConfig().isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES));`
`179`	`179`	`if(converter instanceof MappingJackson2XmlHttpMessageConverter) {`
`180`	`180`	`assertEquals(XmlMapper.class, objectMapper.getClass());`
`181`	`181`	`}`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ public void requestMappingHandlerAdapter() throws Exception {`
`164`	`164`	`ObjectMapper objectMapper = ((AbstractJackson2HttpMessageConverter)converter).getObjectMapper();`
`165`	`165`	`assertTrue(objectMapper.getDeserializationConfig().isEnabled(MapperFeature.DEFAULT_VIEW_INCLUSION));`
`166`	`166`	`assertTrue(objectMapper.getSerializationConfig().isEnabled(MapperFeature.DEFAULT_VIEW_INCLUSION));`
`167`		`- assertTrue(objectMapper.getDeserializationConfig().isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES));`
	`167`	`+ assertFalse(objectMapper.getDeserializationConfig().isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES));`
`168`	`168`	`if(converter instanceof MappingJackson2XmlHttpMessageConverter) {`
`169`	`169`	`assertEquals(XmlMapper.class, objectMapper.getClass());`
`170`	`170`	`}`