Skip to content

Commit 007dd65

Browse files
authored
简化依赖,感谢阿里云工程师的贡献 #489
定义 UnsupportedDataTypeException 类代替 javax.activation.UnsupportedDataTypeException,并移除 javax.activation 依赖
2 parents 8efd38e + 76cf980 commit 007dd65

File tree

8 files changed

+31
-14
lines changed

8 files changed

+31
-14
lines changed

APIJSONORM/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@
2323
<artifactId>fastjson</artifactId>
2424
<version>1.2.83</version>
2525
</dependency>
26-
<dependency>
27-
<groupId>javax.activation</groupId>
28-
<artifactId>activation</artifactId>
29-
<version>1.1.1</version>
30-
</dependency>
3126
</dependencies>
3227

3328
<build>

APIJSONORM/src/main/java/apijson/orm/AbstractFunctionParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import java.util.List;
1919
import java.util.Map;
2020

21-
import javax.activation.UnsupportedDataTypeException;
2221
import javax.script.Invocable;
2322
import javax.script.ScriptEngine;
2423
import javax.script.ScriptEngineManager;
@@ -27,6 +26,7 @@
2726
import apijson.NotNull;
2827
import apijson.RequestMethod;
2928
import apijson.StringUtil;
29+
import apijson.orm.exception.UnsupportedDataTypeException;
3030

3131
/**可远程调用的函数类
3232
* @author Lemon

APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
import apijson.orm.exception.ConflictException;
1515
import apijson.orm.exception.CommonException;
1616
import apijson.orm.exception.NotExistException;
17+
import apijson.orm.exception.UnsupportedDataTypeException;
1718
import com.alibaba.fastjson.JSON;
1819
import com.alibaba.fastjson.JSONArray;
1920
import com.alibaba.fastjson.JSONObject;
2021

21-
import javax.activation.UnsupportedDataTypeException;
2222
import java.rmi.ServerException;
2323
import java.util.ArrayList;
2424
import java.util.Arrays;

APIJSONORM/src/main/java/apijson/orm/AbstractParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import java.util.SortedMap;
2626
import java.util.TreeMap;
2727

28-
import javax.activation.UnsupportedDataTypeException;
2928
import javax.management.MBeanServer;
3029
import javax.management.ObjectName;
3130
import javax.management.Query;
@@ -38,6 +37,7 @@
3837
import apijson.RequestMethod;
3938
import apijson.StringUtil;
4039
import apijson.orm.exception.CommonException;
40+
import apijson.orm.exception.UnsupportedDataTypeException;
4141

4242
import static apijson.JSONObject.KEY_EXPLAIN;
4343
import static apijson.RequestMethod.CRUD;

APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
import java.util.Set;
2121
import java.util.regex.Pattern;
2222

23-
import javax.activation.UnsupportedDataTypeException;
24-
2523
import apijson.JSON;
2624
import apijson.JSONResponse;
2725
import apijson.Log;
@@ -31,6 +29,7 @@
3129
import apijson.StringUtil;
3230
import apijson.orm.Join.On;
3331
import apijson.orm.exception.NotExistException;
32+
import apijson.orm.exception.UnsupportedDataTypeException;
3433
import apijson.orm.model.Access;
3534
import apijson.orm.model.AllColumn;
3635
import apijson.orm.model.AllColumnComment;

APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
import java.util.SortedMap;
4242
import java.util.regex.Pattern;
4343

44-
import javax.activation.UnsupportedDataTypeException;
45-
4644
import com.alibaba.fastjson.JSONArray;
4745
import com.alibaba.fastjson.JSONObject;
4846

@@ -56,6 +54,7 @@
5654
import apijson.orm.AbstractSQLConfig.IdCallback;
5755
import apijson.orm.exception.ConflictException;
5856
import apijson.orm.exception.NotLoggedInException;
57+
import apijson.orm.exception.UnsupportedDataTypeException;
5958
import apijson.orm.model.Access;
6059
import apijson.orm.model.Column;
6160
import apijson.orm.model.Document;

APIJSONORM/src/main/java/apijson/orm/exception/CommonException.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
import java.sql.SQLException;
1010
import java.util.concurrent.TimeoutException;
1111

12-
import javax.activation.UnsupportedDataTypeException;
13-
1412
import apijson.JSONResponse;
1513
import apijson.Log;
1614
import apijson.StringUtil;
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
/*Copyright (C) 2020 THL A29 Limited, a Tencent company. All rights reserved.
2+
3+
This source code is licensed under the Apache License Version 2.0.*/
4+
5+
6+
package apijson.orm.exception;
7+
8+
import java.io.IOException;
9+
10+
/**
11+
* 给定的数据类型不被支持
12+
*
13+
* @author cnscoo
14+
*/
15+
16+
public class UnsupportedDataTypeException extends IOException {
17+
private static final long serialVersionUID = 1L;
18+
19+
public UnsupportedDataTypeException() {
20+
super();
21+
}
22+
23+
public UnsupportedDataTypeException(String s) {
24+
super(s);
25+
}
26+
}

0 commit comments

Comments
 (0)