-
-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '2.19' into 4388-try-another
- Loading branch information
Showing
16 changed files
with
353 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
148 changes: 148 additions & 0 deletions
148
src/test/java/com/fasterxml/jackson/databind/deser/merge/CustomCollectionMerge4783Test.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,148 @@ | ||
| package com.fasterxml.jackson.databind.deser.merge; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonMerge; | ||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
| import com.fasterxml.jackson.databind.exc.InvalidDefinitionException; | ||
| import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.junit.jupiter.api.Assertions.assertTrue; | ||
| import static org.junit.jupiter.api.Assertions.fail; | ||
|
|
||
| // [databind#4783] Test to verify that JsonMerge also works for custom list | ||
| @SuppressWarnings("serial") | ||
| public class CustomCollectionMerge4783Test | ||
| extends DatabindTestUtil | ||
| { | ||
| static class MyArrayListJDK<T> extends ArrayList<T> { } | ||
|
|
||
| static class MergeListJDK { | ||
| @JsonMerge | ||
| @JsonProperty | ||
| public List<String> values = new MyArrayListJDK<>(); | ||
| { values.add("a");} | ||
| } | ||
|
|
||
| interface MyListCustom<T> extends List<T> { } | ||
|
|
||
| static class MyArrayListCustom<T> extends ArrayList<T> implements MyListCustom<T> { } | ||
|
|
||
| static abstract class MyAbstractStringList extends ArrayList<String> { | ||
| MyAbstractStringList() { super(); } | ||
| MyAbstractStringList(int i) { super(); } | ||
| } | ||
|
|
||
| static class MergeCustomStringList { | ||
| @JsonMerge | ||
| @JsonProperty | ||
| public MyListCustom<String> values = new MyArrayListCustom<>(); | ||
| { values.add("a"); } | ||
| } | ||
|
|
||
| static class MergeMyCustomLongList { | ||
| @JsonMerge | ||
| @JsonProperty | ||
| public MyListCustom<Long> values = new MyArrayListCustom<>(); | ||
| { values.add(1L); } | ||
| } | ||
|
|
||
| static class MergeMyCustomPojoList { | ||
| @JsonMerge | ||
| @JsonProperty | ||
| public MyListCustom<CustomPojo> values = new MyArrayListCustom<>(); | ||
| { | ||
| values.add(CustomPojo.create("a", 1)); | ||
| values.add(CustomPojo.create("b", 2)); | ||
| } | ||
| } | ||
|
|
||
| // And then non-merging case too | ||
| static class NonMergeCustomStringList { | ||
| public MyListCustom<String> values; | ||
| } | ||
|
|
||
| public static class CustomPojo { | ||
| public String name; | ||
| public int age; | ||
|
|
||
| public static CustomPojo create(String name, int age) { | ||
| CustomPojo pojo = new CustomPojo(); | ||
| pojo.name = name; | ||
| pojo.age = age; | ||
| return pojo; | ||
| } | ||
| } | ||
|
|
||
| private final ObjectMapper MAPPER = newJsonMapper(); | ||
|
|
||
| @Test | ||
| void testJDKMapperReading() throws Exception { | ||
| MergeListJDK result = MAPPER.readValue("{\"values\":[\"x\"]}", MergeListJDK.class); | ||
|
|
||
| assertEquals(2, result.values.size()); | ||
| assertTrue(result.values.contains("x")); | ||
| assertTrue(result.values.contains("a")); | ||
| } | ||
|
|
||
| @Test | ||
| void testCustomMapperReading() throws Exception { | ||
| MergeCustomStringList result = MAPPER.readValue("{\"values\":[\"x\"]}", | ||
| MergeCustomStringList.class); | ||
|
|
||
| assertEquals(2, result.values.size()); | ||
| assertTrue(result.values.contains("x")); | ||
| assertTrue(result.values.contains("a")); | ||
| } | ||
|
|
||
| @Test | ||
| void testCustomMapperReadingLongArrayList() throws Exception { | ||
| MergeMyCustomLongList result = MAPPER.readValue("{\"values\":[7]}", | ||
| MergeMyCustomLongList.class); | ||
|
|
||
| assertEquals(2, result.values.size()); | ||
| assertTrue(result.values.contains(1L)); | ||
| assertTrue(result.values.contains(7L)); | ||
| } | ||
|
|
||
| @Test | ||
| void testCustomMapperReadingPojoArrayList() throws Exception { | ||
| MergeMyCustomPojoList result = MAPPER.readValue("{\"values\":[{\"name\":\"c\",\"age\":3}]}", | ||
| MergeMyCustomPojoList.class); | ||
|
|
||
| assertEquals(3, result.values.size()); | ||
| } | ||
|
|
||
| // // // And then failure cases | ||
|
|
||
| // Fail can't construct Collection interface unless there's maaping | ||
| @Test | ||
| void failNonMergeInterfaceList() throws Exception { | ||
| try { | ||
| MAPPER.readValue("{\"values\":[\"x\"]}", NonMergeCustomStringList.class); | ||
| fail("Should not pass"); | ||
| } catch (InvalidDefinitionException e) { | ||
| verifyException(e, String.format( | ||
| "Cannot construct instance of `%s` (no Creators", | ||
| MyListCustom.class.getName())); | ||
| } | ||
| } | ||
|
|
||
| // Fail can't construct abstract types | ||
| @Test | ||
| void failNonMergeAbstractList() throws Exception { | ||
| try { | ||
| MAPPER.readValue("[]", MyAbstractStringList.class); | ||
| fail("Should not pass"); | ||
| } catch (InvalidDefinitionException e) { | ||
| verifyException(e, String.format( | ||
| "Cannot construct instance of `%s` (no Creators", | ||
| MyAbstractStringList.class.getName())); | ||
| } | ||
| } | ||
| } |
108 changes: 108 additions & 0 deletions
108
...t/java/com/fasterxml/jackson/databind/jsontype/PolymorphicDeductionObjectVsArrayTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| package com.fasterxml.jackson.databind.jsontype; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Arrays; | ||
| import java.util.Collection; | ||
| import java.util.Iterator; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import com.fasterxml.jackson.annotation.*; | ||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
| import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.*; | ||
|
|
||
| public class PolymorphicDeductionObjectVsArrayTest extends DatabindTestUtil { | ||
| @JsonTypeInfo(use = JsonTypeInfo.Id.DEDUCTION, defaultImpl = DataArray.class) | ||
| @JsonSubTypes({@JsonSubTypes.Type(DataObject.class), @JsonSubTypes.Type(DataArray.class)}) | ||
| interface Data { | ||
| @JsonIgnore | ||
| boolean isObject(); | ||
| } | ||
|
|
||
| static class DataItem { | ||
| final String id; | ||
|
|
||
| @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) | ||
| DataItem(@JsonProperty("id") String id) { | ||
| this.id = id; | ||
| } | ||
|
|
||
| public String getId() { | ||
| return id; | ||
| } | ||
| } | ||
|
|
||
| static class DataObject extends DataItem implements Data { | ||
|
|
||
| @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) | ||
| DataObject(@JsonProperty("id") String id) { | ||
| super(id); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isObject() { | ||
| return true; | ||
| } | ||
| } | ||
|
|
||
| static class DataArray extends ArrayList<DataItem> implements Data { | ||
| private static final long serialVersionUID = 1L; | ||
|
|
||
| @JsonCreator | ||
| DataArray(Collection<DataItem> items) { | ||
| super(new ArrayList<>(items)); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isObject() { | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| static class Container { | ||
| @JsonProperty("data") | ||
| Data data; | ||
| } | ||
|
|
||
| private final ObjectMapper MAPPER = newJsonMapper(); | ||
|
|
||
| private static final String containerWithObjectData = a2q("{'data':{'id':'#1'}}"); | ||
|
|
||
| private static final String containerWithArrayData = a2q("{'data':[{'id':'#1'}]}"); | ||
|
|
||
| @Test | ||
| public void testDeserialization() throws Exception { | ||
| Container container = MAPPER.readValue(containerWithObjectData, Container.class); | ||
|
|
||
| assertInstanceOf(DataObject.class, container.data); | ||
| assertSame(container.data.getClass(), DataObject.class); | ||
| assertTrue(container.data.isObject()); | ||
| assertEquals("#1", ((DataItem) container.data).id); | ||
|
|
||
| container = MAPPER.readValue(containerWithArrayData, Container.class); | ||
| assertInstanceOf(DataArray.class, container.data); | ||
| assertEquals(container.data.getClass(), DataArray.class); | ||
| assertFalse(container.data.isObject()); | ||
|
|
||
| @SuppressWarnings("unchecked") | ||
| Iterator<DataItem> arrayDataIterator = ((Iterable<DataItem>) container.data).iterator(); | ||
|
|
||
| assertTrue(arrayDataIterator.hasNext()); | ||
| assertEquals("#1", arrayDataIterator.next().id); | ||
| } | ||
|
|
||
| @Test | ||
| public void testSerialization() throws Exception { | ||
| Container container = new Container(); | ||
| container.data = new DataObject("#1"); | ||
| String json = MAPPER.writeValueAsString(container); | ||
| assertEquals(containerWithObjectData, json); | ||
|
|
||
| container = new Container(); | ||
| container.data = new DataArray(Arrays.asList(new DataItem("#1"))); | ||
| json = MAPPER.writeValueAsString(container); | ||
| assertEquals(containerWithArrayData, json); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.