This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new ab6a9a2e5d7 Move ShardingSphereSavepoint's package (#31604)
ab6a9a2e5d7 is described below
commit ab6a9a2e5d71661fd4c223e2a9bb1653b6e3ed0e
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Jun 6 16:57:02 2024 +0800
Move ShardingSphereSavepoint's package (#31604)
---
.../DriverDatabaseConnectionManager.java | 2 +-
.../{ => savepoint}/ShardingSphereSavepoint.java | 25 ++++++++++------------
2 files changed, 12 insertions(+), 15 deletions(-)
diff --git
a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/DriverDatabaseConnectionManager.java
b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/DriverDatabaseConnectionManager.java
index f4472436f14..7ad34fd2678 100644
---
a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/DriverDatabaseConnectionManager.java
+++
b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/DriverDatabaseConnectionManager.java
@@ -25,7 +25,7 @@ import lombok.Getter;
import org.apache.shardingsphere.authority.rule.AuthorityRule;
import
org.apache.shardingsphere.driver.jdbc.adapter.executor.ForceExecuteTemplate;
import
org.apache.shardingsphere.driver.jdbc.adapter.invocation.MethodInvocationRecorder;
-import org.apache.shardingsphere.driver.jdbc.core.ShardingSphereSavepoint;
+import
org.apache.shardingsphere.driver.jdbc.core.savepoint.ShardingSphereSavepoint;
import
org.apache.shardingsphere.infra.datasource.pool.creator.DataSourcePoolCreator;
import
org.apache.shardingsphere.infra.datasource.pool.props.domain.DataSourcePoolProperties;
import
org.apache.shardingsphere.infra.exception.kernel.connection.OverallConnectionNotEnoughException;
diff --git
a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/ShardingSphereSavepoint.java
b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/savepoint/ShardingSphereSavepoint.java
similarity index 83%
rename from
jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/ShardingSphereSavepoint.java
rename to
jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/savepoint/ShardingSphereSavepoint.java
index 4c16cfffda8..d25f6dd68a9 100644
---
a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/ShardingSphereSavepoint.java
+++
b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/savepoint/ShardingSphereSavepoint.java
@@ -15,8 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.jdbc.core;
+package org.apache.shardingsphere.driver.jdbc.core.savepoint;
+import lombok.Getter;
import
org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
import java.rmi.server.UID;
@@ -27,6 +28,7 @@ import java.sql.Savepoint;
/**
* ShardingSphere savepoint.
*/
+@Getter
public final class ShardingSphereSavepoint implements Savepoint {
private final String savepointName;
@@ -35,19 +37,9 @@ public final class ShardingSphereSavepoint implements
Savepoint {
savepointName = getUniqueId();
}
- public ShardingSphereSavepoint(final String name) throws SQLException {
- ShardingSpherePreconditions.checkNotEmpty(name, () -> new
SQLFeatureNotSupportedException("Savepoint name can not be NULL or empty"));
- savepointName = name;
- }
-
- @Override
- public int getSavepointId() throws SQLException {
- throw new SQLFeatureNotSupportedException("Only named savepoint are
supported.");
- }
-
- @Override
- public String getSavepointName() {
- return savepointName;
+ public ShardingSphereSavepoint(final String savepointName) throws
SQLException {
+ ShardingSpherePreconditions.checkNotEmpty(savepointName, () -> new
SQLFeatureNotSupportedException("Savepoint name can not be NULL or empty"));
+ this.savepointName = savepointName;
}
private String getUniqueId() {
@@ -65,4 +57,9 @@ public final class ShardingSphereSavepoint implements
Savepoint {
}
return safeString.toString();
}
+
+ @Override
+ public int getSavepointId() throws SQLException {
+ throw new SQLFeatureNotSupportedException("Only named savepoint are
supported.");
+ }
}