From de59752bb915fbe8dc19772957822b874ce67794 Mon Sep 17 00:00:00 2001 From: aoshiguchen <1052045476@qq.com> Date: Thu, 10 Nov 2022 17:52:06 +0800 Subject: [PATCH] =?UTF-8?q?CrispDbKit=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=BB=93=E6=9E=84=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/fun/asgc/neutrino/core/db/crisp/DbConfig.java | 3 +++ .../java/fun/asgc/neutrino/core/db/crisp/DbContext.java | 2 ++ .../java/fun/asgc/neutrino/core/db/crisp/DbExecutor.java | 3 +++ .../java/fun/asgc/neutrino/core/db/crisp/DbOperator.java | 2 ++ .../asgc/neutrino/core/db/crisp/{ => base}/BatchResult.java | 2 +- .../neutrino/core/db/crisp/{ => base}/DbUpdateResult.java | 2 +- .../neutrino/core/db/crisp/{ => base}/MappedStatement.java | 2 +- .../asgc/neutrino/core/db/crisp/{ => base}/RowBounds.java | 2 +- .../neutrino/core/db/crisp/{ => base}/SqlExecutorType.java | 2 +- .../core/db/crisp/{ => ds}/DefaultDataSourceProvider.java | 2 +- .../core/db/crisp/{ => ds}/IDataSourceProvider.java | 2 +- .../db/crisp/{ => session}/DefaultSqlSessionFactory.java | 6 +++++- .../neutrino/core/db/crisp/{ => session}/SqlSession.java | 5 ++++- .../core/db/crisp/{ => session}/SqlSessionFactory.java | 6 +++++- .../db/crisp/{ => session}/SqlSessionFactoryBuilder.java | 4 +++- .../fun/asgc/neutrino/core/db/crisp/tx/JdbcTransaction.java | 1 - .../core/db/crisp/{ => tx}/TransactionIsolationLevel.java | 2 +- 17 files changed, 35 insertions(+), 13 deletions(-) rename neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/{ => base}/BatchResult.java (98%) rename neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/{ => base}/DbUpdateResult.java (96%) rename neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/{ => base}/MappedStatement.java (96%) rename neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/{ => base}/RowBounds.java (97%) rename neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/{ => base}/SqlExecutorType.java (96%) rename neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/{ => ds}/DefaultDataSourceProvider.java (97%) rename neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/{ => ds}/IDataSourceProvider.java (96%) rename neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/{ => session}/DefaultSqlSessionFactory.java (91%) rename neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/{ => session}/SqlSession.java (97%) rename neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/{ => session}/SqlSessionFactory.java (88%) rename neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/{ => session}/SqlSessionFactoryBuilder.java (93%) rename neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/{ => tx}/TransactionIsolationLevel.java (97%) diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbConfig.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbConfig.java index 7d1529ff..9ee65ced 100644 --- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbConfig.java +++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbConfig.java @@ -21,6 +21,9 @@ */ package fun.asgc.neutrino.core.db.crisp; +import fun.asgc.neutrino.core.db.crisp.ds.DefaultDataSourceProvider; +import fun.asgc.neutrino.core.db.crisp.ds.IDataSourceProvider; + import javax.sql.DataSource; /** diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbContext.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbContext.java index 36c378ce..78f9ef4b 100644 --- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbContext.java +++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbContext.java @@ -21,6 +21,8 @@ */ package fun.asgc.neutrino.core.db.crisp; +import fun.asgc.neutrino.core.db.crisp.session.SqlSessionFactory; + import java.sql.Connection; /** diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbExecutor.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbExecutor.java index 11b344d4..8851b75a 100644 --- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbExecutor.java +++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbExecutor.java @@ -21,6 +21,9 @@ */ package fun.asgc.neutrino.core.db.crisp; +import fun.asgc.neutrino.core.db.crisp.base.DbUpdateResult; +import fun.asgc.neutrino.core.db.crisp.ds.IDataSourceProvider; + import javax.sql.DataSource; import java.util.List; diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbOperator.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbOperator.java index e2775d39..1e114cf7 100644 --- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbOperator.java +++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbOperator.java @@ -21,6 +21,8 @@ */ package fun.asgc.neutrino.core.db.crisp; +import fun.asgc.neutrino.core.db.crisp.base.DbUpdateResult; + import java.util.List; /** diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/BatchResult.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/base/BatchResult.java similarity index 98% rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/BatchResult.java rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/base/BatchResult.java index 74665b9c..982b3198 100644 --- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/BatchResult.java +++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/base/BatchResult.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.core.db.crisp; +package fun.asgc.neutrino.core.db.crisp.base; import java.util.ArrayList; import java.util.List; diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbUpdateResult.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/base/DbUpdateResult.java similarity index 96% rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbUpdateResult.java rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/base/DbUpdateResult.java index 41d4e32e..91e7a423 100644 --- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbUpdateResult.java +++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/base/DbUpdateResult.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.core.db.crisp; +package fun.asgc.neutrino.core.db.crisp.base; /** * @author: aoshiguchen diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/MappedStatement.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/base/MappedStatement.java similarity index 96% rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/MappedStatement.java rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/base/MappedStatement.java index 6c68cc6b..c2459d9b 100644 --- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/MappedStatement.java +++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/base/MappedStatement.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.core.db.crisp; +package fun.asgc.neutrino.core.db.crisp.base; /** * @author: aoshiguchen diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/RowBounds.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/base/RowBounds.java similarity index 97% rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/RowBounds.java rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/base/RowBounds.java index dddbdc58..461c1e79 100644 --- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/RowBounds.java +++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/base/RowBounds.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.core.db.crisp; +package fun.asgc.neutrino.core.db.crisp.base; /** * @author: aoshiguchen diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlExecutorType.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/base/SqlExecutorType.java similarity index 96% rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlExecutorType.java rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/base/SqlExecutorType.java index 19fe0ae7..802e513a 100644 --- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlExecutorType.java +++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/base/SqlExecutorType.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.core.db.crisp; +package fun.asgc.neutrino.core.db.crisp.base; /** * @author: aoshiguchen diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DefaultDataSourceProvider.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/ds/DefaultDataSourceProvider.java similarity index 97% rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DefaultDataSourceProvider.java rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/ds/DefaultDataSourceProvider.java index 123c75d2..4d49288c 100644 --- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DefaultDataSourceProvider.java +++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/ds/DefaultDataSourceProvider.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.core.db.crisp; +package fun.asgc.neutrino.core.db.crisp.ds; import javax.sql.DataSource; diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/IDataSourceProvider.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/ds/IDataSourceProvider.java similarity index 96% rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/IDataSourceProvider.java rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/ds/IDataSourceProvider.java index 34cf6a3f..fa748d58 100644 --- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/IDataSourceProvider.java +++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/ds/IDataSourceProvider.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.core.db.crisp; +package fun.asgc.neutrino.core.db.crisp.ds; import javax.sql.DataSource; diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DefaultSqlSessionFactory.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/session/DefaultSqlSessionFactory.java similarity index 91% rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DefaultSqlSessionFactory.java rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/session/DefaultSqlSessionFactory.java index 19eb347c..fa613d44 100644 --- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DefaultSqlSessionFactory.java +++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/session/DefaultSqlSessionFactory.java @@ -19,7 +19,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.core.db.crisp; +package fun.asgc.neutrino.core.db.crisp.session; + +import fun.asgc.neutrino.core.db.crisp.DbConfig; +import fun.asgc.neutrino.core.db.crisp.base.SqlExecutorType; +import fun.asgc.neutrino.core.db.crisp.tx.TransactionIsolationLevel; import java.sql.Connection; diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlSession.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/session/SqlSession.java similarity index 97% rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlSession.java rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/session/SqlSession.java index 94e98e08..6f2fd629 100644 --- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlSession.java +++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/session/SqlSession.java @@ -19,8 +19,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.core.db.crisp; +package fun.asgc.neutrino.core.db.crisp.session; +import fun.asgc.neutrino.core.db.crisp.base.BatchResult; +import fun.asgc.neutrino.core.db.crisp.DbConfig; +import fun.asgc.neutrino.core.db.crisp.base.RowBounds; import sun.plugin2.main.server.ResultHandler; import java.io.Closeable; diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlSessionFactory.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/session/SqlSessionFactory.java similarity index 88% rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlSessionFactory.java rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/session/SqlSessionFactory.java index 26897c15..ebd82cc0 100644 --- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlSessionFactory.java +++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/session/SqlSessionFactory.java @@ -19,7 +19,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.core.db.crisp; +package fun.asgc.neutrino.core.db.crisp.session; + +import fun.asgc.neutrino.core.db.crisp.DbConfig; +import fun.asgc.neutrino.core.db.crisp.base.SqlExecutorType; +import fun.asgc.neutrino.core.db.crisp.tx.TransactionIsolationLevel; import java.sql.Connection; diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlSessionFactoryBuilder.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/session/SqlSessionFactoryBuilder.java similarity index 93% rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlSessionFactoryBuilder.java rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/session/SqlSessionFactoryBuilder.java index ccd377e5..ff77cc3f 100644 --- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlSessionFactoryBuilder.java +++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/session/SqlSessionFactoryBuilder.java @@ -19,7 +19,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.core.db.crisp; +package fun.asgc.neutrino.core.db.crisp.session; + +import fun.asgc.neutrino.core.db.crisp.DbConfig; /** * @author: aoshiguchen diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/tx/JdbcTransaction.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/tx/JdbcTransaction.java index 98048119..9e971f94 100644 --- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/tx/JdbcTransaction.java +++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/tx/JdbcTransaction.java @@ -1,6 +1,5 @@ package fun.asgc.neutrino.core.db.crisp.tx; -import fun.asgc.neutrino.core.db.crisp.TransactionIsolationLevel; import lombok.extern.slf4j.Slf4j; import javax.sql.DataSource; diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/TransactionIsolationLevel.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/tx/TransactionIsolationLevel.java similarity index 97% rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/TransactionIsolationLevel.java rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/tx/TransactionIsolationLevel.java index 553cc039..78afa711 100644 --- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/TransactionIsolationLevel.java +++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/tx/TransactionIsolationLevel.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.core.db.crisp; +package fun.asgc.neutrino.core.db.crisp.tx; import lombok.AllArgsConstructor; import lombok.Getter;