From 5590a34f15fd25231a22bc126f9853dd7e0f8f12 Mon Sep 17 00:00:00 2001 From: fan Date: Fri, 29 Nov 2024 16:58:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=9B=AE=E5=BD=95=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fantasy0v0/swift/jdbc/junit/SwiftJdbcExtension.java | 4 ++-- .../fantasy0v0/swift/jdbc/spring/SpringConnectionPool.java | 4 ++-- .../swift/jdbc/spring/SpringConnectionReference.java | 4 ++-- .../swift/jdbc/spring/SpringConnectionTransaction.java | 2 +- jdbc-spring-support/src/main/java/module-info.java | 4 +++- ....github.fantasy0v0.swift.jdbc.connection.ConnectionPool} | 0 .../github/fantasy0v0/swift/jdbc/ConnectionPoolUtil.java | 3 +++ .../com/github/fantasy0v0/swift/jdbc/InsertBuilder.java | 2 +- .../main/java/com/github/fantasy0v0/swift/jdbc/JDBC.java | 3 ++- .../github/fantasy0v0/swift/jdbc/TransactionBuilder.java | 3 ++- .../com/github/fantasy0v0/swift/jdbc/UpdateBuilder.java | 1 + .../main/java/com/github/fantasy0v0/swift/jdbc/Utils.java | 2 +- .../swift/jdbc/{ => connection}/ConnectionPool.java | 2 +- .../swift/jdbc/{ => connection}/ConnectionReference.java | 2 +- .../swift/jdbc/{ => connection}/ConnectionTransaction.java | 2 +- .../jdbc/connection/{ => impl}/DefaultConnectionPool.java | 6 +++--- .../connection/{ => impl}/DefaultConnectionReference.java | 6 +++--- .../connection/{ => impl}/DefaultConnectionTransaction.java | 6 +++--- jdbc/src/main/java/module-info.java | 3 ++- 19 files changed, 34 insertions(+), 25 deletions(-) rename jdbc-spring-support/src/main/resources/META-INF/services/{com.github.fantasy0v0.swift.jdbc.ConnectionPool => com.github.fantasy0v0.swift.jdbc.connection.ConnectionPool} (100%) rename jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/{ => connection}/ConnectionPool.java (85%) rename jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/{ => connection}/ConnectionReference.java (86%) rename jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/{ => connection}/ConnectionTransaction.java (74%) rename jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/connection/{ => impl}/DefaultConnectionPool.java (76%) rename jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/connection/{ => impl}/DefaultConnectionReference.java (88%) rename jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/connection/{ => impl}/DefaultConnectionTransaction.java (89%) diff --git a/jdbc-junit-support/src/main/java/com/github/fantasy0v0/swift/jdbc/junit/SwiftJdbcExtension.java b/jdbc-junit-support/src/main/java/com/github/fantasy0v0/swift/jdbc/junit/SwiftJdbcExtension.java index 65ea12b..07a3028 100644 --- a/jdbc-junit-support/src/main/java/com/github/fantasy0v0/swift/jdbc/junit/SwiftJdbcExtension.java +++ b/jdbc-junit-support/src/main/java/com/github/fantasy0v0/swift/jdbc/junit/SwiftJdbcExtension.java @@ -1,8 +1,8 @@ package com.github.fantasy0v0.swift.jdbc.junit; import com.github.fantasy0v0.swift.jdbc.ConnectionPoolUtil; -import com.github.fantasy0v0.swift.jdbc.ConnectionReference; -import com.github.fantasy0v0.swift.jdbc.ConnectionTransaction; +import com.github.fantasy0v0.swift.jdbc.connection.ConnectionReference; +import com.github.fantasy0v0.swift.jdbc.connection.ConnectionTransaction; import com.github.fantasy0v0.swift.jdbc.JDBC; import org.junit.jupiter.api.extension.AfterTestExecutionCallback; import org.junit.jupiter.api.extension.BeforeTestExecutionCallback; diff --git a/jdbc-spring-support/src/main/java/com/github/fantasy0v0/swift/jdbc/spring/SpringConnectionPool.java b/jdbc-spring-support/src/main/java/com/github/fantasy0v0/swift/jdbc/spring/SpringConnectionPool.java index ba9045e..bd317d1 100644 --- a/jdbc-spring-support/src/main/java/com/github/fantasy0v0/swift/jdbc/spring/SpringConnectionPool.java +++ b/jdbc-spring-support/src/main/java/com/github/fantasy0v0/swift/jdbc/spring/SpringConnectionPool.java @@ -1,7 +1,7 @@ package com.github.fantasy0v0.swift.jdbc.spring; -import com.github.fantasy0v0.swift.jdbc.ConnectionPool; -import com.github.fantasy0v0.swift.jdbc.ConnectionReference; +import com.github.fantasy0v0.swift.jdbc.connection.ConnectionPool; +import com.github.fantasy0v0.swift.jdbc.connection.ConnectionReference; import javax.sql.DataSource; import java.sql.SQLException; diff --git a/jdbc-spring-support/src/main/java/com/github/fantasy0v0/swift/jdbc/spring/SpringConnectionReference.java b/jdbc-spring-support/src/main/java/com/github/fantasy0v0/swift/jdbc/spring/SpringConnectionReference.java index 9e3a0ab..17e7bd3 100644 --- a/jdbc-spring-support/src/main/java/com/github/fantasy0v0/swift/jdbc/spring/SpringConnectionReference.java +++ b/jdbc-spring-support/src/main/java/com/github/fantasy0v0/swift/jdbc/spring/SpringConnectionReference.java @@ -1,7 +1,7 @@ package com.github.fantasy0v0.swift.jdbc.spring; -import com.github.fantasy0v0.swift.jdbc.ConnectionReference; -import com.github.fantasy0v0.swift.jdbc.ConnectionTransaction; +import com.github.fantasy0v0.swift.jdbc.connection.ConnectionReference; +import com.github.fantasy0v0.swift.jdbc.connection.ConnectionTransaction; import org.springframework.jdbc.datasource.DataSourceUtils; import javax.sql.DataSource; diff --git a/jdbc-spring-support/src/main/java/com/github/fantasy0v0/swift/jdbc/spring/SpringConnectionTransaction.java b/jdbc-spring-support/src/main/java/com/github/fantasy0v0/swift/jdbc/spring/SpringConnectionTransaction.java index 68060da..6e9a065 100644 --- a/jdbc-spring-support/src/main/java/com/github/fantasy0v0/swift/jdbc/spring/SpringConnectionTransaction.java +++ b/jdbc-spring-support/src/main/java/com/github/fantasy0v0/swift/jdbc/spring/SpringConnectionTransaction.java @@ -1,6 +1,6 @@ package com.github.fantasy0v0.swift.jdbc.spring; -import com.github.fantasy0v0.swift.jdbc.ConnectionTransaction; +import com.github.fantasy0v0.swift.jdbc.connection.ConnectionTransaction; import com.github.fantasy0v0.swift.jdbc.util.LogUtil; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.TransactionDefinition; diff --git a/jdbc-spring-support/src/main/java/module-info.java b/jdbc-spring-support/src/main/java/module-info.java index d0c5f6f..f326294 100644 --- a/jdbc-spring-support/src/main/java/module-info.java +++ b/jdbc-spring-support/src/main/java/module-info.java @@ -1,8 +1,10 @@ +import com.github.fantasy0v0.swift.jdbc.connection.ConnectionPool; + module swift.jdbc.spring.support { requires swift.jdbc; requires spring.context; requires spring.jdbc; requires spring.tx; - provides com.github.fantasy0v0.swift.jdbc.ConnectionPool with com.github.fantasy0v0.swift.jdbc.spring.SpringConnectionPool; + provides ConnectionPool with com.github.fantasy0v0.swift.jdbc.spring.SpringConnectionPool; } diff --git a/jdbc-spring-support/src/main/resources/META-INF/services/com.github.fantasy0v0.swift.jdbc.ConnectionPool b/jdbc-spring-support/src/main/resources/META-INF/services/com.github.fantasy0v0.swift.jdbc.connection.ConnectionPool similarity index 100% rename from jdbc-spring-support/src/main/resources/META-INF/services/com.github.fantasy0v0.swift.jdbc.ConnectionPool rename to jdbc-spring-support/src/main/resources/META-INF/services/com.github.fantasy0v0.swift.jdbc.connection.ConnectionPool diff --git a/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/ConnectionPoolUtil.java b/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/ConnectionPoolUtil.java index 1cad06a..53f99bc 100644 --- a/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/ConnectionPoolUtil.java +++ b/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/ConnectionPoolUtil.java @@ -1,5 +1,8 @@ package com.github.fantasy0v0.swift.jdbc; +import com.github.fantasy0v0.swift.jdbc.connection.ConnectionPool; +import com.github.fantasy0v0.swift.jdbc.connection.ConnectionReference; + import javax.sql.DataSource; import java.sql.SQLException; diff --git a/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/InsertBuilder.java b/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/InsertBuilder.java index e87cb70..7a5725e 100644 --- a/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/InsertBuilder.java +++ b/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/InsertBuilder.java @@ -1,5 +1,6 @@ package com.github.fantasy0v0.swift.jdbc; +import com.github.fantasy0v0.swift.jdbc.connection.ConnectionReference; import com.github.fantasy0v0.swift.jdbc.exception.SwiftSQLException; import com.github.fantasy0v0.swift.jdbc.util.LogUtil; @@ -7,7 +8,6 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; -import java.text.NumberFormat; import java.util.Arrays; import java.util.List; diff --git a/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/JDBC.java b/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/JDBC.java index e245ea9..35daa79 100644 --- a/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/JDBC.java +++ b/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/JDBC.java @@ -1,6 +1,7 @@ package com.github.fantasy0v0.swift.jdbc; -import com.github.fantasy0v0.swift.jdbc.connection.DefaultConnectionPool; +import com.github.fantasy0v0.swift.jdbc.connection.ConnectionPool; +import com.github.fantasy0v0.swift.jdbc.connection.impl.DefaultConnectionPool; import com.github.fantasy0v0.swift.jdbc.dialect.ANSI; import com.github.fantasy0v0.swift.jdbc.dialect.SQLDialect; import com.github.fantasy0v0.swift.jdbc.exception.SwiftException; diff --git a/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/TransactionBuilder.java b/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/TransactionBuilder.java index 7252cda..4c9f91c 100644 --- a/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/TransactionBuilder.java +++ b/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/TransactionBuilder.java @@ -1,10 +1,11 @@ package com.github.fantasy0v0.swift.jdbc; +import com.github.fantasy0v0.swift.jdbc.connection.ConnectionReference; +import com.github.fantasy0v0.swift.jdbc.connection.ConnectionTransaction; import com.github.fantasy0v0.swift.jdbc.util.LogUtil; import javax.sql.DataSource; import java.sql.SQLException; -import java.text.NumberFormat; import java.util.function.Supplier; public class TransactionBuilder { diff --git a/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/UpdateBuilder.java b/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/UpdateBuilder.java index 852ddf7..c459629 100644 --- a/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/UpdateBuilder.java +++ b/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/UpdateBuilder.java @@ -1,5 +1,6 @@ package com.github.fantasy0v0.swift.jdbc; +import com.github.fantasy0v0.swift.jdbc.connection.ConnectionReference; import com.github.fantasy0v0.swift.jdbc.exception.SwiftSQLException; import javax.sql.DataSource; diff --git a/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/Utils.java b/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/Utils.java index 50ad89d..563e7d8 100644 --- a/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/Utils.java +++ b/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/Utils.java @@ -1,11 +1,11 @@ package com.github.fantasy0v0.swift.jdbc; +import com.github.fantasy0v0.swift.jdbc.connection.ConnectionReference; import com.github.fantasy0v0.swift.jdbc.type.TypeSetHandler; import com.github.fantasy0v0.swift.jdbc.util.LogUtil; import javax.sql.DataSource; import java.sql.*; -import java.text.NumberFormat; import java.util.ArrayList; import java.util.List; diff --git a/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/ConnectionPool.java b/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/connection/ConnectionPool.java similarity index 85% rename from jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/ConnectionPool.java rename to jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/connection/ConnectionPool.java index fa613be..645b833 100644 --- a/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/ConnectionPool.java +++ b/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/connection/ConnectionPool.java @@ -1,4 +1,4 @@ -package com.github.fantasy0v0.swift.jdbc; +package com.github.fantasy0v0.swift.jdbc.connection; import javax.sql.DataSource; import java.sql.SQLException; diff --git a/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/ConnectionReference.java b/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/connection/ConnectionReference.java similarity index 86% rename from jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/ConnectionReference.java rename to jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/connection/ConnectionReference.java index cebaf82..a18e80f 100644 --- a/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/ConnectionReference.java +++ b/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/connection/ConnectionReference.java @@ -1,4 +1,4 @@ -package com.github.fantasy0v0.swift.jdbc; +package com.github.fantasy0v0.swift.jdbc.connection; import java.sql.Connection; import java.sql.SQLException; diff --git a/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/ConnectionTransaction.java b/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/connection/ConnectionTransaction.java similarity index 74% rename from jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/ConnectionTransaction.java rename to jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/connection/ConnectionTransaction.java index 8a285a6..32732e5 100644 --- a/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/ConnectionTransaction.java +++ b/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/connection/ConnectionTransaction.java @@ -1,4 +1,4 @@ -package com.github.fantasy0v0.swift.jdbc; +package com.github.fantasy0v0.swift.jdbc.connection; import java.sql.SQLException; diff --git a/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/connection/DefaultConnectionPool.java b/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/connection/impl/DefaultConnectionPool.java similarity index 76% rename from jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/connection/DefaultConnectionPool.java rename to jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/connection/impl/DefaultConnectionPool.java index c39ed29..39bf101 100644 --- a/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/connection/DefaultConnectionPool.java +++ b/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/connection/impl/DefaultConnectionPool.java @@ -1,7 +1,7 @@ -package com.github.fantasy0v0.swift.jdbc.connection; +package com.github.fantasy0v0.swift.jdbc.connection.impl; -import com.github.fantasy0v0.swift.jdbc.ConnectionPool; -import com.github.fantasy0v0.swift.jdbc.ConnectionReference; +import com.github.fantasy0v0.swift.jdbc.connection.ConnectionPool; +import com.github.fantasy0v0.swift.jdbc.connection.ConnectionReference; import javax.sql.DataSource; import java.sql.SQLException; diff --git a/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/connection/DefaultConnectionReference.java b/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/connection/impl/DefaultConnectionReference.java similarity index 88% rename from jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/connection/DefaultConnectionReference.java rename to jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/connection/impl/DefaultConnectionReference.java index 69a68bd..d43fe58 100644 --- a/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/connection/DefaultConnectionReference.java +++ b/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/connection/impl/DefaultConnectionReference.java @@ -1,7 +1,7 @@ -package com.github.fantasy0v0.swift.jdbc.connection; +package com.github.fantasy0v0.swift.jdbc.connection.impl; -import com.github.fantasy0v0.swift.jdbc.ConnectionReference; -import com.github.fantasy0v0.swift.jdbc.ConnectionTransaction; +import com.github.fantasy0v0.swift.jdbc.connection.ConnectionReference; +import com.github.fantasy0v0.swift.jdbc.connection.ConnectionTransaction; import com.github.fantasy0v0.swift.jdbc.util.LogUtil; import javax.sql.DataSource; diff --git a/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/connection/DefaultConnectionTransaction.java b/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/connection/impl/DefaultConnectionTransaction.java similarity index 89% rename from jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/connection/DefaultConnectionTransaction.java rename to jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/connection/impl/DefaultConnectionTransaction.java index 258f703..1b3414b 100644 --- a/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/connection/DefaultConnectionTransaction.java +++ b/jdbc/src/main/java/com/github/fantasy0v0/swift/jdbc/connection/impl/DefaultConnectionTransaction.java @@ -1,7 +1,7 @@ -package com.github.fantasy0v0.swift.jdbc.connection; +package com.github.fantasy0v0.swift.jdbc.connection.impl; -import com.github.fantasy0v0.swift.jdbc.ConnectionReference; -import com.github.fantasy0v0.swift.jdbc.ConnectionTransaction; +import com.github.fantasy0v0.swift.jdbc.connection.ConnectionReference; +import com.github.fantasy0v0.swift.jdbc.connection.ConnectionTransaction; import com.github.fantasy0v0.swift.jdbc.util.LogUtil; import java.sql.Connection; diff --git a/jdbc/src/main/java/module-info.java b/jdbc/src/main/java/module-info.java index 77452c0..5450ec4 100644 --- a/jdbc/src/main/java/module-info.java +++ b/jdbc/src/main/java/module-info.java @@ -9,6 +9,7 @@ exports com.github.fantasy0v0.swift.jdbc.dialect; exports com.github.fantasy0v0.swift.jdbc.type; exports com.github.fantasy0v0.swift.jdbc.util; + exports com.github.fantasy0v0.swift.jdbc.connection; - uses com.github.fantasy0v0.swift.jdbc.ConnectionPool; + uses com.github.fantasy0v0.swift.jdbc.connection.ConnectionPool; }