You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by me...@apache.org on 2020/11/26 08:38:53 UTC
[shardingsphere] branch master updated: Use default method to
simplify typed SPI (#8360)
This is an automated email from the ASF dual-hosted git repository.
menghaoran 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 8e406d0 Use default method to simplify typed SPI (#8360)
8e406d0 is described below
commit 8e406d00871c8a6273173644998e568468f8c399
Author: Liang Zhang <te...@163.com>
AuthorDate: Thu Nov 26 16:38:39 2020 +0800
Use default method to simplify typed SPI (#8360)
* Rename SQLExecutorExceptionHandler
* Use default method to simplify typed SPI
---
.../StandardModuloShardingDatabaseAlgorithm.java | 13 -------------
.../StandardModuloShardingTableAlgorithm.java | 13 -------------
.../TestQueryAssistedShardingEncryptAlgorithm.java | 14 --------------
.../hint/raw/jdbc/ModuloHintShardingAlgorithm.java | 13 -------------
.../proxy/hint/ModuloHintShardingAlgorithm.java | 13 -------------
.../encrypt/fixture/TestEncryptAlgorithm.java | 8 --------
.../fixture/TestQueryAssistedEncryptAlgorithm.java | 8 --------
.../fixture/NormalEncryptAlgorithmFixture.java | 8 --------
.../QueryAssistedEncryptAlgorithmFixture.java | 8 --------
.../shardingsphere/ha/algorithm/MGRHAType.java | 4 ++--
.../RoundRobinReplicaLoadBalanceAlgorithm.java | 7 -------
.../shardingsphere/ha/fixture/TestHATypeFixture.java | 8 --------
.../ha/route/fixture/TestRouteHATypeFixture.java | 7 -------
.../algorithm/keygen/UUIDKeyGenerateAlgorithm.java | 7 -------
.../keygen/UUIDKeyGenerateAlgorithmTest.java | 15 ---------------
.../fixture/IncrementKeyGenerateAlgorithm.java | 7 -------
.../fixture/ComplexKeysShardingAlgorithmFixture.java | 7 -------
.../fixture/HintShardingAlgorithmFixture.java | 7 -------
.../fixture/StandardShardingAlgorithmFixture.java | 7 -------
.../rewrite/fixture/KeyGenerateAlgorithmFixture.java | 8 --------
.../fixture/NormalEncryptAlgorithmFixture.java | 8 --------
.../QueryAssistedEncryptAlgorithmFixture.java | 8 --------
.../fixture/ComplexKeysShardingAlgorithmFixture.java | 7 -------
.../fixture/HintShardingAlgorithmFixture.java | 7 -------
.../fixture/StandardShardingAlgorithmFixture.java | 7 -------
.../keygen/IncrementKeyGenerateAlgorithm.java | 7 -------
.../ComplexKeysShardingAlgorithmFixture.java | 7 -------
.../sharding/HintShardingAlgorithmFixture.java | 7 -------
.../src/test/resources/logback-test.xml | 2 +-
.../core/facade/fixture/TestAllRepository.java | 7 -------
.../facade/fixture/TestConfigurationRepository.java | 9 +--------
.../core/facade/fixture/TestRegistryRepository.java | 7 -------
.../impl/H2DatabaseMetaDataDialectHandler.java | 8 --------
.../impl/MariaDBDatabaseMetaDataDialectHandler.java | 8 --------
.../impl/MySQLDatabaseMetaDataDialectHandler.java | 8 --------
.../impl/OracleDatabaseMetaDataDialectHandler.java | 7 -------
.../PostgreSQLDatabaseMetaDataDialectHandler.java | 8 --------
.../impl/SQL92DatabaseMetaDataDialectHandler.java | 8 --------
.../SQLServerDatabaseMetaDataDialectHandler.java | 8 --------
...Handler.java => SQLExecutorExceptionHandler.java} | 4 ++--
.../sql/execute/engine/driver/jdbc/JDBCExecutor.java | 4 ++--
.../engine/driver/jdbc/JDBCExecutorCallback.java | 6 +++---
.../executor/sql/execute/engine/raw/RawExecutor.java | 4 ++--
.../execute/engine/ExecutorExceptionHandlerTest.java | 20 ++++++++++----------
.../sql/execute/engine/jdbc/JDBCExecutorTest.java | 4 ++--
.../sql/execute/engine/raw/RawExecutorTest.java | 4 ++--
.../src/test/resources/logback-test.xml | 2 +-
.../dbtest/fixture/ConstantKeyGenerateAlgorithm.java | 8 --------
.../dbtest/fixture/StandardModuloAlgorithm.java | 7 -------
.../driver/executor/PreparedStatementExecutor.java | 8 ++++----
.../driver/executor/StatementExecutor.java | 8 ++++----
.../batch/BatchPreparedStatementExecutor.java | 4 ++--
.../driver/executor/AbstractBaseExecutorTest.java | 4 ++--
.../driver/executor/StatementExecutorTest.java | 4 ++--
.../fixture/IncrementKeyGenerateAlgorithm.java | 7 -------
.../fixture/ResetIncrementKeyGenerateAlgorithm.java | 6 ------
.../fixture/StandardOrderShardingAlgorithm.java | 7 -------
.../driver/fixture/TestEncryptAlgorithm.java | 8 --------
.../fixture/TestQueryAssistedEncryptAlgorithm.java | 8 --------
.../src/test/resources/logback-test.xml | 2 +-
.../yaml/fixture/DecrementKeyGenerateAlgorithm.java | 7 -------
.../yaml/fixture/IncrementKeyGenerateAlgorithm.java | 7 -------
.../api/yaml/fixture/StandardAlgorithm.java | 7 -------
.../fixture/TestConfigurationRepository.java | 7 -------
.../governance/fixture/TestRegistryRepository.java | 7 -------
.../registry/TestGovernanceRepository.java | 7 -------
.../DefaultComplexKeysShardingAlgorithm.java | 7 -------
.../algorithm/DefaultHintShardingAlgorithm.java | 7 -------
.../StandardModuloDatabaseShardingAlgorithm.java | 7 -------
.../StandardModuloTableShardingAlgorithm.java | 7 -------
.../fixture/DecrementKeyGenerateAlgorithm.java | 7 -------
.../fixture/IncrementKeyGenerateAlgorithm.java | 7 -------
.../registry/TestGovernanceRepository.java | 7 -------
.../jdbc/execute/engine/jdbc/JDBCExecuteEngine.java | 4 ++--
.../jdbc/execute/engine/jdbc/RawProxyExecutor.java | 4 ++--
.../MySQLStatementMemoryStrictlyFetchSizeSetter.java | 7 -------
...greSQLStatementMemoryStrictlyFetchSizeSetter.java | 7 -------
.../fixture/FixtureConfigurationRepository.java | 7 -------
.../proxy/fixture/FixtureRegistryRepository.java | 7 -------
.../core/fixture/FixtureRegistryRepository.java | 5 -----
.../atomikos/manager/AtomikosTransactionManager.java | 11 -----------
.../manager/BitronixXATransactionManager.java | 11 -----------
.../xa/fixture/FixtureXATransactionManager.java | 11 -----------
.../manager/NarayanaXATransactionManager.java | 11 -----------
84 files changed, 47 insertions(+), 578 deletions(-)
diff --git a/examples/example-core/config-utility/src/main/java/org/apache/shardingsphere/example/algorithm/StandardModuloShardingDatabaseAlgorithm.java b/examples/example-core/config-utility/src/main/java/org/apache/shardingsphere/example/algorithm/StandardModuloShardingDatabaseAlgorithm.java
index 98e1f1a..301517c 100644
--- a/examples/example-core/config-utility/src/main/java/org/apache/shardingsphere/example/algorithm/StandardModuloShardingDatabaseAlgorithm.java
+++ b/examples/example-core/config-utility/src/main/java/org/apache/shardingsphere/example/algorithm/StandardModuloShardingDatabaseAlgorithm.java
@@ -24,13 +24,10 @@ import org.apache.shardingsphere.sharding.api.sharding.standard.StandardSharding
import java.util.Collection;
import java.util.LinkedHashSet;
-import java.util.Properties;
import java.util.Set;
public final class StandardModuloShardingDatabaseAlgorithm implements StandardShardingAlgorithm<Integer> {
- private Properties props = new Properties();
-
@Override
public void init() {
}
@@ -69,16 +66,6 @@ public final class StandardModuloShardingDatabaseAlgorithm implements StandardSh
}
@Override
- public Properties getProps() {
- return props;
- }
-
- @Override
- public void setProps(final Properties props) {
- this.props = props;
- }
-
- @Override
public String getType() {
return "STANDARD_TEST_DB";
}
diff --git a/examples/example-core/config-utility/src/main/java/org/apache/shardingsphere/example/algorithm/StandardModuloShardingTableAlgorithm.java b/examples/example-core/config-utility/src/main/java/org/apache/shardingsphere/example/algorithm/StandardModuloShardingTableAlgorithm.java
index f491638..255c50d 100644
--- a/examples/example-core/config-utility/src/main/java/org/apache/shardingsphere/example/algorithm/StandardModuloShardingTableAlgorithm.java
+++ b/examples/example-core/config-utility/src/main/java/org/apache/shardingsphere/example/algorithm/StandardModuloShardingTableAlgorithm.java
@@ -24,13 +24,10 @@ import org.apache.shardingsphere.sharding.api.sharding.standard.StandardSharding
import java.util.Collection;
import java.util.LinkedHashSet;
-import java.util.Properties;
import java.util.Set;
public final class StandardModuloShardingTableAlgorithm implements StandardShardingAlgorithm<Long> {
- private Properties props = new Properties();
-
@Override
public void init() {
}
@@ -61,16 +58,6 @@ public final class StandardModuloShardingTableAlgorithm implements StandardShard
}
@Override
- public Properties getProps() {
- return props;
- }
-
- @Override
- public void setProps(final Properties props) {
- this.props = props;
- }
-
- @Override
public String getType() {
return "STANDARD_TEST_TBL";
}
diff --git a/examples/example-core/config-utility/src/main/java/org/apache/shardingsphere/example/fixture/TestQueryAssistedShardingEncryptAlgorithm.java b/examples/example-core/config-utility/src/main/java/org/apache/shardingsphere/example/fixture/TestQueryAssistedShardingEncryptAlgorithm.java
index a777d70..989b8c0 100644
--- a/examples/example-core/config-utility/src/main/java/org/apache/shardingsphere/example/fixture/TestQueryAssistedShardingEncryptAlgorithm.java
+++ b/examples/example-core/config-utility/src/main/java/org/apache/shardingsphere/example/fixture/TestQueryAssistedShardingEncryptAlgorithm.java
@@ -19,12 +19,8 @@ package org.apache.shardingsphere.example.fixture;
import org.apache.shardingsphere.encrypt.spi.QueryAssistedEncryptAlgorithm;
-import java.util.Properties;
-
public final class TestQueryAssistedShardingEncryptAlgorithm implements QueryAssistedEncryptAlgorithm {
- private Properties props = new Properties();
-
@Override
public void init() {
}
@@ -48,14 +44,4 @@ public final class TestQueryAssistedShardingEncryptAlgorithm implements QueryAss
public String getType() {
return "assistedTest";
}
-
- @Override
- public Properties getProps() {
- return props;
- }
-
- @Override
- public void setProps(final Properties props) {
- this.props = props;
- }
}
diff --git a/examples/shardingsphere-jdbc-example/other-feature-example/hint-example/hint-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/hint/raw/jdbc/ModuloHintShardingAlgorithm.java b/examples/shardingsphere-jdbc-example/other-feature-example/hint-example/hint-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/hint/raw/jdbc/ModuloHintShardingAlgorithm.java
index ce5ffc6..92beac5 100644
--- a/examples/shardingsphere-jdbc-example/other-feature-example/hint-example/hint-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/hint/raw/jdbc/ModuloHintShardingAlgorithm.java
+++ b/examples/shardingsphere-jdbc-example/other-feature-example/hint-example/hint-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/hint/raw/jdbc/ModuloHintShardingAlgorithm.java
@@ -22,12 +22,9 @@ import org.apache.shardingsphere.sharding.api.sharding.hint.HintShardingValue;
import java.util.Collection;
import java.util.LinkedList;
-import java.util.Properties;
public final class ModuloHintShardingAlgorithm implements HintShardingAlgorithm<Long> {
- private Properties props = new Properties();
-
@Override
public void init() {
}
@@ -46,16 +43,6 @@ public final class ModuloHintShardingAlgorithm implements HintShardingAlgorithm<
}
@Override
- public Properties getProps() {
- return props;
- }
-
- @Override
- public void setProps(final Properties props) {
- this.props = props;
- }
-
- @Override
public String getType() {
return "HINT_TEST";
}
diff --git a/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/java/org/apache/shardingsphere/example/proxy/hint/ModuloHintShardingAlgorithm.java b/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/java/org/apache/shardingsphere/example/proxy/hint/ModuloHintShardingAlgorithm.java
index 184784a..f990cb8 100644
--- a/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/java/org/apache/shardingsphere/example/proxy/hint/ModuloHintShardingAlgorithm.java
+++ b/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/java/org/apache/shardingsphere/example/proxy/hint/ModuloHintShardingAlgorithm.java
@@ -22,12 +22,9 @@ import org.apache.shardingsphere.sharding.api.sharding.hint.HintShardingValue;
import java.util.Collection;
import java.util.LinkedList;
-import java.util.Properties;
public final class ModuloHintShardingAlgorithm implements HintShardingAlgorithm<String> {
- private Properties props = new Properties();
-
@Override
public void init() {
}
@@ -46,16 +43,6 @@ public final class ModuloHintShardingAlgorithm implements HintShardingAlgorithm<
}
@Override
- public Properties getProps() {
- return props;
- }
-
- @Override
- public void setProps(final Properties props) {
- this.props = props;
- }
-
- @Override
public String getType() {
return "HINT_TEST";
}
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-common/src/test/java/org/apache/shardingsphere/encrypt/fixture/TestEncryptAlgorithm.java b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-common/src/test/java/org/apache/shardingsphere/encrypt/fixture/TestEncryptAlgorithm.java
index 401eb11..0b0380e 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-common/src/test/java/org/apache/shardingsphere/encrypt/fixture/TestEncryptAlgorithm.java
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-common/src/test/java/org/apache/shardingsphere/encrypt/fixture/TestEncryptAlgorithm.java
@@ -17,18 +17,10 @@
package org.apache.shardingsphere.encrypt.fixture;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm;
-import java.util.Properties;
-
-@Getter
-@Setter
public final class TestEncryptAlgorithm implements EncryptAlgorithm {
- private Properties props = new Properties();
-
@Override
public void init() {
}
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-common/src/test/java/org/apache/shardingsphere/encrypt/fixture/TestQueryAssistedEncryptAlgorithm.java b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-common/src/test/java/org/apache/shardingsphere/encrypt/fixture/TestQueryAssistedEncryptAlgorithm.java
index 964e382..1528af9 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-common/src/test/java/org/apache/shardingsphere/encrypt/fixture/TestQueryAssistedEncryptAlgorithm.java
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-common/src/test/java/org/apache/shardingsphere/encrypt/fixture/TestQueryAssistedEncryptAlgorithm.java
@@ -17,18 +17,10 @@
package org.apache.shardingsphere.encrypt.fixture;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.encrypt.spi.QueryAssistedEncryptAlgorithm;
-import java.util.Properties;
-
-@Getter
-@Setter
public final class TestQueryAssistedEncryptAlgorithm implements QueryAssistedEncryptAlgorithm {
- private Properties props = new Properties();
-
@Override
public void init() {
}
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-rewrite/src/test/java/org/apache/shardingsphere/encrypt/rewrite/fixture/NormalEncryptAlgorithmFixture.java b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-rewrite/src/test/java/org/apache/shardingsphere/encrypt/rewrite/fixture/NormalEncryptAlgorithmFixture.java
index 23b8853..1550581 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-rewrite/src/test/java/org/apache/shardingsphere/encrypt/rewrite/fixture/NormalEncryptAlgorithmFixture.java
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-rewrite/src/test/java/org/apache/shardingsphere/encrypt/rewrite/fixture/NormalEncryptAlgorithmFixture.java
@@ -17,18 +17,10 @@
package org.apache.shardingsphere.encrypt.rewrite.fixture;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm;
-import java.util.Properties;
-
-@Getter
-@Setter
public final class NormalEncryptAlgorithmFixture implements EncryptAlgorithm {
- private Properties props = new Properties();
-
@Override
public void init() {
}
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-rewrite/src/test/java/org/apache/shardingsphere/encrypt/rewrite/fixture/QueryAssistedEncryptAlgorithmFixture.java b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-rewrite/src/test/java/org/apache/shardingsphere/encrypt/rewrite/fixture/QueryAssistedEncryptAlgorithmFixture.java
index 32c8979..aaf2300 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-rewrite/src/test/java/org/apache/shardingsphere/encrypt/rewrite/fixture/QueryAssistedEncryptAlgorithmFixture.java
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-rewrite/src/test/java/org/apache/shardingsphere/encrypt/rewrite/fixture/QueryAssistedEncryptAlgorithmFixture.java
@@ -17,18 +17,10 @@
package org.apache.shardingsphere.encrypt.rewrite.fixture;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.encrypt.spi.QueryAssistedEncryptAlgorithm;
-import java.util.Properties;
-
-@Getter
-@Setter
public final class QueryAssistedEncryptAlgorithmFixture implements QueryAssistedEncryptAlgorithm {
- private Properties props = new Properties();
-
@Override
public void init() {
}
diff --git a/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-common/src/main/java/org/apache/shardingsphere/ha/algorithm/MGRHAType.java b/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-common/src/main/java/org/apache/shardingsphere/ha/algorithm/MGRHAType.java
index 0dc25d7..5716f9d 100644
--- a/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-common/src/main/java/org/apache/shardingsphere/ha/algorithm/MGRHAType.java
+++ b/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-common/src/main/java/org/apache/shardingsphere/ha/algorithm/MGRHAType.java
@@ -46,9 +46,9 @@ public final class MGRHAType implements HAType {
private static final String SINGLE_PRIMARY = "SELECT * FROM performance_schema.global_variables WHERE VARIABLE_NAME='group_replication_single_primary_mode'";
- private String primaryDataSource;
+ private final ScheduledExecutorService scheduledExecutorService = Executors.newSingleThreadScheduledExecutor();
- private ScheduledExecutorService scheduledExecutorService = Executors.newSingleThreadScheduledExecutor();
+ private String primaryDataSource;
@Getter
@Setter
diff --git a/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-common/src/main/java/org/apache/shardingsphere/ha/algorithm/RoundRobinReplicaLoadBalanceAlgorithm.java b/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-common/src/main/java/org/apache/shardingsphere/ha/algorithm/RoundRobinReplicaLoadBalanceAlgorithm.java
index f0f0b44..9f34660 100644
--- a/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-common/src/main/java/org/apache/shardingsphere/ha/algorithm/RoundRobinReplicaLoadBalanceAlgorithm.java
+++ b/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-common/src/main/java/org/apache/shardingsphere/ha/algorithm/RoundRobinReplicaLoadBalanceAlgorithm.java
@@ -17,26 +17,19 @@
package org.apache.shardingsphere.ha.algorithm;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.ha.spi.ReplicaLoadBalanceAlgorithm;
import java.util.List;
-import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
/**
* Round-robin replica load-balance algorithm.
*/
-@Getter
-@Setter
public final class RoundRobinReplicaLoadBalanceAlgorithm implements ReplicaLoadBalanceAlgorithm {
private static final ConcurrentHashMap<String, AtomicInteger> COUNTS = new ConcurrentHashMap<>();
- private Properties props = new Properties();
-
@Override
public String getDataSource(final String name, final String primaryDataSourceName, final List<String> replicaDataSourceNames) {
AtomicInteger count = COUNTS.containsKey(name) ? COUNTS.get(name) : new AtomicInteger(0);
diff --git a/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-common/src/test/java/org/apache/shardingsphere/ha/fixture/TestHATypeFixture.java b/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-common/src/test/java/org/apache/shardingsphere/ha/fixture/TestHATypeFixture.java
index 7616f16..995aa4b 100644
--- a/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-common/src/test/java/org/apache/shardingsphere/ha/fixture/TestHATypeFixture.java
+++ b/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-common/src/test/java/org/apache/shardingsphere/ha/fixture/TestHATypeFixture.java
@@ -17,30 +17,22 @@
package org.apache.shardingsphere.ha.fixture;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.ha.spi.HAType;
import javax.sql.DataSource;
import java.util.Map;
-import java.util.Properties;
/**
* Test HA type.
*/
-@Getter
-@Setter
public final class TestHATypeFixture implements HAType {
- private Properties props = new Properties();
-
@Override
public void checkHAConfig(final Map<String, DataSource> dataSourceMap) {
}
@Override
public void updatePrimaryDataSource(final Map<String, DataSource> dataSourceMap) {
-
}
@Override
diff --git a/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-route/src/test/java/org/apache/shardingsphere/ha/route/fixture/TestRouteHATypeFixture.java b/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-route/src/test/java/org/apache/shardingsphere/ha/route/fixture/TestRouteHATypeFixture.java
index c0f88df..0dae609 100644
--- a/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-route/src/test/java/org/apache/shardingsphere/ha/route/fixture/TestRouteHATypeFixture.java
+++ b/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-route/src/test/java/org/apache/shardingsphere/ha/route/fixture/TestRouteHATypeFixture.java
@@ -17,23 +17,16 @@
package org.apache.shardingsphere.ha.route.fixture;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.ha.spi.HAType;
import javax.sql.DataSource;
import java.util.Map;
-import java.util.Properties;
/**
* Test HA type.
*/
-@Getter
-@Setter
public final class TestRouteHATypeFixture implements HAType {
- private Properties props = new Properties();
-
@Override
public void checkHAConfig(final Map<String, DataSource> dataSourceMap) {
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/algorithm/keygen/UUIDKeyGenerateAlgorithm.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/algorithm/keygen/UUIDKeyGenerateAlgorithm.java
index e142162..5963b53 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/algorithm/keygen/UUIDKeyGenerateAlgorithm.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/algorithm/keygen/UUIDKeyGenerateAlgorithm.java
@@ -17,22 +17,15 @@
package org.apache.shardingsphere.sharding.algorithm.keygen;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm;
-import java.util.Properties;
import java.util.UUID;
/**
* UUID key generate algorithm.
*/
-@Getter
-@Setter
public final class UUIDKeyGenerateAlgorithm implements KeyGenerateAlgorithm {
- private Properties props = new Properties();
-
@Override
public void init() {
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/algorithm/keygen/UUIDKeyGenerateAlgorithmTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/algorithm/keygen/UUIDKeyGenerateAlgorithmTest.java
index b42395a..cc1b3f0 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/algorithm/keygen/UUIDKeyGenerateAlgorithmTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/algorithm/keygen/UUIDKeyGenerateAlgorithmTest.java
@@ -19,8 +19,6 @@ package org.apache.shardingsphere.sharding.algorithm.keygen;
import org.junit.Test;
-import java.util.Properties;
-
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
@@ -32,17 +30,4 @@ public final class UUIDKeyGenerateAlgorithmTest {
public void assertGenerateKey() {
assertThat(((String) uuidKeyGenerateAlgorithm.generateKey()).length(), is(32));
}
-
- @Test
- public void assertGetProps() {
- assertThat(uuidKeyGenerateAlgorithm.getProps().entrySet().size(), is(0));
- }
-
- @Test
- public void assertSetProps() {
- Properties props = new Properties();
- props.setProperty("key1", "value1");
- uuidKeyGenerateAlgorithm.setProps(props);
- assertThat(uuidKeyGenerateAlgorithm.getProps().getProperty("key1"), is("value1"));
- }
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/algorithm/keygen/fixture/IncrementKeyGenerateAlgorithm.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/algorithm/keygen/fixture/IncrementKeyGenerateAlgorithm.java
index f0fd927..ddce7e3 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/algorithm/keygen/fixture/IncrementKeyGenerateAlgorithm.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/algorithm/keygen/fixture/IncrementKeyGenerateAlgorithm.java
@@ -17,21 +17,14 @@
package org.apache.shardingsphere.sharding.algorithm.keygen.fixture;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm;
-import java.util.Properties;
import java.util.concurrent.atomic.AtomicInteger;
public final class IncrementKeyGenerateAlgorithm implements KeyGenerateAlgorithm {
private final AtomicInteger count = new AtomicInteger();
- @Getter
- @Setter
- private Properties props = new Properties();
-
@Override
public void init() {
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/fixture/ComplexKeysShardingAlgorithmFixture.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/fixture/ComplexKeysShardingAlgorithmFixture.java
index b16b5ba..aead335 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/fixture/ComplexKeysShardingAlgorithmFixture.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/fixture/ComplexKeysShardingAlgorithmFixture.java
@@ -17,20 +17,13 @@
package org.apache.shardingsphere.sharding.fixture;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.sharding.api.sharding.complex.ComplexKeysShardingAlgorithm;
import org.apache.shardingsphere.sharding.api.sharding.complex.ComplexKeysShardingValue;
import java.util.Collection;
-import java.util.Properties;
-@Getter
-@Setter
public final class ComplexKeysShardingAlgorithmFixture implements ComplexKeysShardingAlgorithm<Integer> {
- private Properties props = new Properties();
-
@Override
public void init() {
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/fixture/HintShardingAlgorithmFixture.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/fixture/HintShardingAlgorithmFixture.java
index 7243ca9..4fd2dbb 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/fixture/HintShardingAlgorithmFixture.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/fixture/HintShardingAlgorithmFixture.java
@@ -17,21 +17,14 @@
package org.apache.shardingsphere.sharding.fixture;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.sharding.api.sharding.hint.HintShardingAlgorithm;
import org.apache.shardingsphere.sharding.api.sharding.hint.HintShardingValue;
import java.util.Collection;
import java.util.Collections;
-import java.util.Properties;
-@Getter
-@Setter
public final class HintShardingAlgorithmFixture implements HintShardingAlgorithm<Integer> {
- private Properties props = new Properties();
-
@Override
public void init() {
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/fixture/StandardShardingAlgorithmFixture.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/fixture/StandardShardingAlgorithmFixture.java
index d400aeb..3b39f35 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/fixture/StandardShardingAlgorithmFixture.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/fixture/StandardShardingAlgorithmFixture.java
@@ -17,22 +17,15 @@
package org.apache.shardingsphere.sharding.fixture;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.sharding.api.sharding.standard.PreciseShardingValue;
import org.apache.shardingsphere.sharding.api.sharding.standard.RangeShardingValue;
import org.apache.shardingsphere.sharding.api.sharding.standard.StandardShardingAlgorithm;
import java.util.Collection;
import java.util.HashSet;
-import java.util.Properties;
-@Getter
-@Setter
public final class StandardShardingAlgorithmFixture implements StandardShardingAlgorithm<Integer> {
- private Properties props = new Properties();
-
@Override
public void init() {
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/fixture/KeyGenerateAlgorithmFixture.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/fixture/KeyGenerateAlgorithmFixture.java
index 35187a4..d88aff3 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/fixture/KeyGenerateAlgorithmFixture.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/fixture/KeyGenerateAlgorithmFixture.java
@@ -17,18 +17,10 @@
package org.apache.shardingsphere.sharding.rewrite.fixture;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm;
-import java.util.Properties;
-
-@Getter
-@Setter
public final class KeyGenerateAlgorithmFixture implements KeyGenerateAlgorithm {
- private Properties props = new Properties();
-
@Override
public void init() {
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/fixture/NormalEncryptAlgorithmFixture.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/fixture/NormalEncryptAlgorithmFixture.java
index 77986b8..ec9b245 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/fixture/NormalEncryptAlgorithmFixture.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/fixture/NormalEncryptAlgorithmFixture.java
@@ -17,18 +17,10 @@
package org.apache.shardingsphere.sharding.rewrite.fixture;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm;
-import java.util.Properties;
-
-@Getter
-@Setter
public final class NormalEncryptAlgorithmFixture implements EncryptAlgorithm {
- private Properties props = new Properties();
-
@Override
public void init() {
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/fixture/QueryAssistedEncryptAlgorithmFixture.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/fixture/QueryAssistedEncryptAlgorithmFixture.java
index 96feab0..26e3ab1 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/fixture/QueryAssistedEncryptAlgorithmFixture.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/fixture/QueryAssistedEncryptAlgorithmFixture.java
@@ -17,18 +17,10 @@
package org.apache.shardingsphere.sharding.rewrite.fixture;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.encrypt.spi.QueryAssistedEncryptAlgorithm;
-import java.util.Properties;
-
-@Getter
-@Setter
public final class QueryAssistedEncryptAlgorithmFixture implements QueryAssistedEncryptAlgorithm {
- private Properties props = new Properties();
-
@Override
public void init() {
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/test/java/org/apache/shardingsphere/sharding/route/strategy/fixture/ComplexKeysShardingAlgorithmFixture.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/test/java/org/apache/shardingsphere/sharding/route/strategy/fixture/ComplexKeysShardingAlgorithmFixture.java
index 09c590a..6c2f9aa 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/test/java/org/apache/shardingsphere/sharding/route/strategy/fixture/ComplexKeysShardingAlgorithmFixture.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/test/java/org/apache/shardingsphere/sharding/route/strategy/fixture/ComplexKeysShardingAlgorithmFixture.java
@@ -17,20 +17,13 @@
package org.apache.shardingsphere.sharding.route.strategy.fixture;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.sharding.api.sharding.complex.ComplexKeysShardingAlgorithm;
import org.apache.shardingsphere.sharding.api.sharding.complex.ComplexKeysShardingValue;
import java.util.Collection;
-import java.util.Properties;
-@Getter
-@Setter
public final class ComplexKeysShardingAlgorithmFixture implements ComplexKeysShardingAlgorithm<Integer> {
- private Properties props = new Properties();
-
@Override
public void init() {
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/test/java/org/apache/shardingsphere/sharding/route/strategy/fixture/HintShardingAlgorithmFixture.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/test/java/org/apache/shardingsphere/sharding/route/strategy/fixture/HintShardingAlgorithmFixture.java
index dc03573..cda8fdb 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/test/java/org/apache/shardingsphere/sharding/route/strategy/fixture/HintShardingAlgorithmFixture.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/test/java/org/apache/shardingsphere/sharding/route/strategy/fixture/HintShardingAlgorithmFixture.java
@@ -17,21 +17,14 @@
package org.apache.shardingsphere.sharding.route.strategy.fixture;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.sharding.api.sharding.hint.HintShardingAlgorithm;
import org.apache.shardingsphere.sharding.api.sharding.hint.HintShardingValue;
import java.util.Collection;
import java.util.Collections;
-import java.util.Properties;
-@Getter
-@Setter
public final class HintShardingAlgorithmFixture implements HintShardingAlgorithm<Integer> {
- private Properties props = new Properties();
-
@Override
public void init() {
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/test/java/org/apache/shardingsphere/sharding/route/strategy/fixture/StandardShardingAlgorithmFixture.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/test/java/org/apache/shardingsphere/sharding/route/strategy/fixture/StandardShardingAlgorithmFixture.java
index d68e905..695b2e5 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/test/java/org/apache/shardingsphere/sharding/route/strategy/fixture/StandardShardingAlgorithmFixture.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/test/java/org/apache/shardingsphere/sharding/route/strategy/fixture/StandardShardingAlgorithmFixture.java
@@ -17,22 +17,15 @@
package org.apache.shardingsphere.sharding.route.strategy.fixture;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.sharding.api.sharding.standard.PreciseShardingValue;
import org.apache.shardingsphere.sharding.api.sharding.standard.RangeShardingValue;
import org.apache.shardingsphere.sharding.api.sharding.standard.StandardShardingAlgorithm;
import java.util.Collection;
import java.util.HashSet;
-import java.util.Properties;
-@Getter
-@Setter
public final class StandardShardingAlgorithmFixture implements StandardShardingAlgorithm<Integer> {
- private Properties props = new Properties();
-
@Override
public void init() {
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/test/java/org/apache/shardingsphere/sharding/spring/namespace/fixture/keygen/IncrementKeyGenerateAlgorithm.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/test/java/org/apache/shardingsphere/sharding/spring/namespace/fixture/keygen/IncrementKeyGenerateAlgorithm.java
index 019b5a5..22836bf 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/test/java/org/apache/shardingsphere/sharding/spring/namespace/fixture/keygen/IncrementKeyGenerateAlgorithm.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/test/java/org/apache/shardingsphere/sharding/spring/namespace/fixture/keygen/IncrementKeyGenerateAlgorithm.java
@@ -17,21 +17,14 @@
package org.apache.shardingsphere.sharding.spring.namespace.fixture.keygen;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm;
-import java.util.Properties;
import java.util.concurrent.atomic.AtomicInteger;
public final class IncrementKeyGenerateAlgorithm implements KeyGenerateAlgorithm {
private final AtomicInteger sequence = new AtomicInteger(100);
- @Getter
- @Setter
- private Properties props = new Properties();
-
@Override
public void init() {
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/test/java/org/apache/shardingsphere/sharding/spring/namespace/fixture/sharding/ComplexKeysShardingAlgorithmFixture.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/test/java/org/apache/shardingsphere/sharding/spring/namespace/fixture/sharding/ComplexKeysShardingAlgorithmFix [...]
index 0d29127..34ae1be 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/test/java/org/apache/shardingsphere/sharding/spring/namespace/fixture/sharding/ComplexKeysShardingAlgorithmFixture.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/test/java/org/apache/shardingsphere/sharding/spring/namespace/fixture/sharding/ComplexKeysShardingAlgorithmFixture.java
@@ -17,20 +17,13 @@
package org.apache.shardingsphere.sharding.spring.namespace.fixture.sharding;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.sharding.api.sharding.complex.ComplexKeysShardingAlgorithm;
import org.apache.shardingsphere.sharding.api.sharding.complex.ComplexKeysShardingValue;
import java.util.Collection;
-import java.util.Properties;
-@Getter
-@Setter
public final class ComplexKeysShardingAlgorithmFixture implements ComplexKeysShardingAlgorithm<Integer> {
- private Properties props = new Properties();
-
@Override
public void init() {
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/test/java/org/apache/shardingsphere/sharding/spring/namespace/fixture/sharding/HintShardingAlgorithmFixture.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/test/java/org/apache/shardingsphere/sharding/spring/namespace/fixture/sharding/HintShardingAlgorithmFixture.java
index a5b5460..8fa7ab7 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/test/java/org/apache/shardingsphere/sharding/spring/namespace/fixture/sharding/HintShardingAlgorithmFixture.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/test/java/org/apache/shardingsphere/sharding/spring/namespace/fixture/sharding/HintShardingAlgorithmFixture.java
@@ -17,20 +17,13 @@
package org.apache.shardingsphere.sharding.spring.namespace.fixture.sharding;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.sharding.api.sharding.hint.HintShardingAlgorithm;
import org.apache.shardingsphere.sharding.api.sharding.hint.HintShardingValue;
import java.util.Collection;
-import java.util.Properties;
-@Getter
-@Setter
public final class HintShardingAlgorithmFixture implements HintShardingAlgorithm<Integer> {
- private Properties props = new Properties();
-
@Override
public void init() {
}
diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/test/resources/logback-test.xml b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/test/resources/logback-test.xml
index 9c2ca44..a1dc0ca 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/test/resources/logback-test.xml
+++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/test/resources/logback-test.xml
@@ -25,7 +25,7 @@
<logger name="org.apache.shardingsphere" level="warn" additivity="false">
<appender-ref ref="console" />
</logger>
- <logger name="org.apache.shardingsphere.infra.executor.sql.execute.engine.ExecutorExceptionHandler" level="off" />
+ <logger name="org.apache.shardingsphere.infra.executor.sql.execute.engine.SQLExecutorExceptionHandler" level="off" />
<root>
<level value="error" />
diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-facade/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestAllRepository.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-facade/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestAllRepository.java
index 9dc58e2..d22c3bb 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-facade/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestAllRepository.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-facade/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestAllRepository.java
@@ -17,8 +17,6 @@
package org.apache.shardingsphere.governance.core.facade.fixture;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.governance.repository.api.ConfigurationRepository;
import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceCenterConfiguration;
@@ -26,15 +24,10 @@ import org.apache.shardingsphere.governance.repository.api.listener.DataChangedE
import java.util.Collections;
import java.util.List;
-import java.util.Properties;
import java.util.concurrent.TimeUnit;
-@Getter
-@Setter
public final class TestAllRepository implements RegistryRepository, ConfigurationRepository {
- private Properties props = new Properties();
-
@Override
public void init(final String name, final GovernanceCenterConfiguration config) {
}
diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-facade/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestConfigurationRepository.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-facade/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestConfigurationRepository.java
index ffbb1b4..eb39a90 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-facade/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestConfigurationRepository.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-facade/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestConfigurationRepository.java
@@ -17,22 +17,15 @@
package org.apache.shardingsphere.governance.core.facade.fixture;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.governance.repository.api.ConfigurationRepository;
-import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEventListener;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceCenterConfiguration;
+import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEventListener;
import java.util.Collections;
import java.util.List;
-import java.util.Properties;
-@Getter
-@Setter
public final class TestConfigurationRepository implements ConfigurationRepository {
- private Properties props = new Properties();
-
@Override
public void init(final String name, final GovernanceCenterConfiguration config) {
}
diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-facade/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestRegistryRepository.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-facade/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestRegistryRepository.java
index 280cc4f..5a06f5b 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-facade/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestRegistryRepository.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-facade/src/test/java/org/apache/shardingsphere/governance/core/facade/fixture/TestRegistryRepository.java
@@ -17,23 +17,16 @@
package org.apache.shardingsphere.governance.core.facade.fixture;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceCenterConfiguration;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEventListener;
import java.util.Collections;
import java.util.List;
-import java.util.Properties;
import java.util.concurrent.TimeUnit;
-@Getter
-@Setter
public final class TestRegistryRepository implements RegistryRepository {
- private Properties props = new Properties();
-
@Override
public void init(final String name, final GovernanceCenterConfiguration config) {
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/impl/H2DatabaseMetaDataDialectHandler.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/impl/H2DatabaseMetaDataDialectHandler.java
index 824bd5a..0f19cc9 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/impl/H2DatabaseMetaDataDialectHandler.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/impl/H2DatabaseMetaDataDialectHandler.java
@@ -17,22 +17,14 @@
package org.apache.shardingsphere.infra.metadata.schema.builder.loader.dialect.impl;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.infra.metadata.schema.builder.loader.dialect.DatabaseMetaDataDialectHandler;
import org.apache.shardingsphere.sql.parser.sql.common.constant.QuoteCharacter;
-import java.util.Properties;
-
/**
* Database meta data dialect handler of H2.
*/
-@Getter
-@Setter
public final class H2DatabaseMetaDataDialectHandler implements DatabaseMetaDataDialectHandler {
- private Properties props;
-
@Override
public QuoteCharacter getQuoteCharacter() {
return QuoteCharacter.QUOTE;
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/impl/MariaDBDatabaseMetaDataDialectHandler.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/impl/MariaDBDatabaseMetaDataDialectHandler.java
index 1965864..2370f6d 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/impl/MariaDBDatabaseMetaDataDialectHandler.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/impl/MariaDBDatabaseMetaDataDialectHandler.java
@@ -17,22 +17,14 @@
package org.apache.shardingsphere.infra.metadata.schema.builder.loader.dialect.impl;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.infra.metadata.schema.builder.loader.dialect.DatabaseMetaDataDialectHandler;
import org.apache.shardingsphere.sql.parser.sql.common.constant.QuoteCharacter;
-import java.util.Properties;
-
/**
* Database meta data dialect handler of MariaDB.
*/
-@Getter
-@Setter
public final class MariaDBDatabaseMetaDataDialectHandler implements DatabaseMetaDataDialectHandler {
- private Properties props;
-
@Override
public QuoteCharacter getQuoteCharacter() {
return QuoteCharacter.BACK_QUOTE;
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/impl/MySQLDatabaseMetaDataDialectHandler.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/impl/MySQLDatabaseMetaDataDialectHandler.java
index 565c6f2..3f5c8c4 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/impl/MySQLDatabaseMetaDataDialectHandler.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/impl/MySQLDatabaseMetaDataDialectHandler.java
@@ -17,22 +17,14 @@
package org.apache.shardingsphere.infra.metadata.schema.builder.loader.dialect.impl;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.infra.metadata.schema.builder.loader.dialect.DatabaseMetaDataDialectHandler;
import org.apache.shardingsphere.sql.parser.sql.common.constant.QuoteCharacter;
-import java.util.Properties;
-
/**
* Database meta data dialect handler of MySQL.
*/
-@Getter
-@Setter
public final class MySQLDatabaseMetaDataDialectHandler implements DatabaseMetaDataDialectHandler {
- private Properties props;
-
@Override
public QuoteCharacter getQuoteCharacter() {
return QuoteCharacter.BACK_QUOTE;
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/impl/OracleDatabaseMetaDataDialectHandler.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/impl/OracleDatabaseMetaDataDialectHandler.java
index 95fe0a6..430cb17 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/impl/OracleDatabaseMetaDataDialectHandler.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/impl/OracleDatabaseMetaDataDialectHandler.java
@@ -17,25 +17,18 @@
package org.apache.shardingsphere.infra.metadata.schema.builder.loader.dialect.impl;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.infra.metadata.schema.builder.loader.dialect.DatabaseMetaDataDialectHandler;
import org.apache.shardingsphere.sql.parser.sql.common.constant.QuoteCharacter;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Optional;
-import java.util.Properties;
/**
* Database meta data dialect handler of Oracle.
*/
-@Getter
-@Setter
public final class OracleDatabaseMetaDataDialectHandler implements DatabaseMetaDataDialectHandler {
- private Properties props;
-
@SuppressWarnings("ReturnOfNull")
@Override
public String getSchema(final Connection connection) {
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/impl/PostgreSQLDatabaseMetaDataDialectHandler.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/impl/PostgreSQLDatabaseMetaDataDialectHandler.java
index 9b4e368..732dc15 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/impl/PostgreSQLDatabaseMetaDataDialectHandler.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/impl/PostgreSQLDatabaseMetaDataDialectHandler.java
@@ -17,22 +17,14 @@
package org.apache.shardingsphere.infra.metadata.schema.builder.loader.dialect.impl;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.infra.metadata.schema.builder.loader.dialect.DatabaseMetaDataDialectHandler;
import org.apache.shardingsphere.sql.parser.sql.common.constant.QuoteCharacter;
-import java.util.Properties;
-
/**
* Database meta data dialect handler of PostgreSQL.
*/
-@Getter
-@Setter
public final class PostgreSQLDatabaseMetaDataDialectHandler implements DatabaseMetaDataDialectHandler {
- private Properties props;
-
@Override
public QuoteCharacter getQuoteCharacter() {
return QuoteCharacter.QUOTE;
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/impl/SQL92DatabaseMetaDataDialectHandler.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/impl/SQL92DatabaseMetaDataDialectHandler.java
index ade45c5..e39db9f 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/impl/SQL92DatabaseMetaDataDialectHandler.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/impl/SQL92DatabaseMetaDataDialectHandler.java
@@ -17,22 +17,14 @@
package org.apache.shardingsphere.infra.metadata.schema.builder.loader.dialect.impl;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.infra.metadata.schema.builder.loader.dialect.DatabaseMetaDataDialectHandler;
import org.apache.shardingsphere.sql.parser.sql.common.constant.QuoteCharacter;
-import java.util.Properties;
-
/**
* Database meta data dialect handler of SQL92.
*/
-@Getter
-@Setter
public final class SQL92DatabaseMetaDataDialectHandler implements DatabaseMetaDataDialectHandler {
- private Properties props;
-
@Override
public QuoteCharacter getQuoteCharacter() {
return QuoteCharacter.QUOTE;
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/impl/SQLServerDatabaseMetaDataDialectHandler.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/impl/SQLServerDatabaseMetaDataDialectHandler.java
index 1f09b71..500b4c5 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/impl/SQLServerDatabaseMetaDataDialectHandler.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/impl/SQLServerDatabaseMetaDataDialectHandler.java
@@ -17,22 +17,14 @@
package org.apache.shardingsphere.infra.metadata.schema.builder.loader.dialect.impl;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.infra.metadata.schema.builder.loader.dialect.DatabaseMetaDataDialectHandler;
import org.apache.shardingsphere.sql.parser.sql.common.constant.QuoteCharacter;
-import java.util.Properties;
-
/**
* Database meta data dialect handler of SQLServer.
*/
-@Getter
-@Setter
public final class SQLServerDatabaseMetaDataDialectHandler implements DatabaseMetaDataDialectHandler {
- private Properties props;
-
@Override
public QuoteCharacter getQuoteCharacter() {
return QuoteCharacter.BRACKETS;
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/ExecutorExceptionHandler.java b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/SQLExecutorExceptionHandler.java
similarity index 96%
rename from shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/ExecutorExceptionHandler.java
rename to shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/SQLExecutorExceptionHandler.java
index 9f1e9ce..8d9a4d3 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/ExecutorExceptionHandler.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/SQLExecutorExceptionHandler.java
@@ -25,11 +25,11 @@ import org.apache.shardingsphere.infra.exception.ShardingSphereException;
import java.sql.SQLException;
/**
- * Executor exception handler.
+ * SQL executor exception handler.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
@Slf4j
-public final class ExecutorExceptionHandler {
+public final class SQLExecutorExceptionHandler {
private static final ThreadLocal<Boolean> IS_EXCEPTION_THROWN = ThreadLocal.withInitial(() -> true);
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/JDBCExecutor.java b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/JDBCExecutor.java
index 4b33286..91989e8 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/JDBCExecutor.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/JDBCExecutor.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.executor.kernel.ExecutorEngine;
import org.apache.shardingsphere.infra.executor.kernel.model.ExecutionGroup;
-import org.apache.shardingsphere.infra.executor.sql.execute.engine.ExecutorExceptionHandler;
+import org.apache.shardingsphere.infra.executor.sql.execute.engine.SQLExecutorExceptionHandler;
import java.sql.SQLException;
import java.util.Collection;
@@ -65,7 +65,7 @@ public final class JDBCExecutor {
try {
return executorEngine.execute(executionGroups, firstCallback, callback, serial);
} catch (final SQLException ex) {
- ExecutorExceptionHandler.handleException(ex);
+ SQLExecutorExceptionHandler.handleException(ex);
return Collections.emptyList();
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/JDBCExecutorCallback.java b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/JDBCExecutorCallback.java
index 505073f..a8625ad 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/JDBCExecutorCallback.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/driver/jdbc/JDBCExecutorCallback.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.infra.executor.kernel.model.ExecutorCallback;
import org.apache.shardingsphere.infra.executor.sql.context.SQLUnit;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.ConnectionMode;
-import org.apache.shardingsphere.infra.executor.sql.execute.engine.ExecutorExceptionHandler;
+import org.apache.shardingsphere.infra.executor.sql.execute.engine.SQLExecutorExceptionHandler;
import org.apache.shardingsphere.infra.executor.sql.hook.SPISQLExecutionHook;
import org.apache.shardingsphere.infra.executor.sql.hook.SQLExecutionHook;
@@ -65,7 +65,7 @@ public abstract class JDBCExecutorCallback<T> implements ExecutorCallback<JDBCEx
* @see <a href="https://github.com/apache/skywalking/blob/master/docs/en/guides/Java-Plugin-Development-Guide.md#user-content-plugin-development-guide">Plugin Development Guide</a>
*/
private T execute(final JDBCExecutionUnit jdbcExecutionUnit, final boolean isTrunkThread, final Map<String, Object> dataMap) throws SQLException {
- ExecutorExceptionHandler.setExceptionThrown(isExceptionThrown);
+ SQLExecutorExceptionHandler.setExceptionThrown(isExceptionThrown);
DataSourceMetaData dataSourceMetaData = getDataSourceMetaData(jdbcExecutionUnit.getStorageResource().getConnection().getMetaData());
SQLExecutionHook sqlExecutionHook = new SPISQLExecutionHook();
try {
@@ -76,7 +76,7 @@ public abstract class JDBCExecutorCallback<T> implements ExecutorCallback<JDBCEx
return result;
} catch (final SQLException ex) {
sqlExecutionHook.finishFailure(ex);
- ExecutorExceptionHandler.handleException(ex);
+ SQLExecutorExceptionHandler.handleException(ex);
return null;
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/RawExecutor.java b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/RawExecutor.java
index 0fcd289..02ecfde 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/RawExecutor.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/RawExecutor.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.infra.executor.kernel.ExecutorEngine;
import org.apache.shardingsphere.infra.executor.kernel.model.ExecutionGroup;
import org.apache.shardingsphere.infra.executor.sql.execute.result.ExecuteResult;
import org.apache.shardingsphere.infra.executor.sql.execute.result.update.ExecuteUpdateResult;
-import org.apache.shardingsphere.infra.executor.sql.execute.engine.ExecutorExceptionHandler;
+import org.apache.shardingsphere.infra.executor.sql.execute.engine.SQLExecutorExceptionHandler;
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.QueryResult;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.raw.callback.RawSQLExecutorCallback;
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.ExecuteQueryResult;
@@ -100,7 +100,7 @@ public final class RawExecutor {
try {
return executorEngine.execute((Collection) executionGroups, null, callback, serial);
} catch (final SQLException ex) {
- ExecutorExceptionHandler.handleException(ex);
+ SQLExecutorExceptionHandler.handleException(ex);
return Collections.emptyList();
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/ExecutorExceptionHandlerTest.java b/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/ExecutorExceptionHandlerTest.java
index 9f66317..f8c8162 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/ExecutorExceptionHandlerTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/ExecutorExceptionHandlerTest.java
@@ -30,28 +30,28 @@ public final class ExecutorExceptionHandlerTest {
@After
public void tearDown() throws NoSuchFieldException, IllegalAccessException {
- Field field = ExecutorExceptionHandler.class.getDeclaredField("IS_EXCEPTION_THROWN");
+ Field field = SQLExecutorExceptionHandler.class.getDeclaredField("IS_EXCEPTION_THROWN");
field.setAccessible(true);
- ((ThreadLocal) field.get(ExecutorExceptionHandler.class)).remove();
+ ((ThreadLocal) field.get(SQLExecutorExceptionHandler.class)).remove();
}
@Test(expected = SQLException.class)
public void assertHandleExceptionWithoutSet() throws SQLException {
- assertTrue(ExecutorExceptionHandler.isExceptionThrown());
- ExecutorExceptionHandler.handleException(new SQLException(""));
+ assertTrue(SQLExecutorExceptionHandler.isExceptionThrown());
+ SQLExecutorExceptionHandler.handleException(new SQLException(""));
}
@Test(expected = SQLException.class)
public void assertHandleExceptionWhenExceptionThrownIsTrue() throws SQLException {
- ExecutorExceptionHandler.setExceptionThrown(true);
- assertTrue(ExecutorExceptionHandler.isExceptionThrown());
- ExecutorExceptionHandler.handleException(new SQLException(""));
+ SQLExecutorExceptionHandler.setExceptionThrown(true);
+ assertTrue(SQLExecutorExceptionHandler.isExceptionThrown());
+ SQLExecutorExceptionHandler.handleException(new SQLException(""));
}
@Test
public void assertHandleExceptionWhenExceptionThrownIsFalse() throws SQLException {
- ExecutorExceptionHandler.setExceptionThrown(false);
- assertFalse(ExecutorExceptionHandler.isExceptionThrown());
- ExecutorExceptionHandler.handleException(new SQLException(""));
+ SQLExecutorExceptionHandler.setExceptionThrown(false);
+ assertFalse(SQLExecutorExceptionHandler.isExceptionThrown());
+ SQLExecutorExceptionHandler.handleException(new SQLException(""));
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/jdbc/JDBCExecutorTest.java b/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/jdbc/JDBCExecutorTest.java
index 7ec16fb..c240440 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/jdbc/JDBCExecutorTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/jdbc/JDBCExecutorTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.executor.sql.execute.engine.jdbc;
import org.apache.shardingsphere.infra.executor.kernel.ExecutorEngine;
-import org.apache.shardingsphere.infra.executor.sql.execute.engine.ExecutorExceptionHandler;
+import org.apache.shardingsphere.infra.executor.sql.execute.engine.SQLExecutorExceptionHandler;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutor;
import org.junit.Test;
@@ -64,7 +64,7 @@ public final class JDBCExecutorTest {
ExecutorEngine executorEngine = mock(ExecutorEngine.class);
when(executorEngine.execute(anyCollection(), any(), any(), anyBoolean())).thenThrow(new SQLException("TestSQLException"));
JDBCExecutor jdbcExecutor = new JDBCExecutor(executorEngine, false);
- ExecutorExceptionHandler.setExceptionThrown(false);
+ SQLExecutorExceptionHandler.setExceptionThrown(false);
List<?> actual = jdbcExecutor.execute(Collections.emptyList(), null);
assertThat(actual, is(Collections.emptyList()));
}
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/RawExecutorTest.java b/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/RawExecutorTest.java
index ed23124..24ac111 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/RawExecutorTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/RawExecutorTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.executor.sql.execute.engine.raw;
import org.apache.shardingsphere.infra.executor.kernel.ExecutorEngine;
-import org.apache.shardingsphere.infra.executor.sql.execute.engine.ExecutorExceptionHandler;
+import org.apache.shardingsphere.infra.executor.sql.execute.engine.SQLExecutorExceptionHandler;
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.ExecuteQueryResult;
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.QueryResult;
import org.apache.shardingsphere.infra.executor.sql.execute.result.update.ExecuteUpdateResult;
@@ -82,7 +82,7 @@ public final class RawExecutorTest {
ExecutorEngine executorEngine = mock(ExecutorEngine.class);
when(executorEngine.execute(any(), any(), any(), anyBoolean())).thenThrow(new SQLException("TestSQLException"));
RawExecutor rawExecutor = new RawExecutor(executorEngine, false);
- ExecutorExceptionHandler.setExceptionThrown(false);
+ SQLExecutorExceptionHandler.setExceptionThrown(false);
assertFalse(rawExecutor.execute(Collections.emptyList(), null));
}
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/test/resources/logback-test.xml b/shardingsphere-infra/shardingsphere-infra-executor/src/test/resources/logback-test.xml
index 9c2ca44..a1dc0ca 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/test/resources/logback-test.xml
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/test/resources/logback-test.xml
@@ -25,7 +25,7 @@
<logger name="org.apache.shardingsphere" level="warn" additivity="false">
<appender-ref ref="console" />
</logger>
- <logger name="org.apache.shardingsphere.infra.executor.sql.execute.engine.ExecutorExceptionHandler" level="off" />
+ <logger name="org.apache.shardingsphere.infra.executor.sql.execute.engine.SQLExecutorExceptionHandler" level="off" />
<root>
<level value="error" />
diff --git a/shardingsphere-integration-test/shardingsphere-test-fixture/src/test/java/org/apache/shardingsphere/dbtest/fixture/ConstantKeyGenerateAlgorithm.java b/shardingsphere-integration-test/shardingsphere-test-fixture/src/test/java/org/apache/shardingsphere/dbtest/fixture/ConstantKeyGenerateAlgorithm.java
index 221ade3..36ec227 100644
--- a/shardingsphere-integration-test/shardingsphere-test-fixture/src/test/java/org/apache/shardingsphere/dbtest/fixture/ConstantKeyGenerateAlgorithm.java
+++ b/shardingsphere-integration-test/shardingsphere-test-fixture/src/test/java/org/apache/shardingsphere/dbtest/fixture/ConstantKeyGenerateAlgorithm.java
@@ -17,18 +17,10 @@
package org.apache.shardingsphere.dbtest.fixture;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm;
-import java.util.Properties;
-
public final class ConstantKeyGenerateAlgorithm implements KeyGenerateAlgorithm {
- @Getter
- @Setter
- private Properties props = new Properties();
-
@Override
public void init() {
}
diff --git a/shardingsphere-integration-test/shardingsphere-test-fixture/src/test/java/org/apache/shardingsphere/dbtest/fixture/StandardModuloAlgorithm.java b/shardingsphere-integration-test/shardingsphere-test-fixture/src/test/java/org/apache/shardingsphere/dbtest/fixture/StandardModuloAlgorithm.java
index 14bc1a6..3a6f77d 100644
--- a/shardingsphere-integration-test/shardingsphere-test-fixture/src/test/java/org/apache/shardingsphere/dbtest/fixture/StandardModuloAlgorithm.java
+++ b/shardingsphere-integration-test/shardingsphere-test-fixture/src/test/java/org/apache/shardingsphere/dbtest/fixture/StandardModuloAlgorithm.java
@@ -17,8 +17,6 @@
package org.apache.shardingsphere.dbtest.fixture;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.sharding.api.sharding.standard.PreciseShardingValue;
import org.apache.shardingsphere.sharding.api.sharding.standard.RangeShardingValue;
import org.apache.shardingsphere.sharding.api.sharding.standard.StandardShardingAlgorithm;
@@ -26,14 +24,9 @@ import org.apache.shardingsphere.sharding.api.sharding.standard.StandardSharding
import java.math.BigInteger;
import java.util.Collection;
import java.util.LinkedHashSet;
-import java.util.Properties;
-@Getter
-@Setter
public final class StandardModuloAlgorithm implements StandardShardingAlgorithm<Integer> {
- private Properties props = new Properties();
-
@Override
public void init() {
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/PreparedStatementExecutor.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/PreparedStatementExecutor.java
index 074b789..d295b88 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/PreparedStatementExecutor.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/PreparedStatementExecutor.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.context.metadata.MetaDataContexts;
import org.apache.shardingsphere.infra.executor.kernel.model.ExecutionGroup;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.ConnectionMode;
-import org.apache.shardingsphere.infra.executor.sql.execute.engine.ExecutorExceptionHandler;
+import org.apache.shardingsphere.infra.executor.sql.execute.engine.SQLExecutorExceptionHandler;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutionUnit;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutor;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutorCallback;
@@ -53,7 +53,7 @@ public final class PreparedStatementExecutor extends AbstractStatementExecutor {
@Override
public List<QueryResult> executeQuery(final Collection<ExecutionGroup<JDBCExecutionUnit>> executionGroups) throws SQLException {
- boolean isExceptionThrown = ExecutorExceptionHandler.isExceptionThrown();
+ boolean isExceptionThrown = SQLExecutorExceptionHandler.isExceptionThrown();
JDBCExecutorCallback<QueryResult> callback = createJDBCExecutorCallbackWithQueryResult(isExceptionThrown);
return getJdbcExecutor().execute(executionGroups, callback);
}
@@ -77,7 +77,7 @@ public final class PreparedStatementExecutor extends AbstractStatementExecutor {
@Override
public int executeUpdate(final Collection<ExecutionGroup<JDBCExecutionUnit>> executionGroups,
final SQLStatementContext<?> sqlStatementContext, final Collection<RouteUnit> routeUnits) throws SQLException {
- boolean isExceptionThrown = ExecutorExceptionHandler.isExceptionThrown();
+ boolean isExceptionThrown = SQLExecutorExceptionHandler.isExceptionThrown();
JDBCExecutorCallback<Integer> callback = createJDBCExecutorCallbackWithInteger(isExceptionThrown);
List<Integer> results = getJdbcExecutor().execute(executionGroups, callback);
refreshSchema(getMetaDataContexts().getDefaultMetaData(), sqlStatementContext.getSqlStatement(), routeUnits);
@@ -97,7 +97,7 @@ public final class PreparedStatementExecutor extends AbstractStatementExecutor {
@Override
public boolean execute(final Collection<ExecutionGroup<JDBCExecutionUnit>> executionGroups, final SQLStatement sqlStatement, final Collection<RouteUnit> routeUnits) throws SQLException {
- boolean isExceptionThrown = ExecutorExceptionHandler.isExceptionThrown();
+ boolean isExceptionThrown = SQLExecutorExceptionHandler.isExceptionThrown();
JDBCExecutorCallback<Boolean> callback = createJDBCExecutorCallbackWithBoolean(isExceptionThrown);
return executeAndRefreshMetaData(executionGroups, sqlStatement, routeUnits, callback);
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/StatementExecutor.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/StatementExecutor.java
index 89d8077..20b571a 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/StatementExecutor.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/StatementExecutor.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.context.metadata.MetaDataContexts;
import org.apache.shardingsphere.infra.executor.kernel.model.ExecutionGroup;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.ConnectionMode;
-import org.apache.shardingsphere.infra.executor.sql.execute.engine.ExecutorExceptionHandler;
+import org.apache.shardingsphere.infra.executor.sql.execute.engine.SQLExecutorExceptionHandler;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutionUnit;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutor;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutorCallback;
@@ -52,7 +52,7 @@ public final class StatementExecutor extends AbstractStatementExecutor {
@Override
public List<QueryResult> executeQuery(final Collection<ExecutionGroup<JDBCExecutionUnit>> executionGroups) throws SQLException {
- boolean isExceptionThrown = ExecutorExceptionHandler.isExceptionThrown();
+ boolean isExceptionThrown = SQLExecutorExceptionHandler.isExceptionThrown();
JDBCExecutorCallback<QueryResult> jdbcExecutorCallback = new JDBCExecutorCallback<QueryResult>(getMetaDataContexts().getDatabaseType(), isExceptionThrown) {
@Override
@@ -122,7 +122,7 @@ public final class StatementExecutor extends AbstractStatementExecutor {
@SuppressWarnings({"unchecked", "rawtypes"})
private int executeUpdate(final Collection<ExecutionGroup<JDBCExecutionUnit>> executionGroups, final Updater updater,
final SQLStatementContext<?> sqlStatementContext, final Collection<RouteUnit> routeUnits) throws SQLException {
- boolean isExceptionThrown = ExecutorExceptionHandler.isExceptionThrown();
+ boolean isExceptionThrown = SQLExecutorExceptionHandler.isExceptionThrown();
JDBCExecutorCallback jdbcExecutorCallback = new JDBCExecutorCallback<Integer>(getMetaDataContexts().getDatabaseType(), isExceptionThrown) {
@Override
@@ -192,7 +192,7 @@ public final class StatementExecutor extends AbstractStatementExecutor {
@SuppressWarnings("rawtypes")
private boolean execute(final Collection<ExecutionGroup<JDBCExecutionUnit>> executionGroups, final Executor executor,
final SQLStatement sqlStatement, final Collection<RouteUnit> routeUnits) throws SQLException {
- boolean isExceptionThrown = ExecutorExceptionHandler.isExceptionThrown();
+ boolean isExceptionThrown = SQLExecutorExceptionHandler.isExceptionThrown();
JDBCExecutorCallback jdbcExecutorCallback = new JDBCExecutorCallback<Boolean>(getMetaDataContexts().getDatabaseType(), isExceptionThrown) {
@Override
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/batch/BatchPreparedStatementExecutor.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/batch/BatchPreparedStatementExecutor.java
index 3dfb9f3..096c848 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/batch/BatchPreparedStatementExecutor.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/batch/BatchPreparedStatementExecutor.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.infra.context.metadata.MetaDataContexts;
import org.apache.shardingsphere.infra.executor.kernel.model.ExecutionGroup;
import org.apache.shardingsphere.infra.executor.sql.context.ExecutionUnit;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.ConnectionMode;
-import org.apache.shardingsphere.infra.executor.sql.execute.engine.ExecutorExceptionHandler;
+import org.apache.shardingsphere.infra.executor.sql.execute.engine.SQLExecutorExceptionHandler;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutionUnit;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutor;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutorCallback;
@@ -117,7 +117,7 @@ public final class BatchPreparedStatementExecutor {
* @throws SQLException SQL exception
*/
public int[] executeBatch(final SQLStatementContext sqlStatementContext) throws SQLException {
- boolean isExceptionThrown = ExecutorExceptionHandler.isExceptionThrown();
+ boolean isExceptionThrown = SQLExecutorExceptionHandler.isExceptionThrown();
JDBCExecutorCallback<int[]> callback = new JDBCExecutorCallback<int[]>(metaDataContexts.getDatabaseType(), isExceptionThrown) {
@Override
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/executor/AbstractBaseExecutorTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/executor/AbstractBaseExecutorTest.java
index 3f195bb..36fc90d 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/executor/AbstractBaseExecutorTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/executor/AbstractBaseExecutorTest.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.infra.context.metadata.MetaDataContexts;
import org.apache.shardingsphere.infra.context.metadata.impl.StandardMetaDataContexts;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeRegistry;
import org.apache.shardingsphere.infra.executor.kernel.ExecutorEngine;
-import org.apache.shardingsphere.infra.executor.sql.execute.engine.ExecutorExceptionHandler;
+import org.apache.shardingsphere.infra.executor.sql.execute.engine.SQLExecutorExceptionHandler;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.transaction.ShardingTransactionManagerEngine;
@@ -59,7 +59,7 @@ public abstract class AbstractBaseExecutorTest {
@Before
public void setUp() throws SQLException {
MockitoAnnotations.initMocks(this);
- ExecutorExceptionHandler.setExceptionThrown(false);
+ SQLExecutorExceptionHandler.setExceptionThrown(false);
executorEngine = new ExecutorEngine(Runtime.getRuntime().availableProcessors());
setConnection();
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/executor/StatementExecutorTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/executor/StatementExecutorTest.java
index d2ae4de..b001351 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/executor/StatementExecutorTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/executor/StatementExecutorTest.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.infra.executor.sql.execute.result.query.QueryRe
import org.apache.shardingsphere.infra.executor.sql.context.ExecutionUnit;
import org.apache.shardingsphere.infra.executor.sql.context.SQLUnit;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutionUnit;
-import org.apache.shardingsphere.infra.executor.sql.execute.engine.ExecutorExceptionHandler;
+import org.apache.shardingsphere.infra.executor.sql.execute.engine.SQLExecutorExceptionHandler;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutor;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import org.junit.Test;
@@ -296,7 +296,7 @@ public final class StatementExecutorTest extends AbstractBaseExecutorTest {
@Test
public void assertOverallExceptionFailure() throws SQLException {
- ExecutorExceptionHandler.setExceptionThrown(true);
+ SQLExecutorExceptionHandler.setExceptionThrown(true);
Statement statement = getStatement();
SQLException ex = new SQLException("");
when(statement.execute(DML_SQL)).thenThrow(ex);
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/fixture/IncrementKeyGenerateAlgorithm.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/fixture/IncrementKeyGenerateAlgorithm.java
index d21cd29..a8eb8c6 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/fixture/IncrementKeyGenerateAlgorithm.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/fixture/IncrementKeyGenerateAlgorithm.java
@@ -17,21 +17,14 @@
package org.apache.shardingsphere.driver.fixture;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm;
-import java.util.Properties;
import java.util.concurrent.atomic.AtomicInteger;
public final class IncrementKeyGenerateAlgorithm implements KeyGenerateAlgorithm {
private final AtomicInteger count = new AtomicInteger();
- @Getter
- @Setter
- private Properties props = new Properties();
-
@Override
public void init() {
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/fixture/ResetIncrementKeyGenerateAlgorithm.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/fixture/ResetIncrementKeyGenerateAlgorithm.java
index 1577da8..0d3842f 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/fixture/ResetIncrementKeyGenerateAlgorithm.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/fixture/ResetIncrementKeyGenerateAlgorithm.java
@@ -18,10 +18,8 @@
package org.apache.shardingsphere.driver.fixture;
import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm;
-import java.util.Properties;
import java.util.concurrent.atomic.AtomicInteger;
public final class ResetIncrementKeyGenerateAlgorithm implements KeyGenerateAlgorithm {
@@ -29,10 +27,6 @@ public final class ResetIncrementKeyGenerateAlgorithm implements KeyGenerateAlgo
@Getter
private static final AtomicInteger COUNT = new AtomicInteger();
- @Getter
- @Setter
- private Properties props = new Properties();
-
@Override
public void init() {
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/fixture/StandardOrderShardingAlgorithm.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/fixture/StandardOrderShardingAlgorithm.java
index 322f2a0..a7d5d48 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/fixture/StandardOrderShardingAlgorithm.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/fixture/StandardOrderShardingAlgorithm.java
@@ -17,22 +17,15 @@
package org.apache.shardingsphere.driver.fixture;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.sharding.api.sharding.standard.PreciseShardingValue;
import org.apache.shardingsphere.sharding.api.sharding.standard.RangeShardingValue;
import org.apache.shardingsphere.sharding.api.sharding.standard.StandardShardingAlgorithm;
import java.util.Collection;
import java.util.HashSet;
-import java.util.Properties;
-@Getter
-@Setter
public final class StandardOrderShardingAlgorithm implements StandardShardingAlgorithm<Integer> {
- private Properties props = new Properties();
-
@Override
public void init() {
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/fixture/TestEncryptAlgorithm.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/fixture/TestEncryptAlgorithm.java
index 6fda09f..122b7bb 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/fixture/TestEncryptAlgorithm.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/fixture/TestEncryptAlgorithm.java
@@ -17,18 +17,10 @@
package org.apache.shardingsphere.driver.fixture;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm;
-import java.util.Properties;
-
-@Getter
-@Setter
public final class TestEncryptAlgorithm implements EncryptAlgorithm {
- private Properties props = new Properties();
-
@Override
public void init() {
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/fixture/TestQueryAssistedEncryptAlgorithm.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/fixture/TestQueryAssistedEncryptAlgorithm.java
index 83935a8..6c2bccf 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/fixture/TestQueryAssistedEncryptAlgorithm.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/fixture/TestQueryAssistedEncryptAlgorithm.java
@@ -17,18 +17,10 @@
package org.apache.shardingsphere.driver.fixture;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.encrypt.spi.QueryAssistedEncryptAlgorithm;
-import java.util.Properties;
-
-@Getter
-@Setter
public final class TestQueryAssistedEncryptAlgorithm implements QueryAssistedEncryptAlgorithm {
- private Properties props = new Properties();
-
@Override
public void init() {
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/logback-test.xml b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/logback-test.xml
index 9c2ca44..a1dc0ca 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/logback-test.xml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/logback-test.xml
@@ -25,7 +25,7 @@
<logger name="org.apache.shardingsphere" level="warn" additivity="false">
<appender-ref ref="console" />
</logger>
- <logger name="org.apache.shardingsphere.infra.executor.sql.execute.engine.ExecutorExceptionHandler" level="off" />
+ <logger name="org.apache.shardingsphere.infra.executor.sql.execute.engine.SQLExecutorExceptionHandler" level="off" />
<root>
<level value="error" />
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/fixture/DecrementKeyGenerateAlgorithm.java b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/fixture/DecrementKeyGenerateAlgorithm.java
index c6d898c..a618cdd 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/fixture/DecrementKeyGenerateAlgorithm.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/fixture/DecrementKeyGenerateAlgorithm.java
@@ -17,21 +17,14 @@
package org.apache.shardingsphere.driver.governance.api.yaml.fixture;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm;
-import java.util.Properties;
import java.util.concurrent.atomic.AtomicInteger;
public final class DecrementKeyGenerateAlgorithm implements KeyGenerateAlgorithm {
private final AtomicInteger sequence = new AtomicInteger(100);
- @Getter
- @Setter
- private Properties props = new Properties();
-
@Override
public void init() {
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/fixture/IncrementKeyGenerateAlgorithm.java b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/fixture/IncrementKeyGenerateAlgorithm.java
index 7017496..ce6d6ff 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/fixture/IncrementKeyGenerateAlgorithm.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/fixture/IncrementKeyGenerateAlgorithm.java
@@ -17,21 +17,14 @@
package org.apache.shardingsphere.driver.governance.api.yaml.fixture;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm;
-import java.util.Properties;
import java.util.concurrent.atomic.AtomicInteger;
-@Getter
-@Setter
public final class IncrementKeyGenerateAlgorithm implements KeyGenerateAlgorithm {
private static final AtomicInteger SEQUENCE = new AtomicInteger(100);
- private Properties props = new Properties();
-
@Override
public void init() {
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/fixture/StandardAlgorithm.java b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/fixture/StandardAlgorithm.java
index 0373b7f..2e94bd1 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/fixture/StandardAlgorithm.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/fixture/StandardAlgorithm.java
@@ -17,21 +17,14 @@
package org.apache.shardingsphere.driver.governance.api.yaml.fixture;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.sharding.api.sharding.standard.PreciseShardingValue;
import org.apache.shardingsphere.sharding.api.sharding.standard.RangeShardingValue;
import org.apache.shardingsphere.sharding.api.sharding.standard.StandardShardingAlgorithm;
import java.util.Collection;
-import java.util.Properties;
-@Getter
-@Setter
public final class StandardAlgorithm implements StandardShardingAlgorithm<Integer> {
- private Properties props = new Properties();
-
@Override
public void init() {
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/fixture/TestConfigurationRepository.java b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/fixture/TestConfigurationRepository.java
index 2b65260..dbc6770 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/fixture/TestConfigurationRepository.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/fixture/TestConfigurationRepository.java
@@ -17,8 +17,6 @@
package org.apache.shardingsphere.driver.governance.fixture;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.governance.repository.api.ConfigurationRepository;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceCenterConfiguration;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEventListener;
@@ -27,16 +25,11 @@ import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
-@Getter
-@Setter
public final class TestConfigurationRepository implements ConfigurationRepository {
private static final Map<String, String> REGISTRY_DATA = new LinkedHashMap<>();
- private Properties props = new Properties();
-
@Override
public void init(final String name, final GovernanceCenterConfiguration config) {
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/fixture/TestRegistryRepository.java b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/fixture/TestRegistryRepository.java
index 3fb38b1..c7ed68e 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/fixture/TestRegistryRepository.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/fixture/TestRegistryRepository.java
@@ -17,8 +17,6 @@
package org.apache.shardingsphere.driver.governance.fixture;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.governance.repository.api.ConfigurationRepository;
import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceCenterConfiguration;
@@ -28,17 +26,12 @@ import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
import java.util.concurrent.TimeUnit;
-@Getter
-@Setter
public final class TestRegistryRepository implements RegistryRepository, ConfigurationRepository {
private static final Map<String, String> REGISTRY_DATA = new LinkedHashMap<>();
- private Properties props = new Properties();
-
@Override
public void init(final String name, final GovernanceCenterConfiguration config) {
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/governance/registry/TestGovernanceRepository.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/governance/registry/TestGovernanceRepository.java
index 126154f..f175bd7 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/governance/registry/TestGovernanceRepository.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/governance/registry/TestGovernanceRepository.java
@@ -17,8 +17,6 @@
package org.apache.shardingsphere.spring.boot.governance.registry;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.governance.repository.api.ConfigurationRepository;
import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceCenterConfiguration;
@@ -28,17 +26,12 @@ import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
import java.util.concurrent.TimeUnit;
-@Getter
-@Setter
public final class TestGovernanceRepository implements RegistryRepository, ConfigurationRepository {
private static final Map<String, String> REGISTRY_DATA = new LinkedHashMap<>();
- private Properties props = new Properties();
-
@Override
public void init(final String name, final GovernanceCenterConfiguration config) {
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/algorithm/DefaultComplexKeysShardingAlgorithm.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/algorithm/DefaultComplexK [...]
index 058978d..aa15670 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/algorithm/DefaultComplexKeysShardingAlgorithm.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/algorithm/DefaultComplexKeysShardingAlgorithm.java
@@ -17,20 +17,13 @@
package org.apache.shardingsphere.spring.namespace.governance.algorithm;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.sharding.api.sharding.complex.ComplexKeysShardingAlgorithm;
import org.apache.shardingsphere.sharding.api.sharding.complex.ComplexKeysShardingValue;
import java.util.Collection;
-import java.util.Properties;
-@Getter
-@Setter
public final class DefaultComplexKeysShardingAlgorithm implements ComplexKeysShardingAlgorithm<Integer> {
- private Properties props = new Properties();
-
@Override
public void init() {
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/algorithm/DefaultHintShardingAlgorithm.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/algorithm/DefaultHintShardingAlg [...]
index ebed7bb..dd69363 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/algorithm/DefaultHintShardingAlgorithm.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/algorithm/DefaultHintShardingAlgorithm.java
@@ -17,20 +17,13 @@
package org.apache.shardingsphere.spring.namespace.governance.algorithm;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.sharding.api.sharding.hint.HintShardingAlgorithm;
import org.apache.shardingsphere.sharding.api.sharding.hint.HintShardingValue;
import java.util.Collection;
-import java.util.Properties;
-@Getter
-@Setter
public final class DefaultHintShardingAlgorithm implements HintShardingAlgorithm<Integer> {
- private Properties props = new Properties();
-
@Override
public void init() {
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/algorithm/StandardModuloDatabaseShardingAlgorithm.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/algorithm/StandardMod [...]
index 192e192..8c385ba 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/algorithm/StandardModuloDatabaseShardingAlgorithm.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/algorithm/StandardModuloDatabaseShardingAlgorithm.java
@@ -17,22 +17,15 @@
package org.apache.shardingsphere.spring.namespace.governance.algorithm;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.sharding.api.sharding.standard.PreciseShardingValue;
import org.apache.shardingsphere.sharding.api.sharding.standard.RangeShardingValue;
import org.apache.shardingsphere.sharding.api.sharding.standard.StandardShardingAlgorithm;
import java.util.Collection;
import java.util.LinkedHashSet;
-import java.util.Properties;
-@Getter
-@Setter
public final class StandardModuloDatabaseShardingAlgorithm implements StandardShardingAlgorithm<Integer> {
- private Properties props = new Properties();
-
@Override
public void init() {
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/algorithm/StandardModuloTableShardingAlgorithm.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/algorithm/StandardModulo [...]
index ee91c47..c972c2f 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/algorithm/StandardModuloTableShardingAlgorithm.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/algorithm/StandardModuloTableShardingAlgorithm.java
@@ -17,22 +17,15 @@
package org.apache.shardingsphere.spring.namespace.governance.algorithm;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.sharding.api.sharding.standard.PreciseShardingValue;
import org.apache.shardingsphere.sharding.api.sharding.standard.RangeShardingValue;
import org.apache.shardingsphere.sharding.api.sharding.standard.StandardShardingAlgorithm;
import java.util.Collection;
import java.util.LinkedHashSet;
-import java.util.Properties;
-@Getter
-@Setter
public final class StandardModuloTableShardingAlgorithm implements StandardShardingAlgorithm<Integer> {
- private Properties props = new Properties();
-
@Override
public void init() {
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/fixture/DecrementKeyGenerateAlgorithm.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/fixture/DecrementKeyGenerateAlgor [...]
index 7a39a55..6575061 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/fixture/DecrementKeyGenerateAlgorithm.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/fixture/DecrementKeyGenerateAlgorithm.java
@@ -17,21 +17,14 @@
package org.apache.shardingsphere.spring.namespace.governance.fixture;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm;
-import java.util.Properties;
import java.util.concurrent.atomic.AtomicInteger;
public final class DecrementKeyGenerateAlgorithm implements KeyGenerateAlgorithm {
private final AtomicInteger sequence = new AtomicInteger(100);
- @Getter
- @Setter
- private Properties props = new Properties();
-
@Override
public void init() {
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/fixture/IncrementKeyGenerateAlgorithm.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/fixture/IncrementKeyGenerateAlgor [...]
index 2b183a9..67c42ac 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/fixture/IncrementKeyGenerateAlgorithm.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/fixture/IncrementKeyGenerateAlgorithm.java
@@ -17,21 +17,14 @@
package org.apache.shardingsphere.spring.namespace.governance.fixture;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm;
-import java.util.Properties;
import java.util.concurrent.atomic.AtomicInteger;
public final class IncrementKeyGenerateAlgorithm implements KeyGenerateAlgorithm {
private final AtomicInteger sequence = new AtomicInteger(100);
- @Getter
- @Setter
- private Properties props = new Properties();
-
@Override
public void init() {
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/registry/TestGovernanceRepository.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/registry/TestGovernanceRepository.java
index 564a4f1..33a8bc8 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/registry/TestGovernanceRepository.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/registry/TestGovernanceRepository.java
@@ -17,8 +17,6 @@
package org.apache.shardingsphere.spring.namespace.governance.registry;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.governance.repository.api.ConfigurationRepository;
import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceCenterConfiguration;
@@ -26,15 +24,10 @@ import org.apache.shardingsphere.governance.repository.api.listener.DataChangedE
import java.util.Collections;
import java.util.List;
-import java.util.Properties;
import java.util.concurrent.TimeUnit;
-@Getter
-@Setter
public final class TestGovernanceRepository implements RegistryRepository, ConfigurationRepository {
- private Properties props = new Properties();
-
@Override
public void init(final String name, final GovernanceCenterConfiguration config) {
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/execute/engine/jdbc/JDBCExecuteEngine.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/execute/engine/jdbc/JDBCExecuteEngine.java
index 63ae54d..7e72d6e 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/execute/engine/jdbc/JDBCExecuteEngine.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/execute/engine/jdbc/JDBCExecuteEngine.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.infra.executor.kernel.model.ExecutionGroup;
import org.apache.shardingsphere.infra.executor.sql.context.ExecutionContext;
import org.apache.shardingsphere.infra.executor.sql.context.ExecutionUnit;
-import org.apache.shardingsphere.infra.executor.sql.execute.engine.ExecutorExceptionHandler;
+import org.apache.shardingsphere.infra.executor.sql.execute.engine.SQLExecutorExceptionHandler;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutionUnit;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutor;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.raw.RawSQLExecutionUnit;
@@ -103,7 +103,7 @@ public final class JDBCExecuteEngine implements SQLExecuteEngine {
@Override
public BackendResponse execute(final ExecutionContext executionContext) throws SQLException {
Collection<ExecuteResult> executeResults = execute(executionContext,
- executionContext.getSqlStatementContext().getSqlStatement() instanceof InsertStatement, ExecutorExceptionHandler.isExceptionThrown());
+ executionContext.getSqlStatementContext().getSqlStatement() instanceof InsertStatement, SQLExecutorExceptionHandler.isExceptionThrown());
ExecuteResult executeResult = executeResults.iterator().next();
if (executeResult instanceof ExecuteQueryResult) {
return getExecuteQueryResponse(((ExecuteQueryResult) executeResult).getQueryHeaders(), executeResults);
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/execute/engine/jdbc/RawProxyExecutor.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/execute/engine/jdbc/RawProxyExecutor.java
index e8af0c6..bc5b0c5 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/execute/engine/jdbc/RawProxyExecutor.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/execute/engine/jdbc/RawProxyExecutor.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.infra.executor.sql.execute.engine.raw.RawSQLExe
import org.apache.shardingsphere.infra.executor.sql.execute.engine.raw.callback.RawSQLExecutorCallback;
import org.apache.shardingsphere.infra.executor.sql.execute.result.ExecuteResult;
import org.apache.shardingsphere.infra.executor.sql.execute.result.update.ExecuteUpdateResult;
-import org.apache.shardingsphere.infra.executor.sql.execute.engine.ExecutorExceptionHandler;
+import org.apache.shardingsphere.infra.executor.sql.execute.engine.SQLExecutorExceptionHandler;
import java.sql.SQLException;
import java.util.Collection;
@@ -70,7 +70,7 @@ public final class RawProxyExecutor {
try {
return executorEngine.execute((Collection) executionGroups, firstCallback, callback, serial);
} catch (final SQLException ex) {
- ExecutorExceptionHandler.handleException(ex);
+ SQLExecutorExceptionHandler.handleException(ex);
return Collections.emptyList();
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/fetchsize/impl/MySQLStatementMemoryStrictlyFetchSizeSetter.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/fetchsize/impl/MySQLStatementMemoryStrictlyFetchSizeSetter.java
index 3acd536..c5a8761 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/fetchsize/impl/MySQLStatementMemoryStrictlyFetchSizeSetter.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/fetchsize/impl/MySQLStatementMemoryStrictlyFetchSizeSetter.java
@@ -17,23 +17,16 @@
package org.apache.shardingsphere.proxy.backend.communication.jdbc.statement.fetchsize.impl;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.statement.fetchsize.StatementMemoryStrictlyFetchSizeSetter;
import java.sql.SQLException;
import java.sql.Statement;
-import java.util.Properties;
/**
* Statement memory strictly fetch size setter for MySQL.
*/
-@Getter
-@Setter
public final class MySQLStatementMemoryStrictlyFetchSizeSetter implements StatementMemoryStrictlyFetchSizeSetter {
- private Properties props;
-
@Override
public void setFetchSize(final Statement statement) throws SQLException {
statement.setFetchSize(Integer.MIN_VALUE);
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/fetchsize/impl/PostgreSQLStatementMemoryStrictlyFetchSizeSetter.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/fetchsize/impl/PostgreSQLStatementMemoryStrictlyFetchSizeSetter.java
index d0ad478..08e73bc 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/fetchsize/impl/PostgreSQLStatementMemoryStrictlyFetchSizeSetter.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/fetchsize/impl/PostgreSQLStatementMemoryStrictlyFetchSizeSetter.java
@@ -17,23 +17,16 @@
package org.apache.shardingsphere.proxy.backend.communication.jdbc.statement.fetchsize.impl;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.statement.fetchsize.StatementMemoryStrictlyFetchSizeSetter;
import java.sql.SQLException;
import java.sql.Statement;
-import java.util.Properties;
/**
* Statement memory strictly fetch size setter for PostgreSQL.
*/
-@Getter
-@Setter
public final class PostgreSQLStatementMemoryStrictlyFetchSizeSetter implements StatementMemoryStrictlyFetchSizeSetter {
- private Properties props;
-
@Override
public void setFetchSize(final Statement statement) throws SQLException {
statement.setFetchSize(1);
diff --git a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/FixtureConfigurationRepository.java b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/FixtureConfigurationRepository.java
index 96d1523..7c22c5d 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/FixtureConfigurationRepository.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/FixtureConfigurationRepository.java
@@ -17,8 +17,6 @@
package org.apache.shardingsphere.proxy.fixture;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.governance.repository.api.ConfigurationRepository;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceCenterConfiguration;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEventListener;
@@ -27,16 +25,11 @@ import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
-@Getter
-@Setter
public final class FixtureConfigurationRepository implements ConfigurationRepository {
private static final Map<String, String> REGISTRY_DATA = new LinkedHashMap<>();
- private Properties props = new Properties();
-
@Override
public void init(final String name, final GovernanceCenterConfiguration config) {
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/FixtureRegistryRepository.java b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/FixtureRegistryRepository.java
index b632cda..a32b848 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/FixtureRegistryRepository.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/FixtureRegistryRepository.java
@@ -17,8 +17,6 @@
package org.apache.shardingsphere.proxy.fixture;
-import lombok.Getter;
-import lombok.Setter;
import org.apache.shardingsphere.governance.repository.api.ConfigurationRepository;
import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceCenterConfiguration;
@@ -28,17 +26,12 @@ import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
import java.util.concurrent.TimeUnit;
-@Getter
-@Setter
public final class FixtureRegistryRepository implements RegistryRepository, ConfigurationRepository {
private static final Map<String, String> REGISTRY_DATA = new LinkedHashMap<>();
- private Properties props = new Properties();
-
@Override
public void init(final String name, final GovernanceCenterConfiguration config) {
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureRegistryRepository.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureRegistryRepository.java
index e583e85..bd80fa9 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureRegistryRepository.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureRegistryRepository.java
@@ -29,17 +29,12 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
import java.util.concurrent.TimeUnit;
-@Getter
-@Setter
public final class FixtureRegistryRepository implements RegistryRepository, ConfigurationRepository {
private static final Node REGISTRY_DATA = new Node();
- private Properties props = new Properties();
-
@Override
public void init(final String name, final GovernanceCenterConfiguration config) {
}
diff --git a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-atomikos/src/main/java/org/apache/shardingsphere/transaction/xa/atomikos/manager/AtomikosTransactionManager.java b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-atomikos/src/main/java/org/apache/shardingsphere/transaction/xa/atomikos/manager/AtomikosTransactionManager.java
index f38d81f..a2aab89 100644
--- a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-atomikos/src/main/java/org/apache/shardingsphere/transaction/xa/atomikos/manager/AtomikosTransactionManager.java
+++ b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-atomikos/src/main/java/org/apache/shardingsphere/transaction/xa/atomikos/manager/AtomikosTransactionManager.java
@@ -28,7 +28,6 @@ import javax.sql.XADataSource;
import javax.transaction.RollbackException;
import javax.transaction.SystemException;
import javax.transaction.TransactionManager;
-import java.util.Properties;
/**
* Atomikos XA transaction manager.
@@ -74,14 +73,4 @@ public final class AtomikosTransactionManager implements XATransactionManager {
public String getType() {
return "atomikos";
}
-
- @Override
- public Properties getProps() {
- return null;
- }
-
- @Override
- public void setProps(final Properties props) {
-
- }
}
diff --git a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-bitronix/src/main/java/org/apache/shardingsphere/transaction/xa/bitronix/manager/BitronixXATransactionManager.java b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-bitronix/src/main/java/org/apache/shardingsphere/transaction/xa/bitronix/manager/BitronixXATransactionManager.java
index 52ec58b..ed688fd 100644
--- a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-bitronix/src/main/java/org/apache/shardingsphere/transaction/xa/bitronix/manager/BitronixXATransactionManager.java
+++ b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-bitronix/src/main/java/org/apache/shardingsphere/transaction/xa/bitronix/manager/BitronixXATransactionManager.java
@@ -29,7 +29,6 @@ import javax.sql.XADataSource;
import javax.transaction.RollbackException;
import javax.transaction.SystemException;
import javax.transaction.TransactionManager;
-import java.util.Properties;
/**
* Bitronix sharding transaction manager.
@@ -73,14 +72,4 @@ public final class BitronixXATransactionManager implements XATransactionManager
public String getType() {
return "bitronix";
}
-
- @Override
- public Properties getProps() {
- return null;
- }
-
- @Override
- public void setProps(final Properties props) {
-
- }
}
diff --git a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/test/java/org/apache/shardingsphere/transaction/xa/fixture/FixtureXATransactionManager.java b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/test/java/org/apache/shardingsphere/transaction/xa/fixture/FixtureXATransactionManager.java
index 3948970..3037a0f 100644
--- a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/test/java/org/apache/shardingsphere/transaction/xa/fixture/FixtureXATransactionManager.java
+++ b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/test/java/org/apache/shardingsphere/transaction/xa/fixture/FixtureXATransactionManager.java
@@ -22,7 +22,6 @@ import org.apache.shardingsphere.transaction.xa.spi.XATransactionManager;
import javax.sql.XADataSource;
import javax.transaction.TransactionManager;
-import java.util.Properties;
public final class FixtureXATransactionManager implements XATransactionManager {
@@ -55,14 +54,4 @@ public final class FixtureXATransactionManager implements XATransactionManager {
public String getType() {
return "fixture";
}
-
- @Override
- public Properties getProps() {
- return null;
- }
-
- @Override
- public void setProps(final Properties props) {
-
- }
}
diff --git a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-narayana/src/main/java/org/apache/shardingsphere/transaction/xa/narayana/manager/NarayanaXATransactionManager.java b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-narayana/src/main/java/org/apache/shardingsphere/transaction/xa/narayana/manager/NarayanaXATransactionManager.java
index 0ff7ae0..b7e3a1d 100644
--- a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-narayana/src/main/java/org/apache/shardingsphere/transaction/xa/narayana/manager/NarayanaXATransactionManager.java
+++ b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-narayana/src/main/java/org/apache/shardingsphere/transaction/xa/narayana/manager/NarayanaXATransactionManager.java
@@ -29,7 +29,6 @@ import javax.sql.XADataSource;
import javax.transaction.RollbackException;
import javax.transaction.SystemException;
import javax.transaction.TransactionManager;
-import java.util.Properties;
/**
* Narayana transaction manager.
@@ -80,14 +79,4 @@ public final class NarayanaXATransactionManager implements XATransactionManager
public String getType() {
return "narayana";
}
-
- @Override
- public Properties getProps() {
- return null;
- }
-
- @Override
- public void setProps(final Properties props) {
-
- }
}