ziver/zutil
1
0
Fork 0
Code Issues Pull requests Activity Actions

Small update to JSONParser

Browse source
This commit is contained in:
Ziver Koc 2015-10-28 17:23:27 +01:00
parent aea3b9467e
commit 2130877265
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/zutil/parser/json/JSONParser.java
View file

@ -103,7 +103,7 @@ public class JSONParser extends Parser {
case ']':
case '}':
case (char)-1:
end.i = 1;
end.i = END_WITH_NULL;
return null;
// Parse Map
case '{':
@ -114,7 +114,7 @@ public class JSONParser extends Parser {
if(end.i != END_WITH_NULL)
root.set( key.toString(), node );
}
end.i = 0;
end.i = CONTINUE;
break;
// Parse List
case '[':
@ -124,7 +124,7 @@ public class JSONParser extends Parser {
if(end.i != END_WITH_NULL)
root.add( node );
}
end.i = 0;
end.i = CONTINUE;
break;
// Parse String
// TODO: Support double backslash escaping

9
test/zutil/test/JSONParserTest.java
View file

@ -138,6 +138,15 @@ public class JSONParserTest {
assertEquals( "3", data.getString("3"));
}
@Test
public void emptyStringInMap(){
DataNode data = JSONParser.read("{1:{2:\"\"}}");
assertEquals(DataType.Map, data.getType());
assertEquals(1, data.size());
assertEquals( "", data.get("1").getString("2"));
}
@Test
public void complexMap() {
String json = "{" +