Skip to content

Commit 3d22a3d

Browse files
wenshaowenshao
committed
refactor for android
1 parent e02a129 commit 3d22a3d

13 files changed

Lines changed: 23 additions & 198 deletions

‎src/main/java/com/alibaba/fastjson/parser/ParserConfig.java‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
import com.alibaba.fastjson.parser.deserializer.CalendarDeserializer;
6666
import com.alibaba.fastjson.parser.deserializer.CharArrayDeserializer;
6767
import com.alibaba.fastjson.parser.deserializer.CharacterDeserializer;
68-
import com.alibaba.fastjson.parser.deserializer.CharsetDeserializer;
6968
import com.alibaba.fastjson.parser.deserializer.ClassDerializer;
7069
import com.alibaba.fastjson.parser.deserializer.CollectionDeserializer;
7170
import com.alibaba.fastjson.parser.deserializer.DateDeserializer;
@@ -90,18 +89,14 @@
9089
import com.alibaba.fastjson.parser.deserializer.MapDeserializer;
9190
import com.alibaba.fastjson.parser.deserializer.NumberDeserializer;
9291
import com.alibaba.fastjson.parser.deserializer.ObjectDeserializer;
93-
import com.alibaba.fastjson.parser.deserializer.PatternDeserializer;
92+
import com.alibaba.fastjson.parser.deserializer.SimpleTypeDeserializer;
9493
import com.alibaba.fastjson.parser.deserializer.SqlDateDeserializer;
9594
import com.alibaba.fastjson.parser.deserializer.StackTraceElementDeserializer;
9695
import com.alibaba.fastjson.parser.deserializer.StringDeserializer;
9796
import com.alibaba.fastjson.parser.deserializer.StringFieldDeserializer;
9897
import com.alibaba.fastjson.parser.deserializer.ThrowableDeserializer;
9998
import com.alibaba.fastjson.parser.deserializer.TimeDeserializer;
100-
import com.alibaba.fastjson.parser.deserializer.TimeZoneDeserializer;
10199
import com.alibaba.fastjson.parser.deserializer.TimestampDeserializer;
102-
import com.alibaba.fastjson.parser.deserializer.URIDeserializer;
103-
import com.alibaba.fastjson.parser.deserializer.URLDeserializer;
104-
import com.alibaba.fastjson.parser.deserializer.UUIDDeserializer;
105100
import com.alibaba.fastjson.util.FieldInfo;
106101
import com.alibaba.fastjson.util.IdentityHashMap;
107102

