Merge branch '5.2.x'

# Conflicts:
#	spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java
#	spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java

Author: jhoeller

spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java

@@ -712,10 +712,12 @@ public void setOffsetDateTime(OffsetDateTime offsetDateTime) {
 		}
 	}
 
+
 	@SuppressWarnings("serial")
 	public static class MyXmlFactory extends XmlFactory {
 	}
 
+
 	static class Foo {}
 
 	static class Bar {}

spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java

@@ -212,7 +212,7 @@ public void defaultModules() throws JsonProcessingException, UnsupportedEncoding
 		assertThat(new String(objectMapper.writeValueAsBytes(dateTime), "UTF-8")).isEqualTo(timestamp.toString());
 	}
 
-	@Test // SPR-12634
+	@Test  // SPR-12634
 	public void customizeDefaultModulesWithModuleClass() throws JsonProcessingException, UnsupportedEncodingException {
 		this.factory.setModulesToInstall(CustomIntegerModule.class);
 		this.factory.afterPropertiesSet();
@@ -223,7 +223,7 @@ public void customizeDefaultModulesWithModuleClass() throws JsonProcessingExcept
 		assertThat(new String(objectMapper.writeValueAsBytes(4), "UTF-8")).contains("customid");
 	}
 
-	@Test // SPR-12634
+	@Test  // SPR-12634
 	public void customizeDefaultModulesWithSerializer() throws JsonProcessingException, UnsupportedEncodingException {
 		Map<Class<?>, JsonSerializer<?>> serializers = new HashMap<>();
 		serializers.put(Integer.class, new CustomIntegerSerializer());