-
Notifications
You must be signed in to change notification settings - Fork 106
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improved Kotlin support (fix JsonObject detection by probing into Companion field). Improved collection support (more collections work without runtime - JsonObject and known converters). TODO: further improve collection support (known objects can be lazily initialized in the same way).
- Loading branch information
Showing
11 changed files
with
333 additions
and
38 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
161 changes: 161 additions & 0 deletions
161
java8/src/test/java/com/dslplatform/json/JsonObjectTest.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,161 @@ | ||
| package com.dslplatform.json; | ||
|
|
||
| import com.dslplatform.json.runtime.Settings; | ||
| import org.junit.Assert; | ||
| import org.junit.Test; | ||
|
|
||
| import java.io.ByteArrayOutputStream; | ||
| import java.io.IOException; | ||
| import java.util.Arrays; | ||
| import java.util.LinkedHashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| public class JsonObjectTest { | ||
|
|
||
| public static class ObjectModel { | ||
| public JsonObjectReference jsonObject; | ||
| } | ||
|
|
||
| public static class ImmutableObjectModel { | ||
| public final JsonObjectReference jsonObject; | ||
| public final JsonObjectReference jsonObjectNonNull; | ||
| public ImmutableObjectModel(JsonObjectReference jsonObject, JsonObjectReference jsonObjectNonNull) { | ||
| this.jsonObject = jsonObject; | ||
| this.jsonObjectNonNull = jsonObjectNonNull; | ||
| } | ||
| } | ||
|
|
||
| public static class ListModel { | ||
| public List<JsonObjectReference> jsonObjects; | ||
| } | ||
|
|
||
| public static class CombinedModel { | ||
| public JsonObjectReference jsonObject; | ||
| public List<JsonObjectReference> jsonObjects; | ||
| public Map<Integer, JsonObjectReference> mapObjects; | ||
| } | ||
|
|
||
| public static class JsonObjectReference implements JsonObject { | ||
| private final String x; | ||
| public JsonObjectReference(String x) { | ||
| this.x = x; | ||
| } | ||
| public void serialize(JsonWriter writer, boolean minimal) { | ||
| writer.writeAscii("{\"x\":"); | ||
| writer.writeString(x); | ||
| writer.writeAscii("}"); | ||
| } | ||
|
|
||
| public static final JsonReader.ReadJsonObject<JsonObjectReference> JSON_READER = reader -> { | ||
| reader.fillName(); | ||
| reader.getNextToken(); | ||
| String x1 = reader.readString(); | ||
| reader.getNextToken(); | ||
| return new JsonObjectReference(x1); | ||
| }; | ||
|
|
||
| @Override | ||
| public boolean equals(Object obj) { | ||
| return ((JsonObjectReference)obj).x.equals(this.x); | ||
| } | ||
| } | ||
|
|
||
| public static class KotlinObjectModel { | ||
| public final JsonObjectReferenceKotlin jsonObject; | ||
| public KotlinObjectModel(JsonObjectReferenceKotlin jsonObject) { | ||
| this.jsonObject = jsonObject; | ||
| } | ||
| } | ||
|
|
||
| public static class JsonObjectReferenceKotlin implements JsonObject { | ||
| private final String x; | ||
| public JsonObjectReferenceKotlin(String x) { | ||
| this.x = x; | ||
| } | ||
| public void serialize(JsonWriter writer, boolean minimal) { | ||
| writer.writeAscii("{\"x\":"); | ||
| writer.writeString(x); | ||
| writer.writeAscii("}"); | ||
| } | ||
|
|
||
| public static final Companion Companion = new Companion(); | ||
| public static class Companion { | ||
| public JsonReader.ReadJsonObject<JsonObjectReferenceKotlin> getJSON_READER() { | ||
| return reader -> { | ||
| reader.fillName(); | ||
| reader.getNextToken(); | ||
| String x1 = reader.readString(); | ||
| reader.getNextToken(); | ||
| return new JsonObjectReferenceKotlin(x1); | ||
| }; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object obj) { | ||
| return ((JsonObjectReferenceKotlin)obj).x.equals(this.x); | ||
| } | ||
| } | ||
|
|
||
| private final DslJson<Object> dslJson = new DslJson<>(Settings.basicSetup()); | ||
|
|
||
| @Test | ||
| public void simpleTest() throws IOException { | ||
| ObjectModel m = new ObjectModel(); | ||
| m.jsonObject = new JsonObjectReference("test"); | ||
| ByteArrayOutputStream os = new ByteArrayOutputStream(); | ||
| dslJson.serialize(m, os); | ||
| Assert.assertEquals("{\"jsonObject\":{\"x\":\"test\"}}", os.toString()); | ||
| ObjectModel res = dslJson.deserialize(ObjectModel.class, os.toByteArray(), os.size()); | ||
| Assert.assertEquals(m.jsonObject, res.jsonObject); | ||
| } | ||
|
|
||
| @Test | ||
| public void immutableTest() throws IOException { | ||
| ImmutableObjectModel m = new ImmutableObjectModel( | ||
| null, | ||
| new JsonObjectReference("test2")); | ||
| ByteArrayOutputStream os = new ByteArrayOutputStream(); | ||
| dslJson.serialize(m, os); | ||
| Assert.assertEquals("{\"jsonObject\":null,\"jsonObjectNonNull\":{\"x\":\"test2\"}}", os.toString()); | ||
| ImmutableObjectModel res = dslJson.deserialize(ImmutableObjectModel.class, os.toByteArray(), os.size()); | ||
| Assert.assertNull(res.jsonObject); | ||
| Assert.assertEquals(m.jsonObjectNonNull, res.jsonObjectNonNull); | ||
| } | ||
|
|
||
| @Test | ||
| public void collectionTest() throws IOException { | ||
| ListModel m = new ListModel(); | ||
| m.jsonObjects = Arrays.asList(new JsonObjectReference("test"), null, new JsonObjectReference("xxx")); | ||
| ByteArrayOutputStream os = new ByteArrayOutputStream(); | ||
| dslJson.serialize(m, os); | ||
| Assert.assertEquals("{\"jsonObjects\":[{\"x\":\"test\"},null,{\"x\":\"xxx\"}]}", os.toString()); | ||
| ListModel res = dslJson.deserialize(ListModel.class, os.toByteArray(), os.size()); | ||
| Assert.assertEquals(m.jsonObjects, res.jsonObjects); | ||
| } | ||
|
|
||
| @Test | ||
| public void complexTest() throws IOException { | ||
| CombinedModel m = new CombinedModel(); | ||
| m.jsonObject = new JsonObjectReference("test"); | ||
| m.jsonObjects = Arrays.asList(new JsonObjectReference("abc"), null, new JsonObjectReference("xxx")); | ||
| m.mapObjects = new LinkedHashMap<Integer, JsonObjectReference>() {{ put(1, null); put(2, new JsonObjectReference("xXx")); }}; | ||
| ByteArrayOutputStream os = new ByteArrayOutputStream(); | ||
| dslJson.serialize(m, os); | ||
| CombinedModel res = dslJson.deserialize(CombinedModel.class, os.toByteArray(), os.size()); | ||
| Assert.assertEquals(m.jsonObject, res.jsonObject); | ||
| Assert.assertEquals(m.jsonObjects, res.jsonObjects); | ||
| Assert.assertEquals(m.mapObjects, res.mapObjects); | ||
| } | ||
|
|
||
| @Test | ||
| public void kotlinTest() throws IOException { | ||
| KotlinObjectModel m = new KotlinObjectModel(new JsonObjectReferenceKotlin("test")); | ||
| ByteArrayOutputStream os = new ByteArrayOutputStream(); | ||
| dslJson.serialize(m, os); | ||
| Assert.assertEquals("{\"jsonObject\":{\"x\":\"test\"}}", os.toString()); | ||
| KotlinObjectModel res = dslJson.deserialize(KotlinObjectModel.class, os.toByteArray(), os.size()); | ||
| Assert.assertEquals(m.jsonObject, res.jsonObject); | ||
| } | ||
| } |
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.