@@ -208,18 +203,18 @@ public ParserConfig(){
208203
derializers.put(Class.class, ClassDerializer.instance);
209204
derializers.put(char[].class, CharArrayDeserializer.instance);
210205

211-
derializers.put(UUID.class, UUIDDeserializer.instance);
212-
derializers.put(TimeZone.class, TimeZoneDeserializer.instance);
206+
derializers.put(UUID.class, SimpleTypeDeserializer.instance);
207+
derializers.put(TimeZone.class, SimpleTypeDeserializer.instance);
213208
derializers.put(Locale.class, LocaleDeserializer.instance);
214209
derializers.put(InetAddress.class, InetAddressDeserializer.instance);
215210
derializers.put(Inet4Address.class, InetAddressDeserializer.instance);
216211
derializers.put(Inet6Address.class, InetAddressDeserializer.instance);
217212
derializers.put(InetSocketAddress.class, InetSocketAddressDeserializer.instance);
218213
derializers.put(File.class, FileDeserializer.instance);
219-
derializers.put(URI.class, URIDeserializer.instance);
220-
derializers.put(URL.class, URLDeserializer.instance);
221-
derializers.put(Pattern.class, PatternDeserializer.instance);
222-
derializers.put(Charset.class, CharsetDeserializer.instance);
214+
derializers.put(URI.class, SimpleTypeDeserializer.instance);
215+
derializers.put(URL.class, SimpleTypeDeserializer.instance);
216+
derializers.put(Pattern.class, SimpleTypeDeserializer.instance);
217+
derializers.put(Charset.class, SimpleTypeDeserializer.instance);
223218
derializers.put(Number.class, NumberDeserializer.instance);
224219
derializers.put(StackTraceElement.class, StackTraceElementDeserializer.instance);
225220

‎src/main/java/com/alibaba/fastjson/parser/deserializer/CharsetDeserializer.java‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎src/main/java/com/alibaba/fastjson/parser/deserializer/PatternDeserializer.java‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎src/main/java/com/alibaba/fastjson/parser/deserializer/TimeZoneDeserializer.java‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎src/main/java/com/alibaba/fastjson/parser/deserializer/URIDeserializer.java‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎src/main/java/com/alibaba/fastjson/parser/deserializer/URLDeserializer.java‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎src/main/java/com/alibaba/fastjson/parser/deserializer/UUIDDeserializer.java‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎src/test/java/com/alibaba/json/bvt/parser/FastMatchCheckTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
import com.alibaba.fastjson.parser.deserializer.ArrayDeserializer;
88
import com.alibaba.fastjson.parser.deserializer.ArrayListStringDeserializer;
99
import com.alibaba.fastjson.parser.deserializer.CharacterDeserializer;
10-
import com.alibaba.fastjson.parser.deserializer.CharsetDeserializer;
1110
import com.alibaba.fastjson.parser.deserializer.FileDeserializer;
1211
import com.alibaba.fastjson.parser.deserializer.InetAddressDeserializer;
1312
import com.alibaba.fastjson.parser.deserializer.InetSocketAddressDeserializer;
1413
import com.alibaba.fastjson.parser.deserializer.JSONArrayDeserializer;
1514
import com.alibaba.fastjson.parser.deserializer.JSONObjectDeserializer;
1615
import com.alibaba.fastjson.parser.deserializer.LocaleDeserializer;
1716
import com.alibaba.fastjson.parser.deserializer.NumberDeserializer;
17+
import com.alibaba.fastjson.parser.deserializer.SimpleTypeDeserializer;
1818
import com.alibaba.fastjson.parser.deserializer.TimestampDeserializer;
1919

2020
public class FastMatchCheckTest extends TestCase {
@@ -24,7 +24,7 @@ public void test_match() throws Exception {
2424
Assert.assertEquals(JSONToken.LITERAL_STRING, LocaleDeserializer.instance.getFastMatchToken());
2525
Assert.assertEquals(JSONToken.LITERAL_INT, NumberDeserializer.instance.getFastMatchToken());
2626
Assert.assertEquals(JSONToken.LITERAL_INT, TimestampDeserializer.instance.getFastMatchToken());
27-
Assert.assertEquals(JSONToken.LITERAL_STRING, CharsetDeserializer.instance.getFastMatchToken());
27+
Assert.assertEquals(JSONToken.LITERAL_STRING, SimpleTypeDeserializer.instance.getFastMatchToken());
2828
Assert.assertEquals(JSONToken.LITERAL_STRING, FileDeserializer.instance.getFastMatchToken());
2929
Assert.assertEquals(JSONToken.LBRACKET, JSONArrayDeserializer.instance.getFastMatchToken());
3030
Assert.assertEquals(JSONToken.LBRACKET, ArrayDeserializer.instance.getFastMatchToken());

‎src/test/java/com/alibaba/json/bvt/parser/deser/PatternDeserializerTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import com.alibaba.fastjson.parser.DefaultExtJSONParser;
1010
import com.alibaba.fastjson.parser.JSONToken;
1111
import com.alibaba.fastjson.parser.ParserConfig;
12-
import com.alibaba.fastjson.parser.deserializer.PatternDeserializer;
12+
import com.alibaba.fastjson.parser.deserializer.SimpleTypeDeserializer;
1313

1414
public class PatternDeserializerTest extends TestCase {
1515

@@ -19,7 +19,7 @@ public void test_pattern() throws Exception {
1919
Assert.assertEquals(null, JSON.parseObject("null", Pattern.class));
2020

2121
DefaultExtJSONParser parser = new DefaultExtJSONParser("null", ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE);
22-
Assert.assertEquals(null, PatternDeserializer.instance.deserialze(parser, null, null));
23-
Assert.assertEquals(JSONToken.LITERAL_STRING, PatternDeserializer.instance.getFastMatchToken());
22+
Assert.assertEquals(null, SimpleTypeDeserializer.instance.deserialze(parser, null, null));
23+
Assert.assertEquals(JSONToken.LITERAL_STRING, SimpleTypeDeserializer.instance.getFastMatchToken());
2424
}
2525
}

‎src/test/java/com/alibaba/json/bvt/parser/deser/TimeZoneDeserializerTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
import com.alibaba.fastjson.parser.DefaultExtJSONParser;
88
import com.alibaba.fastjson.parser.JSONToken;
99
import com.alibaba.fastjson.parser.ParserConfig;
10-
import com.alibaba.fastjson.parser.deserializer.TimeZoneDeserializer;
10+
import com.alibaba.fastjson.parser.deserializer.SimpleTypeDeserializer;
1111

1212
public class TimeZoneDeserializerTest extends TestCase {
1313
public void test_timezone() throws Exception {
1414
DefaultExtJSONParser parser = new DefaultExtJSONParser("null", ParserConfig.getGlobalInstance(), JSON.DEFAULT_PARSER_FEATURE);
15-
Assert.assertEquals(null, TimeZoneDeserializer.instance.deserialze(parser, null, null));
16-
Assert.assertEquals(JSONToken.LITERAL_STRING, TimeZoneDeserializer.instance.getFastMatchToken());
15+
Assert.assertEquals(null, SimpleTypeDeserializer.instance.deserialze(parser, null, null));
16+
Assert.assertEquals(JSONToken.LITERAL_STRING, SimpleTypeDeserializer.instance.getFastMatchToken());
1717
}
1818
}

0 commit comments

Comments
 (0)