diff --git a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java index 8653bdeb3f..2568de3795 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java @@ -38,7 +38,6 @@ import javax.sql.DataSource; import com.alibaba.druid.filter.Filter; import com.alibaba.druid.filter.FilterChainImpl; -import com.alibaba.druid.pool.vendor.ExceptionSorter; import com.alibaba.druid.proxy.jdbc.DataSourceProxy; import com.alibaba.druid.util.DruidLoaderUtils; diff --git a/src/main/java/com/alibaba/druid/pool/vendor/ExceptionSorter.java b/src/main/java/com/alibaba/druid/pool/ExceptionSorter.java similarity index 90% rename from src/main/java/com/alibaba/druid/pool/vendor/ExceptionSorter.java rename to src/main/java/com/alibaba/druid/pool/ExceptionSorter.java index 2968b15ff1..d648e6ffe6 100644 --- a/src/main/java/com/alibaba/druid/pool/vendor/ExceptionSorter.java +++ b/src/main/java/com/alibaba/druid/pool/ExceptionSorter.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.pool.vendor; +package com.alibaba.druid.pool; import java.sql.SQLException; diff --git a/src/main/java/com/alibaba/druid/pool/PoolableConnection.java b/src/main/java/com/alibaba/druid/pool/PoolableConnection.java index 633b1cc4d6..5e0856186b 100644 --- a/src/main/java/com/alibaba/druid/pool/PoolableConnection.java +++ b/src/main/java/com/alibaba/druid/pool/PoolableConnection.java @@ -40,7 +40,6 @@ import javax.sql.StatementEventListener; import com.alibaba.druid.pool.PoolablePreparedStatement.PreparedStatementKey; import com.alibaba.druid.pool.PreparedStatementPool.MethodType; -import com.alibaba.druid.pool.vendor.ExceptionSorter; /** * @author wenshao diff --git a/src/main/java/com/alibaba/druid/pool/vendor/MySqlExceptionSorter.java b/src/main/java/com/alibaba/druid/pool/vendor/MySqlExceptionSorter.java index cec7af8206..ac91dcd19a 100644 --- a/src/main/java/com/alibaba/druid/pool/vendor/MySqlExceptionSorter.java +++ b/src/main/java/com/alibaba/druid/pool/vendor/MySqlExceptionSorter.java @@ -2,6 +2,8 @@ package com.alibaba.druid.pool.vendor; import java.sql.SQLException; +import com.alibaba.druid.pool.ExceptionSorter; + public class MySqlExceptionSorter implements ExceptionSorter { @Override diff --git a/src/main/java/com/alibaba/druid/pool/vendor/OracleExceptionSorter.java b/src/main/java/com/alibaba/druid/pool/vendor/OracleExceptionSorter.java index 96d9f8fc44..83697b2290 100644 --- a/src/main/java/com/alibaba/druid/pool/vendor/OracleExceptionSorter.java +++ b/src/main/java/com/alibaba/druid/pool/vendor/OracleExceptionSorter.java @@ -3,6 +3,8 @@ package com.alibaba.druid.pool.vendor; import java.io.Serializable; import java.sql.SQLException; +import com.alibaba.druid.pool.ExceptionSorter; + /** * Implementation of ExceptionSorter for Oracle. */