diff options
author | Tatu Saloranta <tatu.saloranta@iki.fi> | 2019-09-24 16:25:15 -0700 |
---|---|---|
committer | Tatu Saloranta <tatu.saloranta@iki.fi> | 2019-09-24 16:25:15 -0700 |
commit | 81b334ce53a512dcf400bbc78f314101d306a45b (patch) | |
tree | 4757daf841380d3d20f56c9727aeaaff1d392809 /src/test/java/com/fasterxml/jackson | |
parent | c71939108f6007d1ef5d907475eac880bd3486b8 (diff) | |
download | jackson-databind-81b334ce53a512dcf400bbc78f314101d306a45b.tar.gz |
Fix #2472
Diffstat (limited to 'src/test/java/com/fasterxml/jackson')
-rw-r--r-- | src/test/java/com/fasterxml/jackson/databind/format/UUIDFormatTest.java | 58 | ||||
-rw-r--r-- | src/test/java/com/fasterxml/jackson/databind/jsontype/deftyping/DefaultTypeResolver2472Test.java | 32 |
2 files changed, 90 insertions, 0 deletions
diff --git a/src/test/java/com/fasterxml/jackson/databind/format/UUIDFormatTest.java b/src/test/java/com/fasterxml/jackson/databind/format/UUIDFormatTest.java new file mode 100644 index 000000000..4fd2f8690 --- /dev/null +++ b/src/test/java/com/fasterxml/jackson/databind/format/UUIDFormatTest.java @@ -0,0 +1,58 @@ +package com.fasterxml.jackson.databind.format; + +import java.util.UUID; + +import com.fasterxml.jackson.annotation.JsonFormat; + +import com.fasterxml.jackson.databind.BaseMapTest; +import com.fasterxml.jackson.databind.ObjectMapper; + +public class UUIDFormatTest extends BaseMapTest +{ + protected static class UUIDWrapper { + @JsonFormat(shape=JsonFormat.Shape.NATURAL) + public UUID u; + + public UUIDWrapper() { } + public UUIDWrapper(UUID value) { u = value; } + } + + protected static class UUIDAsString { + @JsonFormat(shape=JsonFormat.Shape.STRING) + public UUID u; + + public UUIDAsString() { } + public UUIDAsString(UUID value) { u = value; } + } + + /* + /********************************************************************** + /* Test methods + /********************************************************************** + */ + +// private final static ObjectMapper MAPPER = newJsonMapper(); + private final static ObjectMapper MAPPER = new ObjectMapper(); + + public void testShapeViaDefaults() throws Exception + { +/* + assertEquals(aposToQuotes("{'b':true}"), + MAPPER.writeValueAsString(new BooleanWrapper(true))); + ObjectMapper m = newJsonMapper(); + m.configOverride(Boolean.class) + .setFormat(JsonFormat.Value.forShape(JsonFormat.Shape.NUMBER)); + assertEquals(aposToQuotes("{'b':1}"), + m.writeValueAsString(new BooleanWrapper(true))); +*/ + } + + /* + public void testShapeOnProperty() throws Exception + { + assertEquals(aposToQuotes("{'b1':1,'b2':0,'b3':true}"), + MAPPER.writeValueAsString(new BeanWithBoolean(true, false, true))); + } + */ + +} diff --git a/src/test/java/com/fasterxml/jackson/databind/jsontype/deftyping/DefaultTypeResolver2472Test.java b/src/test/java/com/fasterxml/jackson/databind/jsontype/deftyping/DefaultTypeResolver2472Test.java new file mode 100644 index 000000000..1cabea19a --- /dev/null +++ b/src/test/java/com/fasterxml/jackson/databind/jsontype/deftyping/DefaultTypeResolver2472Test.java @@ -0,0 +1,32 @@ +package com.fasterxml.jackson.databind.jsontype.deftyping; + +import java.util.Arrays; + +import com.fasterxml.jackson.annotation.JsonTypeInfo; + +import com.fasterxml.jackson.databind.*; +import com.fasterxml.jackson.databind.ObjectMapper.DefaultTypeResolverBuilder; +import com.fasterxml.jackson.databind.ObjectMapper.DefaultTyping; +import com.fasterxml.jackson.databind.json.JsonMapper; +import com.fasterxml.jackson.databind.jsontype.TypeResolverBuilder; + +// [databind#2472] +public class DefaultTypeResolver2472Test extends BaseMapTest +{ + public void testLegacyCtor2472() throws Exception + { + @SuppressWarnings({ "deprecation", "serial" }) + TypeResolverBuilder<?> legacyTyper = new DefaultTypeResolverBuilder(DefaultTyping.NON_FINAL) { }; + legacyTyper.init(JsonTypeInfo.Id.CLASS, null); + legacyTyper.inclusion(JsonTypeInfo.As.PROPERTY); + + final ObjectMapper mapper = JsonMapper.builder().build(); + mapper.setDefaultTyping(legacyTyper); + + String json = mapper.writeValueAsString(Arrays.asList("foo")); + assertNotNull(json); + + Object ob = mapper.readValue(json, Object.class); + assertNotNull(ob); + } +} |