diff --git a/treedoc/src/main/java/org/jsonex/treedoc/json/TDJSONParser.java b/treedoc/src/main/java/org/jsonex/treedoc/json/TDJSONParser.java index a8db2b4..105ebc6 100644 --- a/treedoc/src/main/java/org/jsonex/treedoc/json/TDJSONParser.java +++ b/treedoc/src/main/java/org/jsonex/treedoc/json/TDJSONParser.java @@ -37,7 +37,8 @@ public class TDJSONParser { public TDNode parseAll(CharSource src) { return parseAll(src, new TDJSONOption()); } public TDNode parseAll(String str, TDJSONOption opt) { return parseAll(new ArrayCharSource(str), opt); } /** Parse all the JSON objects in the input stream until EOF and store them inside a root node with array type */ - public TDNode parseAll(CharSource src, TDJSONOption opt) { + public TDNode parseAll(CharSource src, TDJSONOption option) { + TDJSONOption opt = option.setDefaultRootType(TDNode.Type.MAP); TreeDoc doc = TreeDoc.ofArray(); int docId = 0; while(src.skipSpacesAndReturnsAndCommas()) diff --git a/treedoc/src/test/java/org/jsonex/treedoc/json/TDJsonParserTest.java b/treedoc/src/test/java/org/jsonex/treedoc/json/TDJsonParserTest.java index a0d08aa..fb1f04d 100644 --- a/treedoc/src/test/java/org/jsonex/treedoc/json/TDJsonParserTest.java +++ b/treedoc/src/test/java/org/jsonex/treedoc/json/TDJsonParserTest.java @@ -252,7 +252,7 @@ private static void parseWithException(String str, String expectedError) { TestCls test = new TestCls("va", new TestCls1(23, new String[]{"a", "b"})); String str = test.toString(); // TDJsonParserTest.TestCls(a=va, c=TDJsonParserTest.TestCls1(d=23, strs=[a, b])) TDJSONOption opt = new TDJSONOption().setDeliminatorObject("(", ")").setDeliminatorKey("="); - testParse(str, opt, "{$type:\"TDJsonParserTest.TestCls\",a:\"va\",c:{$type:\"TDJsonParserTest.TestCls1\",d:23,strs:[\"a\",\"b\"]}}"); + testParse(str, opt, "{$type:'TDJsonParserTest.TestCls',a:'va',c:{$type:'TDJsonParserTest.TestCls1',d:23,strs:['a','b']}}"); } @Test public void testParsePathCompression() {