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

Merge branch '5.1.x'

Browse Source
This commit is contained in:
Sebastien Deleuze
2019-03-27 17:13:06 +01:00
parent 673be7fb0d f0ae8bc300
commit 864dddee7a
2 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,6 +71,7 @@ import com.fasterxml.jackson.databind.ser.std.NumberSerializer;
import com.fasterxml.jackson.databind.type.SimpleType;
import com.fasterxml.jackson.dataformat.cbor.CBORFactory;
import com.fasterxml.jackson.dataformat.smile.SmileFactory;
import com.fasterxml.jackson.dataformat.xml.XmlFactory;
import com.fasterxml.jackson.dataformat.xml.XmlMapper;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import kotlin.ranges.IntRange;
@@ -480,6 +481,14 @@ public class Jackson2ObjectMapperBuilderTests {
assertEquals(XmlMapper.class, objectMapper.getClass());
}
@Test // gh-22428
public void xmlMapperAndCustomFactory() {
ObjectMapper objectMapper = Jackson2ObjectMapperBuilder.xml().factory(new MyXmlFactory()).build();
assertNotNull(objectMapper);
assertEquals(XmlMapper.class, objectMapper.getClass());
assertEquals(MyXmlFactory.class, objectMapper.getFactory().getClass());
}
@Test
public void createXmlMapper() {
Jackson2ObjectMapperBuilder builder = Jackson2ObjectMapperBuilder.json().indentOutput(true);
@@ -667,4 +676,7 @@ public class Jackson2ObjectMapperBuilderTests {
}
public static class MyXmlFactory extends XmlFactory {
}
}