diff --git a/src/main/java/com/alibaba/fastjson/JSON.java b/src/main/java/com/alibaba/fastjson/JSON.java index 866099bb4..d04a89172 100755 --- a/src/main/java/com/alibaba/fastjson/JSON.java +++ b/src/main/java/com/alibaba/fastjson/JSON.java @@ -125,8 +125,8 @@ public abstract class JSON implements JSONStreamAware, JSONAware { } int featureValues = DEFAULT_PARSER_FEATURE; - for (Feature featrue : features) { - featureValues = Feature.config(featureValues, featrue, true); + for (Feature feature : features) { + featureValues = Feature.config(featureValues, feature, true); } return parse(input, off, len, charsetDecoder, featureValues); @@ -156,8 +156,8 @@ public abstract class JSON implements JSONStreamAware, JSONAware { public static Object parse(String text, Feature... features) { int featureValues = DEFAULT_PARSER_FEATURE; - for (Feature featrue : features) { - featureValues = Feature.config(featureValues, featrue, true); + for (Feature feature : features) { + featureValues = Feature.config(featureValues, feature, true); } return parse(text, featureValues); @@ -208,8 +208,8 @@ public abstract class JSON implements JSONStreamAware, JSONAware { return null; } - for (Feature featrue : features) { - featureValues = Feature.config(featureValues, featrue, true); + for (Feature feature : features) { + featureValues = Feature.config(featureValues, feature, true); } DefaultJSONParser parser = new DefaultJSONParser(input, ParserConfig.getGlobalInstance(), featureValues); @@ -234,8 +234,8 @@ public abstract class JSON implements JSONStreamAware, JSONAware { return null; } - for (Feature featrue : features) { - featureValues = Feature.config(featureValues, featrue, true); + for (Feature feature : features) { + featureValues = Feature.config(featureValues, feature, true); } DefaultJSONParser parser = new DefaultJSONParser(input, config, featureValues); @@ -286,8 +286,8 @@ public abstract class JSON implements JSONStreamAware, JSONAware { } int featureValues = DEFAULT_PARSER_FEATURE; - for (Feature featrue : features) { - featureValues = Feature.config(featureValues, featrue, true); + for (Feature feature : features) { + featureValues = Feature.config(featureValues, feature, true); } DefaultJSONParser parser = new DefaultJSONParser(input, length, ParserConfig.getGlobalInstance(), featureValues); diff --git a/src/test/java/com/alibaba/json/bvt/parser/DateParserTest.java b/src/test/java/com/alibaba/json/bvt/parser/DateParserTest.java index 1773c194f..1a7166d16 100755 --- a/src/test/java/com/alibaba/json/bvt/parser/DateParserTest.java +++ b/src/test/java/com/alibaba/json/bvt/parser/DateParserTest.java @@ -43,9 +43,9 @@ public class DateParserTest extends TestCase { } public void test_date_1() throws Exception { - int featrues = JSON.DEFAULT_PARSER_FEATURE; - featrues = Feature.config(featrues, Feature.AllowISO8601DateFormat, true); - DefaultJSONParser parser = new DefaultJSONParser("\"2011-01-09T13:49:53.254\"", ParserConfig.getGlobalInstance(), featrues); + int features = JSON.DEFAULT_PARSER_FEATURE; + features = Feature.config(features, Feature.AllowISO8601DateFormat, true); + DefaultJSONParser parser = new DefaultJSONParser("\"2011-01-09T13:49:53.254\"", ParserConfig.getGlobalInstance(), features); java.util.Date date = parser.parseObject(java.util.Date.class); @@ -54,8 +54,8 @@ public class DateParserTest extends TestCase { } public void test_date_2() throws Exception { - int featrues = JSON.DEFAULT_PARSER_FEATURE; - DefaultJSONParser parser = new DefaultJSONParser("new Date(1294552193254)", ParserConfig.getGlobalInstance(), featrues); + int features = JSON.DEFAULT_PARSER_FEATURE; + DefaultJSONParser parser = new DefaultJSONParser("new Date(1294552193254)", ParserConfig.getGlobalInstance(), features); java.util.Date date = parser.parseObject(java.util.Date.class); @@ -70,9 +70,9 @@ public class DateParserTest extends TestCase { } public void test_date_4() throws Exception { - int featrues = JSON.DEFAULT_PARSER_FEATURE; - featrues = Feature.config(featrues, Feature.AllowISO8601DateFormat, true); - DefaultJSONParser parser = new DefaultJSONParser("\"2011-01-09\"", ParserConfig.getGlobalInstance(), featrues); + int features = JSON.DEFAULT_PARSER_FEATURE; + features = Feature.config(features, Feature.AllowISO8601DateFormat, true); + DefaultJSONParser parser = new DefaultJSONParser("\"2011-01-09\"", ParserConfig.getGlobalInstance(), features); java.util.Date date = parser.parseObject(java.util.Date.class); @@ -86,8 +86,8 @@ public class DateParserTest extends TestCase { } public void test_date_6() throws Exception { - int featrues = JSON.DEFAULT_PARSER_FEATURE; - featrues = Feature.config(featrues, Feature.AllowISO8601DateFormat, true); + int features = JSON.DEFAULT_PARSER_FEATURE; + features = Feature.config(features, Feature.AllowISO8601DateFormat, true); java.util.Date date = JSON.parseObject("{d:\"2011-01-09T13:49:53\"}", Entity.class, Feature.AllowISO8601DateFormat).getD(); 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 569e2a608..b23e8f8ec 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 @@ -23,9 +23,9 @@ public class DateParserTest_sql extends TestCase { } public void test_date_1() throws Exception { - int featrues = JSON.DEFAULT_PARSER_FEATURE; - featrues = Feature.config(featrues, Feature.AllowISO8601DateFormat, true); - DefaultExtJSONParser parser = new DefaultExtJSONParser("\"2011-01-09T13:49:53.254\"", ParserConfig.getGlobalInstance(), featrues); + 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); java.sql.Date date = parser.parseObject(java.sql.Date.class); @@ -34,8 +34,8 @@ public class DateParserTest_sql extends TestCase { } public void test_date_2() throws Exception { - int featrues = JSON.DEFAULT_PARSER_FEATURE; - DefaultExtJSONParser parser = new DefaultExtJSONParser("new Date(1294552193254)", ParserConfig.getGlobalInstance(), featrues); + int features = JSON.DEFAULT_PARSER_FEATURE; + DefaultExtJSONParser parser = new DefaultExtJSONParser("new Date(1294552193254)", ParserConfig.getGlobalInstance(), features); java.sql.Date date = parser.parseObject(java.sql.Date.class); @@ -44,9 +44,9 @@ public class DateParserTest_sql extends TestCase { } public void test_date_3() throws Exception { - int featrues = JSON.DEFAULT_PARSER_FEATURE; - featrues = Feature.config(featrues, Feature.AllowISO8601DateFormat, true); - DefaultExtJSONParser parser = new DefaultExtJSONParser("\"2011-01-09T13:49:53\"", ParserConfig.getGlobalInstance(), featrues); + 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); java.sql.Date date = parser.parseObject(java.sql.Date.class); @@ -55,9 +55,9 @@ public class DateParserTest_sql extends TestCase { } public void test_date_4() throws Exception { - int featrues = JSON.DEFAULT_PARSER_FEATURE; - featrues = Feature.config(featrues, Feature.AllowISO8601DateFormat, true); - DefaultExtJSONParser parser = new DefaultExtJSONParser("\"2011-01-09\"", ParserConfig.getGlobalInstance(), featrues); + int features = JSON.DEFAULT_PARSER_FEATURE; + features = Feature.config(features, Feature.AllowISO8601DateFormat, true); + DefaultExtJSONParser parser = new DefaultExtJSONParser("\"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 cfd99b44e..9a46f5595 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 @@ -22,9 +22,9 @@ public class DateParserTest_sql_timestamp extends TestCase { } public void test_date_1() throws Exception { - int featrues = JSON.DEFAULT_PARSER_FEATURE; - featrues = Feature.config(featrues, Feature.AllowISO8601DateFormat, true); - DefaultExtJSONParser parser = new DefaultExtJSONParser("\"2011-01-09T13:49:53.254\"", ParserConfig.getGlobalInstance(), featrues); + 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); java.sql.Timestamp date = parser.parseObject(java.sql.Timestamp.class); @@ -33,8 +33,8 @@ public class DateParserTest_sql_timestamp extends TestCase { } public void test_date_2() throws Exception { - int featrues = JSON.DEFAULT_PARSER_FEATURE; - DefaultExtJSONParser parser = new DefaultExtJSONParser("new Date(1294552193254)", ParserConfig.getGlobalInstance(), featrues); + int features = JSON.DEFAULT_PARSER_FEATURE; + DefaultExtJSONParser parser = new DefaultExtJSONParser("new Date(1294552193254)", ParserConfig.getGlobalInstance(), features); java.sql.Timestamp date = parser.parseObject(java.sql.Timestamp.class); @@ -43,9 +43,9 @@ public class DateParserTest_sql_timestamp extends TestCase { } public void test_date_3() throws Exception { - int featrues = JSON.DEFAULT_PARSER_FEATURE; - featrues = Feature.config(featrues, Feature.AllowISO8601DateFormat, true); - DefaultExtJSONParser parser = new DefaultExtJSONParser("\"2011-01-09T13:49:53\"", ParserConfig.getGlobalInstance(), featrues); + 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); java.sql.Timestamp date = parser.parseObject(java.sql.Timestamp.class); @@ -54,9 +54,9 @@ public class DateParserTest_sql_timestamp extends TestCase { } public void test_date_4() throws Exception { - int featrues = JSON.DEFAULT_PARSER_FEATURE; - featrues = Feature.config(featrues, Feature.AllowISO8601DateFormat, true); - DefaultExtJSONParser parser = new DefaultExtJSONParser("\"2011-01-09\"", ParserConfig.getGlobalInstance(), featrues); + int features = JSON.DEFAULT_PARSER_FEATURE; + features = Feature.config(features, Feature.AllowISO8601DateFormat, true); + DefaultExtJSONParser parser = new DefaultExtJSONParser("\"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/deser/ArrayListStringDeserializerTest.java b/src/test/java/com/alibaba/json/bvt/parser/deser/ArrayListStringDeserializerTest.java index a3e4303c7..3a0a64314 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 @@ -108,8 +108,8 @@ public class ArrayListStringDeserializerTest extends TestCase { } int featureValues = 0; - for (Feature featrue : features) { - featureValues = Feature.config(featureValues, featrue, true); + for (Feature feature : features) { + featureValues = Feature.config(featureValues, feature, true); } DefaultExtJSONParser parser = new DefaultExtJSONParser(input, ParserConfig.getGlobalInstance(), featureValues); 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 4c60574c7..a34845125 100755 --- a/src/test/java/com/alibaba/json/bvt/serializer/BooleanFieldSerializerTest.java +++ b/src/test/java/com/alibaba/json/bvt/serializer/BooleanFieldSerializerTest.java @@ -59,8 +59,8 @@ public class BooleanFieldSerializerTest extends TestCase { return null; } - for (Feature featrue : features) { - featureValues = Feature.config(featureValues, featrue, true); + for (Feature feature : features) { + featureValues = Feature.config(featureValues, feature, true); } ParserConfig config = new ParserConfig(); 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 8714aa3ad..e3a171cce 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 @@ -71,8 +71,8 @@ public class BooleanFieldSerializerTest_primitive extends TestCase { return null; } - for (Feature featrue : features) { - featureValues = Feature.config(featureValues, featrue, true); + for (Feature feature : features) { + featureValues = Feature.config(featureValues, feature, true); } ParserConfig config = new ParserConfig();