From 12e84b5c7eb80c85fbeb01d57eec00b7c7b5362d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E9=93=81?= Date: Wed, 6 Apr 2016 19:22:23 +0800 Subject: [PATCH] removed deprecated api DefaultExtJSONParser --- .../fastjson/parser/DefaultExtJSONParser.java | 42 -------------- .../json/bvt/parser/DateParserTest_sql.java | 12 ++-- .../parser/DateParserTest_sql_timestamp.java | 12 ++-- .../bvt/parser/DefaultExtJSONParserTest.java | 44 +++++++------- .../parser/DefaultExtJSONParserTest_0.java | 20 +++---- .../parser/DefaultExtJSONParserTest_1.java | 8 +-- .../parser/DefaultExtJSONParserTest_2.java | 26 ++++----- .../parser/DefaultExtJSONParserTest_3.java | 18 +++--- .../parser/DefaultExtJSONParserTest_4.java | 8 +-- .../parser/DefaultExtJSONParserTest_5.java | 6 +- .../parser/DefaultExtJSONParserTest_6.java | 6 +- .../parser/DefaultExtJSONParserTest_7.java | 10 ++-- .../DefaultExtJSONParser_parseArray.java | 58 +++++++++---------- .../DefaultExtJSONParser_parseArray_2.java | 20 +++---- .../json/bvt/parser/EnumParserTest.java | 16 ++--- .../ArrayListStringDeserializerTest.java | 4 +- .../deser/BigDecimalDeserializerTest.java | 4 +- .../deser/DefaultObjectDeserializerTest2.java | 4 +- .../deser/DefaultObjectDeserializerTest4.java | 4 +- .../parser/deser/FieldDeserializerTest2.java | 8 +-- .../parser/deser/FieldDeserializerTest3.java | 6 +- .../parser/deser/FloatDeserializerTest.java | 4 +- .../deser/InetAddressDeserializerTest.java | 8 +-- .../parser/deser/IntegerDeserializerTest.java | 4 +- .../json/bvt/parser/deser/LocaleTest.java | 4 +- .../parser/deser/LongDeserializerTest.java | 4 +- .../parser/deser/PatternDeserializerTest.java | 4 +- .../parser/deser/SqlDateDeserializerTest.java | 4 +- .../json/bvt/parser/deser/TestNull.java | 10 ++-- .../deser/TimeZoneDeserializerTest.java | 4 +- .../bvt/parser/deser/URIDeserializerTest.java | 4 +- .../bvt/parser/deser/URLDeserializerTest.java | 4 +- .../parser/deser/UUIDDeserializerTest.java | 4 +- .../BooleanFieldSerializerTest.java | 4 +- .../BooleanFieldSerializerTest_primitive.java | 4 +- .../test/codec/FastjsonBeanToArrayCodec.java | 6 +- .../json/test/codec/FastjsonCodec.java | 6 +- .../json/test/codec/FastjsonSCodec.java | 6 +- 38 files changed, 189 insertions(+), 231 deletions(-) delete mode 100755 src/main/java/com/alibaba/fastjson/parser/DefaultExtJSONParser.java diff --git a/src/main/java/com/alibaba/fastjson/parser/DefaultExtJSONParser.java b/src/main/java/com/alibaba/fastjson/parser/DefaultExtJSONParser.java deleted file mode 100755 index 0fe28d94d..000000000 --- a/src/main/java/com/alibaba/fastjson/parser/DefaultExtJSONParser.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 1999-2101 Alibaba Group. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.alibaba.fastjson.parser; - - -/** - * @author wenshao[szujobs@hotmail.com] - */ -@Deprecated -public class DefaultExtJSONParser extends DefaultJSONParser { - - public DefaultExtJSONParser(String input){ - this(input, ParserConfig.getGlobalInstance()); - } - - public DefaultExtJSONParser(String input, ParserConfig mapping){ - super(input, mapping); - } - - public DefaultExtJSONParser(String input, ParserConfig mapping, int features){ - super(input, mapping, features); - } - - public DefaultExtJSONParser(char[] input, int length, ParserConfig mapping, int features){ - super(input, length, mapping, features); - } - - -} diff --git a/src/test/java/com/alibaba/json/bvt/parser/DateParserTest_sql.java b/src/test/java/com/alibaba/json/bvt/parser/DateParserTest_sql.java index b23e8f8ec..f61d2728d 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/DateParserTest_sql.java +++ b/src/test/java/com/alibaba/json/bvt/parser/DateParserTest_sql.java @@ -5,7 +5,7 @@ import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.parser.DefaultExtJSONParser; +import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.Feature; import com.alibaba.fastjson.parser.ParserConfig; @@ -13,7 +13,7 @@ import com.alibaba.fastjson.parser.ParserConfig; public class DateParserTest_sql extends TestCase { public void f_test_date_0() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("1294552193254"); + DefaultJSONParser parser = new DefaultJSONParser("1294552193254"); java.sql.Date date = parser.parseObject(java.sql.Date.class); @@ -25,7 +25,7 @@ public class DateParserTest_sql extends TestCase { public void test_date_1() throws Exception { int features = JSON.DEFAULT_PARSER_FEATURE; features = Feature.config(features, Feature.AllowISO8601DateFormat, true); - DefaultExtJSONParser parser = new DefaultExtJSONParser("\"2011-01-09T13:49:53.254\"", ParserConfig.getGlobalInstance(), features); + DefaultJSONParser parser = new DefaultJSONParser("\"2011-01-09T13:49:53.254\"", ParserConfig.getGlobalInstance(), features); java.sql.Date date = parser.parseObject(java.sql.Date.class); @@ -35,7 +35,7 @@ public class DateParserTest_sql extends TestCase { public void test_date_2() throws Exception { int features = JSON.DEFAULT_PARSER_FEATURE; - DefaultExtJSONParser parser = new DefaultExtJSONParser("new Date(1294552193254)", ParserConfig.getGlobalInstance(), features); + DefaultJSONParser parser = new DefaultJSONParser("new Date(1294552193254)", ParserConfig.getGlobalInstance(), features); java.sql.Date date = parser.parseObject(java.sql.Date.class); @@ -46,7 +46,7 @@ public class DateParserTest_sql extends TestCase { public void test_date_3() throws Exception { int features = JSON.DEFAULT_PARSER_FEATURE; features = Feature.config(features, Feature.AllowISO8601DateFormat, true); - DefaultExtJSONParser parser = new DefaultExtJSONParser("\"2011-01-09T13:49:53\"", ParserConfig.getGlobalInstance(), features); + DefaultJSONParser parser = new DefaultJSONParser("\"2011-01-09T13:49:53\"", ParserConfig.getGlobalInstance(), features); java.sql.Date date = parser.parseObject(java.sql.Date.class); @@ -57,7 +57,7 @@ public class DateParserTest_sql extends TestCase { public void test_date_4() throws Exception { int features = JSON.DEFAULT_PARSER_FEATURE; features = Feature.config(features, Feature.AllowISO8601DateFormat, true); - DefaultExtJSONParser parser = new DefaultExtJSONParser("\"2011-01-09\"", ParserConfig.getGlobalInstance(), features); + DefaultJSONParser parser = new DefaultJSONParser("\"2011-01-09\"", ParserConfig.getGlobalInstance(), features); java.sql.Date date = parser.parseObject(java.sql.Date.class); diff --git a/src/test/java/com/alibaba/json/bvt/parser/DateParserTest_sql_timestamp.java b/src/test/java/com/alibaba/json/bvt/parser/DateParserTest_sql_timestamp.java index 9a46f5595..89f153ae7 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/DateParserTest_sql_timestamp.java +++ b/src/test/java/com/alibaba/json/bvt/parser/DateParserTest_sql_timestamp.java @@ -5,7 +5,7 @@ import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.parser.DefaultExtJSONParser; +import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.Feature; import com.alibaba.fastjson.parser.ParserConfig; @@ -13,7 +13,7 @@ import com.alibaba.fastjson.parser.ParserConfig; public class DateParserTest_sql_timestamp extends TestCase { public void f_test_date_0() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("1294552193254"); + DefaultJSONParser parser = new DefaultJSONParser("1294552193254"); java.sql.Timestamp date = parser.parseObject(java.sql.Timestamp.class); @@ -24,7 +24,7 @@ public class DateParserTest_sql_timestamp extends TestCase { public void test_date_1() throws Exception { int features = JSON.DEFAULT_PARSER_FEATURE; features = Feature.config(features, Feature.AllowISO8601DateFormat, true); - DefaultExtJSONParser parser = new DefaultExtJSONParser("\"2011-01-09T13:49:53.254\"", ParserConfig.getGlobalInstance(), features); + DefaultJSONParser parser = new DefaultJSONParser("\"2011-01-09T13:49:53.254\"", ParserConfig.getGlobalInstance(), features); java.sql.Timestamp date = parser.parseObject(java.sql.Timestamp.class); @@ -34,7 +34,7 @@ public class DateParserTest_sql_timestamp extends TestCase { public void test_date_2() throws Exception { int features = JSON.DEFAULT_PARSER_FEATURE; - DefaultExtJSONParser parser = new DefaultExtJSONParser("new Date(1294552193254)", ParserConfig.getGlobalInstance(), features); + DefaultJSONParser parser = new DefaultJSONParser("new Date(1294552193254)", ParserConfig.getGlobalInstance(), features); java.sql.Timestamp date = parser.parseObject(java.sql.Timestamp.class); @@ -45,7 +45,7 @@ public class DateParserTest_sql_timestamp extends TestCase { public void test_date_3() throws Exception { int features = JSON.DEFAULT_PARSER_FEATURE; features = Feature.config(features, Feature.AllowISO8601DateFormat, true); - DefaultExtJSONParser parser = new DefaultExtJSONParser("\"2011-01-09T13:49:53\"", ParserConfig.getGlobalInstance(), features); + DefaultJSONParser parser = new DefaultJSONParser("\"2011-01-09T13:49:53\"", ParserConfig.getGlobalInstance(), features); java.sql.Timestamp date = parser.parseObject(java.sql.Timestamp.class); @@ -56,7 +56,7 @@ public class DateParserTest_sql_timestamp extends TestCase { public void test_date_4() throws Exception { int features = JSON.DEFAULT_PARSER_FEATURE; features = Feature.config(features, Feature.AllowISO8601DateFormat, true); - DefaultExtJSONParser parser = new DefaultExtJSONParser("\"2011-01-09\"", ParserConfig.getGlobalInstance(), features); + DefaultJSONParser parser = new DefaultJSONParser("\"2011-01-09\"", ParserConfig.getGlobalInstance(), features); java.sql.Timestamp date = parser.parseObject(java.sql.Timestamp.class); diff --git a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest.java b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest.java index d694ca7bd..78a177448 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest.java @@ -40,18 +40,18 @@ import java.util.Map; import org.junit.Assert; -import junit.framework.TestCase; - import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.parser.DefaultExtJSONParser; +import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.Feature; import com.alibaba.fastjson.parser.ParserConfig; import com.alibaba.fastjson.util.TypeUtils; +import junit.framework.TestCase; + public class DefaultExtJSONParserTest extends TestCase { public void test_parseObject() { - new DefaultExtJSONParser("".toCharArray(), 0, ParserConfig.getGlobalInstance(), 0).close(); + new DefaultJSONParser("".toCharArray(), 0, ParserConfig.getGlobalInstance(), 0).close(); User user = new User(); user.setName("校长"); user.setAge(3); @@ -63,7 +63,7 @@ public class DefaultExtJSONParserTest extends TestCase { JSON.parseObject(jsonString); - DefaultExtJSONParser parser = new DefaultExtJSONParser(jsonString); + DefaultJSONParser parser = new DefaultJSONParser(jsonString); User user1 = new User(); parser.parseObject(user1); @@ -80,7 +80,7 @@ public class DefaultExtJSONParserTest extends TestCase { public void testCast() throws Exception { new TypeUtils(); - DefaultExtJSONParser parser = new DefaultExtJSONParser(""); + DefaultJSONParser parser = new DefaultJSONParser(""); Assert.assertNull(castToByte(null)); Assert.assertNull(castToShort(null)); @@ -134,7 +134,7 @@ public class DefaultExtJSONParserTest extends TestCase { } public void test_casterror2() { - DefaultExtJSONParser parser = new DefaultExtJSONParser(""); + DefaultJSONParser parser = new DefaultJSONParser(""); { Exception error = null; try { @@ -228,7 +228,7 @@ public class DefaultExtJSONParserTest extends TestCase { } public void test_casterror() { - DefaultExtJSONParser parser = new DefaultExtJSONParser(""); + DefaultJSONParser parser = new DefaultJSONParser(""); { Exception error = null; @@ -330,19 +330,19 @@ public class DefaultExtJSONParserTest extends TestCase { Type[] types = method.getGenericParameterTypes(); { String text = "[{\"old\":false,\"name\":\"校长\",\"age\":3,\"salary\":123456789.0123}]"; - DefaultExtJSONParser parser = new DefaultExtJSONParser(text); + DefaultJSONParser parser = new DefaultJSONParser(text); Assert.assertEquals(true, ((List) parser.parseArrayWithType(types[0])).get(0) instanceof Map); } { String text = "[{\"old\":false,\"name\":\"校长\",\"age\":3,\"salary\":123456789.0123}]"; - DefaultExtJSONParser parser = new DefaultExtJSONParser(text); + DefaultJSONParser parser = new DefaultJSONParser(text); Assert.assertEquals(true, ((List) parser.parseArrayWithType(types[1])).get(0) instanceof User); } { Exception error = null; try { String text = "[{\"old\":false,\"name\":\"校长\",\"age\":3,\"salary\":123456789.0123}]"; - DefaultExtJSONParser parser = new DefaultExtJSONParser(text); + DefaultJSONParser parser = new DefaultJSONParser(text); parser.parseArrayWithType(types[2]); ; } catch (Exception ex) { @@ -352,14 +352,14 @@ public class DefaultExtJSONParserTest extends TestCase { } { String text = "[{\"old\":false,\"name\":\"校长\",\"age\":3,\"salary\":123456789.0123}]"; - DefaultExtJSONParser parser = new DefaultExtJSONParser(text); + DefaultJSONParser parser = new DefaultJSONParser(text); Assert.assertEquals(true, ((List) parser.parseArrayWithType(types[3])).get(0) instanceof User); } { Exception error = null; try { String text = "[{\"old\":false,\"name\":\"校长\",\"age\":3,\"salary\":123456789.0123}]"; - DefaultExtJSONParser parser = new DefaultExtJSONParser(text); + DefaultJSONParser parser = new DefaultJSONParser(text); parser.parseArrayWithType(types[4]); ; } catch (Exception ex) { @@ -369,7 +369,7 @@ public class DefaultExtJSONParserTest extends TestCase { } { String text = "[{\"old\":false,\"name\":\"校长\",\"age\":3,\"salary\":123456789.0123}]"; - DefaultExtJSONParser parser = new DefaultExtJSONParser(text); + DefaultJSONParser parser = new DefaultJSONParser(text); Assert.assertEquals(true, ((List) parser.parseArrayWithType(types[5])).get(0) instanceof User); } @@ -377,7 +377,7 @@ public class DefaultExtJSONParserTest extends TestCase { Exception error = null; try { String text = "[{\"old\":false,\"name\":\"校长\",\"age\":3,\"salary\":123456789.0123}]"; - DefaultExtJSONParser parser = new DefaultExtJSONParser(text); + DefaultJSONParser parser = new DefaultJSONParser(text); parser.parseArrayWithType(types[6]); ; } catch (Exception ex) { @@ -395,7 +395,7 @@ public class DefaultExtJSONParserTest extends TestCase { Exception error = null; try { String text = "[{\"old\":false,\"name\":\"校长\",\"age\":3,\"salary\":123456789.0123}]"; - DefaultExtJSONParser parser = new DefaultExtJSONParser(text); + DefaultJSONParser parser = new DefaultJSONParser(text); parser.parseArrayWithType(types[6]); ; } catch (Exception ex) { @@ -412,7 +412,7 @@ public class DefaultExtJSONParserTest extends TestCase { public void test_not_match() throws Exception { String text = "[{\"old\":false,\"name\":\"校长\",\"age\":3,\"salary\":123456789.0123, \"kxxx\":33}]"; - DefaultExtJSONParser parser = new DefaultExtJSONParser(text); + DefaultJSONParser parser = new DefaultJSONParser(text); Assert.assertEquals(true, (parser.parseArray(User.class).get(0) instanceof User)); } @@ -420,7 +420,7 @@ public class DefaultExtJSONParserTest extends TestCase { Exception error = null; try { String text = "[{\"old\":false,\"name\":\"校长\",\"age\":3,\"salary\":123456789.0123, \"kxxx\":33}]"; - DefaultExtJSONParser parser = new DefaultExtJSONParser(text); + DefaultJSONParser parser = new DefaultJSONParser(text); parser.config(Feature.IgnoreNotMatch, false); Assert.assertEquals(true, (parser.parseArray(User.class).get(0) instanceof User)); } catch (Exception ex) { @@ -434,7 +434,7 @@ public class DefaultExtJSONParserTest extends TestCase { Exception error = null; try { String text = "[{\"old\":false,\"name\":\"校长\",\"age\":3,\"salary\":123456789.0123]"; - DefaultExtJSONParser parser = new DefaultExtJSONParser(text); + DefaultJSONParser parser = new DefaultJSONParser(text); parser.parseArray(User.class); } catch (Exception ex) { error = ex; @@ -445,7 +445,7 @@ public class DefaultExtJSONParserTest extends TestCase { Exception error = null; try { String text = "{\"reader\":3}"; - DefaultExtJSONParser parser = new DefaultExtJSONParser(text); + DefaultJSONParser parser = new DefaultJSONParser(text); parser.parseObject(ErrorObject.class); } catch (Exception ex) { error = ex; @@ -456,7 +456,7 @@ public class DefaultExtJSONParserTest extends TestCase { Exception error = null; try { String text = "{\"name\":3}"; - DefaultExtJSONParser parser = new DefaultExtJSONParser(text); + DefaultJSONParser parser = new DefaultJSONParser(text); parser.parseObject(ErrorObject2.class); } catch (Exception ex) { error = ex; @@ -497,7 +497,7 @@ public class DefaultExtJSONParserTest extends TestCase { Exception error = null; try { String text = "{}"; - DefaultExtJSONParser parser = new DefaultExtJSONParser(text); + DefaultJSONParser parser = new DefaultJSONParser(text); parser.parseArray(User.class); } catch (Exception ex) { error = ex; diff --git a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_0.java b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_0.java index 0cce85599..9b17ce0d3 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_0.java +++ b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_0.java @@ -7,7 +7,7 @@ import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONException; -import com.alibaba.fastjson.parser.DefaultExtJSONParser; +import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.Feature; public class DefaultExtJSONParserTest_0 extends TestCase { @@ -16,31 +16,31 @@ public class DefaultExtJSONParserTest_0 extends TestCase { } public void test_0() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("123"); + DefaultJSONParser parser = new DefaultJSONParser("123"); Assert.assertEquals(new Integer(123), (Integer) parser.parse()); parser.config(Feature.IgnoreNotMatch, false); } public void test_1() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("[]"); + DefaultJSONParser parser = new DefaultJSONParser("[]"); parser.parseArray(Class.class); } public void test_2() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("{}"); + DefaultJSONParser parser = new DefaultJSONParser("{}"); parser.parseObject(Object.class); } public void test_3() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("{}"); + DefaultJSONParser parser = new DefaultJSONParser("{}"); parser.parseObject(User.class); } public void test_error_0() throws Exception { JSONException error = null; try { - DefaultExtJSONParser parser = new DefaultExtJSONParser("123"); + DefaultJSONParser parser = new DefaultJSONParser("123"); parser.parseObject(Class.class); } catch (JSONException e) { error = e; @@ -51,7 +51,7 @@ public class DefaultExtJSONParserTest_0 extends TestCase { public void test_error_1() throws Exception { JSONException error = null; try { - DefaultExtJSONParser parser = new DefaultExtJSONParser("[{}]"); + DefaultJSONParser parser = new DefaultJSONParser("[{}]"); parser.parseArray(Class.class); } catch (JSONException e) { error = e; @@ -62,7 +62,7 @@ public class DefaultExtJSONParserTest_0 extends TestCase { public void test_error_2() throws Exception { JSONException error = null; try { - DefaultExtJSONParser parser = new DefaultExtJSONParser( + DefaultJSONParser parser = new DefaultJSONParser( "{\"errorValue\":33}"); parser.parseArray(User.class); } catch (JSONException e) { @@ -74,7 +74,7 @@ public class DefaultExtJSONParserTest_0 extends TestCase { public void test_error_3() throws Exception { JSONException error = null; try { - DefaultExtJSONParser parser = new DefaultExtJSONParser( + DefaultJSONParser parser = new DefaultJSONParser( "{\"age\"33}"); parser.parseArray(User.class); } catch (JSONException e) { @@ -86,7 +86,7 @@ public class DefaultExtJSONParserTest_0 extends TestCase { public void test_error_4() throws Exception { JSONException error = null; try { - DefaultExtJSONParser parser = new DefaultExtJSONParser( + DefaultJSONParser parser = new DefaultJSONParser( "[\"age\":33}"); parser.parseObject(new User()); } catch (JSONException e) { diff --git a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_1.java b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_1.java index 964b5456e..2ec732ade 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_1.java +++ b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_1.java @@ -7,19 +7,19 @@ import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.parser.DefaultExtJSONParser; +import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.json.test.entity.TestEntity; public class DefaultExtJSONParserTest_1 extends TestCase { public void test_0() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("{\"f1\":true}"); + DefaultJSONParser parser = new DefaultJSONParser("{\"f1\":true}"); TestEntity entity = parser.parseObject(TestEntity.class); Assert.assertEquals(true, entity.isF1()); } public void test_1() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("{\"f2\":true}"); + DefaultJSONParser parser = new DefaultJSONParser("{\"f2\":true}"); TestEntity entity = parser.parseObject(TestEntity.class); Assert.assertEquals(Boolean.TRUE, entity.getF2()); } @@ -50,7 +50,7 @@ public class DefaultExtJSONParserTest_1 extends TestCase { TestEntity b = new TestEntity(); { - DefaultExtJSONParser parser = new DefaultExtJSONParser(text); + DefaultJSONParser parser = new DefaultJSONParser(text); parser.parseObject(b); } diff --git a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_2.java b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_2.java index 22eaed0c9..b1f13a01d 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_2.java +++ b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_2.java @@ -8,42 +8,42 @@ import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONException; -import com.alibaba.fastjson.parser.DefaultExtJSONParser; +import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.Feature; import com.alibaba.json.bvt.parser.DefaultExtJSONParserTest.User; public class DefaultExtJSONParserTest_2 extends TestCase { public void test_0() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("{'a':3}"); + DefaultJSONParser parser = new DefaultJSONParser("{'a':3}"); parser.config(Feature.AllowSingleQuotes, true); A a = parser.parseObject(A.class); Assert.assertEquals(3, a.getA()); } public void test_1() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("{a:3}"); + DefaultJSONParser parser = new DefaultJSONParser("{a:3}"); parser.config(Feature.AllowUnQuotedFieldNames, true); A a = parser.parseObject(A.class); Assert.assertEquals(3, a.getA()); } public void test_2() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("{a:3}"); + DefaultJSONParser parser = new DefaultJSONParser("{a:3}"); parser.config(Feature.AllowUnQuotedFieldNames, true); Map a = parser.parseObject(Map.class); Assert.assertEquals(3, a.get("a")); } public void test_3() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("{a:3}"); + DefaultJSONParser parser = new DefaultJSONParser("{a:3}"); parser.config(Feature.AllowUnQuotedFieldNames, true); HashMap a = parser.parseObject(HashMap.class); Assert.assertEquals(3, a.get("a")); } public void test_4() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("{a:3}"); + DefaultJSONParser parser = new DefaultJSONParser("{a:3}"); parser.config(Feature.AllowUnQuotedFieldNames, true); LinkedHashMap a = parser.parseObject(LinkedHashMap.class); Assert.assertEquals(3, a.get("a")); @@ -53,7 +53,7 @@ public class DefaultExtJSONParserTest_2 extends TestCase { Exception error = null; try { String text = "[{\"old\":false,\"name\":\"校长\",\"age\":3,\"salary\":123456789.0123]"; - DefaultExtJSONParser parser = new DefaultExtJSONParser(text); + DefaultJSONParser parser = new DefaultJSONParser(text); parser.parseArray(User.class); } catch (Exception ex) { error = ex; @@ -64,7 +64,7 @@ public class DefaultExtJSONParserTest_2 extends TestCase { public void test_error_1() throws Exception { JSONException error = null; try { - DefaultExtJSONParser parser = new DefaultExtJSONParser("{'a'3}"); + DefaultJSONParser parser = new DefaultJSONParser("{'a'3}"); parser.config(Feature.AllowSingleQuotes, true); parser.parseObject(A.class); } catch (JSONException e) { @@ -76,7 +76,7 @@ public class DefaultExtJSONParserTest_2 extends TestCase { public void test_error_2() throws Exception { JSONException error = null; try { - DefaultExtJSONParser parser = new DefaultExtJSONParser("{a 3}"); + DefaultJSONParser parser = new DefaultJSONParser("{a 3}"); parser.config(Feature.AllowUnQuotedFieldNames, true); parser.parseObject(A.class); } catch (JSONException e) { @@ -88,7 +88,7 @@ public class DefaultExtJSONParserTest_2 extends TestCase { public void test_error_3() throws Exception { JSONException error = null; try { - DefaultExtJSONParser parser = new DefaultExtJSONParser("{"); + DefaultJSONParser parser = new DefaultJSONParser("{"); parser.config(Feature.AllowUnQuotedFieldNames, true); parser.parseObject(A.class); } catch (JSONException e) { @@ -100,7 +100,7 @@ public class DefaultExtJSONParserTest_2 extends TestCase { public void test_error_4() throws Exception { JSONException error = null; try { - DefaultExtJSONParser parser = new DefaultExtJSONParser("{\"a\"3}"); + DefaultJSONParser parser = new DefaultJSONParser("{\"a\"3}"); parser.parseObject(A.class); } catch (JSONException e) { error = e; @@ -111,7 +111,7 @@ public class DefaultExtJSONParserTest_2 extends TestCase { public void test_error_5() throws Exception { JSONException error = null; try { - DefaultExtJSONParser parser = new DefaultExtJSONParser("{a:3}"); + DefaultJSONParser parser = new DefaultJSONParser("{a:3}"); parser.config(Feature.AllowUnQuotedFieldNames, false); parser.parseObject(A.class); } catch (JSONException e) { @@ -123,7 +123,7 @@ public class DefaultExtJSONParserTest_2 extends TestCase { public void test_error_6() throws Exception { JSONException error = null; try { - DefaultExtJSONParser parser = new DefaultExtJSONParser("{'a':3}"); + DefaultJSONParser parser = new DefaultJSONParser("{'a':3}"); parser.config(Feature.AllowSingleQuotes, false); parser.parseObject(A.class); } catch (JSONException e) { diff --git a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_3.java b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_3.java index bf8d9692e..77e1b2f3f 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_3.java +++ b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_3.java @@ -6,21 +6,21 @@ import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.parser.DefaultExtJSONParser; +import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.Feature; import com.alibaba.fastjson.parser.ParserConfig; public class DefaultExtJSONParserTest_3 extends TestCase { public void test_0() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("{v1:3}"); + DefaultJSONParser parser = new DefaultJSONParser("{v1:3}"); parser.config(Feature.AllowUnQuotedFieldNames, true); A a = parser.parseObject(A.class); Assert.assertEquals(3, a.getV1()); } public void test_1() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("{v1:'3'}"); + DefaultJSONParser parser = new DefaultJSONParser("{v1:'3'}"); parser.config(Feature.AllowUnQuotedFieldNames, true); parser.config(Feature.AllowSingleQuotes, true); A a = parser.parseObject(A.class); @@ -28,7 +28,7 @@ public class DefaultExtJSONParserTest_3 extends TestCase { } public void test_2() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("{v1:\"3\"}"); + DefaultJSONParser parser = new DefaultJSONParser("{v1:\"3\"}"); parser.config(Feature.AllowUnQuotedFieldNames, true); parser.config(Feature.AllowSingleQuotes, true); A a = parser.parseObject(A.class); @@ -36,7 +36,7 @@ public class DefaultExtJSONParserTest_3 extends TestCase { } public void test_3() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("{o1:{}}"); + DefaultJSONParser parser = new DefaultJSONParser("{o1:{}}"); parser.config(Feature.AllowUnQuotedFieldNames, true); parser.config(Feature.AllowSingleQuotes, true); A a = parser.parseObject(A.class); @@ -44,7 +44,7 @@ public class DefaultExtJSONParserTest_3 extends TestCase { } public void test_4() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("{v5:'3'}"); + DefaultJSONParser parser = new DefaultJSONParser("{v5:'3'}"); parser.config(Feature.AllowUnQuotedFieldNames, true); parser.config(Feature.AllowSingleQuotes, true); A a = parser.parseObject(A.class); @@ -52,7 +52,7 @@ public class DefaultExtJSONParserTest_3 extends TestCase { } public void test_5() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("{v5:\"3\"}"); + DefaultJSONParser parser = new DefaultJSONParser("{v5:\"3\"}"); parser.config(Feature.AllowUnQuotedFieldNames, true); parser.config(Feature.AllowSingleQuotes, true); A a = parser.parseObject(A.class); @@ -65,13 +65,13 @@ public class DefaultExtJSONParserTest_3 extends TestCase { Assert.assertEquals(true, Feature.isEnabled(features, Feature.AllowSingleQuotes)); - DefaultExtJSONParser parser = new DefaultExtJSONParser("'abc'", ParserConfig.getGlobalInstance(), features); + DefaultJSONParser parser = new DefaultJSONParser("'abc'", ParserConfig.getGlobalInstance(), features); Assert.assertEquals("abc", parser.parse()); } public void test_7() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("123"); + DefaultJSONParser parser = new DefaultJSONParser("123"); ParserConfig mapping = new ParserConfig(); parser.setConfig(mapping); diff --git a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_4.java b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_4.java index 275008df1..a88c042cc 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_4.java +++ b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_4.java @@ -8,7 +8,7 @@ import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.parser.DefaultExtJSONParser; +import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.Feature; @@ -19,7 +19,7 @@ public class DefaultExtJSONParserTest_4 extends TestCase { String[] tests = { "[1,2,3]", "[1,,2,3]", "[1,2,,,3]", "[1 2,,,3]", "[1 2 3]", "[1, 2, 3,,]", "[,,1, 2, 3,,]", }; for (String t : tests) { - DefaultExtJSONParser ext = new DefaultExtJSONParser(t); + DefaultJSONParser ext = new DefaultJSONParser(t); ext.config(Feature.AllowArbitraryCommas, true); List extRes = ext.parseArray(Object.class); Assert.assertEquals(res, extRes); @@ -42,7 +42,7 @@ public class DefaultExtJSONParserTest_4 extends TestCase { "{,,'a':1,,,,'b':2,'c':3,,,,,}", }; for (String t : tests) { - DefaultExtJSONParser ext = new DefaultExtJSONParser(t); + DefaultJSONParser ext = new DefaultJSONParser(t); ext.config(Feature.AllowArbitraryCommas, true); JSONObject extRes = ext.parseObject(); @@ -65,7 +65,7 @@ public class DefaultExtJSONParserTest_4 extends TestCase { "{,,'a':1,,,,'b':2,,'c':3,,,,,}", }; for (String t : tests) { - DefaultExtJSONParser ext = new DefaultExtJSONParser(t); + DefaultJSONParser ext = new DefaultJSONParser(t); ext.config(Feature.AllowArbitraryCommas, true); A extRes = ext.parseObject(A.class); diff --git a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_5.java b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_5.java index 30453c973..6bce91c98 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_5.java +++ b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_5.java @@ -3,13 +3,13 @@ package com.alibaba.json.bvt.parser; import org.junit.Assert; import junit.framework.TestCase; -import com.alibaba.fastjson.parser.DefaultExtJSONParser; +import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.Feature; public class DefaultExtJSONParserTest_5 extends TestCase { public void test_0() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("{,,,,\"value\":3,\"id\":1}"); + DefaultJSONParser parser = new DefaultJSONParser("{,,,,\"value\":3,\"id\":1}"); parser.config(Feature.AllowArbitraryCommas, true); Entity entity = new Entity(); parser.parseObject(entity); @@ -17,7 +17,7 @@ public class DefaultExtJSONParserTest_5 extends TestCase { } public void test_1() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("{\"value\":3,\"id\":1}"); + DefaultJSONParser parser = new DefaultJSONParser("{\"value\":3,\"id\":1}"); parser.config(Feature.AllowArbitraryCommas, false); Entity entity = new Entity(); parser.parseObject(entity); diff --git a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_6.java b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_6.java index 32aacaefb..116c7f8f2 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_6.java +++ b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_6.java @@ -3,13 +3,13 @@ package com.alibaba.json.bvt.parser; import org.junit.Assert; import junit.framework.TestCase; -import com.alibaba.fastjson.parser.DefaultExtJSONParser; +import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.Feature; public class DefaultExtJSONParserTest_6 extends TestCase { public void test_0() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("{value:{,,,,\"value\":3,\"id\":1}}"); + DefaultJSONParser parser = new DefaultJSONParser("{value:{,,,,\"value\":3,\"id\":1}}"); parser.config(Feature.AllowArbitraryCommas, true); Entity entity = new Entity(); parser.parseObject(entity); @@ -17,7 +17,7 @@ public class DefaultExtJSONParserTest_6 extends TestCase { } public void test_1() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("{'value':{\"value\":3,\"id\":1}}"); + DefaultJSONParser parser = new DefaultJSONParser("{'value':{\"value\":3,\"id\":1}}"); parser.config(Feature.AllowArbitraryCommas, false); Entity entity = new Entity(); parser.parseObject(entity); diff --git a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_7.java b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_7.java index fc7f8267d..0b91dfad1 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_7.java +++ b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParserTest_7.java @@ -8,13 +8,13 @@ import junit.framework.TestCase; import org.junit.Assert; import com.alibaba.fastjson.JSONException; -import com.alibaba.fastjson.parser.DefaultExtJSONParser; +import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.Feature; public class DefaultExtJSONParserTest_7 extends TestCase { public void test_parse() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("1"); + DefaultJSONParser parser = new DefaultJSONParser("1"); Assert.assertEquals(Integer.valueOf(1), parser.parse()); Exception error = null; @@ -27,14 +27,14 @@ public class DefaultExtJSONParserTest_7 extends TestCase { } public void test_parse_str() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("\"1\""); + DefaultJSONParser parser = new DefaultJSONParser("\"1\""); parser.config(Feature.AllowISO8601DateFormat, true); Assert.assertEquals("1", parser.parse()); } public void test_parseArray() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("[1]"); + DefaultJSONParser parser = new DefaultJSONParser("[1]"); parser.config(Feature.AllowArbitraryCommas, false); List list = new ArrayList(); parser.parseArray(String.class, list); @@ -42,7 +42,7 @@ public class DefaultExtJSONParserTest_7 extends TestCase { } public void test_parseArray_error() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("[1,2}"); + DefaultJSONParser parser = new DefaultJSONParser("[1,2}"); parser.config(Feature.AllowArbitraryCommas, false); List list = new ArrayList(); diff --git a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParser_parseArray.java b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParser_parseArray.java index c7ab4b846..93bc751d5 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParser_parseArray.java +++ b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParser_parseArray.java @@ -11,21 +11,21 @@ import junit.framework.TestCase; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; -import com.alibaba.fastjson.parser.DefaultExtJSONParser; +import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.Feature; import com.alibaba.fastjson.parser.JSONToken; public class DefaultExtJSONParser_parseArray extends TestCase { public void test_0() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("[1,2,,,3]"); + DefaultJSONParser parser = new DefaultJSONParser("[1,2,,,3]"); List list = new ArrayList(); parser.parseArray(int.class, list); Assert.assertEquals("[1, 2, 3]", list.toString()); } public void test_1() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("[1,2,3]"); + DefaultJSONParser parser = new DefaultJSONParser("[1,2,3]"); parser.config(Feature.AllowArbitraryCommas, true); List list = new ArrayList(); parser.parseArray(int.class, list); @@ -33,7 +33,7 @@ public class DefaultExtJSONParser_parseArray extends TestCase { } public void test_2() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("['1','2','3']"); + DefaultJSONParser parser = new DefaultJSONParser("['1','2','3']"); parser.config(Feature.AllowArbitraryCommas, true); List list = new ArrayList(); parser.parseArray(String.class, list); @@ -42,7 +42,7 @@ public class DefaultExtJSONParser_parseArray extends TestCase { } public void test_3() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("[1,2,3]"); + DefaultJSONParser parser = new DefaultJSONParser("[1,2,3]"); parser.config(Feature.AllowArbitraryCommas, true); List list = new ArrayList(); parser.parseArray(BigDecimal.class, list); @@ -51,7 +51,7 @@ public class DefaultExtJSONParser_parseArray extends TestCase { } public void test_4() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("[1,2,3,null]"); + DefaultJSONParser parser = new DefaultJSONParser("[1,2,3,null]"); parser.config(Feature.AllowArbitraryCommas, true); List list = new ArrayList(); parser.parseArray(BigDecimal.class, list); @@ -60,7 +60,7 @@ public class DefaultExtJSONParser_parseArray extends TestCase { } public void test_5() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("[1,2,3,null]"); + DefaultJSONParser parser = new DefaultJSONParser("[1,2,3,null]"); Object[] array = parser.parseArray(new Type[] { Integer.class, BigDecimal.class, Long.class, String.class }); Assert.assertEquals(new Integer(1), array[0]); Assert.assertEquals(new BigDecimal("2"), array[1]); @@ -69,7 +69,7 @@ public class DefaultExtJSONParser_parseArray extends TestCase { } public void test_error() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("{}"); + DefaultJSONParser parser = new DefaultJSONParser("{}"); Exception error = null; try { parser.parseArray(new ArrayList()); @@ -80,7 +80,7 @@ public class DefaultExtJSONParser_parseArray extends TestCase { } public void test_6() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("[1.2]"); + DefaultJSONParser parser = new DefaultJSONParser("[1.2]"); parser.config(Feature.UseBigDecimal, false); ArrayList list = new ArrayList(); parser.parseArray(list); @@ -88,7 +88,7 @@ public class DefaultExtJSONParser_parseArray extends TestCase { } public void test_7() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("[\"2011-01-09T13:49:53.254\", \"xxx\", true, false, null, {}]"); + DefaultJSONParser parser = new DefaultJSONParser("[\"2011-01-09T13:49:53.254\", \"xxx\", true, false, null, {}]"); parser.config(Feature.AllowISO8601DateFormat, true); ArrayList list = new ArrayList(); parser.parseArray(list); @@ -101,21 +101,21 @@ public class DefaultExtJSONParser_parseArray extends TestCase { } public void test_8() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("\"2011-01-09T13:49:53.254\""); + DefaultJSONParser parser = new DefaultJSONParser("\"2011-01-09T13:49:53.254\""); parser.config(Feature.AllowISO8601DateFormat, true); Object value = parser.parse(); Assert.assertEquals(new Date(1294552193254L), value); } public void test_9() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser(""); + DefaultJSONParser parser = new DefaultJSONParser(""); parser.config(Feature.AllowISO8601DateFormat, true); Object value = parser.parse(); Assert.assertEquals(null, value); } public void test_error_2() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("{}"); + DefaultJSONParser parser = new DefaultJSONParser("{}"); Exception error = null; try { parser.accept(JSONToken.NULL); @@ -126,7 +126,7 @@ public class DefaultExtJSONParser_parseArray extends TestCase { } public void test_10() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("[1,2,3]"); + DefaultJSONParser parser = new DefaultJSONParser("[1,2,3]"); Object[] array = parser.parseArray(new Type[] { Integer[].class }); Integer[] values = (Integer[]) array[0]; Assert.assertEquals(new Integer(1), values[0]); @@ -135,31 +135,31 @@ public class DefaultExtJSONParser_parseArray extends TestCase { } public void test_11() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("[1]"); + DefaultJSONParser parser = new DefaultJSONParser("[1]"); Object[] array = parser.parseArray(new Type[] { String.class }); Assert.assertEquals("1", array[0]); } public void test_12() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("['1']"); + DefaultJSONParser parser = new DefaultJSONParser("['1']"); Object[] array = parser.parseArray(new Type[] { int.class }); Assert.assertEquals(new Integer(1), array[0]); } public void test_13() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("['1']"); + DefaultJSONParser parser = new DefaultJSONParser("['1']"); Object[] array = parser.parseArray(new Type[] { Integer.class }); Assert.assertEquals(new Integer(1), array[0]); } public void test_14() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("[]"); + DefaultJSONParser parser = new DefaultJSONParser("[]"); Object[] array = parser.parseArray(new Type[] {}); Assert.assertEquals(0, array.length); } public void test_15() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("[1,null]"); + DefaultJSONParser parser = new DefaultJSONParser("[1,null]"); ArrayList list = new ArrayList(); parser.config(Feature.AllowISO8601DateFormat, false); parser.parseArray(String.class, list); @@ -168,7 +168,7 @@ public class DefaultExtJSONParser_parseArray extends TestCase { } public void test_16() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("[[1]]"); + DefaultJSONParser parser = new DefaultJSONParser("[[1]]"); parser.config(Feature.AllowISO8601DateFormat, false); Object[] array = parser.parseArray(new Type[] { new TypeReference>() { }.getType() }); @@ -176,14 +176,14 @@ public class DefaultExtJSONParser_parseArray extends TestCase { } public void test_17() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("[]"); + DefaultJSONParser parser = new DefaultJSONParser("[]"); Object[] array = parser.parseArray(new Type[] { Integer[].class }); Integer[] values = (Integer[]) array[0]; Assert.assertEquals(0, values.length); } public void test_18() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("null"); + DefaultJSONParser parser = new DefaultJSONParser("null"); parser.config(Feature.AllowISO8601DateFormat, false); List list = (List) parser.parseArrayWithType(new TypeReference>() { }.getType()); @@ -191,7 +191,7 @@ public class DefaultExtJSONParser_parseArray extends TestCase { } public void test_error_var() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("[1,2,null }"); + DefaultJSONParser parser = new DefaultJSONParser("[1,2,null }"); parser.config(Feature.AllowISO8601DateFormat, false); Exception error = null; @@ -204,7 +204,7 @@ public class DefaultExtJSONParser_parseArray extends TestCase { } public void test_error_3() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("[1,null }"); + DefaultJSONParser parser = new DefaultJSONParser("[1,null }"); ArrayList list = new ArrayList(); parser.config(Feature.AllowISO8601DateFormat, false); @@ -218,7 +218,7 @@ public class DefaultExtJSONParser_parseArray extends TestCase { } public void test_error_4() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("[1,null }"); + DefaultJSONParser parser = new DefaultJSONParser("[1,null }"); parser.config(Feature.AllowISO8601DateFormat, false); Exception error = null; @@ -231,7 +231,7 @@ public class DefaultExtJSONParser_parseArray extends TestCase { } public void test_error_5() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("[1,null }"); + DefaultJSONParser parser = new DefaultJSONParser("[1,null }"); ArrayList list = new ArrayList(); parser.config(Feature.AllowISO8601DateFormat, false); @@ -245,7 +245,7 @@ public class DefaultExtJSONParser_parseArray extends TestCase { } public void test_error_6() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("{1,null }"); + DefaultJSONParser parser = new DefaultJSONParser("{1,null }"); parser.config(Feature.AllowISO8601DateFormat, false); Exception error = null; @@ -258,7 +258,7 @@ public class DefaultExtJSONParser_parseArray extends TestCase { } public void test_error_7() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("{1}"); + DefaultJSONParser parser = new DefaultJSONParser("{1}"); parser.config(Feature.AllowISO8601DateFormat, false); Exception error = null; @@ -271,7 +271,7 @@ public class DefaultExtJSONParser_parseArray extends TestCase { } public void test_error_8() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("[1,2,3 4]"); + DefaultJSONParser parser = new DefaultJSONParser("[1,2,3 4]"); parser.config(Feature.AllowISO8601DateFormat, false); Exception error = null; diff --git a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParser_parseArray_2.java b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParser_parseArray_2.java index 888f7d595..d5aeec18a 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParser_parseArray_2.java +++ b/src/test/java/com/alibaba/json/bvt/parser/DefaultExtJSONParser_parseArray_2.java @@ -10,14 +10,14 @@ import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.TypeReference; -import com.alibaba.fastjson.parser.DefaultExtJSONParser; +import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.Feature; @SuppressWarnings("deprecation") public class DefaultExtJSONParser_parseArray_2 extends TestCase { public void test_0() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("[['1']]"); + DefaultJSONParser parser = new DefaultJSONParser("[['1']]"); parser.config(Feature.AllowISO8601DateFormat, false); List> list = (List>) parser.parseArrayWithType(new TypeReference>>() { }.getType()); @@ -25,7 +25,7 @@ public class DefaultExtJSONParser_parseArray_2 extends TestCase { } public void test_1() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("['1','2']"); + DefaultJSONParser parser = new DefaultJSONParser("['1','2']"); parser.config(Feature.AllowISO8601DateFormat, false); List list = new ArrayList(); parser.parseArray(Integer.class, list); @@ -34,7 +34,7 @@ public class DefaultExtJSONParser_parseArray_2 extends TestCase { } public void test_error_0() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("['1','2'}"); + DefaultJSONParser parser = new DefaultJSONParser("['1','2'}"); parser.config(Feature.AllowISO8601DateFormat, false); Exception error = null; @@ -48,7 +48,7 @@ public class DefaultExtJSONParser_parseArray_2 extends TestCase { } public void test_error_1() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("[['1']]"); + DefaultJSONParser parser = new DefaultJSONParser("[['1']]"); parser.config(Feature.AllowISO8601DateFormat, false); Exception error = null; @@ -62,7 +62,7 @@ public class DefaultExtJSONParser_parseArray_2 extends TestCase { } public void test_error_2() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("[new X()]"); + DefaultJSONParser parser = new DefaultJSONParser("[new X()]"); parser.config(Feature.AllowISO8601DateFormat, false); List list = new ArrayList(); @@ -76,7 +76,7 @@ public class DefaultExtJSONParser_parseArray_2 extends TestCase { } public void test_error_3() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("[] a"); + DefaultJSONParser parser = new DefaultJSONParser("[] a"); parser.config(Feature.AllowISO8601DateFormat, false); List list = new ArrayList(); @@ -91,7 +91,7 @@ public class DefaultExtJSONParser_parseArray_2 extends TestCase { } public void test_error_4() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("['1','2'}"); + DefaultJSONParser parser = new DefaultJSONParser("['1','2'}"); parser.config(Feature.AllowISO8601DateFormat, false); Exception error = null; @@ -104,14 +104,14 @@ public class DefaultExtJSONParser_parseArray_2 extends TestCase { } public void test_error_5() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("[]"); + DefaultJSONParser parser = new DefaultJSONParser("[]"); parser.config(Feature.AllowISO8601DateFormat, false); Assert.assertEquals(1, parser.parseArray(new Type[] { Integer[].class }).length); } public void test_error_6() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("['1' 1 '2'}"); + DefaultJSONParser parser = new DefaultJSONParser("['1' 1 '2'}"); parser.config(Feature.AllowISO8601DateFormat, false); Exception error = null; diff --git a/src/test/java/com/alibaba/json/bvt/parser/EnumParserTest.java b/src/test/java/com/alibaba/json/bvt/parser/EnumParserTest.java index 6df0249aa..fac64ec92 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/EnumParserTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/EnumParserTest.java @@ -3,14 +3,14 @@ package com.alibaba.json.bvt.parser; import org.junit.Assert; import junit.framework.TestCase; -import com.alibaba.fastjson.parser.DefaultExtJSONParser; +import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.deserializer.EnumDeserializer; public class EnumParserTest extends TestCase { public void test_0() throws Exception { String text = "\"A\""; - DefaultExtJSONParser parser = new DefaultExtJSONParser(text); + DefaultJSONParser parser = new DefaultJSONParser(text); Type type = parser.parseObject(Type.class); Assert.assertEquals(Type.A, type); @@ -18,7 +18,7 @@ public class EnumParserTest extends TestCase { public void test_1() throws Exception { String text = "0"; - DefaultExtJSONParser parser = new DefaultExtJSONParser(text); + DefaultJSONParser parser = new DefaultJSONParser(text); Type type = parser.parseObject(Type.class); Assert.assertEquals(Type.A, type); @@ -28,7 +28,7 @@ public class EnumParserTest extends TestCase { Exception error = null; try { String text = "\"C\""; - DefaultExtJSONParser parser = new DefaultExtJSONParser(text); + DefaultJSONParser parser = new DefaultJSONParser(text); parser.parseObject(Type.class); } catch (Exception ex) { @@ -41,7 +41,7 @@ public class EnumParserTest extends TestCase { Exception error = null; try { String text = "4"; - DefaultExtJSONParser parser = new DefaultExtJSONParser(text); + DefaultJSONParser parser = new DefaultJSONParser(text); parser.parseObject(Type.class); } catch (Exception ex) { @@ -54,7 +54,7 @@ public class EnumParserTest extends TestCase { Exception error = null; try { String text = "4"; - DefaultExtJSONParser parser = new DefaultExtJSONParser(text); + DefaultJSONParser parser = new DefaultJSONParser(text); parser.parseObject(TypeA.class); } catch (Exception ex) { @@ -67,7 +67,7 @@ public class EnumParserTest extends TestCase { Exception error = null; try { String text = "4"; - DefaultExtJSONParser parser = new DefaultExtJSONParser(text); + DefaultJSONParser parser = new DefaultJSONParser(text); new EnumDeserializer(Object.class).deserialze(parser, Object.class, null); } catch (Exception ex) { @@ -80,7 +80,7 @@ public class EnumParserTest extends TestCase { Exception error = null; try { String text = "true"; - DefaultExtJSONParser parser = new DefaultExtJSONParser(text); + DefaultJSONParser parser = new DefaultJSONParser(text); new EnumDeserializer(Object.class).deserialze(parser, Object.class, null); } catch (Exception ex) { diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/ArrayListStringDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/ArrayListStringDeserializerTest.java index 3a0a64314..d17e08fc4 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/ArrayListStringDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/ArrayListStringDeserializerTest.java @@ -11,7 +11,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONException; import com.alibaba.fastjson.TypeReference; -import com.alibaba.fastjson.parser.DefaultExtJSONParser; +import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.Feature; import com.alibaba.fastjson.parser.ParserConfig; @@ -112,7 +112,7 @@ public class ArrayListStringDeserializerTest extends TestCase { featureValues = Feature.config(featureValues, feature, true); } - DefaultExtJSONParser parser = new DefaultExtJSONParser(input, ParserConfig.getGlobalInstance(), featureValues); + DefaultJSONParser parser = new DefaultJSONParser(input, ParserConfig.getGlobalInstance(), featureValues); T value = (T) parser.parseObject(clazz); if (clazz != JSONArray.class) { diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/BigDecimalDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/BigDecimalDeserializerTest.java index 67d35fc56..0f95b6406 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/BigDecimalDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/BigDecimalDeserializerTest.java @@ -7,7 +7,7 @@ import junit.framework.TestCase; import org.junit.Assert; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.parser.DefaultExtJSONParser; +import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.ParserConfig; import com.alibaba.fastjson.serializer.BigDecimalCodec; @@ -21,7 +21,7 @@ public class BigDecimalDeserializerTest extends TestCase { Assert.assertEquals(null, JSON.parseObject("null", BigDecimal.class)); - DefaultExtJSONParser parser = new DefaultExtJSONParser("null", ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE); + DefaultJSONParser parser = new DefaultJSONParser("null", ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE); Assert.assertEquals(null, BigDecimalCodec.instance.deserialze(parser, null, null)); } } diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/DefaultObjectDeserializerTest2.java b/src/test/java/com/alibaba/json/bvt/parser/deser/DefaultObjectDeserializerTest2.java index 072b319ef..1489c1b56 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/DefaultObjectDeserializerTest2.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/DefaultObjectDeserializerTest2.java @@ -12,7 +12,7 @@ import org.junit.Assert; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.TypeReference; -import com.alibaba.fastjson.parser.DefaultExtJSONParser; +import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.ParserConfig; @SuppressWarnings("deprecation") @@ -21,7 +21,7 @@ public class DefaultObjectDeserializerTest2 extends TestCase { public void test_1() throws Exception { String input = "{'map':{}}"; - DefaultExtJSONParser parser = new DefaultExtJSONParser(input, ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE); + DefaultJSONParser parser = new DefaultJSONParser(input, ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE); SortedMap map = JSON.parseObject(input, new TypeReference>() { diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/DefaultObjectDeserializerTest4.java b/src/test/java/com/alibaba/json/bvt/parser/deser/DefaultObjectDeserializerTest4.java index fe928fc3e..5fdb004e9 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/DefaultObjectDeserializerTest4.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/DefaultObjectDeserializerTest4.java @@ -3,14 +3,14 @@ package com.alibaba.json.bvt.parser.deser; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.parser.DefaultExtJSONParser; +import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.Feature; import com.alibaba.fastjson.parser.ParserConfig; public class DefaultObjectDeserializerTest4 extends TestCase { public void test_0() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("{\"id\":3, \"name\":\"xx\"}", ParserConfig.getGlobalInstance()); + DefaultJSONParser parser = new DefaultJSONParser("{\"id\":3, \"name\":\"xx\"}", ParserConfig.getGlobalInstance()); Entity entity = new Entity(); parser.parseObject(entity); diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/FieldDeserializerTest2.java b/src/test/java/com/alibaba/json/bvt/parser/deser/FieldDeserializerTest2.java index 15cea063c..0aa8f7b17 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/FieldDeserializerTest2.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/FieldDeserializerTest2.java @@ -5,7 +5,7 @@ import junit.framework.TestCase; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONException; -import com.alibaba.fastjson.parser.DefaultExtJSONParser; +import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.Feature; import com.alibaba.fastjson.parser.ParserConfig; @@ -15,7 +15,7 @@ public class FieldDeserializerTest2 extends TestCase { String input = "{,,,\"value\":null,,,,}"; int featureValues = 0; featureValues |= Feature.AllowArbitraryCommas.getMask(); - DefaultExtJSONParser parser = new DefaultExtJSONParser(input, ParserConfig.getGlobalInstance(), featureValues); + DefaultJSONParser parser = new DefaultJSONParser(input, ParserConfig.getGlobalInstance(), featureValues); Entity object = new Entity(); parser.parseObject(object); @@ -26,7 +26,7 @@ public class FieldDeserializerTest2 extends TestCase { int featureValues = 0; featureValues |= Feature.AllowArbitraryCommas.getMask(); featureValues |= Feature.IgnoreNotMatch.getMask(); - DefaultExtJSONParser parser = new DefaultExtJSONParser(input, ParserConfig.getGlobalInstance(), featureValues); + DefaultJSONParser parser = new DefaultJSONParser(input, ParserConfig.getGlobalInstance(), featureValues); Entity object = new Entity(); parser.parseObject(object); @@ -37,7 +37,7 @@ public class FieldDeserializerTest2 extends TestCase { try { String input = "{\"value\":null,\"id\":123}"; int featureValues = 0; - DefaultExtJSONParser parser = new DefaultExtJSONParser(input, ParserConfig.getGlobalInstance(), featureValues); + DefaultJSONParser parser = new DefaultJSONParser(input, ParserConfig.getGlobalInstance(), featureValues); Entity object = new Entity(); parser.parseObject(object); diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/FieldDeserializerTest3.java b/src/test/java/com/alibaba/json/bvt/parser/deser/FieldDeserializerTest3.java index a6c1bded0..250053c37 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/FieldDeserializerTest3.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/FieldDeserializerTest3.java @@ -5,7 +5,7 @@ import junit.framework.TestCase; import org.junit.Assert; import com.alibaba.fastjson.JSONException; -import com.alibaba.fastjson.parser.DefaultExtJSONParser; +import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.ParserConfig; public class FieldDeserializerTest3 extends TestCase { @@ -15,7 +15,7 @@ public class FieldDeserializerTest3 extends TestCase { try { String input = "{\"value\":null}"; int featureValues = 0; - DefaultExtJSONParser parser = new DefaultExtJSONParser(input, ParserConfig.getGlobalInstance(), + DefaultJSONParser parser = new DefaultJSONParser(input, ParserConfig.getGlobalInstance(), featureValues); Entity object = new Entity(); @@ -31,7 +31,7 @@ public class FieldDeserializerTest3 extends TestCase { try { String input = "{,,\"value\":null}"; int featureValues = 0; - DefaultExtJSONParser parser = new DefaultExtJSONParser(input, ParserConfig.getGlobalInstance(), + DefaultJSONParser parser = new DefaultJSONParser(input, ParserConfig.getGlobalInstance(), featureValues); Entity object = new Entity(); diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/FloatDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/FloatDeserializerTest.java index 35b498748..064010e0d 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/FloatDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/FloatDeserializerTest.java @@ -5,7 +5,7 @@ import junit.framework.TestCase; import org.junit.Assert; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.parser.DefaultExtJSONParser; +import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.JSONToken; import com.alibaba.fastjson.parser.ParserConfig; import com.alibaba.fastjson.serializer.FloatCodec; @@ -19,7 +19,7 @@ public class FloatDeserializerTest extends TestCase { Assert.assertEquals(null, JSON.parseObject("null", Float.class)); - DefaultExtJSONParser parser = new DefaultExtJSONParser("null", ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE); + DefaultJSONParser parser = new DefaultJSONParser("null", ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE); Assert.assertEquals(null, FloatCodec.instance.deserialze(parser, null, null)); Assert.assertEquals(JSONToken.LITERAL_INT, FloatCodec.instance.getFastMatchToken()); } diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/InetAddressDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/InetAddressDeserializerTest.java index f5a685128..8e973613d 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/InetAddressDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/InetAddressDeserializerTest.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.parser.deser; import org.junit.Assert; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.parser.DefaultExtJSONParser; +import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.ParserConfig; import com.alibaba.fastjson.serializer.MiscCodec; import com.alibaba.fastjson.serializer.StringCodec; @@ -14,7 +14,7 @@ public class InetAddressDeserializerTest extends TestCase { public void test_null() throws Exception { String input = "null"; - DefaultExtJSONParser parser = new DefaultExtJSONParser(input, ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE); + DefaultJSONParser parser = new DefaultJSONParser(input, ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE); MiscCodec deser = new MiscCodec(); @@ -23,7 +23,7 @@ public class InetAddressDeserializerTest extends TestCase { public void test_string_null() throws Exception { String input = "null"; - DefaultExtJSONParser parser = new DefaultExtJSONParser(input, ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE); + DefaultJSONParser parser = new DefaultJSONParser(input, ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE); StringCodec deser = new StringCodec(); @@ -32,7 +32,7 @@ public class InetAddressDeserializerTest extends TestCase { public void test_error_0() throws Exception { String input = "'[&中国-^]'"; - DefaultExtJSONParser parser = new DefaultExtJSONParser(input, ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE); + DefaultJSONParser parser = new DefaultJSONParser(input, ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE); MiscCodec deser = new MiscCodec(); diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/IntegerDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/IntegerDeserializerTest.java index a67a1c97a..5ff9f349a 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/IntegerDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/IntegerDeserializerTest.java @@ -5,7 +5,7 @@ import junit.framework.TestCase; import org.junit.Assert; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.parser.DefaultExtJSONParser; +import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.JSONToken; import com.alibaba.fastjson.parser.ParserConfig; import com.alibaba.fastjson.serializer.IntegerCodec; @@ -19,7 +19,7 @@ public class IntegerDeserializerTest extends TestCase { Assert.assertEquals(null, JSON.parseObject("null", Integer.class)); - DefaultExtJSONParser parser = new DefaultExtJSONParser("null", ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE); + DefaultJSONParser parser = new DefaultJSONParser("null", ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE); Assert.assertEquals(null, IntegerCodec.instance.deserialze(parser, null, null)); Assert.assertEquals(JSONToken.LITERAL_INT, IntegerCodec.instance.getFastMatchToken()); } diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/LocaleTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/LocaleTest.java index 39ecbc992..c35c56e77 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/LocaleTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/LocaleTest.java @@ -5,7 +5,7 @@ import java.util.Locale; import org.junit.Assert; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.parser.DefaultExtJSONParser; +import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.ParserConfig; import com.alibaba.fastjson.serializer.MiscCodec; @@ -32,7 +32,7 @@ public class LocaleTest extends TestCase { public void test_null() throws Exception { String input = "null"; - DefaultExtJSONParser parser = new DefaultExtJSONParser(input, ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE); + DefaultJSONParser parser = new DefaultJSONParser(input, ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE); MiscCodec deser = new MiscCodec(); diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/LongDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/LongDeserializerTest.java index 6a3a60b22..96adb27a6 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/LongDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/LongDeserializerTest.java @@ -5,7 +5,7 @@ import junit.framework.TestCase; import org.junit.Assert; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.parser.DefaultExtJSONParser; +import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.JSONToken; import com.alibaba.fastjson.parser.ParserConfig; import com.alibaba.fastjson.serializer.LongCodec; @@ -19,7 +19,7 @@ public class LongDeserializerTest extends TestCase { Assert.assertEquals(null, JSON.parseObject("null", Long.class)); - DefaultExtJSONParser parser = new DefaultExtJSONParser("null", ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE); + DefaultJSONParser parser = new DefaultJSONParser("null", ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE); Assert.assertEquals(null, LongCodec.instance.deserialze(parser, null, null)); Assert.assertEquals(JSONToken.LITERAL_INT, LongCodec.instance.getFastMatchToken()); } diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/PatternDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/PatternDeserializerTest.java index e6cb6ea67..9abc506e3 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/PatternDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/PatternDeserializerTest.java @@ -5,7 +5,7 @@ import java.util.regex.Pattern; import org.junit.Assert; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.parser.DefaultExtJSONParser; +import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.JSONToken; import com.alibaba.fastjson.parser.ParserConfig; import com.alibaba.fastjson.serializer.MiscCodec; @@ -19,7 +19,7 @@ public class PatternDeserializerTest extends TestCase { Assert.assertEquals(null, JSON.parseObject("null", Pattern.class)); - DefaultExtJSONParser parser = new DefaultExtJSONParser("null", ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE); + DefaultJSONParser parser = new DefaultJSONParser("null", ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE); Assert.assertEquals(null, MiscCodec.instance.deserialze(parser, null, null)); Assert.assertEquals(JSONToken.LITERAL_STRING, MiscCodec.instance.getFastMatchToken()); } diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/SqlDateDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/SqlDateDeserializerTest.java index da2233a12..7b3b50ca7 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/SqlDateDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/SqlDateDeserializerTest.java @@ -4,7 +4,7 @@ import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.parser.DefaultExtJSONParser; +import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.JSONToken; import com.alibaba.fastjson.parser.ParserConfig; import com.alibaba.fastjson.parser.deserializer.SqlDateDeserializer; @@ -18,7 +18,7 @@ public class SqlDateDeserializerTest extends TestCase { Assert.assertEquals(null, JSON.parseObject("null", Integer.class)); - DefaultExtJSONParser parser = new DefaultExtJSONParser("null", ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE); + DefaultJSONParser parser = new DefaultJSONParser("null", ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE); Assert.assertEquals(null, SqlDateDeserializer.instance.deserialze(parser, null, null)); Assert.assertEquals(JSONToken.LITERAL_INT, SqlDateDeserializer.instance.getFastMatchToken()); } diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/TestNull.java b/src/test/java/com/alibaba/json/bvt/parser/deser/TestNull.java index c982e5d11..d95bcad47 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/TestNull.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/TestNull.java @@ -5,7 +5,7 @@ import junit.framework.TestCase; import org.junit.Assert; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.parser.DefaultExtJSONParser; +import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.ParserConfig; import com.alibaba.fastjson.parser.deserializer.NumberDeserializer; import com.alibaba.fastjson.serializer.CharacterCodec; @@ -13,25 +13,25 @@ import com.alibaba.fastjson.serializer.CharacterCodec; public class TestNull extends TestCase { public void test_byte() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("null", ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE); + DefaultJSONParser parser = new DefaultJSONParser("null", ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE); Assert.assertNull(new NumberDeserializer().deserialze(parser, null, null)); } public void test_char() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("null", ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE); + DefaultJSONParser parser = new DefaultJSONParser("null", ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE); Assert.assertNull(new CharacterCodec().deserialze(parser, null, null)); } public void test_short() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("null", ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE); + DefaultJSONParser parser = new DefaultJSONParser("null", ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE); Assert.assertNull(new NumberDeserializer().deserialze(parser, null, null)); } public void test_null() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("null", ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE); + DefaultJSONParser parser = new DefaultJSONParser("null", ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE); Assert.assertNull(new NumberDeserializer().deserialze(parser, null, null)); } diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/TimeZoneDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/TimeZoneDeserializerTest.java index af3af702c..dc6f6e93c 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/TimeZoneDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/TimeZoneDeserializerTest.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.parser.deser; import org.junit.Assert; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.parser.DefaultExtJSONParser; +import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.JSONToken; import com.alibaba.fastjson.parser.ParserConfig; import com.alibaba.fastjson.serializer.MiscCodec; @@ -12,7 +12,7 @@ import junit.framework.TestCase; public class TimeZoneDeserializerTest extends TestCase { public void test_timezone() throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser("null", ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE); + DefaultJSONParser parser = new DefaultJSONParser("null", ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE); Assert.assertEquals(null, MiscCodec.instance.deserialze(parser, null, null)); Assert.assertEquals(JSONToken.LITERAL_STRING, MiscCodec.instance.getFastMatchToken()); } diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/URIDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/URIDeserializerTest.java index 508fd8b2d..cc72ec8b5 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/URIDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/URIDeserializerTest.java @@ -3,7 +3,7 @@ package com.alibaba.json.bvt.parser.deser; import org.junit.Assert; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.parser.DefaultExtJSONParser; +import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.JSONToken; import com.alibaba.fastjson.parser.ParserConfig; import com.alibaba.fastjson.serializer.MiscCodec; @@ -14,7 +14,7 @@ public class URIDeserializerTest extends TestCase { public void test_null() throws Exception { String input = "null"; - DefaultExtJSONParser parser = new DefaultExtJSONParser(input, ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE); + DefaultJSONParser parser = new DefaultJSONParser(input, ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE); MiscCodec deser = new MiscCodec(); Assert.assertEquals(JSONToken.LITERAL_STRING, deser.getFastMatchToken()); diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/URLDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/URLDeserializerTest.java index 423f43377..a66b5fab0 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/URLDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/URLDeserializerTest.java @@ -8,7 +8,7 @@ import org.junit.Assert; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONException; -import com.alibaba.fastjson.parser.DefaultExtJSONParser; +import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.JSONToken; import com.alibaba.fastjson.parser.ParserConfig; import com.alibaba.fastjson.serializer.MiscCodec; @@ -20,7 +20,7 @@ public class URLDeserializerTest extends TestCase { Assert.assertEquals(null, JSON.parseObject("null", URL.class)); - DefaultExtJSONParser parser = new DefaultExtJSONParser("null", ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE); + DefaultJSONParser parser = new DefaultJSONParser("null", ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE); Assert.assertEquals(null, MiscCodec.instance.deserialze(parser, null, null)); Assert.assertEquals(JSONToken.LITERAL_STRING, MiscCodec.instance.getFastMatchToken()); diff --git a/src/test/java/com/alibaba/json/bvt/parser/deser/UUIDDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/UUIDDeserializerTest.java index ee58b0a42..52e65273d 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/deser/UUIDDeserializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/deser/UUIDDeserializerTest.java @@ -6,7 +6,7 @@ import org.junit.Assert; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONException; -import com.alibaba.fastjson.parser.DefaultExtJSONParser; +import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.JSONToken; import com.alibaba.fastjson.parser.ParserConfig; import com.alibaba.fastjson.serializer.MiscCodec; @@ -21,7 +21,7 @@ public class UUIDDeserializerTest extends TestCase { Assert.assertEquals(null, JSON.parseObject("null", UUID.class)); - DefaultExtJSONParser parser = new DefaultExtJSONParser("null", ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE); + DefaultJSONParser parser = new DefaultJSONParser("null", ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE); Assert.assertEquals(null, MiscCodec.instance.deserialze(parser, null, null)); Assert.assertEquals(JSONToken.LITERAL_STRING, MiscCodec.instance.getFastMatchToken()); diff --git a/src/test/java/com/alibaba/json/bvt/serializer/BooleanFieldSerializerTest.java b/src/test/java/com/alibaba/json/bvt/serializer/BooleanFieldSerializerTest.java index a34845125..ec7e27e8a 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/BooleanFieldSerializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/BooleanFieldSerializerTest.java @@ -8,7 +8,7 @@ import org.junit.Assert; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.parser.DefaultExtJSONParser; +import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.Feature; import com.alibaba.fastjson.parser.ParserConfig; import com.alibaba.fastjson.serializer.SerializeConfig; @@ -66,7 +66,7 @@ public class BooleanFieldSerializerTest extends TestCase { ParserConfig config = new ParserConfig(); config.setAsmEnable(false); - DefaultExtJSONParser parser = new DefaultExtJSONParser(input, config, featureValues); + DefaultJSONParser parser = new DefaultJSONParser(input, config, featureValues); T value = (T) parser.parseObject(clazz); if (clazz != JSONArray.class) { diff --git a/src/test/java/com/alibaba/json/bvt/serializer/BooleanFieldSerializerTest_primitive.java b/src/test/java/com/alibaba/json/bvt/serializer/BooleanFieldSerializerTest_primitive.java index e3a171cce..be020ebfd 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/BooleanFieldSerializerTest_primitive.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/BooleanFieldSerializerTest_primitive.java @@ -8,7 +8,7 @@ import org.junit.Assert; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.parser.DefaultExtJSONParser; +import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.Feature; import com.alibaba.fastjson.parser.ParserConfig; import com.alibaba.fastjson.serializer.SerializeConfig; @@ -78,7 +78,7 @@ public class BooleanFieldSerializerTest_primitive extends TestCase { ParserConfig config = new ParserConfig(); config.setAsmEnable(false); - DefaultExtJSONParser parser = new DefaultExtJSONParser(input, config, featureValues); + DefaultJSONParser parser = new DefaultJSONParser(input, config, featureValues); T value = (T) parser.parseObject(clazz); if (clazz != JSONArray.class) { diff --git a/src/test/java/com/alibaba/json/test/codec/FastjsonBeanToArrayCodec.java b/src/test/java/com/alibaba/json/test/codec/FastjsonBeanToArrayCodec.java index 62349a7e7..b4e2a26e1 100644 --- a/src/test/java/com/alibaba/json/test/codec/FastjsonBeanToArrayCodec.java +++ b/src/test/java/com/alibaba/json/test/codec/FastjsonBeanToArrayCodec.java @@ -3,7 +3,7 @@ package com.alibaba.json.test.codec; import java.util.Collection; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.parser.DefaultExtJSONParser; +import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.Feature; import com.alibaba.fastjson.parser.ParserConfig; @@ -21,14 +21,14 @@ public class FastjsonBeanToArrayCodec implements Codec { } public T decodeObject(String text, Class clazz) { - DefaultExtJSONParser parser = new DefaultExtJSONParser(text, config); + DefaultJSONParser parser = new DefaultJSONParser(text, config); parser.config(Feature.DisableCircularReferenceDetect, true); parser.config(Feature.SupportArrayToBean, true); return parser.parseObject(clazz); } public Collection decodeArray(String text, Class clazz) throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser(text, config); + DefaultJSONParser parser = new DefaultJSONParser(text, config); parser.config(Feature.DisableCircularReferenceDetect, true); parser.config(Feature.SupportArrayToBean, true); return parser.parseArray(clazz); diff --git a/src/test/java/com/alibaba/json/test/codec/FastjsonCodec.java b/src/test/java/com/alibaba/json/test/codec/FastjsonCodec.java index 5875477e0..f0f680736 100755 --- a/src/test/java/com/alibaba/json/test/codec/FastjsonCodec.java +++ b/src/test/java/com/alibaba/json/test/codec/FastjsonCodec.java @@ -3,7 +3,7 @@ package com.alibaba.json.test.codec; import java.util.Collection; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.parser.DefaultExtJSONParser; +import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.Feature; import com.alibaba.fastjson.parser.ParserConfig; @@ -21,13 +21,13 @@ public class FastjsonCodec implements Codec { } public T decodeObject(String text, Class clazz) { - DefaultExtJSONParser parser = new DefaultExtJSONParser(text, config); + DefaultJSONParser parser = new DefaultJSONParser(text, config); parser.config(Feature.DisableCircularReferenceDetect, true); return parser.parseObject(clazz); } public Collection decodeArray(String text, Class clazz) throws Exception { - DefaultExtJSONParser parser = new DefaultExtJSONParser(text, config); + DefaultJSONParser parser = new DefaultJSONParser(text, config); parser.config(Feature.DisableCircularReferenceDetect, true); return parser.parseArray(clazz); } diff --git a/src/test/java/com/alibaba/json/test/codec/FastjsonSCodec.java b/src/test/java/com/alibaba/json/test/codec/FastjsonSCodec.java index 540bd8761..44faa3f7e 100644 --- a/src/test/java/com/alibaba/json/test/codec/FastjsonSCodec.java +++ b/src/test/java/com/alibaba/json/test/codec/FastjsonSCodec.java @@ -3,7 +3,7 @@ package com.alibaba.json.test.codec; import java.util.Collection; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.parser.DefaultExtJSONParser; +import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.DefaultJSONParser; import com.alibaba.fastjson.parser.Feature; import com.alibaba.fastjson.parser.ParserConfig; @@ -22,14 +22,14 @@ public class FastjsonSCodec implements Codec { public T decodeObject(String text, Class clazz) { ParserConfig config = new ParserConfig(); - DefaultExtJSONParser parser = new DefaultExtJSONParser(text, config); + DefaultJSONParser parser = new DefaultJSONParser(text, config); parser.config(Feature.DisableCircularReferenceDetect, true); return parser.parseObject(clazz); } public Collection decodeArray(String text, Class clazz) throws Exception { ParserConfig config = new ParserConfig(); - DefaultExtJSONParser parser = new DefaultExtJSONParser(text, config); + DefaultJSONParser parser = new DefaultJSONParser(text, config); parser.config(Feature.DisableCircularReferenceDetect, true); return parser.parseArray(clazz); }