Skip to content

Commit 56aff29

Browse files
SeanDragonSeanDragon
committed
去除私库中的包，替换为官方包
1 parent 3be54b7 commit 56aff29

14 files changed

Lines changed: 31 additions & 37 deletions

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
## [更新日志](https://github.com/SeanDragon/protools/blob/master/changelog.txt)
1414
- 简单过了一遍阿里的规范手册，把一些显而易见的代码优化了。
15+
- 去除私库中的包，替换为官方包。
1516

1617
## 开发计划
1718
- 使用阿里的规范手册整理规范所有代码

‎changelog.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
2018-01-25 17:31
2-
简单过了一遍阿里的规范手册，把一些显而易见的代码优化了。
1+
2018-01-25
2+
简单过了一遍阿里的规范手册，把一些显而易见的代码优化了。
3+
去除私库中的包，替换为官方包

‎common/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828

2929
<!--json-->
3030
<dependency>
31-
<groupId>org.google.code.gson</groupId>
31+
<groupId>com.google.code.gson</groupId>
3232
<artifactId>gson</artifactId>
33-
<version>2.8.3</version>
33+
<version>2.8.2</version>
3434
</dependency>
3535

3636
<!--barCode-->

‎common/src/main/java/pro/tools/data/text/ToolJson.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import com.google.common.collect.Lists;
44
import com.google.common.collect.Maps;
5-
import org.google.gson.Gson;
6-
import org.google.gson.GsonBuilder;
7-
import org.google.gson.JsonObject;
8-
import org.google.gson.reflect.TypeToken;
5+
import com.google.gson.Gson;
6+
import com.google.gson.GsonBuilder;
7+
import com.google.gson.JsonObject;
8+
import com.google.gson.reflect.TypeToken;
99
import pro.tools.data.decimal.Decimal;
1010
import pro.tools.data.text.json.TypeBuilder;
1111
import pro.tools.data.text.json.typeadapter.BigDecimalTypeAdapter;

‎common/src/main/java/pro/tools/data/text/json/TypeBuilder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public TypeBuilder beginSubType(Class raw) {
3636
return newInstance(raw, this);
3737
}
3838

39-
public TypeBuilder endSubType() {
39+
public TypeBuilder endSubType() throws TypeException {
4040
if (parent == null) {
4141
throw new TypeException("expect beginSubType() before endSubType()");
4242
}

‎common/src/main/java/pro/tools/data/text/json/exception/TypeException.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @author SeanDragon
55
*/
6-
public class TypeException extends Exception {
6+
public class TypeException extends RuntimeException {
77
public TypeException() {
88
}
99

‎common/src/main/java/pro/tools/data/text/json/typeadapter/BaseTypeAdapter.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package pro.tools.data.text.json.typeadapter;
22

3-
import org.google.gson.TypeAdapter;
4-
import org.google.gson.stream.JsonReader;
5-
import org.google.gson.stream.JsonToken;
6-
import org.google.gson.stream.JsonWriter;
3+
import com.google.gson.TypeAdapter;
4+
import com.google.gson.stream.JsonReader;
5+
import com.google.gson.stream.JsonToken;
6+
import com.google.gson.stream.JsonWriter;
77

88
import java.io.IOException;
99

‎common/src/main/java/pro/tools/data/text/json/typeadapter/BigDecimalTypeAdapter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package pro.tools.data.text.json.typeadapter;
22

3-
import org.google.gson.stream.JsonReader;
4-
import org.google.gson.stream.JsonWriter;
3+
import com.google.gson.stream.JsonReader;
4+
import com.google.gson.stream.JsonWriter;
55

66
import java.io.IOException;
77
import java.math.BigDecimal;

‎common/src/main/java/pro/tools/data/text/json/typeadapter/DatePlusTypeAdapter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package pro.tools.data.text.json.typeadapter;
22

3-
import org.google.gson.stream.JsonReader;
4-
import org.google.gson.stream.JsonWriter;
3+
import com.google.gson.stream.JsonReader;
4+
import com.google.gson.stream.JsonWriter;
55
import pro.tools.time.DatePlus;
66
import pro.tools.time.ToolDatePlus;
77

‎common/src/main/java/pro/tools/data/text/json/typeadapter/DecimalTypeAdapter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package pro.tools.data.text.json.typeadapter;
22

3-
import org.google.gson.stream.JsonReader;
4-
import org.google.gson.stream.JsonWriter;
3+
import com.google.gson.stream.JsonReader;
4+
import com.google.gson.stream.JsonWriter;
55
import pro.tools.data.decimal.Decimal;
66

77
import java.io.IOException;

0 commit comments

Comments
 (0)