Skip to content

Add support for nulls in maps #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zsperske wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Add support for nulls in maps #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a8dbd57
Wrote tests for nulls in maps
Nov 1, 2017
2e84e04
Added support for nulls in maps
Nov 1, 2017
571b76b
Added check for JSONObject.NULL
Nov 4, 2017
23673e9
Changed return type of NULL case to JSONObject.NULL
Nov 6, 2017
36d6fea
Moved null code
Nov 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions core/src/main/java/com/workday/autoparse/json/parser/JsonParserUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ public static Object parseNextValue(JsonReader reader, boolean convertJsonTypes)
case NULL:
reader.nextNull();
return null;

default:
throw new IllegalStateException("Unexpected token: " + nextToken);
}
Expand All @@ -130,7 +129,12 @@ public static JSONObject parseAsJsonObject(JsonReader reader, String key) throws
reader.beginObject();
while (reader.hasNext()) {
try {
result.put(reader.nextName(), parseNextValue(reader, false));
String name = reader.nextName();
Object value = parseNextValue(reader, false);
if (value == null) {
value = JSONObject.NULL;
}
result.put(name, value);
} catch (JSONException e) {
throw new RuntimeException("This should be impossible.", e);
}
Expand Down Expand Up @@ -173,11 +177,13 @@ public static <T> void parseAsMap(JsonReader reader, Map<String, T> map, Class<T
reader.endObject();
} else {
Object o = parseNextValue(reader, true);
if (!valueClass.isInstance(o)) {
if (o == null) {
map.put(name, null);
continue;
} else if (!valueClass.isInstance(o)) {
throwMapException(name, key, valueClass, o);
}
value = cast(o);

}
map.put(name, value);
}
Expand Down Expand Up @@ -287,6 +293,9 @@ private static <T> void convertJsonObjectToMap(JSONObject jsonObject,
parserTable);
} else if (valueClass.isInstance(o)) {
result = cast(o);
} else if (o == JSONObject.NULL) {
map.put(name, null);
continue;
}

