From 76cf980084cb450d3554831a2298bd883d818979 Mon Sep 17 00:00:00 2001 From: dhc Date: Thu, 15 Dec 2022 10:31:32 +0800 Subject: [PATCH] =?UTF-8?q?#488=20=E5=AE=9A=E4=B9=89=20UnsupportedDataType?= =?UTF-8?q?Exception=20=E7=B1=BB=E4=BB=A3=E6=9B=BF=20javax.activation.Unsu?= =?UTF-8?q?pportedDataTypeException=EF=BC=8C=E7=A7=BB=E9=99=A4javax.activa?= =?UTF-8?q?tion=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APIJSONORM/pom.xml | 5 ---- .../apijson/orm/AbstractFunctionParser.java | 2 +- .../apijson/orm/AbstractObjectParser.java | 2 +- .../main/java/apijson/orm/AbstractParser.java | 2 +- .../java/apijson/orm/AbstractSQLConfig.java | 3 +-- .../java/apijson/orm/AbstractVerifier.java | 3 +-- .../orm/exception/CommonException.java | 2 -- .../UnsupportedDataTypeException.java | 26 +++++++++++++++++++ 8 files changed, 31 insertions(+), 14 deletions(-) create mode 100644 APIJSONORM/src/main/java/apijson/orm/exception/UnsupportedDataTypeException.java diff --git a/APIJSONORM/pom.xml b/APIJSONORM/pom.xml index 5fe07af67..807f0de38 100644 --- a/APIJSONORM/pom.xml +++ b/APIJSONORM/pom.xml @@ -23,11 +23,6 @@ fastjson 1.2.83 - - javax.activation - activation - 1.1.1 - diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractFunctionParser.java b/APIJSONORM/src/main/java/apijson/orm/AbstractFunctionParser.java index 0d87b32f0..277e08aa6 100755 --- a/APIJSONORM/src/main/java/apijson/orm/AbstractFunctionParser.java +++ b/APIJSONORM/src/main/java/apijson/orm/AbstractFunctionParser.java @@ -18,7 +18,6 @@ import java.util.List; import java.util.Map; -import javax.activation.UnsupportedDataTypeException; import javax.script.Invocable; import javax.script.ScriptEngine; import javax.script.ScriptEngineManager; @@ -27,6 +26,7 @@ import apijson.NotNull; import apijson.RequestMethod; import apijson.StringUtil; +import apijson.orm.exception.UnsupportedDataTypeException; /**可远程调用的函数类 * @author Lemon diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java b/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java index 0640cd6b3..e4cb1ee44 100755 --- a/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java +++ b/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java @@ -14,11 +14,11 @@ import apijson.orm.exception.ConflictException; import apijson.orm.exception.CommonException; import apijson.orm.exception.NotExistException; +import apijson.orm.exception.UnsupportedDataTypeException; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import javax.activation.UnsupportedDataTypeException; import java.rmi.ServerException; import java.util.ArrayList; import java.util.Arrays; diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java b/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java index dd932b8b7..9c44cc965 100755 --- a/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java +++ b/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java @@ -25,7 +25,6 @@ import java.util.SortedMap; import java.util.TreeMap; -import javax.activation.UnsupportedDataTypeException; import javax.management.MBeanServer; import javax.management.ObjectName; import javax.management.Query; @@ -38,6 +37,7 @@ import apijson.RequestMethod; import apijson.StringUtil; import apijson.orm.exception.CommonException; +import apijson.orm.exception.UnsupportedDataTypeException; import static apijson.JSONObject.KEY_EXPLAIN; import static apijson.RequestMethod.CRUD; diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java index 707147c18..9a0cc3150 100755 --- a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java +++ b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java @@ -20,8 +20,6 @@ import java.util.Set; import java.util.regex.Pattern; -import javax.activation.UnsupportedDataTypeException; - import apijson.JSON; import apijson.JSONResponse; import apijson.Log; @@ -31,6 +29,7 @@ import apijson.StringUtil; import apijson.orm.Join.On; import apijson.orm.exception.NotExistException; +import apijson.orm.exception.UnsupportedDataTypeException; import apijson.orm.model.Access; import apijson.orm.model.AllColumn; import apijson.orm.model.AllColumnComment; diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java b/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java index 12ba0db69..3ca5b468a 100755 --- a/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java +++ b/APIJSONORM/src/main/java/apijson/orm/AbstractVerifier.java @@ -41,8 +41,6 @@ import java.util.SortedMap; import java.util.regex.Pattern; -import javax.activation.UnsupportedDataTypeException; - import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -56,6 +54,7 @@ import apijson.orm.AbstractSQLConfig.IdCallback; import apijson.orm.exception.ConflictException; import apijson.orm.exception.NotLoggedInException; +import apijson.orm.exception.UnsupportedDataTypeException; import apijson.orm.model.Access; import apijson.orm.model.Column; import apijson.orm.model.Document; diff --git a/APIJSONORM/src/main/java/apijson/orm/exception/CommonException.java b/APIJSONORM/src/main/java/apijson/orm/exception/CommonException.java index c9b7b9992..17d45d414 100755 --- a/APIJSONORM/src/main/java/apijson/orm/exception/CommonException.java +++ b/APIJSONORM/src/main/java/apijson/orm/exception/CommonException.java @@ -9,8 +9,6 @@ import java.sql.SQLException; import java.util.concurrent.TimeoutException; -import javax.activation.UnsupportedDataTypeException; - import apijson.JSONResponse; import apijson.Log; import apijson.StringUtil; diff --git a/APIJSONORM/src/main/java/apijson/orm/exception/UnsupportedDataTypeException.java b/APIJSONORM/src/main/java/apijson/orm/exception/UnsupportedDataTypeException.java new file mode 100644 index 000000000..e272141c9 --- /dev/null +++ b/APIJSONORM/src/main/java/apijson/orm/exception/UnsupportedDataTypeException.java @@ -0,0 +1,26 @@ +/*Copyright (C) 2020 THL A29 Limited, a Tencent company. All rights reserved. + +This source code is licensed under the Apache License Version 2.0.*/ + + +package apijson.orm.exception; + +import java.io.IOException; + +/** + * 给定的数据类型不被支持 + * + * @author cnscoo + */ + +public class UnsupportedDataTypeException extends IOException { + private static final long serialVersionUID = 1L; + + public UnsupportedDataTypeException() { + super(); + } + + public UnsupportedDataTypeException(String s) { + super(s); + } +}