You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2023/02/02 02:41:43 UTC
[shardingsphere] branch master updated: Remove ShardingSphereAlgorithm's getProps method (#23916)
This is an automated email from the ASF dual-hosted git repository.
panjuan 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 87f4f45da64 Remove ShardingSphereAlgorithm's getProps method (#23916)
87f4f45da64 is described below
commit 87f4f45da64271132d2e5a1dfe3622ccf91cff81
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Thu Feb 2 10:41:27 2023 +0800
Remove ShardingSphereAlgorithm's getProps method (#23916)
* Remove ShardingSphereAlgorithm's getProps method
* Fix test case
* Fix test case
---
.../StandardModuloShardingDatabaseAlgorithm.java | 10 ----------
.../StandardModuloShardingTableAlgorithm.java | 10 ----------
.../TestQueryAssistedShardingEncryptAlgorithm.java | 11 -----------
.../proxy/hint/ModuloHintShardingAlgorithm.java | 10 ----------
...reDatabaseDiscoveryProviderAlgorithmFixture.java | 10 ----------
...QLDatabaseDiscoveryProviderAlgorithmFixture.java | 10 ----------
.../MGRMySQLDatabaseDiscoveryProviderAlgorithm.java | 12 +++++-------
...plicationDatabaseDiscoveryProviderAlgorithm.java | 5 -----
...plicationDatabaseDiscoveryProviderAlgorithm.java | 5 -----
.../algorithm/encrypt/AESEncryptAlgorithm.java | 5 -----
.../algorithm/encrypt/MD5EncryptAlgorithm.java | 5 -----
.../algorithm/encrypt/RC4EncryptAlgorithm.java | 5 -----
.../like/CharDigestLikeEncryptAlgorithm.java | 5 -----
.../fixture/CoreEncryptAlgorithmFixture.java | 11 -----------
.../CoreQueryAssistedEncryptAlgorithmFixture.java | 11 -----------
.../CoreQueryLikeEncryptAlgorithmFixture.java | 11 -----------
...eSchemaMetaDataAwareEncryptAlgorithmFixture.java | 10 ----------
.../encrypt/sm/algorithm/SM3EncryptAlgorithm.java | 5 -----
.../encrypt/sm/algorithm/SM4EncryptAlgorithm.java | 5 -----
.../cover/KeepFirstNLastMMaskAlgorithm.java | 11 +++--------
.../algorithm/cover/KeepFromXToYMaskAlgorithm.java | 11 +++--------
.../cover/MaskAfterSpecialCharsAlgorithm.java | 9 ++-------
.../cover/MaskBeforeSpecialCharsAlgorithm.java | 9 ++-------
.../cover/MaskFirstNLastMMaskAlgorithm.java | 11 +++--------
.../algorithm/cover/MaskFromXToYMaskAlgorithm.java | 11 +++--------
.../mask/algorithm/hash/MD5MaskAlgorithm.java | 7 +------
.../replace/GenericTableRandomReplaceAlgorithm.java | 5 -----
.../replace/LandlineNumberRandomAlgorithm.java | 7 +------
...ilitaryIdentityNumberRandomReplaceAlgorithm.java | 7 +------
...ersonalIdentityNumberRandomReplaceAlgorithm.java | 7 +------
.../replace/TelephoneRandomReplaceAlgorithm.java | 7 +------
.../FixedPrimaryReadQueryLoadBalanceAlgorithm.java | 10 ----------
...dReplicaRandomReadQueryLoadBalanceAlgorithm.java | 10 ----------
...licaRoundRobinReadQueryLoadBalanceAlgorithm.java | 10 ----------
...dReplicaWeightReadQueryLoadBalanceAlgorithm.java | 2 --
.../RandomReadQueryLoadBalanceAlgorithm.java | 10 ----------
.../RoundRobinReadQueryLoadBalanceAlgorithm.java | 10 ----------
...nsactionRandomReadQueryLoadBalanceAlgorithm.java | 10 ----------
...tionRoundRobinReadQueryLoadBalanceAlgorithm.java | 10 ----------
...nsactionWeightReadQueryLoadBalanceAlgorithm.java | 2 +-
.../WeightReadQueryLoadBalanceAlgorithm.java | 2 +-
.../AbstractColumnMatchedShadowAlgorithm.java | 3 ---
.../shadow/hint/SQLHintShadowAlgorithm.java | 5 -----
...DMLShardingConditionsShardingAuditAlgorithm.java | 10 ----------
.../keygen/SnowflakeKeyGenerateAlgorithm.java | 2 --
.../algorithm/keygen/UUIDKeyGenerateAlgorithm.java | 10 ----------
.../classbased/ClassBasedShardingAlgorithm.java | 5 -----
.../complex/ComplexInlineShardingAlgorithm.java | 5 -----
.../datetime/AutoIntervalShardingAlgorithm.java | 4 ----
.../datetime/IntervalShardingAlgorithm.java | 5 -----
.../sharding/hint/HintInlineShardingAlgorithm.java | 5 -----
.../sharding/inline/InlineShardingAlgorithm.java | 5 -----
.../sharding/mod/HashModShardingAlgorithm.java | 5 -----
.../sharding/mod/ModShardingAlgorithm.java | 5 -----
.../range/AbstractRangeShardingAlgorithm.java | 5 -----
.../AutoIncrementKeyGenerateAlgorithmFixture.java | 8 --------
...assBasedComplexKeysShardingAlgorithmFixture.java | 10 ----------
.../ClassBasedHintShardingAlgorithmFixture.java | 10 ----------
.../ClassBasedStandardShardingAlgorithmFixture.java | 10 ----------
.../CoreComplexKeysShardingAlgorithmFixture.java | 10 ----------
.../fixture/CoreHintShardingAlgorithmFixture.java | 10 ----------
.../CoreStandardShardingAlgorithmFixture.java | 10 ----------
.../keygen/DistSQLKeyGenerateAlgorithmFixture.java | 11 -----------
.../BarDistSQLShardingAlgorithmFixture.java | 10 ----------
.../sharding/CoreAutoShardingAlgorithmFixture.java | 5 -----
.../sharding/CoreHintShardingAlgorithmFixture.java | 5 -----
.../CoreStandardShardingAlgorithmFixture.java | 10 ----------
.../FooDistSQLShardingAlgorithmFixture.java | 10 ----------
.../algorithm/keygen/CosIdKeyGenerateAlgorithm.java | 5 -----
.../keygen/CosIdSnowflakeKeyGenerateAlgorithm.java | 2 --
.../AbstractCosIdIntervalShardingAlgorithm.java | 4 ----
.../sharding/mod/CosIdModShardingAlgorithm.java | 5 -----
.../keygen/NanoIdKeyGenerateAlgorithm.java | 10 ----------
.../infra/algorithm/ShardingSphereAlgorithm.java | 9 ---------
.../encrypt/JDBCEncryptAlgorithmFixture.java | 11 -----------
.../JDBCQueryAssistedEncryptAlgorithmFixture.java | 11 -----------
.../IncrementKeyGenerateAlgorithmFixture.java | 10 ----------
.../ResetIncrementKeyGenerateAlgorithmFixture.java | 9 ---------
...atabasePermittedPrivilegesProviderAlgorithm.java | 2 --
.../AllPermittedPrivilegesProviderAlgorithm.java | 10 ----------
...CRC32MatchDataConsistencyCalculateAlgorithm.java | 9 ---------
.../DataMatchDataConsistencyCalculateAlgorithm.java | 4 ----
.../process/PipelineProcessConfigurationUtil.java | 5 ++---
.../memory/MemoryPipelineChannelCreator.java | 21 +++++----------------
.../core/ratelimit/QPSJobRateLimitAlgorithm.java | 2 --
.../core/ratelimit/TPSJobRateLimitAlgorithm.java | 2 --
.../memory/MemoryPipelineChannelCreatorTest.java | 13 +++++--------
.../InputJobRateLimitAlgorithmFixture.java | 11 -----------
.../OutputJobRateLimitAlgorithmFixture.java | 11 -----------
.../RandomTrafficLoadBalanceAlgorithm.java | 10 ----------
.../RoundRobinTrafficLoadBalanceAlgorithm.java | 10 ----------
.../traffic/hint/SQLHintTrafficAlgorithm.java | 11 -----------
.../traffic/segment/SQLMatchTrafficAlgorithm.java | 5 -----
.../traffic/segment/SQLRegexTrafficAlgorithm.java | 5 -----
.../transaction/FirstSQLTrafficAlgorithm.java | 11 -----------
.../traffic/transaction/JDBCTrafficAlgorithm.java | 11 -----------
.../traffic/transaction/ProxyTrafficAlgorithm.java | 11 -----------
.../fixture/DistSQLTrafficAlgorithmFixture.java | 11 -----------
.../DistSQLTrafficLoadBalanceAlgorithmFixture.java | 10 ----------
test/e2e/agent/pom.xml | 10 +++++-----
.../keygen/DriverKeyGenerateAlgorithmFixture.java | 10 ----------
.../DriverComplexKeysShardingAlgorithmFixture.java | 10 ----------
.../DriverStandardShardingAlgorithmFixture.java | 10 ----------
.../ITAutoIncrementKeyGenerateAlgorithmFixture.java | 10 ----------
.../e2e/fixture/ITKeyGenerateAlgorithmFixture.java | 11 -----------
.../fixture/ITShardingAuditAlgorithmFixture.java | 10 ----------
.../fixture/ITStandardShardingAlgorithmFixture.java | 10 ----------
.../util/AutoIncrementKeyGenerateAlgorithm.java | 10 ----------
...elineProcessConfigurationPersistServiceTest.java | 5 ++---
.../DataConsistencyCalculateAlgorithmFixture.java | 10 ----------
.../data/pipeline/core/task/InventoryTaskTest.java | 4 ++--
.../pipeline/core/util/PipelineContextUtil.java | 3 +--
.../RewriteNormalEncryptAlgorithmFixture.java | 11 -----------
...RewriteQueryAssistedEncryptAlgorithmFixture.java | 11 -----------
.../RewriteQueryLikeEncryptAlgorithmFixture.java | 16 +---------------
...eSchemaMetaDataAwareEncryptAlgorithmFixture.java | 10 ----------
.../keygen/RewriteKeyGenerateAlgorithmFixture.java | 11 -----------
117 files changed, 51 insertions(+), 909 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 fa8008729fc..8cf45e1cfe1 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
@@ -18,26 +18,16 @@
package org.apache.shardingsphere.example.algorithm;
import com.google.common.collect.Range;
-import lombok.Getter;
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;
import java.util.Set;
-@Getter
public final class StandardModuloShardingDatabaseAlgorithm implements StandardShardingAlgorithm<Integer> {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public String doSharding(final Collection<String> databaseNames, final PreciseShardingValue<Integer> shardingValue) {
for (String each : databaseNames) {
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 7f44863faad..ee99a459bd1 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
@@ -18,26 +18,16 @@
package org.apache.shardingsphere.example.algorithm;
import com.google.common.collect.Range;
-import lombok.Getter;
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;
import java.util.Set;
-@Getter
public final class StandardModuloShardingTableAlgorithm implements StandardShardingAlgorithm<Long> {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public String doSharding(final Collection<String> tableNames, final PreciseShardingValue<Long> shardingValue) {
for (String each : tableNames) {
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 55cf83bab45..5e457bf7df8 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
@@ -17,22 +17,11 @@
package org.apache.shardingsphere.example.fixture;
-import lombok.Getter;
import org.apache.shardingsphere.encrypt.api.encrypt.standard.StandardEncryptAlgorithm;
import org.apache.shardingsphere.encrypt.spi.context.EncryptContext;
-import java.util.Properties;
-
-@Getter
public final class TestQueryAssistedShardingEncryptAlgorithm implements StandardEncryptAlgorithm<Object, String> {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public String encrypt(final Object plainValue, final EncryptContext encryptContext) {
return "assistedEncryptValue";
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 d514d61f207..d2c99877c80 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
@@ -17,24 +17,14 @@
package org.apache.shardingsphere.example.proxy.hint;
-import lombok.Getter;
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.LinkedList;
-import java.util.Properties;
-@Getter
public final class ModuloHintShardingAlgorithm implements HintShardingAlgorithm<String> {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public Collection<String> doSharding(final Collection<String> availableTargetNames, final HintShardingValue<String> shardingValue) {
Collection<String> result = new LinkedList<>();
diff --git a/features/db-discovery/core/src/test/java/org/apache/shardingsphere/dbdiscovery/fixture/CoreDatabaseDiscoveryProviderAlgorithmFixture.java b/features/db-discovery/core/src/test/java/org/apache/shardingsphere/dbdiscovery/fixture/CoreDatabaseDiscoveryProviderAlgorithmFixture.java
index 938a44959f7..1b463afc223 100644
--- a/features/db-discovery/core/src/test/java/org/apache/shardingsphere/dbdiscovery/fixture/CoreDatabaseDiscoveryProviderAlgorithmFixture.java
+++ b/features/db-discovery/core/src/test/java/org/apache/shardingsphere/dbdiscovery/fixture/CoreDatabaseDiscoveryProviderAlgorithmFixture.java
@@ -17,25 +17,15 @@
package org.apache.shardingsphere.dbdiscovery.fixture;
-import lombok.Getter;
import org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProviderAlgorithm;
import org.apache.shardingsphere.dbdiscovery.spi.ReplicaDataSourceStatus;
import javax.sql.DataSource;
import java.util.Collection;
import java.util.Optional;
-import java.util.Properties;
-@Getter
public final class CoreDatabaseDiscoveryProviderAlgorithmFixture implements DatabaseDiscoveryProviderAlgorithm {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public void checkEnvironment(final String databaseName, final Collection<DataSource> dataSource) {
}
diff --git a/features/db-discovery/distsql/handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/fixture/DistSQLDatabaseDiscoveryProviderAlgorithmFixture.java b/features/db-discovery/distsql/handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/fixture/DistSQLDatabaseDiscoveryProviderAlgorithmFixture.java
index f47e2d7e8be..6131ac45e40 100644
--- a/features/db-discovery/distsql/handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/fixture/DistSQLDatabaseDiscoveryProviderAlgorithmFixture.java
+++ b/features/db-discovery/distsql/handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/fixture/DistSQLDatabaseDiscoveryProviderAlgorithmFixture.java
@@ -17,25 +17,15 @@
package org.apache.shardingsphere.dbdiscovery.distsql.handler.fixture;
-import lombok.Getter;
import org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProviderAlgorithm;
import org.apache.shardingsphere.dbdiscovery.spi.ReplicaDataSourceStatus;
import javax.sql.DataSource;
import java.util.Collection;
import java.util.Optional;
-import java.util.Properties;
-@Getter
public final class DistSQLDatabaseDiscoveryProviderAlgorithmFixture implements DatabaseDiscoveryProviderAlgorithm {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public void checkEnvironment(final String databaseName, final Collection<DataSource> dataSource) {
}
diff --git a/features/db-discovery/provider/mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MGRMySQLDatabaseDiscoveryProviderAlgorithm.java b/features/db-discovery/provider/mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MGRMySQLDatabaseDiscoveryProviderAlgorithm.java
index e2a65d64d2f..47a08e5a559 100644
--- a/features/db-discovery/provider/mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MGRMySQLDatabaseDiscoveryProviderAlgorithm.java
+++ b/features/db-discovery/provider/mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MGRMySQLDatabaseDiscoveryProviderAlgorithm.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.dbdiscovery.mysql.type;
-import lombok.Getter;
import org.apache.shardingsphere.dbdiscovery.mysql.exception.mgr.InvalidMGRGroupNameConfigurationException;
import org.apache.shardingsphere.dbdiscovery.mysql.exception.mgr.InvalidMGRModeException;
import org.apache.shardingsphere.dbdiscovery.mysql.exception.mgr.InvalidMGRPluginException;
@@ -46,7 +45,6 @@ import java.util.concurrent.ExecutorService;
/**
* MGR database discovery provider algorithm for MySQL.
*/
-@Getter
public final class MGRMySQLDatabaseDiscoveryProviderAlgorithm implements DatabaseDiscoveryProviderAlgorithm {
private static final String QUERY_PLUGIN_STATUS = "SELECT PLUGIN_STATUS FROM information_schema.PLUGINS WHERE PLUGIN_NAME='group_replication'";
@@ -62,14 +60,14 @@ public final class MGRMySQLDatabaseDiscoveryProviderAlgorithm implements Databas
private static final String QUERY_CURRENT_MEMBER_STATE = "SELECT MEMBER_STATE FROM performance_schema.replication_group_members WHERE MEMBER_HOST=? AND MEMBER_PORT=?";
- private Properties props;
-
private int minEnabledReplicas;
+ private String groupName;
+
@Override
public void init(final Properties props) {
- this.props = props;
minEnabledReplicas = Integer.parseInt(props.getProperty("min-enabled-replicas", "0"));
+ groupName = props.getProperty("group-name", "");
}
@Override
@@ -121,8 +119,8 @@ public final class MGRMySQLDatabaseDiscoveryProviderAlgorithm implements Databas
private void checkGroupName(final String databaseName, final Statement statement) throws SQLException {
try (ResultSet resultSet = statement.executeQuery(QUERY_GROUP_NAME)) {
- ShardingSpherePreconditions.checkState(resultSet.next() && props.getProperty("group-name", "").equals(resultSet.getString("VARIABLE_VALUE")),
- () -> new InvalidMGRGroupNameConfigurationException(props.getProperty("group-name"), databaseName));
+ ShardingSpherePreconditions.checkState(resultSet.next() && groupName.equals(resultSet.getString("VARIABLE_VALUE")),
+ () -> new InvalidMGRGroupNameConfigurationException(groupName, databaseName));
}
}
diff --git a/features/db-discovery/provider/mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MySQLNormalReplicationDatabaseDiscoveryProviderAlgorithm.java b/features/db-discovery/provider/mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MySQLNormalReplicationDatabaseDiscoveryProviderAlgorithm.java
index 12970f65c30..9f4541fd11f 100644
--- a/features/db-discovery/provider/mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MySQLNormalReplicationDatabaseDiscoveryProviderAlgorithm.java
+++ b/features/db-discovery/provider/mysql/src/main/java/org/apache/shardingsphere/dbdiscovery/mysql/type/MySQLNormalReplicationDatabaseDiscoveryProviderAlgorithm.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.dbdiscovery.mysql.type;
-import lombok.Getter;
import org.apache.shardingsphere.dbdiscovery.mysql.exception.replica.DuplicatePrimaryDataSourceException;
import org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProviderAlgorithm;
import org.apache.shardingsphere.dbdiscovery.spi.ReplicaDataSourceStatus;
@@ -50,16 +49,12 @@ public final class MySQLNormalReplicationDatabaseDiscoveryProviderAlgorithm impl
private static final String SHOW_VARIABLES_READ_ONLY = "SHOW VARIABLES LIKE 'read_only'";
- @Getter
- private Properties props;
-
private int minEnabledReplicas;
private long delayMillisecondsThreshold;
@Override
public void init(final Properties props) {
- this.props = props;
minEnabledReplicas = Integer.parseInt(props.getProperty("min-enabled-replicas", "0"));
delayMillisecondsThreshold = Long.parseLong(props.getProperty("delay-milliseconds-threshold", "0"));
}
diff --git a/features/db-discovery/provider/opengauss/src/main/java/org/apache/shardingsphere/dbdiscovery/opengauss/OpenGaussNormalReplicationDatabaseDiscoveryProviderAlgorithm.java b/features/db-discovery/provider/opengauss/src/main/java/org/apache/shardingsphere/dbdiscovery/opengauss/OpenGaussNormalReplicationDatabaseDiscoveryProviderAlgorithm.java
index 355d08a5fdd..d0435a2e6fa 100644
--- a/features/db-discovery/provider/opengauss/src/main/java/org/apache/shardingsphere/dbdiscovery/opengauss/OpenGaussNormalReplicationDatabaseDiscoveryProviderAlgorithm.java
+++ b/features/db-discovery/provider/opengauss/src/main/java/org/apache/shardingsphere/dbdiscovery/opengauss/OpenGaussNormalReplicationDatabaseDiscoveryProviderAlgorithm.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.dbdiscovery.opengauss;
-import lombok.Getter;
import org.apache.shardingsphere.dbdiscovery.spi.DatabaseDiscoveryProviderAlgorithm;
import org.apache.shardingsphere.dbdiscovery.spi.ReplicaDataSourceStatus;
@@ -33,18 +32,14 @@ import java.util.Properties;
/**
* Normal replication database discovery provider algorithm for openGauss.
*/
-@Getter
public final class OpenGaussNormalReplicationDatabaseDiscoveryProviderAlgorithm implements DatabaseDiscoveryProviderAlgorithm {
private static final String QUERY_DB_ROLE = "SELECT local_role,db_state FROM pg_stat_get_stream_replications()";
- private Properties props;
-
private int minEnabledReplicas;
@Override
public void init(final Properties props) {
- this.props = props;
minEnabledReplicas = Integer.parseInt(props.getProperty("min-enabled-replicas", "0"));
}
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/algorithm/encrypt/AESEncryptAlgorithm.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/algorithm/encrypt/AESEncryptAlgorithm.java
index be21ed70348..6ac58be1cea 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/algorithm/encrypt/AESEncryptAlgorithm.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/algorithm/encrypt/AESEncryptAlgorithm.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.encrypt.algorithm.encrypt;
-import lombok.Getter;
import lombok.SneakyThrows;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.shardingsphere.encrypt.api.encrypt.standard.StandardEncryptAlgorithm;
@@ -43,14 +42,10 @@ public final class AESEncryptAlgorithm implements StandardEncryptAlgorithm<Objec
private static final String AES_KEY = "aes-key-value";
- @Getter
- private Properties props;
-
private byte[] secretKey;
@Override
public void init(final Properties props) {
- this.props = props;
secretKey = createSecretKey(props);
}
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/algorithm/encrypt/MD5EncryptAlgorithm.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/algorithm/encrypt/MD5EncryptAlgorithm.java
index f6f44883975..73c73495d3d 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/algorithm/encrypt/MD5EncryptAlgorithm.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/algorithm/encrypt/MD5EncryptAlgorithm.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.encrypt.algorithm.encrypt;
-import lombok.Getter;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.shardingsphere.encrypt.api.encrypt.standard.StandardEncryptAlgorithm;
import org.apache.shardingsphere.encrypt.spi.context.EncryptContext;
@@ -33,12 +32,8 @@ public final class MD5EncryptAlgorithm implements StandardEncryptAlgorithm<Objec
private String salt;
- @Getter
- private Properties props;
-
@Override
public void init(final Properties props) {
- this.props = props;
this.salt = props.getProperty(SALT, "");
}
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/algorithm/encrypt/RC4EncryptAlgorithm.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/algorithm/encrypt/RC4EncryptAlgorithm.java
index 1cb524a4937..987e7e9c5c1 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/algorithm/encrypt/RC4EncryptAlgorithm.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/algorithm/encrypt/RC4EncryptAlgorithm.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.encrypt.algorithm.encrypt;
-import lombok.Getter;
import org.apache.commons.codec.binary.Base64;
import org.apache.shardingsphere.encrypt.api.encrypt.standard.StandardEncryptAlgorithm;
import org.apache.shardingsphere.encrypt.exception.algorithm.EncryptAlgorithmInitializationException;
@@ -38,16 +37,12 @@ public final class RC4EncryptAlgorithm implements StandardEncryptAlgorithm<Objec
private static final int KEY_MIN_LENGTH = 5;
- @Getter
- private Properties props;
-
private volatile byte[] key = new byte[SBOX_LENGTH - 1];
private volatile int[] sBox = new int[SBOX_LENGTH];
@Override
public void init(final Properties props) {
- this.props = props;
reset();
setKey(props.getProperty(RC4_KEY, "").getBytes(StandardCharsets.UTF_8));
}
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/algorithm/like/CharDigestLikeEncryptAlgorithm.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/algorithm/like/CharDigestLikeEncryptAlgorithm.java
index f79f75ad675..15d984914c5 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/algorithm/like/CharDigestLikeEncryptAlgorithm.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/algorithm/like/CharDigestLikeEncryptAlgorithm.java
@@ -21,7 +21,6 @@ import com.google.common.base.Charsets;
import com.google.common.base.Strings;
import com.google.common.io.CharStreams;
import com.google.common.io.LineProcessor;
-import lombok.Getter;
import lombok.SneakyThrows;
import org.apache.shardingsphere.encrypt.api.encrypt.like.LikeEncryptAlgorithm;
import org.apache.shardingsphere.encrypt.exception.algorithm.EncryptAlgorithmInitializationException;
@@ -55,9 +54,6 @@ public final class CharDigestLikeEncryptAlgorithm implements LikeEncryptAlgorith
private static final int MAX_NUMERIC_LETTER_CHAR = 255;
- @Getter
- private Properties props;
-
private int delta;
private int mask;
@@ -68,7 +64,6 @@ public final class CharDigestLikeEncryptAlgorithm implements LikeEncryptAlgorith
@Override
public void init(final Properties props) {
- this.props = props;
delta = createDelta(props);
mask = createMask(props);
start = createStart(props);
diff --git a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/fixture/CoreEncryptAlgorithmFixture.java b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/fixture/CoreEncryptAlgorithmFixture.java
index efcc10253eb..1466e2e7ac3 100644
--- a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/fixture/CoreEncryptAlgorithmFixture.java
+++ b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/fixture/CoreEncryptAlgorithmFixture.java
@@ -17,22 +17,11 @@
package org.apache.shardingsphere.encrypt.fixture;
-import lombok.Getter;
import org.apache.shardingsphere.encrypt.api.encrypt.standard.StandardEncryptAlgorithm;
import org.apache.shardingsphere.encrypt.spi.context.EncryptContext;
-import java.util.Properties;
-
-@Getter
public final class CoreEncryptAlgorithmFixture implements StandardEncryptAlgorithm<Object, String> {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public String encrypt(final Object plainValue, final EncryptContext encryptContext) {
return "encryptValue";
diff --git a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/fixture/CoreQueryAssistedEncryptAlgorithmFixture.java b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/fixture/CoreQueryAssistedEncryptAlgorithmFixture.java
index 7c8a7921d89..8d4e56e5584 100644
--- a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/fixture/CoreQueryAssistedEncryptAlgorithmFixture.java
+++ b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/fixture/CoreQueryAssistedEncryptAlgorithmFixture.java
@@ -17,22 +17,11 @@
package org.apache.shardingsphere.encrypt.fixture;
-import lombok.Getter;
import org.apache.shardingsphere.encrypt.api.encrypt.standard.StandardEncryptAlgorithm;
import org.apache.shardingsphere.encrypt.spi.context.EncryptContext;
-import java.util.Properties;
-
-@Getter
public final class CoreQueryAssistedEncryptAlgorithmFixture implements StandardEncryptAlgorithm<Object, String> {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public String encrypt(final Object plainValue, final EncryptContext encryptContext) {
return "assistedEncryptValue";
diff --git a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/fixture/CoreQueryLikeEncryptAlgorithmFixture.java b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/fixture/CoreQueryLikeEncryptAlgorithmFixture.java
index 320f7a8a5a1..63804ae6bca 100644
--- a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/fixture/CoreQueryLikeEncryptAlgorithmFixture.java
+++ b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/fixture/CoreQueryLikeEncryptAlgorithmFixture.java
@@ -17,22 +17,11 @@
package org.apache.shardingsphere.encrypt.fixture;
-import lombok.Getter;
import org.apache.shardingsphere.encrypt.api.encrypt.like.LikeEncryptAlgorithm;
import org.apache.shardingsphere.encrypt.spi.context.EncryptContext;
-import java.util.Properties;
-
-@Getter
public final class CoreQueryLikeEncryptAlgorithmFixture implements LikeEncryptAlgorithm<Object, String> {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public String encrypt(final Object plainValue, final EncryptContext encryptContext) {
return "likeEncryptValue";
diff --git a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/fixture/CoreSchemaMetaDataAwareEncryptAlgorithmFixture.java b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/fixture/CoreSchemaMetaDataAwareEncryptAlgorithmFixture.java
index ca7bd484ba0..c0d806386f0 100644
--- a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/fixture/CoreSchemaMetaDataAwareEncryptAlgorithmFixture.java
+++ b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/fixture/CoreSchemaMetaDataAwareEncryptAlgorithmFixture.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.encrypt.fixture;
-import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
import org.apache.shardingsphere.encrypt.api.encrypt.standard.StandardEncryptAlgorithm;
@@ -26,24 +25,15 @@ import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.
import org.apache.shardingsphere.infra.rewrite.sql.token.generator.aware.SchemaMetaDataAware;
import java.util.Map;
-import java.util.Properties;
@Getter
@Setter
public final class CoreSchemaMetaDataAwareEncryptAlgorithmFixture implements StandardEncryptAlgorithm<Integer, Integer>, SchemaMetaDataAware {
- @Setter(AccessLevel.NONE)
- private Properties props;
-
private String databaseName;
private Map<String, ShardingSphereSchema> schemas;
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public Integer encrypt(final Integer plainValue, final EncryptContext encryptContext) {
return plainValue;
diff --git a/features/encrypt/plugin/sm/src/main/java/org/apache/shardingsphere/encrypt/sm/algorithm/SM3EncryptAlgorithm.java b/features/encrypt/plugin/sm/src/main/java/org/apache/shardingsphere/encrypt/sm/algorithm/SM3EncryptAlgorithm.java
index d5b06697e85..c3a8e01abe3 100644
--- a/features/encrypt/plugin/sm/src/main/java/org/apache/shardingsphere/encrypt/sm/algorithm/SM3EncryptAlgorithm.java
+++ b/features/encrypt/plugin/sm/src/main/java/org/apache/shardingsphere/encrypt/sm/algorithm/SM3EncryptAlgorithm.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.encrypt.sm.algorithm;
-import lombok.Getter;
import org.apache.shardingsphere.encrypt.api.encrypt.standard.StandardEncryptAlgorithm;
import org.apache.shardingsphere.encrypt.exception.algorithm.EncryptAlgorithmInitializationException;
import org.apache.shardingsphere.encrypt.spi.context.EncryptContext;
@@ -43,14 +42,10 @@ public final class SM3EncryptAlgorithm implements StandardEncryptAlgorithm<Objec
private static final int SALT_LENGTH = 8;
- @Getter
- private Properties props;
-
private byte[] sm3Salt;
@Override
public void init(final Properties props) {
- this.props = props;
sm3Salt = createSm3Salt(props);
}
diff --git a/features/encrypt/plugin/sm/src/main/java/org/apache/shardingsphere/encrypt/sm/algorithm/SM4EncryptAlgorithm.java b/features/encrypt/plugin/sm/src/main/java/org/apache/shardingsphere/encrypt/sm/algorithm/SM4EncryptAlgorithm.java
index c89ff2302f5..ab22ccd6ebe 100644
--- a/features/encrypt/plugin/sm/src/main/java/org/apache/shardingsphere/encrypt/sm/algorithm/SM4EncryptAlgorithm.java
+++ b/features/encrypt/plugin/sm/src/main/java/org/apache/shardingsphere/encrypt/sm/algorithm/SM4EncryptAlgorithm.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.encrypt.sm.algorithm;
-import lombok.Getter;
import lombok.SneakyThrows;
import org.apache.shardingsphere.encrypt.api.encrypt.standard.StandardEncryptAlgorithm;
import org.apache.shardingsphere.encrypt.exception.algorithm.EncryptAlgorithmInitializationException;
@@ -63,9 +62,6 @@ public final class SM4EncryptAlgorithm implements StandardEncryptAlgorithm<Objec
private static final Set<String> PADDINGS = new HashSet<>(Arrays.asList("PKCS5Padding", "PKCS7Padding"));
- @Getter
- private Properties props;
-
private byte[] sm4Key;
private byte[] sm4Iv;
@@ -74,7 +70,6 @@ public final class SM4EncryptAlgorithm implements StandardEncryptAlgorithm<Objec
@Override
public void init(final Properties props) {
- this.props = props;
String sm4Mode = createSm4Mode(props);
String sm4Padding = createSm4Padding(props);
sm4ModePadding = "SM4/" + sm4Mode + "/" + sm4Padding;
diff --git a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/KeepFirstNLastMMaskAlgorithm.java b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/KeepFirstNLastMMaskAlgorithm.java
index 97f1556ee68..bbfe531cde2 100644
--- a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/KeepFirstNLastMMaskAlgorithm.java
+++ b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/KeepFirstNLastMMaskAlgorithm.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.mask.algorithm.cover;
import com.google.common.base.Strings;
-import lombok.Getter;
import org.apache.shardingsphere.mask.algorithm.MaskAlgorithmPropsChecker;
import org.apache.shardingsphere.mask.spi.MaskAlgorithm;
@@ -41,15 +40,11 @@ public final class KeepFirstNLastMMaskAlgorithm implements MaskAlgorithm<Object,
private Character replaceChar;
- @Getter
- private Properties props;
-
@Override
public void init(final Properties props) {
- this.props = props;
- this.firstN = createFirstN(props);
- this.lastM = createLastM(props);
- this.replaceChar = createReplaceChar(props);
+ firstN = createFirstN(props);
+ lastM = createLastM(props);
+ replaceChar = createReplaceChar(props);
}
private Integer createFirstN(final Properties props) {
diff --git a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/KeepFromXToYMaskAlgorithm.java b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/KeepFromXToYMaskAlgorithm.java
index 3d447991886..93a153ba6cf 100644
--- a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/KeepFromXToYMaskAlgorithm.java
+++ b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/KeepFromXToYMaskAlgorithm.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.mask.algorithm.cover;
import com.google.common.base.Strings;
-import lombok.Getter;
import org.apache.shardingsphere.mask.algorithm.MaskAlgorithmPropsChecker;
import org.apache.shardingsphere.mask.spi.MaskAlgorithm;
@@ -41,15 +40,11 @@ public final class KeepFromXToYMaskAlgorithm implements MaskAlgorithm<Object, St
private Character replaceChar;
- @Getter
- private Properties props;
-
@Override
public void init(final Properties props) {
- this.props = props;
- this.fromX = createFromX(props);
- this.toY = createToY(props);
- this.replaceChar = createReplaceChar(props);
+ fromX = createFromX(props);
+ toY = createToY(props);
+ replaceChar = createReplaceChar(props);
}
private Integer createFromX(final Properties props) {
diff --git a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/MaskAfterSpecialCharsAlgorithm.java b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/MaskAfterSpecialCharsAlgorithm.java
index 92553e4b37d..423dd6c44a0 100644
--- a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/MaskAfterSpecialCharsAlgorithm.java
+++ b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/MaskAfterSpecialCharsAlgorithm.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.mask.algorithm.cover;
import com.google.common.base.Strings;
-import lombok.Getter;
import org.apache.shardingsphere.mask.algorithm.MaskAlgorithmPropsChecker;
import org.apache.shardingsphere.mask.spi.MaskAlgorithm;
@@ -37,14 +36,10 @@ public final class MaskAfterSpecialCharsAlgorithm implements MaskAlgorithm<Objec
private Character replaceChar;
- @Getter
- private Properties props;
-
@Override
public void init(final Properties props) {
- this.props = props;
- this.specialChars = createSpecialChars(props);
- this.replaceChar = createReplaceChar(props);
+ specialChars = createSpecialChars(props);
+ replaceChar = createReplaceChar(props);
}
private String createSpecialChars(final Properties props) {
diff --git a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/MaskBeforeSpecialCharsAlgorithm.java b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/MaskBeforeSpecialCharsAlgorithm.java
index 8d834d86712..48e01b22afb 100644
--- a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/MaskBeforeSpecialCharsAlgorithm.java
+++ b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/MaskBeforeSpecialCharsAlgorithm.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.mask.algorithm.cover;
import com.google.common.base.Strings;
-import lombok.Getter;
import org.apache.shardingsphere.mask.algorithm.MaskAlgorithmPropsChecker;
import org.apache.shardingsphere.mask.spi.MaskAlgorithm;
@@ -37,14 +36,10 @@ public final class MaskBeforeSpecialCharsAlgorithm implements MaskAlgorithm<Obje
private Character replaceChar;
- @Getter
- private Properties props;
-
@Override
public void init(final Properties props) {
- this.props = props;
- this.specialChars = createSpecialChars(props);
- this.replaceChar = createReplaceChar(props);
+ specialChars = createSpecialChars(props);
+ replaceChar = createReplaceChar(props);
}
private String createSpecialChars(final Properties props) {
diff --git a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/MaskFirstNLastMMaskAlgorithm.java b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/MaskFirstNLastMMaskAlgorithm.java
index 9909d6b09de..fa78e3dc9d1 100644
--- a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/MaskFirstNLastMMaskAlgorithm.java
+++ b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/MaskFirstNLastMMaskAlgorithm.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.mask.algorithm.cover;
import com.google.common.base.Strings;
-import lombok.Getter;
import org.apache.shardingsphere.mask.algorithm.MaskAlgorithmPropsChecker;
import org.apache.shardingsphere.mask.spi.MaskAlgorithm;
@@ -41,15 +40,11 @@ public final class MaskFirstNLastMMaskAlgorithm implements MaskAlgorithm<Object,
private Character replaceChar;
- @Getter
- private Properties props;
-
@Override
public void init(final Properties props) {
- this.props = props;
- this.firstN = createFirstN(props);
- this.lastM = createLastM(props);
- this.replaceChar = createReplaceChar(props);
+ firstN = createFirstN(props);
+ lastM = createLastM(props);
+ replaceChar = createReplaceChar(props);
}
private Integer createFirstN(final Properties props) {
diff --git a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/MaskFromXToYMaskAlgorithm.java b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/MaskFromXToYMaskAlgorithm.java
index 762d9d289a1..d69ca7c1bf4 100644
--- a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/MaskFromXToYMaskAlgorithm.java
+++ b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/cover/MaskFromXToYMaskAlgorithm.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.mask.algorithm.cover;
import com.google.common.base.Strings;
-import lombok.Getter;
import org.apache.shardingsphere.mask.algorithm.MaskAlgorithmPropsChecker;
import org.apache.shardingsphere.mask.spi.MaskAlgorithm;
@@ -41,15 +40,11 @@ public final class MaskFromXToYMaskAlgorithm implements MaskAlgorithm<Object, St
private Character replaceChar;
- @Getter
- private Properties props;
-
@Override
public void init(final Properties props) {
- this.props = props;
- this.fromX = createFromX(props);
- this.toY = createToY(props);
- this.replaceChar = createReplaceChar(props);
+ fromX = createFromX(props);
+ toY = createToY(props);
+ replaceChar = createReplaceChar(props);
}
private Integer createFromX(final Properties props) {
diff --git a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/hash/MD5MaskAlgorithm.java b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/hash/MD5MaskAlgorithm.java
index 25ce03bae65..4e142d15a79 100644
--- a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/hash/MD5MaskAlgorithm.java
+++ b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/hash/MD5MaskAlgorithm.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.mask.algorithm.hash;
-import lombok.Getter;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.shardingsphere.mask.spi.MaskAlgorithm;
@@ -32,13 +31,9 @@ public final class MD5MaskAlgorithm implements MaskAlgorithm<Object, String> {
private String salt;
- @Getter
- private Properties props;
-
@Override
public void init(final Properties props) {
- this.props = props;
- this.salt = props.getProperty(SALT, "");
+ salt = props.getProperty(SALT, "");
}
@Override
diff --git a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/replace/GenericTableRandomReplaceAlgorithm.java b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/replace/GenericTableRandomReplaceAlgorithm.java
index 545f9486933..cc0a2584db6 100644
--- a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/replace/GenericTableRandomReplaceAlgorithm.java
+++ b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/replace/GenericTableRandomReplaceAlgorithm.java
@@ -19,7 +19,6 @@ package org.apache.shardingsphere.mask.algorithm.replace;
import com.google.common.base.Splitter;
import com.google.common.base.Strings;
-import lombok.Getter;
import org.apache.shardingsphere.mask.spi.MaskAlgorithm;
import java.util.List;
@@ -56,12 +55,8 @@ public final class GenericTableRandomReplaceAlgorithm implements MaskAlgorithm<O
private List<Character> specialCodes;
- @Getter
- private Properties props;
-
@Override
public void init(final Properties props) {
- this.props = props;
uppercaseLetterCodes = splitPropsToList(props.getProperty(UPPERCASE_LETTER_CODES, DEFAULT_UPPERCASE_LETTER_CODES));
lowercaseLetterCodes = splitPropsToList(props.getProperty(LOWERCASE_LETTER_CODES, DEFAULT_LOWERCASE_LETTER_CODES));
digitalCodes = splitPropsToList(props.getProperty(DIGITAL_CODES, DEFAULT_DIGITAL_CODES));
diff --git a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/replace/LandlineNumberRandomAlgorithm.java b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/replace/LandlineNumberRandomAlgorithm.java
index 224c6e1bdfa..9e52c6893a8 100644
--- a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/replace/LandlineNumberRandomAlgorithm.java
+++ b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/replace/LandlineNumberRandomAlgorithm.java
@@ -19,7 +19,6 @@ package org.apache.shardingsphere.mask.algorithm.replace;
import com.google.common.base.Splitter;
import com.google.common.base.Strings;
-import lombok.Getter;
import org.apache.shardingsphere.mask.algorithm.MaskAlgorithmPropsChecker;
import org.apache.shardingsphere.mask.spi.MaskAlgorithm;
@@ -36,13 +35,9 @@ public final class LandlineNumberRandomAlgorithm implements MaskAlgorithm<Object
private List<String> landLineNumbers;
- @Getter
- private Properties props;
-
@Override
public void init(final Properties props) {
- this.props = props;
- this.landLineNumbers = createLandLineNumbers(props);
+ landLineNumbers = createLandLineNumbers(props);
}
private List<String> createLandLineNumbers(final Properties props) {
diff --git a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/replace/MilitaryIdentityNumberRandomReplaceAlgorithm.java b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/replace/MilitaryIdentityNumberRandomReplaceAlgorithm.java
index 83e3d677f44..bdecdc8e7f8 100644
--- a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/replace/MilitaryIdentityNumberRandomReplaceAlgorithm.java
+++ b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/replace/MilitaryIdentityNumberRandomReplaceAlgorithm.java
@@ -19,7 +19,6 @@ package org.apache.shardingsphere.mask.algorithm.replace;
import com.google.common.base.Splitter;
import com.google.common.base.Strings;
-import lombok.Getter;
import org.apache.shardingsphere.mask.algorithm.MaskAlgorithmPropsChecker;
import org.apache.shardingsphere.mask.spi.MaskAlgorithm;
@@ -37,13 +36,9 @@ public final class MilitaryIdentityNumberRandomReplaceAlgorithm implements MaskA
private List<Character> typeCodes;
- @Getter
- private Properties props;
-
@Override
public void init(final Properties props) {
- this.props = props;
- this.typeCodes = createTypeCodes(props);
+ typeCodes = createTypeCodes(props);
}
private List<Character> createTypeCodes(final Properties props) {
diff --git a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/replace/PersonalIdentityNumberRandomReplaceAlgorithm.java b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/replace/PersonalIdentityNumberRandomReplaceAlgorithm.java
index 4f2cb22daf8..8b4e2ea6922 100644
--- a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/replace/PersonalIdentityNumberRandomReplaceAlgorithm.java
+++ b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/replace/PersonalIdentityNumberRandomReplaceAlgorithm.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.mask.algorithm.replace;
import com.google.common.base.Strings;
-import lombok.Getter;
import org.apache.shardingsphere.mask.spi.MaskAlgorithm;
import java.util.Properties;
@@ -33,13 +32,9 @@ public final class PersonalIdentityNumberRandomReplaceAlgorithm implements MaskA
private String alphaTwoCountryAreaCode;
- @Getter
- private Properties props;
-
@Override
public void init(final Properties props) {
- this.props = props;
- this.alphaTwoCountryAreaCode = props.getProperty(ALPHA_TWO_COUNTRY_AREA_CODE, "CN");
+ alphaTwoCountryAreaCode = props.getProperty(ALPHA_TWO_COUNTRY_AREA_CODE, "CN");
}
@Override
diff --git a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/replace/TelephoneRandomReplaceAlgorithm.java b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/replace/TelephoneRandomReplaceAlgorithm.java
index 67841730286..74cdbaa736a 100644
--- a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/replace/TelephoneRandomReplaceAlgorithm.java
+++ b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/algorithm/replace/TelephoneRandomReplaceAlgorithm.java
@@ -22,7 +22,6 @@ import com.google.common.base.Splitter;
import com.google.common.base.Strings;
import com.google.common.io.CharStreams;
import com.google.common.io.LineProcessor;
-import lombok.Getter;
import lombok.SneakyThrows;
import org.apache.shardingsphere.mask.exception.algorithm.MaskAlgorithmInitializationException;
import org.apache.shardingsphere.mask.spi.MaskAlgorithm;
@@ -44,13 +43,9 @@ public final class TelephoneRandomReplaceAlgorithm implements MaskAlgorithm<Obje
private List<String> networkNumbers;
- @Getter
- private Properties props;
-
@Override
public void init(final Properties props) {
- this.props = props;
- this.networkNumbers = createNetworkNumbers(props);
+ networkNumbers = createNetworkNumbers(props);
}
private List<String> createNetworkNumbers(final Properties props) {
diff --git a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedPrimaryReadQueryLoadBalanceAlgorithm.java b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedPrimaryReadQueryLoadBalanceAlgorithm.java
index a457f60be6b..4f1555a3868 100644
--- a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedPrimaryReadQueryLoadBalanceAlgorithm.java
+++ b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedPrimaryReadQueryLoadBalanceAlgorithm.java
@@ -17,26 +17,16 @@
package org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance;
-import lombok.Getter;
import org.apache.shardingsphere.infra.context.transaction.TransactionConnectionContext;
import org.apache.shardingsphere.readwritesplitting.spi.ReadQueryLoadBalanceAlgorithm;
import java.util.List;
-import java.util.Properties;
/**
* Fixed primary read query load-balance algorithm.
*/
public final class FixedPrimaryReadQueryLoadBalanceAlgorithm implements ReadQueryLoadBalanceAlgorithm {
- @Getter
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public String getDataSource(final String name, final String writeDataSourceName, final List<String> readDataSourceNames, final TransactionConnectionContext context) {
return writeDataSourceName;
diff --git a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaRandomReadQueryLoadBalanceAlgorithm.java b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaRandomReadQueryLoadBalanceAlgorithm.java
index c3a498a002b..b3beab3d1cd 100644
--- a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaRandomReadQueryLoadBalanceAlgorithm.java
+++ b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaRandomReadQueryLoadBalanceAlgorithm.java
@@ -17,27 +17,17 @@
package org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance;
-import lombok.Getter;
import org.apache.shardingsphere.infra.context.transaction.TransactionConnectionContext;
import org.apache.shardingsphere.readwritesplitting.spi.ReadQueryLoadBalanceAlgorithm;
import java.util.List;
-import java.util.Properties;
import java.util.concurrent.ThreadLocalRandom;
/**
* Fixed replica random read query load-balance algorithm.
*/
-@Getter
public final class FixedReplicaRandomReadQueryLoadBalanceAlgorithm implements ReadQueryLoadBalanceAlgorithm {
- private Properties props = new Properties();
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public String getDataSource(final String name, final String writeDataSourceName, final List<String> readDataSourceNames, final TransactionConnectionContext context) {
if (context.isInTransaction()) {
diff --git a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaRoundRobinReadQueryLoadBalanceAlgorithm.java b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaRoundRobinReadQueryLoadBalanceAlgorithm.java
index 51381a90489..3d0023eb73e 100644
--- a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaRoundRobinReadQueryLoadBalanceAlgorithm.java
+++ b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaRoundRobinReadQueryLoadBalanceAlgorithm.java
@@ -17,12 +17,10 @@
package org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance;
-import lombok.Getter;
import org.apache.shardingsphere.infra.context.transaction.TransactionConnectionContext;
import org.apache.shardingsphere.readwritesplitting.spi.ReadQueryLoadBalanceAlgorithm;
import java.util.List;
-import java.util.Properties;
import java.util.concurrent.atomic.AtomicInteger;
/**
@@ -32,14 +30,6 @@ public final class FixedReplicaRoundRobinReadQueryLoadBalanceAlgorithm implement
private final AtomicInteger count = new AtomicInteger(0);
- @Getter
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public String getDataSource(final String name, final String writeDataSourceName, final List<String> readDataSourceNames, final TransactionConnectionContext context) {
if (context.isInTransaction()) {
diff --git a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaWeightReadQueryLoadBalanceAlgorithm.java b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaWeightReadQueryLoadBalanceAlgorithm.java
index 453952d61f9..4978fb84c11 100644
--- a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaWeightReadQueryLoadBalanceAlgorithm.java
+++ b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaWeightReadQueryLoadBalanceAlgorithm.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance;
import com.google.common.base.Preconditions;
-import lombok.Getter;
import org.apache.shardingsphere.infra.context.transaction.TransactionConnectionContext;
import org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.readwritesplitting.exception.algorithm.InvalidReadDatabaseWeightException;
@@ -34,7 +33,6 @@ import java.util.concurrent.ThreadLocalRandom;
/**
* Fixed replica weight read query load-balance algorithm.
*/
-@Getter
public final class FixedReplicaWeightReadQueryLoadBalanceAlgorithm implements ReadQueryLoadBalanceAlgorithm {
private static final double ACCURACY_THRESHOLD = 0.0001;
diff --git a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/RandomReadQueryLoadBalanceAlgorithm.java b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/RandomReadQueryLoadBalanceAlgorithm.java
index f7f9a0164ed..d4723e55b4c 100644
--- a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/RandomReadQueryLoadBalanceAlgorithm.java
+++ b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/RandomReadQueryLoadBalanceAlgorithm.java
@@ -17,27 +17,17 @@
package org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance;
-import lombok.Getter;
import org.apache.shardingsphere.infra.context.transaction.TransactionConnectionContext;
import org.apache.shardingsphere.readwritesplitting.spi.ReadQueryLoadBalanceAlgorithm;
import java.util.List;
-import java.util.Properties;
import java.util.concurrent.ThreadLocalRandom;
/**
* Random read query load-balance algorithm.
*/
-@Getter
public final class RandomReadQueryLoadBalanceAlgorithm implements ReadQueryLoadBalanceAlgorithm {
- private Properties props = new Properties();
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public String getDataSource(final String name, final String writeDataSourceName, final List<String> readDataSourceNames, final TransactionConnectionContext context) {
if (context.isInTransaction()) {
diff --git a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/RoundRobinReadQueryLoadBalanceAlgorithm.java b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/RoundRobinReadQueryLoadBalanceAlgorithm.java
index 94a5a36a32a..d3c652ca464 100644
--- a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/RoundRobinReadQueryLoadBalanceAlgorithm.java
+++ b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/RoundRobinReadQueryLoadBalanceAlgorithm.java
@@ -17,12 +17,10 @@
package org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance;
-import lombok.Getter;
import org.apache.shardingsphere.infra.context.transaction.TransactionConnectionContext;
import org.apache.shardingsphere.readwritesplitting.spi.ReadQueryLoadBalanceAlgorithm;
import java.util.List;
-import java.util.Properties;
import java.util.concurrent.atomic.AtomicInteger;
/**
@@ -32,14 +30,6 @@ public final class RoundRobinReadQueryLoadBalanceAlgorithm implements ReadQueryL
private final AtomicInteger count = new AtomicInteger(0);
- @Getter
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public String getDataSource(final String name, final String writeDataSourceName, final List<String> readDataSourceNames, final TransactionConnectionContext context) {
if (context.isInTransaction()) {
diff --git a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionRandomReadQueryLoadBalanceAlgorithm.java b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionRandomReadQueryLoadBalanceAlgorithm.java
index 582feb3ec6c..e33e15e6b19 100644
--- a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionRandomReadQueryLoadBalanceAlgorithm.java
+++ b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionRandomReadQueryLoadBalanceAlgorithm.java
@@ -17,27 +17,17 @@
package org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance;
-import lombok.Getter;
import org.apache.shardingsphere.infra.context.transaction.TransactionConnectionContext;
import org.apache.shardingsphere.readwritesplitting.spi.ReadQueryLoadBalanceAlgorithm;
import java.util.List;
-import java.util.Properties;
import java.util.concurrent.ThreadLocalRandom;
/**
* Transaction random read query load-balance algorithm.
*/
-@Getter
public final class TransactionRandomReadQueryLoadBalanceAlgorithm implements ReadQueryLoadBalanceAlgorithm {
- private Properties props = new Properties();
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public String getDataSource(final String name, final String writeDataSourceName, final List<String> readDataSourceNames, final TransactionConnectionContext context) {
return readDataSourceNames.get(ThreadLocalRandom.current().nextInt(readDataSourceNames.size()));
diff --git a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionRoundRobinReadQueryLoadBalanceAlgorithm.java b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionRoundRobinReadQueryLoadBalanceAlgorithm.java
index bbfa9aa635b..3d0497c1761 100644
--- a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionRoundRobinReadQueryLoadBalanceAlgorithm.java
+++ b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionRoundRobinReadQueryLoadBalanceAlgorithm.java
@@ -17,12 +17,10 @@
package org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance;
-import lombok.Getter;
import org.apache.shardingsphere.infra.context.transaction.TransactionConnectionContext;
import org.apache.shardingsphere.readwritesplitting.spi.ReadQueryLoadBalanceAlgorithm;
import java.util.List;
-import java.util.Properties;
import java.util.concurrent.atomic.AtomicInteger;
/**
@@ -32,14 +30,6 @@ public final class TransactionRoundRobinReadQueryLoadBalanceAlgorithm implements
private final AtomicInteger count = new AtomicInteger(0);
- @Getter
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public String getDataSource(final String name, final String writeDataSourceName, final List<String> readDataSourceNames, final TransactionConnectionContext context) {
return readDataSourceNames.get(Math.abs(count.getAndIncrement()) % readDataSourceNames.size());
diff --git a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionWeightReadQueryLoadBalanceAlgorithm.java b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionWeightReadQueryLoadBalanceAlgorithm.java
index fbb2c318ae0..6553b6de9d7 100644
--- a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionWeightReadQueryLoadBalanceAlgorithm.java
+++ b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionWeightReadQueryLoadBalanceAlgorithm.java
@@ -36,7 +36,6 @@ import java.util.concurrent.ThreadLocalRandom;
/**
* Transaction weight read query load-balance algorithm.
*/
-@Getter
public final class TransactionWeightReadQueryLoadBalanceAlgorithm implements ReadQueryLoadBalanceAlgorithm, WeightAware {
private static final double ACCURACY_THRESHOLD = 0.0001;
@@ -45,6 +44,7 @@ public final class TransactionWeightReadQueryLoadBalanceAlgorithm implements Rea
private Properties props;
+ @Getter
private Collection<String> dataSourceNames;
@Override
diff --git a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/WeightReadQueryLoadBalanceAlgorithm.java b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/WeightReadQueryLoadBalanceAlgorithm.java
index 7da356b52ab..a96d09edb43 100644
--- a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/WeightReadQueryLoadBalanceAlgorithm.java
+++ b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/WeightReadQueryLoadBalanceAlgorithm.java
@@ -36,7 +36,6 @@ import java.util.concurrent.ThreadLocalRandom;
/**
* Weight read query load-balance algorithm.
*/
-@Getter
public final class WeightReadQueryLoadBalanceAlgorithm implements ReadQueryLoadBalanceAlgorithm, WeightAware {
private static final double ACCURACY_THRESHOLD = 0.0001;
@@ -45,6 +44,7 @@ public final class WeightReadQueryLoadBalanceAlgorithm implements ReadQueryLoadB
private Properties props;
+ @Getter
private Collection<String> dataSourceNames;
@Override
diff --git a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/AbstractColumnMatchedShadowAlgorithm.java b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/AbstractColumnMatchedShadowAlgorithm.java
index a5042d514d5..358f8b1df72 100644
--- a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/AbstractColumnMatchedShadowAlgorithm.java
+++ b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/column/AbstractColumnMatchedShadowAlgorithm.java
@@ -38,15 +38,12 @@ public abstract class AbstractColumnMatchedShadowAlgorithm implements ColumnShad
private static final String OPERATION_PROPS_KEY = "operation";
- private Properties props;
-
private String shadowColumn;
private ShadowOperationType shadowOperationType;
@Override
public void init(final Properties props) {
- this.props = props;
shadowColumn = getShadowColumn(props);
shadowOperationType = getShadowOperationType(props);
}
diff --git a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/hint/SQLHintShadowAlgorithm.java b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/hint/SQLHintShadowAlgorithm.java
index e0d47fe60a0..27534156da2 100644
--- a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/hint/SQLHintShadowAlgorithm.java
+++ b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/algorithm/shadow/hint/SQLHintShadowAlgorithm.java
@@ -17,23 +17,18 @@
package org.apache.shardingsphere.shadow.algorithm.shadow.hint;
-import lombok.Getter;
import org.apache.shardingsphere.infra.hint.SQLHintExtractor;
import org.apache.shardingsphere.shadow.api.shadow.ShadowOperationType;
import org.apache.shardingsphere.shadow.api.shadow.hint.HintShadowAlgorithm;
import org.apache.shardingsphere.shadow.api.shadow.hint.PreciseHintShadowValue;
import java.util.Collection;
-import java.util.Properties;
/**
* SQL hint shadow algorithm.
*/
public final class SQLHintShadowAlgorithm implements HintShadowAlgorithm<String> {
- @Getter
- private final Properties props = new Properties();
-
@Override
public boolean isShadow(final Collection<String> shadowTableNames, final PreciseHintShadowValue<String> noteShadowValue) {
if (ShadowOperationType.HINT_MATCH == noteShadowValue.getShadowOperationType() || shadowTableNames.contains(noteShadowValue.getLogicTableName())) {
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/audit/DMLShardingConditionsShardingAuditAlgorithm.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/audit/DMLShardingConditionsShardingAuditAlgorithm.java
index 25a35c152f9..b48e8ee5d98 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/audit/DMLShardingConditionsShardingAuditAlgorithm.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/audit/DMLShardingConditionsShardingAuditAlgorithm.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.sharding.algorithm.audit;
-import lombok.Getter;
import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.executor.audit.exception.SQLAuditException;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
@@ -30,21 +29,12 @@ import org.apache.shardingsphere.sharding.spi.ShardingAuditAlgorithm;
import org.apache.shardingsphere.sql.parser.sql.common.statement.dml.DMLStatement;
import java.util.List;
-import java.util.Properties;
/**
* DML sharding conditions sharding audit algorithm.
*/
public final class DMLShardingConditionsShardingAuditAlgorithm implements ShardingAuditAlgorithm {
- @Getter
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public void check(final SQLStatementContext<?> sqlStatementContext, final List<Object> params,
final Grantee grantee, final ShardingSphereRuleMetaData globalRuleMetaData, final ShardingSphereDatabase database) {
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/keygen/SnowflakeKeyGenerateAlgorithm.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/keygen/SnowflakeKeyGenerateAlgorithm.java
index 453e9f09cfb..30624124da6 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/keygen/SnowflakeKeyGenerateAlgorithm.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/keygen/SnowflakeKeyGenerateAlgorithm.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.sharding.algorithm.keygen;
-import lombok.Getter;
import lombok.Setter;
import lombok.SneakyThrows;
import org.apache.shardingsphere.infra.instance.InstanceContext;
@@ -68,7 +67,6 @@ public final class SnowflakeKeyGenerateAlgorithm implements KeyGenerateAlgorithm
@Setter
private static TimeService timeService = new TimeService();
- @Getter
private Properties props;
private int maxVibrationOffset;
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/keygen/UUIDKeyGenerateAlgorithm.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/keygen/UUIDKeyGenerateAlgorithm.java
index e0415dd81f0..b9b96b4ae50 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/keygen/UUIDKeyGenerateAlgorithm.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/keygen/UUIDKeyGenerateAlgorithm.java
@@ -17,26 +17,16 @@
package org.apache.shardingsphere.sharding.algorithm.keygen;
-import lombok.Getter;
import org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm;
-import java.util.Properties;
import java.util.UUID;
import java.util.concurrent.ThreadLocalRandom;
/**
* UUID key generate algorithm.
*/
-@Getter
public final class UUIDKeyGenerateAlgorithm implements KeyGenerateAlgorithm {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public String generateKey() {
ThreadLocalRandom threadLocalRandom = ThreadLocalRandom.current();
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/classbased/ClassBasedShardingAlgorithm.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/classbased/ClassBasedShardingAlgorithm.java
index 14a9221366e..c6506df0940 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/classbased/ClassBasedShardingAlgorithm.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/classbased/ClassBasedShardingAlgorithm.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.sharding.algorithm.sharding.classbased;
-import lombok.Getter;
import org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.sharding.api.sharding.complex.ComplexKeysShardingAlgorithm;
import org.apache.shardingsphere.sharding.api.sharding.complex.ComplexKeysShardingValue;
@@ -41,9 +40,6 @@ public final class ClassBasedShardingAlgorithm implements StandardShardingAlgori
private static final String ALGORITHM_CLASS_NAME_KEY = "algorithmClassName";
- @Getter
- private Properties props;
-
private ClassBasedShardingAlgorithmStrategyType strategy;
private String algorithmClassName;
@@ -56,7 +52,6 @@ public final class ClassBasedShardingAlgorithm implements StandardShardingAlgori
@Override
public void init(final Properties props) {
- this.props = props;
strategy = getStrategy(props);
algorithmClassName = getAlgorithmClassName(props);
initAlgorithmInstance(props);
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/complex/ComplexInlineShardingAlgorithm.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/complex/ComplexInlineShardingAlgorithm.java
index f6454374aed..46b66e8510d 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/complex/ComplexInlineShardingAlgorithm.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/complex/ComplexInlineShardingAlgorithm.java
@@ -19,7 +19,6 @@ package org.apache.shardingsphere.sharding.algorithm.sharding.complex;
import groovy.lang.Closure;
import groovy.util.Expando;
-import lombok.Getter;
import org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.util.exception.external.sql.type.generic.UnsupportedSQLOperationException;
import org.apache.shardingsphere.infra.util.expr.InlineExpressionParser;
@@ -49,9 +48,6 @@ public final class ComplexInlineShardingAlgorithm implements ComplexKeysSharding
private static final String ALLOW_RANGE_QUERY_KEY = "allow-range-query-with-inline-sharding";
- @Getter
- private Properties props;
-
private String algorithmExpression;
private Collection<String> shardingColumns;
@@ -60,7 +56,6 @@ public final class ComplexInlineShardingAlgorithm implements ComplexKeysSharding
@Override
public void init(final Properties props) {
- this.props = props;
algorithmExpression = getAlgorithmExpression(props);
shardingColumns = getShardingColumns(props);
allowRangeQuery = getAllowRangeQuery(props);
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/datetime/AutoIntervalShardingAlgorithm.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/datetime/AutoIntervalShardingAlgorithm.java
index 6c78fbf3ee9..6d4f68e1898 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/datetime/AutoIntervalShardingAlgorithm.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/datetime/AutoIntervalShardingAlgorithm.java
@@ -51,9 +51,6 @@ public final class AutoIntervalShardingAlgorithm implements StandardShardingAlgo
private static final DateTimeFormatter DATE_TIME_FORMAT = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
- @Getter
- private Properties props;
-
private LocalDateTime dateTimeLower;
private long shardingSeconds;
@@ -63,7 +60,6 @@ public final class AutoIntervalShardingAlgorithm implements StandardShardingAlgo
@Override
public void init(final Properties props) {
- this.props = props;
dateTimeLower = getDateTime(props);
shardingSeconds = getShardingSeconds(props);
autoTablesAmount = (int) (Math.ceil((double) (parseDate(props.getProperty(DATE_TIME_UPPER_KEY)) / shardingSeconds)) + 2);
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/datetime/IntervalShardingAlgorithm.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/datetime/IntervalShardingAlgorithm.java
index 70bd08264ef..3437744917b 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/datetime/IntervalShardingAlgorithm.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/datetime/IntervalShardingAlgorithm.java
@@ -19,7 +19,6 @@ package org.apache.shardingsphere.sharding.algorithm.sharding.datetime;
import com.google.common.collect.BoundType;
import com.google.common.collect.Range;
-import lombok.Getter;
import org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.util.exception.external.sql.type.generic.UnsupportedSQLOperationException;
import org.apache.shardingsphere.sharding.api.sharding.standard.PreciseShardingValue;
@@ -66,9 +65,6 @@ public final class IntervalShardingAlgorithm implements StandardShardingAlgorith
private static final String INTERVAL_UNIT_KEY = "datetime-interval-unit";
- @Getter
- private Properties props;
-
private DateTimeFormatter dateTimeFormatter;
private int dateTimePatternLength;
@@ -85,7 +81,6 @@ public final class IntervalShardingAlgorithm implements StandardShardingAlgorith
@Override
public void init(final Properties props) {
- this.props = props;
String dateTimePattern = getDateTimePattern(props);
dateTimeFormatter = DateTimeFormatter.ofPattern(dateTimePattern);
dateTimePatternLength = dateTimePattern.length();
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/hint/HintInlineShardingAlgorithm.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/hint/HintInlineShardingAlgorithm.java
index efb69509f99..229311b8dc5 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/hint/HintInlineShardingAlgorithm.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/hint/HintInlineShardingAlgorithm.java
@@ -19,7 +19,6 @@ package org.apache.shardingsphere.sharding.algorithm.sharding.hint;
import groovy.lang.Closure;
import groovy.util.Expando;
-import lombok.Getter;
import org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.util.expr.InlineExpressionParser;
import org.apache.shardingsphere.sharding.api.sharding.hint.HintShardingAlgorithm;
@@ -41,14 +40,10 @@ public final class HintInlineShardingAlgorithm implements HintShardingAlgorithm<
private static final String HINT_INLINE_VALUE_PROPERTY_NAME = "value";
- @Getter
- private Properties props = new Properties();
-
private String algorithmExpression;
@Override
public void init(final Properties props) {
- this.props = props;
algorithmExpression = getAlgorithmExpression(props);
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/inline/InlineShardingAlgorithm.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/inline/InlineShardingAlgorithm.java
index 29ecae864c3..3062feae91b 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/inline/InlineShardingAlgorithm.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/inline/InlineShardingAlgorithm.java
@@ -20,7 +20,6 @@ package org.apache.shardingsphere.sharding.algorithm.sharding.inline;
import groovy.lang.Closure;
import groovy.lang.MissingMethodException;
import groovy.util.Expando;
-import lombok.Getter;
import org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.util.exception.external.sql.type.generic.UnsupportedSQLOperationException;
import org.apache.shardingsphere.infra.util.expr.InlineExpressionParser;
@@ -43,16 +42,12 @@ public final class InlineShardingAlgorithm implements StandardShardingAlgorithm<
private static final String ALLOW_RANGE_QUERY_KEY = "allow-range-query-with-inline-sharding";
- @Getter
- private Properties props;
-
private String algorithmExpression;
private boolean allowRangeQuery;
@Override
public void init(final Properties props) {
- this.props = props;
algorithmExpression = getAlgorithmExpression(props);
allowRangeQuery = isAllowRangeQuery(props);
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/mod/HashModShardingAlgorithm.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/mod/HashModShardingAlgorithm.java
index 1ee05d7bc45..13c37f29a31 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/mod/HashModShardingAlgorithm.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/mod/HashModShardingAlgorithm.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.sharding.algorithm.sharding.mod;
-import lombok.Getter;
import org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.sharding.algorithm.sharding.ShardingAutoTableAlgorithmUtil;
import org.apache.shardingsphere.sharding.api.sharding.ShardingAutoTableAlgorithm;
@@ -36,14 +35,10 @@ public final class HashModShardingAlgorithm implements StandardShardingAlgorithm
private static final String SHARDING_COUNT_KEY = "sharding-count";
- @Getter
- private Properties props;
-
private int shardingCount;
@Override
public void init(final Properties props) {
- this.props = props;
shardingCount = getShardingCount(props);
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/mod/ModShardingAlgorithm.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/mod/ModShardingAlgorithm.java
index ab9b0929653..2209efa065d 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/mod/ModShardingAlgorithm.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/mod/ModShardingAlgorithm.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.sharding.algorithm.sharding.mod;
-import lombok.Getter;
import org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.sharding.algorithm.sharding.ShardingAutoTableAlgorithmUtil;
import org.apache.shardingsphere.sharding.api.sharding.ShardingAutoTableAlgorithm;
@@ -45,9 +44,6 @@ public final class ModShardingAlgorithm implements StandardShardingAlgorithm<Com
private static final String ZERO_PADDING_KEY = "zero-padding";
- @Getter
- private Properties props;
-
private int shardingCount;
private int startOffset;
@@ -60,7 +56,6 @@ public final class ModShardingAlgorithm implements StandardShardingAlgorithm<Com
@Override
public void init(final Properties props) {
- this.props = props;
shardingCount = getShardingCount(props);
startOffset = getStartOffset(props);
stopOffset = getStopOffset(props);
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/range/AbstractRangeShardingAlgorithm.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/range/AbstractRangeShardingAlgorithm.java
index e7e7f296c34..19b8eb3a187 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/range/AbstractRangeShardingAlgorithm.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/range/AbstractRangeShardingAlgorithm.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.sharding.algorithm.sharding.range;
import com.google.common.collect.Range;
-import lombok.Getter;
import org.apache.shardingsphere.infra.util.exception.external.sql.type.generic.UnsupportedSQLOperationException;
import org.apache.shardingsphere.sharding.algorithm.sharding.ShardingAutoTableAlgorithmUtil;
import org.apache.shardingsphere.sharding.api.sharding.ShardingAutoTableAlgorithm;
@@ -37,14 +36,10 @@ import java.util.Properties;
*/
public abstract class AbstractRangeShardingAlgorithm implements StandardShardingAlgorithm<Comparable<?>>, ShardingAutoTableAlgorithm {
- @Getter
- private Properties props;
-
private Map<Integer, Range<Comparable<?>>> partitionRange;
@Override
public final void init(final Properties props) {
- this.props = props;
partitionRange = calculatePartitionRange(props);
}
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/algorithm/keygen/fixture/AutoIncrementKeyGenerateAlgorithmFixture.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/algorithm/keygen/fixture/AutoIncrementKeyGenerateAlgorithmFixture.java
index db7aa968cff..f593618cf17 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/algorithm/keygen/fixture/AutoIncrementKeyGenerateAlgorithmFixture.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/algorithm/keygen/fixture/AutoIncrementKeyGenerateAlgorithmFixture.java
@@ -20,7 +20,6 @@ package org.apache.shardingsphere.sharding.algorithm.keygen.fixture;
import lombok.Getter;
import org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm;
-import java.util.Properties;
import java.util.concurrent.atomic.AtomicInteger;
@Getter
@@ -28,13 +27,6 @@ public final class AutoIncrementKeyGenerateAlgorithmFixture implements KeyGenera
private final AtomicInteger count = new AtomicInteger();
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public Comparable<?> generateKey() {
return count.incrementAndGet();
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/fixture/ClassBasedComplexKeysShardingAlgorithmFixture.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/fixture/ClassBasedComplexKeysShardingAlgorithmFixture.java
index 822fd3d70ee..6f197a1056e 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/fixture/ClassBasedComplexKeysShardingAlgorithmFixture.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/fixture/ClassBasedComplexKeysShardingAlgorithmFixture.java
@@ -17,23 +17,13 @@
package org.apache.shardingsphere.sharding.fixture;
-import lombok.Getter;
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
public final class ClassBasedComplexKeysShardingAlgorithmFixture implements ComplexKeysShardingAlgorithm<Integer> {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public Collection<String> doSharding(final Collection<String> availableTargetNames, final ComplexKeysShardingValue<Integer> shardingValue) {
return availableTargetNames;
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/fixture/ClassBasedHintShardingAlgorithmFixture.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/fixture/ClassBasedHintShardingAlgorithmFixture.java
index 9eb136a0453..d2885c57017 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/fixture/ClassBasedHintShardingAlgorithmFixture.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/fixture/ClassBasedHintShardingAlgorithmFixture.java
@@ -17,23 +17,13 @@
package org.apache.shardingsphere.sharding.fixture;
-import lombok.Getter;
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
public final class ClassBasedHintShardingAlgorithmFixture implements HintShardingAlgorithm<Integer> {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public Collection<String> doSharding(final Collection<String> availableTargetNames, final HintShardingValue<Integer> shardingValue) {
return availableTargetNames;
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/fixture/ClassBasedStandardShardingAlgorithmFixture.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/fixture/ClassBasedStandardShardingAlgorithmFixture.java
index a0adc50d399..97643ad0604 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/fixture/ClassBasedStandardShardingAlgorithmFixture.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/fixture/ClassBasedStandardShardingAlgorithmFixture.java
@@ -17,24 +17,14 @@
package org.apache.shardingsphere.sharding.fixture;
-import lombok.Getter;
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
public final class ClassBasedStandardShardingAlgorithmFixture implements StandardShardingAlgorithm<Integer> {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public String doSharding(final Collection<String> availableTargetNames, final PreciseShardingValue<Integer> shardingValue) {
for (String each : availableTargetNames) {
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/fixture/CoreComplexKeysShardingAlgorithmFixture.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/fixture/CoreComplexKeysShardingAlgorithmFixture.java
index 828634bb46d..5e730ac0921 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/fixture/CoreComplexKeysShardingAlgorithmFixture.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/fixture/CoreComplexKeysShardingAlgorithmFixture.java
@@ -17,23 +17,13 @@
package org.apache.shardingsphere.sharding.fixture;
-import lombok.Getter;
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
public final class CoreComplexKeysShardingAlgorithmFixture implements ComplexKeysShardingAlgorithm<Integer> {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public Collection<String> doSharding(final Collection<String> availableTargetNames, final ComplexKeysShardingValue<Integer> shardingValue) {
return availableTargetNames;
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/fixture/CoreHintShardingAlgorithmFixture.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/fixture/CoreHintShardingAlgorithmFixture.java
index b651374f046..f959d19157c 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/fixture/CoreHintShardingAlgorithmFixture.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/fixture/CoreHintShardingAlgorithmFixture.java
@@ -17,24 +17,14 @@
package org.apache.shardingsphere.sharding.fixture;
-import lombok.Getter;
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
public final class CoreHintShardingAlgorithmFixture implements HintShardingAlgorithm<Integer> {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public Collection<String> doSharding(final Collection<String> availableTargetNames, final HintShardingValue<Integer> shardingValue) {
for (String each : availableTargetNames) {
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/fixture/CoreStandardShardingAlgorithmFixture.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/fixture/CoreStandardShardingAlgorithmFixture.java
index 3a68d58ecb0..44228b8c2eb 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/fixture/CoreStandardShardingAlgorithmFixture.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/fixture/CoreStandardShardingAlgorithmFixture.java
@@ -17,25 +17,15 @@
package org.apache.shardingsphere.sharding.fixture;
-import lombok.Getter;
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
public final class CoreStandardShardingAlgorithmFixture implements StandardShardingAlgorithm<Integer> {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public String doSharding(final Collection<String> availableTargetNames, final PreciseShardingValue<Integer> shardingValue) {
for (String each : availableTargetNames) {
diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/fixture/keygen/DistSQLKeyGenerateAlgorithmFixture.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/fixture/keygen/DistSQLKeyGenerateAlgorithmFixture.java
index f28a9b8efcc..6afc3738e04 100644
--- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/fixture/keygen/DistSQLKeyGenerateAlgorithmFixture.java
+++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/fixture/keygen/DistSQLKeyGenerateAlgorithmFixture.java
@@ -17,21 +17,10 @@
package org.apache.shardingsphere.sharding.distsql.fixture.keygen;
-import lombok.Getter;
import org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm;
-import java.util.Properties;
-
-@Getter
public final class DistSQLKeyGenerateAlgorithmFixture implements KeyGenerateAlgorithm {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public Comparable<?> generateKey() {
return 0L;
diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/fixture/sharding/BarDistSQLShardingAlgorithmFixture.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/fixture/sharding/BarDistSQLShardingAlgorithmFixture.java
index e7773919da1..1688ec6f2b1 100644
--- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/fixture/sharding/BarDistSQLShardingAlgorithmFixture.java
+++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/fixture/sharding/BarDistSQLShardingAlgorithmFixture.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.sharding.distsql.fixture.sharding;
-import lombok.Getter;
import org.apache.shardingsphere.sharding.api.sharding.ShardingAutoTableAlgorithm;
import org.apache.shardingsphere.sharding.api.sharding.standard.PreciseShardingValue;
import org.apache.shardingsphere.sharding.api.sharding.standard.RangeShardingValue;
@@ -25,18 +24,9 @@ import org.apache.shardingsphere.sharding.api.sharding.standard.StandardSharding
import java.util.Collection;
import java.util.Collections;
-import java.util.Properties;
-@Getter
public final class BarDistSQLShardingAlgorithmFixture implements StandardShardingAlgorithm<Integer>, ShardingAutoTableAlgorithm {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public String doSharding(final Collection<String> availableTargetNames, final PreciseShardingValue<Integer> shardingValue) {
return "";
diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/fixture/sharding/CoreAutoShardingAlgorithmFixture.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/fixture/sharding/CoreAutoShardingAlgorithmFixture.java
index 45957c8dc28..eefa58edd59 100644
--- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/fixture/sharding/CoreAutoShardingAlgorithmFixture.java
+++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/fixture/sharding/CoreAutoShardingAlgorithmFixture.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.sharding.distsql.fixture.sharding;
import com.google.common.base.Preconditions;
-import lombok.Getter;
import org.apache.shardingsphere.sharding.algorithm.sharding.ShardingAutoTableAlgorithmUtil;
import org.apache.shardingsphere.sharding.api.sharding.ShardingAutoTableAlgorithm;
import org.apache.shardingsphere.sharding.api.sharding.standard.PreciseShardingValue;
@@ -40,9 +39,6 @@ public final class CoreAutoShardingAlgorithmFixture implements StandardShardingA
private static final String ZERO_PADDING_KEY = "zero-padding";
- @Getter
- private Properties props;
-
private int shardingCount;
private int startOffset;
@@ -55,7 +51,6 @@ public final class CoreAutoShardingAlgorithmFixture implements StandardShardingA
@Override
public void init(final Properties props) {
- this.props = props;
shardingCount = getShardingCount(props);
startOffset = getStartOffset(props);
stopOffset = getStopOffset(props);
diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/fixture/sharding/CoreHintShardingAlgorithmFixture.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/fixture/sharding/CoreHintShardingAlgorithmFixture.java
index f725dd2b9a0..36c792d18f5 100644
--- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/fixture/sharding/CoreHintShardingAlgorithmFixture.java
+++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/fixture/sharding/CoreHintShardingAlgorithmFixture.java
@@ -20,7 +20,6 @@ package org.apache.shardingsphere.sharding.distsql.fixture.sharding;
import com.google.common.base.Preconditions;
import groovy.lang.Closure;
import groovy.util.Expando;
-import lombok.Getter;
import org.apache.shardingsphere.infra.util.expr.InlineExpressionParser;
import org.apache.shardingsphere.sharding.api.sharding.hint.HintShardingAlgorithm;
import org.apache.shardingsphere.sharding.api.sharding.hint.HintShardingValue;
@@ -37,14 +36,10 @@ public final class CoreHintShardingAlgorithmFixture implements HintShardingAlgor
private static final String HINT_INLINE_VALUE_PROPERTY_NAME = "value";
- @Getter
- private Properties props = new Properties();
-
private String algorithmExpression;
@Override
public void init(final Properties props) {
- this.props = props;
algorithmExpression = getAlgorithmExpression(props);
}
diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/fixture/sharding/CoreStandardShardingAlgorithmFixture.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/fixture/sharding/CoreStandardShardingAlgorithmFixture.java
index b032e641048..6db442171ad 100644
--- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/fixture/sharding/CoreStandardShardingAlgorithmFixture.java
+++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/fixture/sharding/CoreStandardShardingAlgorithmFixture.java
@@ -17,25 +17,15 @@
package org.apache.shardingsphere.sharding.distsql.fixture.sharding;
-import lombok.Getter;
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
public final class CoreStandardShardingAlgorithmFixture implements StandardShardingAlgorithm<Integer> {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public String doSharding(final Collection<String> availableTargetNames, final PreciseShardingValue<Integer> shardingValue) {
for (String each : availableTargetNames) {
diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/fixture/sharding/FooDistSQLShardingAlgorithmFixture.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/fixture/sharding/FooDistSQLShardingAlgorithmFixture.java
index 5d3d96d5e11..36b4cb3f85b 100644
--- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/fixture/sharding/FooDistSQLShardingAlgorithmFixture.java
+++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/fixture/sharding/FooDistSQLShardingAlgorithmFixture.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.sharding.distsql.fixture.sharding;
-import lombok.Getter;
import org.apache.shardingsphere.sharding.api.sharding.ShardingAutoTableAlgorithm;
import org.apache.shardingsphere.sharding.api.sharding.standard.PreciseShardingValue;
import org.apache.shardingsphere.sharding.api.sharding.standard.RangeShardingValue;
@@ -25,18 +24,9 @@ import org.apache.shardingsphere.sharding.api.sharding.standard.StandardSharding
import java.util.Collection;
import java.util.Collections;
-import java.util.Properties;
-@Getter
public final class FooDistSQLShardingAlgorithmFixture implements StandardShardingAlgorithm<Integer>, ShardingAutoTableAlgorithm {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public String doSharding(final Collection<String> availableTargetNames, final PreciseShardingValue<Integer> shardingValue) {
return "";
diff --git a/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/keygen/CosIdKeyGenerateAlgorithm.java b/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/keygen/CosIdKeyGenerateAlgorithm.java
index 9aec6fdf284..3c7b59af57b 100644
--- a/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/keygen/CosIdKeyGenerateAlgorithm.java
+++ b/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/keygen/CosIdKeyGenerateAlgorithm.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.sharding.cosid.algorithm.keygen;
-import lombok.Getter;
import me.ahoo.cosid.CosId;
import me.ahoo.cosid.provider.IdGeneratorProvider;
import me.ahoo.cosid.provider.LazyIdGenerator;
@@ -33,16 +32,12 @@ public final class CosIdKeyGenerateAlgorithm implements KeyGenerateAlgorithm {
private static final String AS_STRING_KEY = "as-string";
- @Getter
- private Properties props;
-
private LazyIdGenerator lazyIdGenerator;
private boolean asString;
@Override
public void init(final Properties props) {
- this.props = props;
lazyIdGenerator = new LazyIdGenerator(props.getProperty(CosIdAlgorithmConstants.ID_NAME_KEY, IdGeneratorProvider.SHARE));
asString = Boolean.parseBoolean(props.getProperty(AS_STRING_KEY, Boolean.FALSE.toString()));
lazyIdGenerator.tryGet(false);
diff --git a/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/keygen/CosIdSnowflakeKeyGenerateAlgorithm.java b/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/keygen/CosIdSnowflakeKeyGenerateAlgorithm.java
index d67061e9282..66cb32610a9 100644
--- a/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/keygen/CosIdSnowflakeKeyGenerateAlgorithm.java
+++ b/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/keygen/CosIdSnowflakeKeyGenerateAlgorithm.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.sharding.cosid.algorithm.keygen;
-import lombok.Getter;
import me.ahoo.cosid.converter.Radix62IdConverter;
import me.ahoo.cosid.snowflake.ClockSyncSnowflakeId;
import me.ahoo.cosid.snowflake.MillisecondSnowflakeId;
@@ -44,7 +43,6 @@ public final class CosIdSnowflakeKeyGenerateAlgorithm implements KeyGenerateAlgo
public static final String EPOCH_KEY = "epoch";
- @Getter
private Properties props;
private SnowflakeId snowflakeId;
diff --git a/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/AbstractCosIdIntervalShardingAlgorithm.java b/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/AbstractCosIdIntervalShardingAlgorithm.java
index 4e476accf4f..b4219752a9e 100644
--- a/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/AbstractCosIdIntervalShardingAlgorithm.java
+++ b/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/interval/AbstractCosIdIntervalShardingAlgorithm.java
@@ -58,9 +58,6 @@ public abstract class AbstractCosIdIntervalShardingAlgorithm<T extends Comparabl
public static final String ZONE_ID_KEY = "zone-id";
- @Getter
- private Properties props;
-
@Getter(AccessLevel.PROTECTED)
private ZoneId zoneId;
@@ -68,7 +65,6 @@ public abstract class AbstractCosIdIntervalShardingAlgorithm<T extends Comparabl
@Override
public void init(final Properties props) {
- this.props = props;
zoneId = getZoneId(props);
intervalTimeline = getIntervalTimeline(props);
}
diff --git a/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/mod/CosIdModShardingAlgorithm.java b/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/mod/CosIdModShardingAlgorithm.java
index d7324119be1..a52b1bb14dc 100644
--- a/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/mod/CosIdModShardingAlgorithm.java
+++ b/features/sharding/plugin/cosid/src/main/java/org/apache/shardingsphere/sharding/cosid/algorithm/sharding/mod/CosIdModShardingAlgorithm.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.sharding.cosid.algorithm.sharding.mod;
-import lombok.Getter;
import me.ahoo.cosid.sharding.ModCycle;
import org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.sharding.api.sharding.standard.PreciseShardingValue;
@@ -36,14 +35,10 @@ public final class CosIdModShardingAlgorithm<T extends Number & Comparable<T>> i
private static final String MODULO_KEY = "mod";
- @Getter
- private Properties props;
-
private ModCycle<T> modCycle;
@Override
public void init(final Properties props) {
- this.props = props;
String divisorStr = getRequiredValue(props, MODULO_KEY);
int divisor = Integer.parseInt(divisorStr);
String logicNamePrefix = getRequiredValue(props, CosIdAlgorithmConstants.LOGIC_NAME_PREFIX_KEY);
diff --git a/features/sharding/plugin/nanoid/src/main/java/org/apache/shardingsphere/sharding/nanoid/algorithm/keygen/NanoIdKeyGenerateAlgorithm.java b/features/sharding/plugin/nanoid/src/main/java/org/apache/shardingsphere/sharding/nanoid/algorithm/keygen/NanoIdKeyGenerateAlgorithm.java
index eefc9d3d99c..4ff26b95d9e 100644
--- a/features/sharding/plugin/nanoid/src/main/java/org/apache/shardingsphere/sharding/nanoid/algorithm/keygen/NanoIdKeyGenerateAlgorithm.java
+++ b/features/sharding/plugin/nanoid/src/main/java/org/apache/shardingsphere/sharding/nanoid/algorithm/keygen/NanoIdKeyGenerateAlgorithm.java
@@ -18,25 +18,15 @@
package org.apache.shardingsphere.sharding.nanoid.algorithm.keygen;
import com.aventrix.jnanoid.jnanoid.NanoIdUtils;
-import lombok.Getter;
import org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm;
-import java.util.Properties;
import java.util.concurrent.ThreadLocalRandom;
/**
* NanoId key generate algorithm.
*/
-@Getter
public final class NanoIdKeyGenerateAlgorithm implements KeyGenerateAlgorithm {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public String generateKey() {
return NanoIdUtils.randomNanoId(ThreadLocalRandom.current(), NanoIdUtils.DEFAULT_ALPHABET, NanoIdUtils.DEFAULT_SIZE);
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/algorithm/ShardingSphereAlgorithm.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/algorithm/ShardingSphereAlgorithm.java
index 70fd4ca778f..21926d0e118 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/algorithm/ShardingSphereAlgorithm.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/algorithm/ShardingSphereAlgorithm.java
@@ -19,17 +19,8 @@ package org.apache.shardingsphere.infra.algorithm;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPI;
-import java.util.Properties;
-
/**
* ShardingSphere algorithm.
*/
public interface ShardingSphereAlgorithm extends TypedSPI {
-
- /**
- * Get properties.
- *
- * @return properties
- */
- Properties getProps();
}
diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/encrypt/JDBCEncryptAlgorithmFixture.java b/jdbc/core/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/encrypt/JDBCEncryptAlgorithmFixture.java
index 002ea32970f..292ca8bf5a2 100644
--- a/jdbc/core/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/encrypt/JDBCEncryptAlgorithmFixture.java
+++ b/jdbc/core/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/encrypt/JDBCEncryptAlgorithmFixture.java
@@ -17,22 +17,11 @@
package org.apache.shardingsphere.test.e2e.driver.fixture.encrypt;
-import lombok.Getter;
import org.apache.shardingsphere.encrypt.api.encrypt.standard.StandardEncryptAlgorithm;
import org.apache.shardingsphere.encrypt.spi.context.EncryptContext;
-import java.util.Properties;
-
-@Getter
public final class JDBCEncryptAlgorithmFixture implements StandardEncryptAlgorithm<Object, String> {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public String encrypt(final Object plainValue, final EncryptContext encryptContext) {
return "encryptValue";
diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/encrypt/JDBCQueryAssistedEncryptAlgorithmFixture.java b/jdbc/core/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/encrypt/JDBCQueryAssistedEncryptAlgorithmFixture.java
index 2841723099c..53b021d0bed 100644
--- a/jdbc/core/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/encrypt/JDBCQueryAssistedEncryptAlgorithmFixture.java
+++ b/jdbc/core/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/encrypt/JDBCQueryAssistedEncryptAlgorithmFixture.java
@@ -17,22 +17,11 @@
package org.apache.shardingsphere.test.e2e.driver.fixture.encrypt;
-import lombok.Getter;
import org.apache.shardingsphere.encrypt.api.encrypt.standard.StandardEncryptAlgorithm;
import org.apache.shardingsphere.encrypt.spi.context.EncryptContext;
-import java.util.Properties;
-
-@Getter
public final class JDBCQueryAssistedEncryptAlgorithmFixture implements StandardEncryptAlgorithm<Object, String> {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public String encrypt(final Object plainValue, final EncryptContext encryptContext) {
return "assistedEncryptValue";
diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/keygen/IncrementKeyGenerateAlgorithmFixture.java b/jdbc/core/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/keygen/IncrementKeyGenerateAlgorithmFixture.java
index 6ddd61dd7ba..14a2b343efe 100644
--- a/jdbc/core/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/keygen/IncrementKeyGenerateAlgorithmFixture.java
+++ b/jdbc/core/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/keygen/IncrementKeyGenerateAlgorithmFixture.java
@@ -17,24 +17,14 @@
package org.apache.shardingsphere.test.e2e.driver.fixture.keygen;
-import lombok.Getter;
import org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm;
-import java.util.Properties;
import java.util.concurrent.atomic.AtomicInteger;
-@Getter
public final class IncrementKeyGenerateAlgorithmFixture implements KeyGenerateAlgorithm {
private final AtomicInteger count = new AtomicInteger();
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public Comparable<?> generateKey() {
return count.incrementAndGet();
diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/keygen/ResetIncrementKeyGenerateAlgorithmFixture.java b/jdbc/core/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/keygen/ResetIncrementKeyGenerateAlgorithmFixture.java
index c0fcd38a3ce..ad28cb02c87 100644
--- a/jdbc/core/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/keygen/ResetIncrementKeyGenerateAlgorithmFixture.java
+++ b/jdbc/core/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/keygen/ResetIncrementKeyGenerateAlgorithmFixture.java
@@ -20,22 +20,13 @@ package org.apache.shardingsphere.test.e2e.driver.fixture.keygen;
import lombok.Getter;
import org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm;
-import java.util.Properties;
import java.util.concurrent.atomic.AtomicInteger;
-@Getter
public final class ResetIncrementKeyGenerateAlgorithmFixture implements KeyGenerateAlgorithm {
@Getter
private static final AtomicInteger COUNT = new AtomicInteger();
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public Comparable<?> generateKey() {
return COUNT.incrementAndGet();
diff --git a/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/database/DatabasePermittedPrivilegesProviderAlgorithm.java b/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/database/DatabasePermittedPrivilegesProviderAlgorithm.java
index 2d465310662..6286c0cf1dd 100644
--- a/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/database/DatabasePermittedPrivilegesProviderAlgorithm.java
+++ b/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/database/DatabasePermittedPrivilegesProviderAlgorithm.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.authority.provider.database;
-import lombok.Getter;
import org.apache.shardingsphere.authority.model.AuthorityRegistry;
import org.apache.shardingsphere.authority.provider.database.builder.DatabasePrivilegeBuilder;
import org.apache.shardingsphere.authority.registry.UserPrivilegeMapAuthorityRegistry;
@@ -37,7 +36,6 @@ public final class DatabasePermittedPrivilegesProviderAlgorithm implements Autho
public static final String PROP_USER_DATABASE_MAPPINGS = "user-database-mappings";
- @Getter
private Properties props;
@Override
diff --git a/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/simple/AllPermittedPrivilegesProviderAlgorithm.java b/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/simple/AllPermittedPrivilegesProviderAlgorithm.java
index 4c0bdcd28dc..1aceeda6cc2 100644
--- a/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/simple/AllPermittedPrivilegesProviderAlgorithm.java
+++ b/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/simple/AllPermittedPrivilegesProviderAlgorithm.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.authority.provider.simple;
-import lombok.Getter;
import org.apache.shardingsphere.authority.model.AuthorityRegistry;
import org.apache.shardingsphere.authority.registry.AllPermittedAuthorityRegistry;
import org.apache.shardingsphere.authority.spi.AuthorityProviderAlgorithm;
@@ -27,21 +26,12 @@ import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
-import java.util.Properties;
/**
* All permitted privileges provider algorithm.
*/
-@Getter
public final class AllPermittedPrivilegesProviderAlgorithm implements AuthorityProviderAlgorithm {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public AuthorityRegistry buildAuthorityRegistry(final Map<String, ShardingSphereDatabase> databases, final Collection<ShardingSphereUser> users) {
return new AllPermittedAuthorityRegistry();
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/CRC32MatchDataConsistencyCalculateAlgorithm.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/CRC32MatchDataConsistencyCalculateAlgorithm.java
index d3546e086c6..42116c8f0f8 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/CRC32MatchDataConsistencyCalculateAlgorithm.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/CRC32MatchDataConsistencyCalculateAlgorithm.java
@@ -38,7 +38,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
-import java.util.Properties;
import java.util.stream.Collectors;
/**
@@ -50,14 +49,6 @@ public final class CRC32MatchDataConsistencyCalculateAlgorithm extends AbstractD
private static final Collection<String> SUPPORTED_DATABASE_TYPES = Collections.singletonList(new MySQLDatabaseType().getType());
- @Getter
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public Iterable<DataConsistencyCalculatedResult> calculate(final DataConsistencyCalculateParameter param) {
PipelineSQLBuilder sqlBuilder = TypedSPILoader.getService(PipelineSQLBuilder.class, param.getDatabaseType());
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/DataMatchDataConsistencyCalculateAlgorithm.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/DataMatchDataConsistencyCalculateAlgorithm.java
index f5d2f094355..4c40db804dd 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/DataMatchDataConsistencyCalculateAlgorithm.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/DataMatchDataConsistencyCalculateAlgorithm.java
@@ -66,9 +66,6 @@ public final class DataMatchDataConsistencyCalculateAlgorithm extends AbstractSt
private static final int DEFAULT_CHUNK_SIZE = 1000;
- @Getter
- private Properties props;
-
private int chunkSize;
private final Map<String, String> firstSQLCache = new ConcurrentHashMap<>();
@@ -77,7 +74,6 @@ public final class DataMatchDataConsistencyCalculateAlgorithm extends AbstractSt
@Override
public void init(final Properties props) {
- this.props = props;
chunkSize = getChunkSize(props);
}
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/process/PipelineProcessConfigurationUtil.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/process/PipelineProcessConfigurationUtil.java
index 92ec715e11a..d4ea97ffdab 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/process/PipelineProcessConfigurationUtil.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/config/process/PipelineProcessConfigurationUtil.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.data.pipeline.core.config.process;
import org.apache.shardingsphere.data.pipeline.api.config.process.PipelineProcessConfiguration;
-import org.apache.shardingsphere.data.pipeline.core.ingest.channel.memory.MemoryPipelineChannelCreator;
import org.apache.shardingsphere.data.pipeline.yaml.process.YamlPipelineProcessConfiguration;
import org.apache.shardingsphere.data.pipeline.yaml.process.YamlPipelineProcessConfigurationSwapper;
import org.apache.shardingsphere.data.pipeline.yaml.process.YamlPipelineReadConfiguration;
@@ -64,8 +63,8 @@ public final class PipelineProcessConfigurationUtil {
}
if (null == yamlConfig.getStreamChannel()) {
Properties props = new Properties();
- props.put(MemoryPipelineChannelCreator.BLOCK_QUEUE_SIZE_KEY, MemoryPipelineChannelCreator.BLOCK_QUEUE_SIZE_DEFAULT_VALUE);
- yamlConfig.setStreamChannel(new YamlAlgorithmConfiguration(MemoryPipelineChannelCreator.TYPE, props));
+ props.setProperty("block-queue-size", "10000");
+ yamlConfig.setStreamChannel(new YamlAlgorithmConfiguration("MEMORY", props));
}
}
}
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/channel/memory/MemoryPipelineChannelCreator.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/channel/memory/MemoryPipelineChannelCreator.java
index 650ee113813..ede119b8d74 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/channel/memory/MemoryPipelineChannelCreator.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/channel/memory/MemoryPipelineChannelCreator.java
@@ -17,8 +17,6 @@
package org.apache.shardingsphere.data.pipeline.core.ingest.channel.memory;
-import com.google.common.base.Strings;
-import lombok.Getter;
import org.apache.shardingsphere.data.pipeline.api.ingest.channel.AckCallback;
import org.apache.shardingsphere.data.pipeline.api.ingest.channel.PipelineChannel;
import org.apache.shardingsphere.data.pipeline.spi.ingest.channel.PipelineChannelCreator;
@@ -30,24 +28,15 @@ import java.util.Properties;
*/
public final class MemoryPipelineChannelCreator implements PipelineChannelCreator {
- public static final String TYPE = "MEMORY";
+ private static final String BLOCK_QUEUE_SIZE_KEY = "block-queue-size";
- public static final int BLOCK_QUEUE_SIZE_DEFAULT_VALUE = 10000;
+ private static final String BLOCK_QUEUE_SIZE_DEFAULT_VALUE = "10000";
- public static final String BLOCK_QUEUE_SIZE_KEY = "block-queue-size";
-
- @Getter
- private Properties props;
-
- private int blockQueueSize = BLOCK_QUEUE_SIZE_DEFAULT_VALUE;
+ private int blockQueueSize;
@Override
public void init(final Properties props) {
- this.props = props;
- String blockQueueSizeValue = props.getProperty(BLOCK_QUEUE_SIZE_KEY);
- if (!Strings.isNullOrEmpty(blockQueueSizeValue)) {
- blockQueueSize = Integer.parseInt(blockQueueSizeValue);
- }
+ blockQueueSize = Integer.parseInt(props.getProperty(BLOCK_QUEUE_SIZE_KEY, BLOCK_QUEUE_SIZE_DEFAULT_VALUE));
}
@Override
@@ -57,6 +46,6 @@ public final class MemoryPipelineChannelCreator implements PipelineChannelCreato
@Override
public String getType() {
- return TYPE;
+ return "MEMORY";
}
}
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ratelimit/QPSJobRateLimitAlgorithm.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ratelimit/QPSJobRateLimitAlgorithm.java
index 8aad098b1c4..0565340017c 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ratelimit/QPSJobRateLimitAlgorithm.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ratelimit/QPSJobRateLimitAlgorithm.java
@@ -19,7 +19,6 @@ package org.apache.shardingsphere.data.pipeline.core.ratelimit;
import com.google.common.base.Strings;
import com.google.common.util.concurrent.RateLimiter;
-import lombok.Getter;
import org.apache.shardingsphere.data.pipeline.api.job.JobOperationType;
import org.apache.shardingsphere.data.pipeline.spi.ratelimit.JobRateLimitAlgorithm;
@@ -36,7 +35,6 @@ public final class QPSJobRateLimitAlgorithm implements JobRateLimitAlgorithm {
private RateLimiter rateLimiter;
- @Getter
private Properties props = new Properties();
@Override
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ratelimit/TPSJobRateLimitAlgorithm.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ratelimit/TPSJobRateLimitAlgorithm.java
index 4a5cb6b426c..a95392df08d 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ratelimit/TPSJobRateLimitAlgorithm.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ratelimit/TPSJobRateLimitAlgorithm.java
@@ -19,7 +19,6 @@ package org.apache.shardingsphere.data.pipeline.core.ratelimit;
import com.google.common.base.Strings;
import com.google.common.util.concurrent.RateLimiter;
-import lombok.Getter;
import org.apache.shardingsphere.data.pipeline.api.job.JobOperationType;
import org.apache.shardingsphere.data.pipeline.spi.ratelimit.JobRateLimitAlgorithm;
@@ -36,7 +35,6 @@ public final class TPSJobRateLimitAlgorithm implements JobRateLimitAlgorithm {
private RateLimiter rateLimiter;
- @Getter
private Properties props = new Properties();
@Override
diff --git a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/ingest/channel/memory/MemoryPipelineChannelCreatorTest.java b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/ingest/channel/memory/MemoryPipelineChannelCreatorTest.java
index 60ee0874122..0527e693cca 100644
--- a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/ingest/channel/memory/MemoryPipelineChannelCreatorTest.java
+++ b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/ingest/channel/memory/MemoryPipelineChannelCreatorTest.java
@@ -19,13 +19,12 @@ package org.apache.shardingsphere.data.pipeline.core.ingest.channel.memory;
import org.apache.shardingsphere.data.pipeline.api.ingest.channel.AckCallback;
import org.apache.shardingsphere.data.pipeline.spi.ingest.channel.PipelineChannelCreator;
+import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.test.util.PropertiesBuilder;
import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;
import org.junit.Test;
import org.mockito.internal.configuration.plugins.Plugins;
-import java.util.Properties;
-
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -35,25 +34,23 @@ public final class MemoryPipelineChannelCreatorTest {
@Test
public void assertInitWithBlockQueueSize() throws Exception {
- PipelineChannelCreator creator = new MemoryPipelineChannelCreator();
- creator.init(PropertiesBuilder.build(new Property("block-queue-size", "200")));
+ PipelineChannelCreator creator = TypedSPILoader.getService(PipelineChannelCreator.class, "MEMORY", PropertiesBuilder.build(new Property("block-queue-size", "200")));
assertThat(Plugins.getMemberAccessor().get(MemoryPipelineChannelCreator.class.getDeclaredField("blockQueueSize"), creator), is(200));
}
@Test
public void assertInitWithoutBlockQueueSize() throws Exception {
- PipelineChannelCreator creator = new MemoryPipelineChannelCreator();
- creator.init(new Properties());
+ PipelineChannelCreator creator = TypedSPILoader.getService(PipelineChannelCreator.class, "MEMORY");
assertThat(Plugins.getMemberAccessor().get(MemoryPipelineChannelCreator.class.getDeclaredField("blockQueueSize"), creator), is(10000));
}
@Test
public void assertCreateSimpleMemoryPipelineChannel() {
- assertThat(new MemoryPipelineChannelCreator().createPipelineChannel(1, mock(AckCallback.class)), instanceOf(SimpleMemoryPipelineChannel.class));
+ assertThat(TypedSPILoader.getService(PipelineChannelCreator.class, "MEMORY").createPipelineChannel(1, mock(AckCallback.class)), instanceOf(SimpleMemoryPipelineChannel.class));
}
@Test
public void assertCreateMultiplexMemoryPipelineChannel() {
- assertThat(new MemoryPipelineChannelCreator().createPipelineChannel(2, mock(AckCallback.class)), instanceOf(MultiplexMemoryPipelineChannel.class));
+ assertThat(TypedSPILoader.getService(PipelineChannelCreator.class, "MEMORY").createPipelineChannel(2, mock(AckCallback.class)), instanceOf(MultiplexMemoryPipelineChannel.class));
}
}
diff --git a/kernel/data-pipeline/distsql/handler/src/test/java/org/apache/shardingsphere/data/pipeline/spi/ratelimit/InputJobRateLimitAlgorithmFixture.java b/kernel/data-pipeline/distsql/handler/src/test/java/org/apache/shardingsphere/data/pipeline/spi/ratelimit/InputJobRateLimitAlgorithmFixture.java
index aa738deb5a9..378386d7408 100644
--- a/kernel/data-pipeline/distsql/handler/src/test/java/org/apache/shardingsphere/data/pipeline/spi/ratelimit/InputJobRateLimitAlgorithmFixture.java
+++ b/kernel/data-pipeline/distsql/handler/src/test/java/org/apache/shardingsphere/data/pipeline/spi/ratelimit/InputJobRateLimitAlgorithmFixture.java
@@ -17,21 +17,10 @@
package org.apache.shardingsphere.data.pipeline.spi.ratelimit;
-import lombok.Getter;
import org.apache.shardingsphere.data.pipeline.api.job.JobOperationType;
-import java.util.Properties;
-
-@Getter
public final class InputJobRateLimitAlgorithmFixture implements JobRateLimitAlgorithm {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public String getType() {
return "FIXTURE_INPUT";
diff --git a/kernel/data-pipeline/distsql/handler/src/test/java/org/apache/shardingsphere/data/pipeline/spi/ratelimit/OutputJobRateLimitAlgorithmFixture.java b/kernel/data-pipeline/distsql/handler/src/test/java/org/apache/shardingsphere/data/pipeline/spi/ratelimit/OutputJobRateLimitAlgorithmFixture.java
index 518efcf56c4..3d292996adc 100644
--- a/kernel/data-pipeline/distsql/handler/src/test/java/org/apache/shardingsphere/data/pipeline/spi/ratelimit/OutputJobRateLimitAlgorithmFixture.java
+++ b/kernel/data-pipeline/distsql/handler/src/test/java/org/apache/shardingsphere/data/pipeline/spi/ratelimit/OutputJobRateLimitAlgorithmFixture.java
@@ -17,21 +17,10 @@
package org.apache.shardingsphere.data.pipeline.spi.ratelimit;
-import lombok.Getter;
import org.apache.shardingsphere.data.pipeline.api.job.JobOperationType;
-import java.util.Properties;
-
-@Getter
public final class OutputJobRateLimitAlgorithmFixture implements JobRateLimitAlgorithm {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public String getType() {
return "FIXTURE_OUTPUT";
diff --git a/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/loadbalance/RandomTrafficLoadBalanceAlgorithm.java b/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/loadbalance/RandomTrafficLoadBalanceAlgorithm.java
index 8f883c0c9dd..2e9b2d1e7e8 100644
--- a/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/loadbalance/RandomTrafficLoadBalanceAlgorithm.java
+++ b/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/loadbalance/RandomTrafficLoadBalanceAlgorithm.java
@@ -17,27 +17,17 @@
package org.apache.shardingsphere.traffic.algorithm.loadbalance;
-import lombok.Getter;
import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;
import org.apache.shardingsphere.traffic.spi.TrafficLoadBalanceAlgorithm;
import java.util.List;
-import java.util.Properties;
import java.util.concurrent.ThreadLocalRandom;
/**
* Random traffic load balance algorithm.
*/
-@Getter
public final class RandomTrafficLoadBalanceAlgorithm implements TrafficLoadBalanceAlgorithm {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public InstanceMetaData getInstanceId(final String name, final List<InstanceMetaData> instances) {
return instances.get(ThreadLocalRandom.current().nextInt(instances.size()));
diff --git a/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/loadbalance/RoundRobinTrafficLoadBalanceAlgorithm.java b/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/loadbalance/RoundRobinTrafficLoadBalanceAlgorithm.java
index 7ba02aada6b..f216aad5857 100644
--- a/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/loadbalance/RoundRobinTrafficLoadBalanceAlgorithm.java
+++ b/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/loadbalance/RoundRobinTrafficLoadBalanceAlgorithm.java
@@ -17,12 +17,10 @@
package org.apache.shardingsphere.traffic.algorithm.loadbalance;
-import lombok.Getter;
import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;
import org.apache.shardingsphere.traffic.spi.TrafficLoadBalanceAlgorithm;
import java.util.List;
-import java.util.Properties;
import java.util.concurrent.atomic.AtomicInteger;
/**
@@ -32,14 +30,6 @@ public final class RoundRobinTrafficLoadBalanceAlgorithm implements TrafficLoadB
private final AtomicInteger count = new AtomicInteger(0);
- @Getter
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public InstanceMetaData getInstanceId(final String name, final List<InstanceMetaData> instances) {
return instances.get(Math.abs(count.getAndIncrement()) % instances.size());
diff --git a/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/traffic/hint/SQLHintTrafficAlgorithm.java b/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/traffic/hint/SQLHintTrafficAlgorithm.java
index 231c59279b6..820d32d1e79 100644
--- a/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/traffic/hint/SQLHintTrafficAlgorithm.java
+++ b/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/traffic/hint/SQLHintTrafficAlgorithm.java
@@ -17,25 +17,14 @@
package org.apache.shardingsphere.traffic.algorithm.traffic.hint;
-import lombok.Getter;
import org.apache.shardingsphere.traffic.api.traffic.hint.HintTrafficAlgorithm;
import org.apache.shardingsphere.traffic.api.traffic.hint.HintTrafficValue;
-import java.util.Properties;
-
/**
* Simple hint traffic algorithm.
*/
-@Getter
public final class SQLHintTrafficAlgorithm implements HintTrafficAlgorithm {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public boolean match(final HintTrafficValue hintTrafficValue) {
return hintTrafficValue.getHintValueContext().isUseTraffic();
diff --git a/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/traffic/segment/SQLMatchTrafficAlgorithm.java b/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/traffic/segment/SQLMatchTrafficAlgorithm.java
index 576e43e0bba..2902078bcb1 100644
--- a/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/traffic/segment/SQLMatchTrafficAlgorithm.java
+++ b/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/traffic/segment/SQLMatchTrafficAlgorithm.java
@@ -20,7 +20,6 @@ package org.apache.shardingsphere.traffic.algorithm.traffic.segment;
import com.google.common.base.CharMatcher;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
-import lombok.Getter;
import org.apache.shardingsphere.sql.parser.sql.common.util.SQLUtil;
import org.apache.shardingsphere.traffic.api.traffic.segment.SegmentTrafficAlgorithm;
import org.apache.shardingsphere.traffic.api.traffic.segment.SegmentTrafficValue;
@@ -38,14 +37,10 @@ public final class SQLMatchTrafficAlgorithm implements SegmentTrafficAlgorithm {
private static final String EXCLUDED_CHARACTERS = "[]`'\" ";
- @Getter
- private Properties props;
-
private Collection<String> sql;
@Override
public void init(final Properties props) {
- this.props = props;
Preconditions.checkArgument(props.containsKey(SQL_PROPS_KEY), "%s cannot be null.", SQL_PROPS_KEY);
sql = getExactlySQL(props.getProperty(SQL_PROPS_KEY));
}
diff --git a/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/traffic/segment/SQLRegexTrafficAlgorithm.java b/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/traffic/segment/SQLRegexTrafficAlgorithm.java
index 52b5ccf608d..1543c05d17e 100644
--- a/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/traffic/segment/SQLRegexTrafficAlgorithm.java
+++ b/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/traffic/segment/SQLRegexTrafficAlgorithm.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.traffic.algorithm.traffic.segment;
import com.google.common.base.Preconditions;
-import lombok.Getter;
import org.apache.shardingsphere.traffic.api.traffic.segment.SegmentTrafficAlgorithm;
import org.apache.shardingsphere.traffic.api.traffic.segment.SegmentTrafficValue;
@@ -32,14 +31,10 @@ public final class SQLRegexTrafficAlgorithm implements SegmentTrafficAlgorithm {
private static final String REGEX_PROPS_KEY = "regex";
- @Getter
- private Properties props;
-
private Pattern regex;
@Override
public void init(final Properties props) {
- this.props = props;
Preconditions.checkArgument(props.containsKey(REGEX_PROPS_KEY), "%s can not be null.", REGEX_PROPS_KEY);
regex = Pattern.compile(props.getProperty(REGEX_PROPS_KEY));
}
diff --git a/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/traffic/transaction/FirstSQLTrafficAlgorithm.java b/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/traffic/transaction/FirstSQLTrafficAlgorithm.java
index a7cc1f2b7fe..99f1108b08a 100644
--- a/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/traffic/transaction/FirstSQLTrafficAlgorithm.java
+++ b/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/traffic/transaction/FirstSQLTrafficAlgorithm.java
@@ -17,26 +17,15 @@
package org.apache.shardingsphere.traffic.algorithm.traffic.transaction;
-import lombok.Getter;
import org.apache.shardingsphere.traffic.api.traffic.identifier.SimplifiedTrafficAlgorithm;
import org.apache.shardingsphere.traffic.api.traffic.transaction.TransactionTrafficAlgorithm;
import org.apache.shardingsphere.traffic.api.traffic.transaction.TransactionTrafficValue;
-import java.util.Properties;
-
/**
* First SQL traffic algorithm.
*/
-@Getter
public final class FirstSQLTrafficAlgorithm implements TransactionTrafficAlgorithm, SimplifiedTrafficAlgorithm {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public boolean match(final TransactionTrafficValue transactionTrafficValue) {
return false;
diff --git a/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/traffic/transaction/JDBCTrafficAlgorithm.java b/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/traffic/transaction/JDBCTrafficAlgorithm.java
index 782673be32f..9aa4000a42a 100644
--- a/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/traffic/transaction/JDBCTrafficAlgorithm.java
+++ b/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/traffic/transaction/JDBCTrafficAlgorithm.java
@@ -17,26 +17,15 @@
package org.apache.shardingsphere.traffic.algorithm.traffic.transaction;
-import lombok.Getter;
import org.apache.shardingsphere.traffic.api.traffic.identifier.SimplifiedTrafficAlgorithm;
import org.apache.shardingsphere.traffic.api.traffic.transaction.TransactionTrafficAlgorithm;
import org.apache.shardingsphere.traffic.api.traffic.transaction.TransactionTrafficValue;
-import java.util.Properties;
-
/**
* JDBC traffic algorithm.
*/
-@Getter
public final class JDBCTrafficAlgorithm implements TransactionTrafficAlgorithm, SimplifiedTrafficAlgorithm {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public boolean match(final TransactionTrafficValue transactionTrafficValue) {
return transactionTrafficValue.isInTransaction();
diff --git a/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/traffic/transaction/ProxyTrafficAlgorithm.java b/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/traffic/transaction/ProxyTrafficAlgorithm.java
index cf134dc491b..e826970c138 100644
--- a/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/traffic/transaction/ProxyTrafficAlgorithm.java
+++ b/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/traffic/transaction/ProxyTrafficAlgorithm.java
@@ -17,25 +17,14 @@
package org.apache.shardingsphere.traffic.algorithm.traffic.transaction;
-import lombok.Getter;
import org.apache.shardingsphere.traffic.api.traffic.transaction.TransactionTrafficAlgorithm;
import org.apache.shardingsphere.traffic.api.traffic.transaction.TransactionTrafficValue;
-import java.util.Properties;
-
/**
* Proxy traffic algorithm.
*/
-@Getter
public final class ProxyTrafficAlgorithm implements TransactionTrafficAlgorithm {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public boolean match(final TransactionTrafficValue transactionTrafficValue) {
return transactionTrafficValue.isInTransaction();
diff --git a/kernel/traffic/distsql/handler/src/test/java/org/apache/shardingsphere/traffic/distsql/handler/fixture/DistSQLTrafficAlgorithmFixture.java b/kernel/traffic/distsql/handler/src/test/java/org/apache/shardingsphere/traffic/distsql/handler/fixture/DistSQLTrafficAlgorithmFixture.java
index 55e90ea97a7..21baed65cda 100644
--- a/kernel/traffic/distsql/handler/src/test/java/org/apache/shardingsphere/traffic/distsql/handler/fixture/DistSQLTrafficAlgorithmFixture.java
+++ b/kernel/traffic/distsql/handler/src/test/java/org/apache/shardingsphere/traffic/distsql/handler/fixture/DistSQLTrafficAlgorithmFixture.java
@@ -17,21 +17,10 @@
package org.apache.shardingsphere.traffic.distsql.handler.fixture;
-import lombok.Getter;
import org.apache.shardingsphere.traffic.spi.TrafficAlgorithm;
-import java.util.Properties;
-
-@Getter
public final class DistSQLTrafficAlgorithmFixture implements TrafficAlgorithm {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public String getType() {
return "DISTSQL.FIXTURE";
diff --git a/kernel/traffic/distsql/handler/src/test/java/org/apache/shardingsphere/traffic/distsql/handler/fixture/DistSQLTrafficLoadBalanceAlgorithmFixture.java b/kernel/traffic/distsql/handler/src/test/java/org/apache/shardingsphere/traffic/distsql/handler/fixture/DistSQLTrafficLoadBalanceAlgorithmFixture.java
index 48132ff23bb..35e498742a0 100644
--- a/kernel/traffic/distsql/handler/src/test/java/org/apache/shardingsphere/traffic/distsql/handler/fixture/DistSQLTrafficLoadBalanceAlgorithmFixture.java
+++ b/kernel/traffic/distsql/handler/src/test/java/org/apache/shardingsphere/traffic/distsql/handler/fixture/DistSQLTrafficLoadBalanceAlgorithmFixture.java
@@ -17,23 +17,13 @@
package org.apache.shardingsphere.traffic.distsql.handler.fixture;
-import lombok.Getter;
import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;
import org.apache.shardingsphere.traffic.spi.TrafficLoadBalanceAlgorithm;
import java.util.List;
-import java.util.Properties;
-@Getter
public final class DistSQLTrafficLoadBalanceAlgorithmFixture implements TrafficLoadBalanceAlgorithm {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public String getType() {
return "DISTSQL.FIXTURE";
diff --git a/test/e2e/agent/pom.xml b/test/e2e/agent/pom.xml
index 5889108b996..2bee1753f4e 100644
--- a/test/e2e/agent/pom.xml
+++ b/test/e2e/agent/pom.xml
@@ -32,6 +32,11 @@
<module>plugins</module>
</modules>
+ <properties>
+ <maven.deploy.skip>true</maven.deploy.skip>
+ <docker.distribution.name>apache-shardingsphere-${project.version}-shardingsphere-proxy-bin</docker.distribution.name>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.awaitility</groupId>
@@ -39,11 +44,6 @@
</dependency>
</dependencies>
- <properties>
- <maven.deploy.skip>true</maven.deploy.skip>
- <docker.distribution.name>apache-shardingsphere-${project.version}-shardingsphere-proxy-bin</docker.distribution.name>
- </properties>
-
<build>
<plugins>
<plugin>
diff --git a/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/algorithm/keygen/DriverKeyGenerateAlgorithmFixture.java b/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/algorithm/keygen/DriverKeyGenerateAlgorithmFixture.java
index d62861e24b0..a6f8193f739 100644
--- a/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/algorithm/keygen/DriverKeyGenerateAlgorithmFixture.java
+++ b/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/algorithm/keygen/DriverKeyGenerateAlgorithmFixture.java
@@ -17,24 +17,14 @@
package org.apache.shardingsphere.test.e2e.driver.fixture.algorithm.keygen;
-import lombok.Getter;
import org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm;
-import java.util.Properties;
import java.util.concurrent.atomic.AtomicInteger;
-@Getter
public final class DriverKeyGenerateAlgorithmFixture implements KeyGenerateAlgorithm {
private static final AtomicInteger SEQUENCE = new AtomicInteger(100);
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public Comparable<?> generateKey() {
return SEQUENCE.incrementAndGet();
diff --git a/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/algorithm/sharding/DriverComplexKeysShardingAlgorithmFixture.java b/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/algorithm/sharding/DriverComplexKeysShardingAlgorithmFixture.java
index fcc2871c4bf..fe82247c3a5 100644
--- a/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/algorithm/sharding/DriverComplexKeysShardingAlgorithmFixture.java
+++ b/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/algorithm/sharding/DriverComplexKeysShardingAlgorithmFixture.java
@@ -17,24 +17,14 @@
package org.apache.shardingsphere.test.e2e.driver.fixture.algorithm.sharding;
-import lombok.Getter;
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.Collections;
-import java.util.Properties;
-@Getter
public final class DriverComplexKeysShardingAlgorithmFixture implements ComplexKeysShardingAlgorithm<String> {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public Collection<String> doSharding(final Collection<String> availableTargetNames, final ComplexKeysShardingValue<String> shardingValue) {
return Collections.emptyList();
diff --git a/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/algorithm/sharding/DriverStandardShardingAlgorithmFixture.java b/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/algorithm/sharding/DriverStandardShardingAlgorithmFixture.java
index 3d8427b816c..5a561d85daf 100644
--- a/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/algorithm/sharding/DriverStandardShardingAlgorithmFixture.java
+++ b/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/algorithm/sharding/DriverStandardShardingAlgorithmFixture.java
@@ -17,24 +17,14 @@
package org.apache.shardingsphere.test.e2e.driver.fixture.algorithm.sharding;
-import lombok.Getter;
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
public final class DriverStandardShardingAlgorithmFixture implements StandardShardingAlgorithm<Integer> {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public String doSharding(final Collection<String> availableTargetNames, final PreciseShardingValue<Integer> shardingValue) {
for (String each : availableTargetNames) {
diff --git a/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITAutoIncrementKeyGenerateAlgorithmFixture.java b/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITAutoIncrementKeyGenerateAlgorithmFixture.java
index 717fa42518c..97ceb6fe977 100644
--- a/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITAutoIncrementKeyGenerateAlgorithmFixture.java
+++ b/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITAutoIncrementKeyGenerateAlgorithmFixture.java
@@ -17,24 +17,14 @@
package org.apache.shardingsphere.test.e2e.fixture;
-import lombok.Getter;
import org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm;
-import java.util.Properties;
import java.util.concurrent.atomic.AtomicLong;
-@Getter
public final class ITAutoIncrementKeyGenerateAlgorithmFixture implements KeyGenerateAlgorithm {
private final AtomicLong idGenerator = new AtomicLong(1L);
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public Long generateKey() {
return idGenerator.getAndIncrement();
diff --git a/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITKeyGenerateAlgorithmFixture.java b/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITKeyGenerateAlgorithmFixture.java
index 51eb7097d00..42c756895e6 100644
--- a/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITKeyGenerateAlgorithmFixture.java
+++ b/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITKeyGenerateAlgorithmFixture.java
@@ -17,21 +17,10 @@
package org.apache.shardingsphere.test.e2e.fixture;
-import lombok.Getter;
import org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm;
-import java.util.Properties;
-
-@Getter
public final class ITKeyGenerateAlgorithmFixture implements KeyGenerateAlgorithm {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public Long generateKey() {
return 1L;
diff --git a/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITShardingAuditAlgorithmFixture.java b/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITShardingAuditAlgorithmFixture.java
index 4f9983edf4f..6d0ec55e0df 100644
--- a/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITShardingAuditAlgorithmFixture.java
+++ b/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITShardingAuditAlgorithmFixture.java
@@ -24,24 +24,14 @@ import org.apache.shardingsphere.infra.metadata.user.Grantee;
import org.apache.shardingsphere.sharding.spi.ShardingAuditAlgorithm;
import java.util.List;
-import java.util.Properties;
public final class ITShardingAuditAlgorithmFixture implements ShardingAuditAlgorithm {
- @Override
- public void init(final Properties props) {
- }
-
@Override
public void check(final SQLStatementContext<?> sqlStatementContext, final List<Object> params,
final Grantee grantee, final ShardingSphereRuleMetaData globalRuleMetaData, final ShardingSphereDatabase database) {
}
- @Override
- public Properties getProps() {
- return new Properties();
- }
-
@Override
public String getType() {
return "IT.AUDITOR.FIXTURE";
diff --git a/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITStandardShardingAlgorithmFixture.java b/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITStandardShardingAlgorithmFixture.java
index f9dd096cda3..7cbf60a1a2c 100644
--- a/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITStandardShardingAlgorithmFixture.java
+++ b/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITStandardShardingAlgorithmFixture.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.test.e2e.fixture;
-import lombok.Getter;
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;
@@ -25,18 +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
public final class ITStandardShardingAlgorithmFixture implements StandardShardingAlgorithm<Integer> {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public String doSharding(final Collection<String> availableTargetNames, final PreciseShardingValue<Integer> shardingValue) {
for (String each : availableTargetNames) {
diff --git a/test/e2e/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/util/AutoIncrementKeyGenerateAlgorithm.java b/test/e2e/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/util/AutoIncrementKeyGenerateAlgorithm.java
index b61dca3d3b2..bf9dbc5bbd6 100644
--- a/test/e2e/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/util/AutoIncrementKeyGenerateAlgorithm.java
+++ b/test/e2e/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/util/AutoIncrementKeyGenerateAlgorithm.java
@@ -19,7 +19,6 @@ package org.apache.shardingsphere.test.e2e.data.pipeline.util;
import org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm;
-import java.util.Properties;
import java.util.concurrent.atomic.AtomicInteger;
public final class AutoIncrementKeyGenerateAlgorithm implements KeyGenerateAlgorithm {
@@ -31,15 +30,6 @@ public final class AutoIncrementKeyGenerateAlgorithm implements KeyGenerateAlgor
return idGen.getAndIncrement();
}
- @Override
- public Properties getProps() {
- return null;
- }
-
- @Override
- public void init(final Properties props) {
- }
-
@Override
public boolean isSupportAutoIncrement() {
return true;
diff --git a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/api/impl/PipelineProcessConfigurationPersistServiceTest.java b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/api/impl/PipelineProcessConfigurationPersistServiceTest.java
index 920f2c6eb1b..3598f6834df 100644
--- a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/api/impl/PipelineProcessConfigurationPersistServiceTest.java
+++ b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/api/impl/PipelineProcessConfigurationPersistServiceTest.java
@@ -19,8 +19,6 @@ package org.apache.shardingsphere.test.it.data.pipeline.core.api.impl;
import org.apache.shardingsphere.data.pipeline.api.config.process.PipelineProcessConfiguration;
import org.apache.shardingsphere.data.pipeline.core.api.impl.PipelineProcessConfigurationPersistService;
-import org.apache.shardingsphere.data.pipeline.core.ingest.channel.memory.MemoryPipelineChannelCreator;
-import org.apache.shardingsphere.test.it.data.pipeline.core.util.PipelineContextUtil;
import org.apache.shardingsphere.data.pipeline.scenario.migration.MigrationJobType;
import org.apache.shardingsphere.data.pipeline.spi.job.JobType;
import org.apache.shardingsphere.data.pipeline.yaml.process.YamlPipelineProcessConfiguration;
@@ -29,6 +27,7 @@ import org.apache.shardingsphere.data.pipeline.yaml.process.YamlPipelineReadConf
import org.apache.shardingsphere.data.pipeline.yaml.process.YamlPipelineWriteConfiguration;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
+import org.apache.shardingsphere.test.it.data.pipeline.core.util.PipelineContextUtil;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -53,7 +52,7 @@ public final class PipelineProcessConfigurationPersistServiceTest {
yamlProcessConfig.setRead(yamlReadConfig);
YamlPipelineWriteConfiguration yamlWriteConfig = YamlPipelineWriteConfiguration.buildWithDefaultValue();
yamlProcessConfig.setWrite(yamlWriteConfig);
- YamlAlgorithmConfiguration yamlStreamChannel = new YamlAlgorithmConfiguration(MemoryPipelineChannelCreator.TYPE, new Properties());
+ YamlAlgorithmConfiguration yamlStreamChannel = new YamlAlgorithmConfiguration("MEMORY", new Properties());
yamlProcessConfig.setStreamChannel(yamlStreamChannel);
String expectedYamlText = YamlEngine.marshal(yamlProcessConfig);
PipelineProcessConfiguration processConfig = new YamlPipelineProcessConfigurationSwapper().swapToObject(yamlProcessConfig);
diff --git a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/DataConsistencyCalculateAlgorithmFixture.java b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/DataConsistencyCalculateAlgorithmFixture.java
index 50d4cefbd06..9415325951a 100644
--- a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/DataConsistencyCalculateAlgorithmFixture.java
+++ b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/DataConsistencyCalculateAlgorithmFixture.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.test.it.data.pipeline.core.fixture;
-import lombok.Getter;
import org.apache.shardingsphere.data.pipeline.api.check.consistency.DataConsistencyCalculateParameter;
import org.apache.shardingsphere.data.pipeline.api.check.consistency.DataConsistencyCalculatedResult;
import org.apache.shardingsphere.data.pipeline.spi.check.consistency.DataConsistencyCalculateAlgorithm;
@@ -27,20 +26,11 @@ import org.apache.shardingsphere.infra.util.spi.ShardingSphereServiceLoader;
import java.util.Collection;
import java.util.Collections;
-import java.util.Properties;
import java.util.stream.Collectors;
@AlgorithmDescription("Fixture description.")
-@Getter
public final class DataConsistencyCalculateAlgorithmFixture implements DataConsistencyCalculateAlgorithm {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public Iterable<DataConsistencyCalculatedResult> calculate(final DataConsistencyCalculateParameter param) {
return Collections.singletonList(new FixtureDataConsistencyCalculatedResult(2));
diff --git a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/task/InventoryTaskTest.java b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/task/InventoryTaskTest.java
index d801576cd9b..e3ffd00534b 100644
--- a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/task/InventoryTaskTest.java
+++ b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/task/InventoryTaskTest.java
@@ -78,7 +78,7 @@ public final class InventoryTaskTest {
InventoryTask inventoryTask = new InventoryTask(inventoryDumperConfig, taskConfig.getImporterConfig(),
PipelineContextUtil.getPipelineChannelCreator(), new FixtureImporterConnector(), dataSource,
metaDataLoader, PipelineContextUtil.getExecuteEngine(), PipelineContextUtil.getExecuteEngine(), new FixtureInventoryIncrementalJobItemContext())) {
- CompletableFuture.allOf(inventoryTask.start().toArray(new CompletableFuture[0])).get(10, TimeUnit.SECONDS);
+ CompletableFuture.allOf(inventoryTask.start().toArray(new CompletableFuture[0])).get(10L, TimeUnit.SECONDS);
}
}
@@ -93,7 +93,7 @@ public final class InventoryTaskTest {
InventoryTask inventoryTask = new InventoryTask(inventoryDumperConfig, taskConfig.getImporterConfig(),
PipelineContextUtil.getPipelineChannelCreator(), new FixtureImporterConnector(), dataSource,
metaDataLoader, PipelineContextUtil.getExecuteEngine(), PipelineContextUtil.getExecuteEngine(), new FixtureInventoryIncrementalJobItemContext())) {
- CompletableFuture.allOf(inventoryTask.start().toArray(new CompletableFuture[0])).get(10, TimeUnit.SECONDS);
+ CompletableFuture.allOf(inventoryTask.start().toArray(new CompletableFuture[0])).get(10L, TimeUnit.SECONDS);
assertThat(inventoryTask.getTaskProgress().getPosition(), instanceOf(IntegerPrimaryKeyPosition.class));
}
}
diff --git a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtil.java b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtil.java
index ab3949cc386..92e3992e20e 100644
--- a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtil.java
+++ b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtil.java
@@ -26,7 +26,6 @@ import org.apache.shardingsphere.data.pipeline.core.context.PipelineContext;
import org.apache.shardingsphere.data.pipeline.core.datasource.DefaultPipelineDataSourceManager;
import org.apache.shardingsphere.data.pipeline.core.datasource.PipelineDataSourceFactory;
import org.apache.shardingsphere.data.pipeline.core.execute.ExecuteEngine;
-import org.apache.shardingsphere.data.pipeline.core.ingest.channel.memory.MemoryPipelineChannelCreator;
import org.apache.shardingsphere.data.pipeline.scenario.migration.api.impl.MigrationJobAPI;
import org.apache.shardingsphere.data.pipeline.scenario.migration.config.MigrationTaskConfiguration;
import org.apache.shardingsphere.data.pipeline.scenario.migration.context.MigrationJobItemContext;
@@ -60,7 +59,7 @@ public final class PipelineContextUtil {
private static final ExecuteEngine EXECUTE_ENGINE = ExecuteEngine.newCachedThreadInstance(PipelineContextUtil.class.getSimpleName());
- private static final PipelineChannelCreator PIPELINE_CHANNEL_CREATOR = new MemoryPipelineChannelCreator();
+ private static final PipelineChannelCreator PIPELINE_CHANNEL_CREATOR = TypedSPILoader.getService(PipelineChannelCreator.class, "MEMORY");
/**
* Mock mode configuration and context manager.
diff --git a/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/encrypt/RewriteNormalEncryptAlgorithmFixture.java b/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/encrypt/RewriteNormalEncryptAlgorithmFixture.java
index aefca7d25c2..833b09a0938 100644
--- a/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/encrypt/RewriteNormalEncryptAlgorithmFixture.java
+++ b/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/encrypt/RewriteNormalEncryptAlgorithmFixture.java
@@ -17,22 +17,11 @@
package org.apache.shardingsphere.test.it.rewrite.fixture.encrypt;
-import lombok.Getter;
import org.apache.shardingsphere.encrypt.api.encrypt.standard.StandardEncryptAlgorithm;
import org.apache.shardingsphere.encrypt.spi.context.EncryptContext;
-import java.util.Properties;
-
-@Getter
public final class RewriteNormalEncryptAlgorithmFixture implements StandardEncryptAlgorithm<Object, String> {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public String encrypt(final Object plainValue, final EncryptContext encryptContext) {
if (null == plainValue) {
diff --git a/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/encrypt/RewriteQueryAssistedEncryptAlgorithmFixture.java b/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/encrypt/RewriteQueryAssistedEncryptAlgorithmFixture.java
index d2c523ef763..0ab9f6c0435 100644
--- a/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/encrypt/RewriteQueryAssistedEncryptAlgorithmFixture.java
+++ b/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/encrypt/RewriteQueryAssistedEncryptAlgorithmFixture.java
@@ -17,22 +17,11 @@
package org.apache.shardingsphere.test.it.rewrite.fixture.encrypt;
-import lombok.Getter;
import org.apache.shardingsphere.encrypt.api.encrypt.standard.StandardEncryptAlgorithm;
import org.apache.shardingsphere.encrypt.spi.context.EncryptContext;
-import java.util.Properties;
-
-@Getter
public final class RewriteQueryAssistedEncryptAlgorithmFixture implements StandardEncryptAlgorithm<Object, String> {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public String encrypt(final Object plainValue, final EncryptContext encryptContext) {
if (null == plainValue) {
diff --git a/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/encrypt/RewriteQueryLikeEncryptAlgorithmFixture.java b/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/encrypt/RewriteQueryLikeEncryptAlgorithmFixture.java
index 615651f5744..69156eb79f8 100644
--- a/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/encrypt/RewriteQueryLikeEncryptAlgorithmFixture.java
+++ b/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/encrypt/RewriteQueryLikeEncryptAlgorithmFixture.java
@@ -17,28 +17,14 @@
package org.apache.shardingsphere.test.it.rewrite.fixture.encrypt;
-import lombok.Getter;
import org.apache.shardingsphere.encrypt.api.encrypt.like.LikeEncryptAlgorithm;
import org.apache.shardingsphere.encrypt.spi.context.EncryptContext;
-import java.util.Properties;
-
-@Getter
public final class RewriteQueryLikeEncryptAlgorithmFixture implements LikeEncryptAlgorithm<Object, String> {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public String encrypt(final Object plainValue, final EncryptContext encryptContext) {
- if (null == plainValue) {
- return null;
- }
- return "like_query_" + plainValue;
+ return null == plainValue ? null : "like_query_" + plainValue;
}
@Override
diff --git a/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/encrypt/RewriteSchemaMetaDataAwareEncryptAlgorithmFixture.java b/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/encrypt/RewriteSchemaMetaDataAwareEncryptAlgorithmFixture.java
index 8749b784e37..127d2730233 100644
--- a/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/encrypt/RewriteSchemaMetaDataAwareEncryptAlgorithmFixture.java
+++ b/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/encrypt/RewriteSchemaMetaDataAwareEncryptAlgorithmFixture.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.test.it.rewrite.fixture.encrypt;
-import lombok.Getter;
import lombok.Setter;
import org.apache.shardingsphere.encrypt.api.encrypt.standard.StandardEncryptAlgorithm;
import org.apache.shardingsphere.encrypt.spi.context.EncryptContext;
@@ -26,24 +25,15 @@ import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.
import org.apache.shardingsphere.infra.rewrite.sql.token.generator.aware.SchemaMetaDataAware;
import java.util.Map;
-import java.util.Properties;
public final class RewriteSchemaMetaDataAwareEncryptAlgorithmFixture implements StandardEncryptAlgorithm<Object, String>, SchemaMetaDataAware {
- @Getter
- private Properties props;
-
@Setter
private String databaseName;
@Setter
private Map<String, ShardingSphereSchema> schemas;
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public String encrypt(final Object plainValue, final EncryptContext encryptContext) {
if (null == plainValue) {
diff --git a/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/keygen/RewriteKeyGenerateAlgorithmFixture.java b/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/keygen/RewriteKeyGenerateAlgorithmFixture.java
index c7f482221c4..de7c6400802 100644
--- a/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/keygen/RewriteKeyGenerateAlgorithmFixture.java
+++ b/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/keygen/RewriteKeyGenerateAlgorithmFixture.java
@@ -17,21 +17,10 @@
package org.apache.shardingsphere.test.it.rewrite.fixture.keygen;
-import lombok.Getter;
import org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm;
-import java.util.Properties;
-
-@Getter
public final class RewriteKeyGenerateAlgorithmFixture implements KeyGenerateAlgorithm {
- private Properties props;
-
- @Override
- public void init(final Properties props) {
- this.props = props;
- }
-
@Override
public Long generateKey() {
return 1L;