if (result != null) {
Expand Down Expand Up @@ -633,6 +642,9 @@ private static Object parseSpecificJsonObjectDelayed(JsonReader reader,

// No matching parser has been found yet; save the current name and value to the
// jsonObject.
if (value == null) {
value = JSONObject.NULL;
}
try {
jsonObject.put(name, value);
} catch (JSONException e) {
Expand Down
8 changes: 8 additions & 0 deletions demo/src/main/java/com/workday/autoparse/json/demo/TestObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ public class TestObject extends AbstractTestObject {
@JsonValue("myEmptyCollection")
public Collection<String> myEmptyCollection;

//Nulls
@JsonValue("myNullInt")
public int myNullInt = 1;

Expand All @@ -180,6 +181,13 @@ public class TestObject extends AbstractTestObject {
@JsonValue("myCollectionWithNullValues")
public Collection<String> myCollectionWithNullValues;

@JsonValue("myStringMapWithSingleNullValue")
public Map<String, String> myStringMapWithSingleNullValue;
@JsonValue("myStringMapWithNullValues")
public Map<String, String> myStringMapWithNullValues;
@JsonValue("myObjectMapWithNullValues")
public Map<String, SimpleTestObject> myObjectMapWithNullValues;

// Fields for setters
public String stringFromSetter;
public UnannotatedObject unannotatedObjectFromSetter;
Expand Down
3 changes: 2 additions & 1 deletion demo/src/test/java/com/workday/autoparse/json/demo/InstanceUpdaterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,8 @@ public void testCollectionWithNullValueUpdate() throws Exception {

TestObject$$JsonObjectParser.INSTANCE.updateInstanceFromMap(testObject, updates, CONTEXT);

assertEquals(testObject.myCollectionWithNullValues, CollectionUtils.newArrayList("one", null, "null"));
assertEquals("testObject.myCollectionWithNullValues", testObject.myCollectionWithNullValues,
CollectionUtils.newArrayList("one", null, "null"));
}

@Test(expected = RuntimeException.class)
Expand Down
44 changes: 40 additions & 4 deletions demo/src/test/java/com/workday/autoparse/json/demo/JsonParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,27 @@ public void testPartialDelayParse() throws Exception {
testParse("partially-delayed-object.json");
}

@Test
public void testFullDelayNullMap() throws Exception {
TestObject testObject = (TestObject) parser.parseJsonStream(getInputStream("null-in-maps.json"));

assertNotNull("testObject.myStringMapWithSingleNullValue", testObject.myStringMapWithSingleNullValue);
assertEquals("testObject.myStringMapWithSingleNullValue.size", 1, testObject.myStringMapWithSingleNullValue.size());
assertEquals("testObject.myStringMapWithSingleNullValue[key1]", null, testObject.myStringMapWithSingleNullValue.get("key1"));

assertNotNull("testObject.myStringMapWithNullValues", testObject.myStringMapWithNullValues);
assertEquals("testObject.myStringMapWithNullValues.size", 3, testObject.myStringMapWithNullValues.size());
assertEquals("testObject.myStringMapWithNullValues[key1]", null, testObject.myStringMapWithNullValues.get("key1"));
assertEquals("testObject.myStringMapWithNullValues[key2]", "value2", testObject.myStringMapWithNullValues.get("key2"));
assertEquals("testObject.myStringMapWithNullValues[key3]", "null", testObject.myStringMapWithNullValues.get("key3"));

assertNotNull("testObject.myObjectMapWithNullValues", testObject.myObjectMapWithNullValues);
assertEquals("testObject.myObjectMapWithNullValues.size", 3, testObject.myObjectMapWithNullValues.size());
assertEquals("testObject.myObjectMapWithNullValues[key1]", new SimpleTestObject(null), testObject.myObjectMapWithNullValues.get("key1"));
assertEquals("testObject.myObjectMapWithNullValues[key2]", new SimpleTestObject("post-parse:value2"), testObject.myObjectMapWithNullValues.get("key2"));
assertEquals("testObject.myObjectMapWithNullValues[key3]", new SimpleTestObject("post-parse:null"), testObject.myObjectMapWithNullValues.get("key3"));
}

private void testParse(String fileName) throws Exception {
TestObject testObject = (TestObject) parser.parseJsonStream(getInputStream(fileName));
assertNotNull("testObject", testObject);
Expand Down Expand Up @@ -256,10 +277,25 @@ private void testParse(String fileName) throws Exception {
assertEquals("testObject.myDefaultCollection", Collections.singleton("the one"),
testObject.myDefaultCollection);

Collection<String> expected = new ArrayList<>();
expected.add(null);
assertEquals(expected, testObject.myCollectionWithSingleNullValue);
assertEquals(CollectionUtils.newArrayList(null, "string", null, "null"), testObject.myCollectionWithNullValues);
assertEquals("testObject.myCollectionWithSingleNullValue", CollectionUtils.newArrayList((String) null), testObject.myCollectionWithSingleNullValue);
assertEquals("testObject.myCollectionWithNullValues",
CollectionUtils.newArrayList(null, "string", null, "null"), testObject.myCollectionWithNullValues);

assertNotNull("testObject.myStringMapWithSingleNullValue", testObject.myStringMapWithSingleNullValue);
assertEquals("testObject.myStringMapWithSingleNullValue.size", 1, testObject.myStringMapWithSingleNullValue.size());
assertEquals("testObject.myStringMapWithSingleNullValue[key1]", null, testObject.myStringMapWithSingleNullValue.get("key1"));

assertNotNull("testObject.myStringMapWithNullValues", testObject.myStringMapWithNullValues);
assertEquals("testObject.myStringMapWithNullValues.size", 3, testObject.myStringMapWithNullValues.size());
assertEquals("testObject.myStringMapWithNullValues[key1]", null, testObject.myStringMapWithNullValues.get("key1"));
assertEquals("testObject.myStringMapWithNullValues[key2]", "value2", testObject.myStringMapWithNullValues.get("key2"));
assertEquals("testObject.myStringMapWithNullValues[key3]", "null", testObject.myStringMapWithNullValues.get("key3"));

assertNotNull("testObject.myObjectMapWithNullValues", testObject.myObjectMapWithNullValues);
assertEquals("testObject.myObjectMapWithNullValues.size", 3, testObject.myObjectMapWithNullValues.size());
assertEquals("testObject.myObjectMapWithNullValues[key1]", new SimpleTestObject(null), testObject.myObjectMapWithNullValues.get("key1"));
assertEquals("testObject.myObjectMapWithNullValues[key2]", new SimpleTestObject("post-parse:value2"), testObject.myObjectMapWithNullValues.get("key2"));
assertEquals("testObject.myObjectMapWithNullValues[key3]", new SimpleTestObject("post-parse:null"), testObject.myObjectMapWithNullValues.get("key3"));
}

@Test
Expand Down
19 changes: 19 additions & 0 deletions demo/src/test/resources/com/workday/autoparse/json/demo/delayed-object.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,5 +222,24 @@
"myDefaultCollection": null,
"myCollectionWithSingleNullValue": [null],
"myCollectionWithNullValues": [null, "string", null, "null"],
"myStringMapWithSingleNullValue": {
"key1": null
},
"myStringMapWithNullValues": {
"key1": null,
"key2": "value2",
"key3": "null"
},
"myObjectMapWithNullValues": {
"key1": {
"myString": null
},
"key2": {
"myString": "value2"
},
"key3": {
"myString": "null"
}
},
"object": "testObject"
}
22 changes: 22 additions & 0 deletions demo/src/test/resources/com/workday/autoparse/json/demo/null-in-maps.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"myStringMapWithSingleNullValue": {
"key1": null
},
"myStringMapWithNullValues": {
"key1": null,
"key2": "value2",
"key3": "null"
},
"myObjectMapWithNullValues": {
"key1": {
"myString": null
},
"key2": {
"myString": "value2"
},
"key3": {
"myString": "null"
}
},
"object": "testObject"
}
21 changes: 20 additions & 1 deletion demo/src/test/resources/com/workday/autoparse/json/demo/partially-delayed-object.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,5 +222,24 @@
"myNullCollection": null,
"myDefaultCollection": null,
"myCollectionWithSingleNullValue": [null],
"myCollectionWithNullValues": [null, "string", null, "null"]
"myCollectionWithNullValues": [null, "string", null, "null"],
"myStringMapWithSingleNullValue": {
"key1": null
},
"myStringMapWithNullValues": {
"key1": null,
"key2": "value2",
"key3": "null"
},
"myObjectMapWithNullValues": {
"key1": {
"myString": null
},
"key2": {
"myString": "value2"
},
"key3": {
"myString": "null"
}
}
}
21 changes: 20 additions & 1 deletion demo/src/test/resources/com/workday/autoparse/json/demo/single-object.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,5 +218,24 @@
"myNullCollection": null,
"myDefaultCollection": null,
"myCollectionWithSingleNullValue": [null],
"myCollectionWithNullValues": [null, "string", null, "null"]
"myCollectionWithNullValues": [null, "string", null, "null"],
"myStringMapWithSingleNullValue": {
"key1": null
},
"myStringMapWithNullValues": {
"key1": null,
"key2": "value2",
"key3": "null"
},
"myObjectMapWithNullValues": {
"key1": {
"myString": null
},
"key2": {
"myString": "value2"
},
"key3": {
"myString": "null"
}
}
}