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 2020/10/04 07:31:49 UTC
[shardingsphere] branch master updated: Rename configuration to
config for variable name (#7695)
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 f349cef Rename configuration to config for variable name (#7695)
f349cef is described below
commit f349cef933891b95ba134e877b2c50f303d987e7
Author: Liang Zhang <te...@163.com>
AuthorDate: Sun Oct 4 15:31:28 2020 +0800
Rename configuration to config for variable name (#7695)
---
.../raw/jdbc/JavaConfigurationExampleMain.java | 12 +--
.../config/cloud/CloudEncryptConfiguration.java | 8 +-
.../config/cloud/CloudShadowConfiguration.java | 8 +-
...oudShardingDatabasesAndTablesConfiguration.java | 8 +-
.../config/local/LocalEncryptConfiguration.java | 12 +--
.../config/local/LocalShadowConfiguration.java | 10 +--
...calShardingDatabasesAndTablesConfiguration.java | 8 +-
.../local/LocalShardingDatabasesConfiguration.java | 8 +-
.../local/LocalShardingTablesConfiguration.java | 8 +-
.../jdbc/config/EncryptDatabasesConfiguration.java | 12 +--
.../EncryptShadowDatabasesConfiguration.java | 8 +-
.../jdbc/config/ShadowDatabasesConfiguration.java | 6 +-
.../ShardingShadowDatabasesConfiguration.java | 14 ++--
.../rule/ConsensusReplicationTableRule.java | 10 +--
...ionActualTableRuleConfigurationYamlSwapper.java | 6 +-
...tionLogicTableRuleConfigurationYamlSwapper.java | 6 +-
...susReplicationRuleConfigurationYamlSwapper.java | 4 +-
.../rule/ConsensusReplicationRuleTest.java | 4 +-
...ctualTableRuleConfigurationYamlSwapperTest.java | 30 ++++----
...eplicationRuleConfigurationYamlSwapperTest.java | 48 ++++++------
.../shardingsphere/encrypt/rule/EncryptRule.java | 48 ++++++------
.../AlgorithmProvidedEncryptRuleBuilder.java | 4 +-
.../encrypt/rule/builder/EncryptRuleBuilder.java | 4 +-
...ryptColumnRuleConfigurationYamlSwapperTest.java | 22 +++---
.../PrimaryReplicaReplicationDataSourceRule.java | 8 +-
...ovidedPrimaryReplicaReplicationRuleBuilder.java | 4 +-
.../PrimaryReplicaReplicationRuleBuilder.java | 4 +-
...eAlgorithmProviderConfigurationYamlSwapper.java | 6 +-
...edPrimaryReplicaReplicationRuleBuilderTest.java | 13 ++--
.../PrimaryReplicaReplicationRuleBuilderTest.java | 6 +-
...orithmProviderConfigurationYamlSwapperTest.java | 16 ++--
...aryReplicaReplicationRuleConfigurationTest.java | 6 +-
.../shardingsphere/shadow/rule/ShadowRule.java | 10 +--
.../shadow/rule/builder/ShadowRuleBuilder.java | 4 +-
.../shardingsphere/shadow/rule/ShadowRuleTest.java | 3 +-
.../ShadowRuleConfigurationYamlSwapperTest.java | 4 +-
.../impl/PreparedShadowDataSourceRouterTest.java | 8 +-
.../impl/SimpleShadowDataSourceRouterTest.java | 3 +-
.../shardingsphere/sharding/rule/ShardingRule.java | 6 +-
.../shardingsphere/sharding/rule/TableRule.java | 16 ++--
.../AlgorithmProvidedShardingRuleBuilder.java | 4 +-
.../sharding/rule/builder/ShardingRuleBuilder.java | 4 +-
.../sharding/strategy/ShardingStrategyFactory.java | 8 +-
...eAlgorithmProviderConfigurationYamlSwapper.java | 32 ++++----
.../ShardingRuleConfigurationYamlSwapper.java | 38 +++++-----
.../ShardingStrategyConfigurationYamlSwapper.java | 12 +--
.../sharding/rule/ShardingRuleTest.java | 46 +++++------
.../sharding/rule/TableRuleTest.java | 6 +-
.../ShardingRuleConfigurationYamlSwapperTest.java | 44 +++++------
...ationsForYamlShardingRuleConfigurationTest.java | 20 ++---
...gAutoTableRuleConfigurationYamlSwapperTest.java | 8 +-
.../TableRuleConfigurationYamlSwapperTest.java | 32 ++++----
...nerateStrategyConfigurationYamlSwapperTest.java | 8 +-
...ardingStrategyConfigurationYamlSwapperTest.java | 22 +++---
.../spring/boot/ShardingSpringBootStarterTest.java | 88 +++++++++++-----------
.../namespace/ShardingSpringNamespaceTest.java | 16 ++--
.../route/time/impl/TimeServiceFactory.java | 4 +-
.../DataSourceConfigurationYamlSwapper.java | 6 +-
.../DataSourceConfigurationYamlSwapperTest.java | 18 ++---
...vernanceCenterConfigurationYamlSwapperTest.java | 10 +--
.../governance/core/config/ConfigCenter.java | 37 +++++----
.../governance/core/config/ConfigCenterTest.java | 22 +++---
.../config/listener/SchemaChangedListenerTest.java | 6 +-
.../core/facade/GovernanceFacadeTest.java | 10 +--
.../algorithm/ShardingSphereAlgorithmFactory.java | 6 +-
.../infra/rule/ShardingSphereRuleBuilder.java | 4 +-
.../yaml/swapper/ProxyUserYamlSwapperTest.java | 14 ++--
.../infra/config/DataSourceConfigurationTest.java | 18 ++---
.../infra/rule/ShardingSphereRulesBuilderTest.java | 4 +-
.../fixture/TestShardingSphereRuleBuilder.java | 2 +-
.../YamlRuleConfigurationSwapperEngineTest.java | 12 +--
...phereAlgorithmConfigurationYamlSwapperTest.java | 8 +-
.../infra/context/fixture/FixtureRuleBuilder.java | 2 +-
.../ShardingSphereDatabaseMetaDataTest.java | 4 +-
...ernanceShardingSphereDataSourceFactoryTest.java | 22 +++---
.../GovernanceSpringBootConfiguration.java | 21 +++---
.../GovernanceSpringBootRegistryEncryptTest.java | 10 +--
.../governance/GovernanceEncryptNamespaceTest.java | 20 ++---
.../AbstractAlgorithmProvidedBeanRegistry.java | 8 +-
.../config/util/DataSourceParameterConverter.java | 12 +--
.../proxy/config/ProxyConfigurationLoaderTest.java | 14 ++--
.../swapper/YamlProxyConfigurationSwapperTest.java | 12 +--
.../apache/shardingsphere/scaling/Bootstrap.java | 8 +-
.../scaling/web/HttpServerHandler.java | 6 +-
.../scaling/web/HttpServerHandlerTest.java | 6 +-
.../core/check/AbstractDataConsistencyChecker.java | 4 +-
.../core/config/DataSourceConfiguration.java | 1 +
.../scaling/core/config/ScalingContext.java | 10 +--
.../scaling/core/datasource/DataSourceFactory.java | 28 +++----
.../execute/executor/channel/MemoryChannel.java | 2 +-
.../executor/dumper/AbstractJDBCDumper.java | 6 +-
.../execute/executor/dumper/DumperFactory.java | 24 +++---
.../executor/importer/AbstractJDBCImporter.java | 24 +++---
...ractSqlBuilder.java => AbstractSQLBuilder.java} | 2 +-
.../execute/executor/importer/ImporterFactory.java | 12 +--
.../scaling/core/job/ShardingScalingJob.java | 8 +-
.../resume/RepositoryResumeBreakPointManager.java | 2 +-
.../job/preparer/ShardingScalingJobPreparer.java | 4 +-
.../job/preparer/resumer/SyncPositionResumer.java | 15 ++--
.../splitter/InventoryDataTaskSplitter.java | 52 ++++++-------
.../core/job/task/DefaultSyncTaskFactory.java | 8 +-
.../scaling/core/job/task/SyncTaskFactory.java | 12 +--
.../incremental/IncrementalDataScalingTask.java | 18 ++---
.../task/inventory/InventoryDataScalingTask.java | 34 ++++-----
.../core/utils/ConfigurationYamlConverter.java | 6 +-
.../scaling/core/utils/RdbmsConfigurationUtil.java | 6 +-
.../scaling/core/utils/SyncConfigurationUtil.java | 62 +++++++--------
.../scaling/core/ScalingJobControllerTest.java | 6 +-
.../check/AbstractDataConsistencyCheckerTest.java | 10 +--
.../config/JDBCDataSourceConfigurationTest.java | 18 ++---
.../scaling/core/config/RuleConfigurationTest.java | 14 ++--
.../ShardingSphereJDBCConfigurationTest.java | 4 +-
.../core/datasource/DataSourceFactoryTest.java | 11 ++-
.../core/datasource/DataSourceManagerTest.java | 4 +-
.../importer/AbstractJDBCImporterTest.java | 10 +--
.../executor/importer/AbstractSqlBuilderTest.java | 4 +-
.../fixture/FixtureDataConsistencyChecker.java | 6 +-
.../scaling/core/fixture/FixtureH2JDBCDumper.java | 4 +-
.../scaling/core/fixture/FixtureH2LogDumper.java | 2 +-
.../scaling/core/fixture/FixtureNopImporter.java | 2 +-
.../preparer/resumer/SyncPositionResumerTest.java | 4 +-
.../splitter/InventoryDataTaskSplitterTest.java | 24 +++---
.../IncrementalDataScalingTaskTest.java | 4 +-
.../inventory/InventoryDataScalingTaskTest.java | 30 ++++----
.../core/util/SyncConfigurationUtilTest.java | 8 +-
.../scaling/mysql/MySQLBinlogDumper.java | 16 ++--
.../scaling/mysql/MySQLDataConsistencyChecker.java | 4 +-
.../scaling/mysql/MySQLImporter.java | 10 +--
.../scaling/mysql/MySQLJdbcDumper.java | 8 +-
.../{MySQLSqlBuilder.java => MySQLSQLBuilder.java} | 6 +-
.../scaling/mysql/MySQLBinlogDumperTest.java | 6 +-
.../scaling/mysql/MySQLImporterTest.java | 6 +-
.../scaling/mysql/MySQLJdbcDumperTest.java | 6 +-
.../PostgreSQLDataConsistencyChecker.java | 6 +-
.../scaling/postgresql/PostgreSQLImporter.java | 10 +--
.../scaling/postgresql/PostgreSQLJdbcDumper.java | 8 +-
...QLSqlBuilder.java => PostgreSQLSQLBuilder.java} | 4 +-
.../scaling/postgresql/PostgreSQLWalDumper.java | 18 ++---
.../scaling/postgresql/wal/WalEventConverter.java | 14 ++--
.../scaling/postgresql/PostgreSQLImporterTest.java | 8 +-
.../postgresql/PostgreSQLJdbcDumperTest.java | 6 +-
.../postgresql/PostgreSQLSqlBuilderTest.java | 2 +-
.../postgresql/PostgreSQLWalDumperTest.java | 8 +-
.../postgresql/wal/WalEventConverterTest.java | 14 ++--
.../sql/parser/core/parser/SQLParserFactory.java | 6 +-
.../core/visitor/ParseTreeVisitorFactory.java | 4 +-
.../jta/datasource/swapper/DataSourceSwapper.java | 4 +-
.../at/SeataATShardingTransactionManager.java | 8 +-
148 files changed, 908 insertions(+), 918 deletions(-)
diff --git a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/JavaConfigurationExampleMain.java b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/JavaConfigurationExampleMain.java
index 655acce..79cb61b 100644
--- a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/JavaConfigurationExampleMain.java
+++ b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/JavaConfigurationExampleMain.java
@@ -67,25 +67,25 @@ public final class JavaConfigurationExampleMain {
private static DataSource getDataSource(final ShardingType shardingType, final boolean loadConfigFromRegCenter) throws SQLException {
GovernanceConfiguration governanceConfig = getGovernanceConfiguration(registryCenterType, shardingType);
- ExampleConfiguration configuration;
+ ExampleConfiguration config;
switch (shardingType) {
case SHARDING_DATABASES_AND_TABLES:
- configuration = loadConfigFromRegCenter
+ config = loadConfigFromRegCenter
? new CloudShardingDatabasesAndTablesConfiguration(governanceConfig) : new LocalShardingDatabasesAndTablesConfiguration(governanceConfig);
break;
case PRIMARY_REPLICA_REPLICATION:
- configuration = loadConfigFromRegCenter ? new CloudPrimaryReplicaReplicationConfiguration(governanceConfig) : new LocalPrimaryReplicaReplicationConfiguration(governanceConfig);
+ config = loadConfigFromRegCenter ? new CloudPrimaryReplicaReplicationConfiguration(governanceConfig) : new LocalPrimaryReplicaReplicationConfiguration(governanceConfig);
break;
case ENCRYPT:
- configuration = loadConfigFromRegCenter ? new CloudEncryptConfiguration(governanceConfig) : new LocalEncryptConfiguration(governanceConfig);
+ config = loadConfigFromRegCenter ? new CloudEncryptConfiguration(governanceConfig) : new LocalEncryptConfiguration(governanceConfig);
break;
case SHADOW:
- configuration = loadConfigFromRegCenter ? new CloudShadowConfiguration(governanceConfig) : new LocalShadowConfiguration(governanceConfig);
+ config = loadConfigFromRegCenter ? new CloudShadowConfiguration(governanceConfig) : new LocalShadowConfiguration(governanceConfig);
break;
default:
throw new UnsupportedOperationException(shardingType.name());
}
- return configuration.getDataSource();
+ return config.getDataSource();
}
private static GovernanceConfiguration getGovernanceConfiguration(final RegistryCenterType registryCenterType, final ShardingType shardingType) {
diff --git a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/cloud/CloudEncryptConfiguration.java b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/cloud/CloudEncryptConfiguration.java
index 123ceb2..88f5324 100644
--- a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/cloud/CloudEncryptConfiguration.java
+++ b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/cloud/CloudEncryptConfiguration.java
@@ -26,14 +26,14 @@ import java.sql.SQLException;
public class CloudEncryptConfiguration implements ExampleConfiguration {
- private final GovernanceConfiguration governanceConfiguration;
+ private final GovernanceConfiguration governanceConfig;
- public CloudEncryptConfiguration(final GovernanceConfiguration governanceConfiguration) {
- this.governanceConfiguration = governanceConfiguration;
+ public CloudEncryptConfiguration(final GovernanceConfiguration governanceConfig) {
+ this.governanceConfig = governanceConfig;
}
@Override
public DataSource getDataSource() throws SQLException {
- return GovernanceShardingSphereDataSourceFactory.createDataSource(governanceConfiguration);
+ return GovernanceShardingSphereDataSourceFactory.createDataSource(governanceConfig);
}
}
diff --git a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/cloud/CloudShadowConfiguration.java b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/cloud/CloudShadowConfiguration.java
index da80829..83c477d 100644
--- a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/cloud/CloudShadowConfiguration.java
+++ b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/cloud/CloudShadowConfiguration.java
@@ -26,14 +26,14 @@ import java.sql.SQLException;
public final class CloudShadowConfiguration implements ExampleConfiguration {
- private final GovernanceConfiguration governanceConfiguration;
+ private final GovernanceConfiguration governanceConfig;
- public CloudShadowConfiguration(final GovernanceConfiguration governanceConfiguration) {
- this.governanceConfiguration = governanceConfiguration;
+ public CloudShadowConfiguration(final GovernanceConfiguration governanceConfig) {
+ this.governanceConfig = governanceConfig;
}
@Override
public DataSource getDataSource() throws SQLException {
- return GovernanceShardingSphereDataSourceFactory.createDataSource(governanceConfiguration);
+ return GovernanceShardingSphereDataSourceFactory.createDataSource(governanceConfig);
}
}
diff --git a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/cloud/CloudShardingDatabasesAndTablesConfiguration.java b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/cloud/CloudShardingDatabasesAndTablesConfiguration.java
index ca414db..5c56248 100644
--- a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/cloud/CloudShardingDatabasesAndTablesConfiguration.java
+++ b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/cloud/CloudShardingDatabasesAndTablesConfiguration.java
@@ -26,14 +26,14 @@ import java.sql.SQLException;
public final class CloudShardingDatabasesAndTablesConfiguration implements ExampleConfiguration {
- private final GovernanceConfiguration governanceConfiguration;
+ private final GovernanceConfiguration governanceConfig;
- public CloudShardingDatabasesAndTablesConfiguration(final GovernanceConfiguration governanceConfiguration) {
- this.governanceConfiguration = governanceConfiguration;
+ public CloudShardingDatabasesAndTablesConfiguration(final GovernanceConfiguration governanceConfig) {
+ this.governanceConfig = governanceConfig;
}
@Override
public DataSource getDataSource() throws SQLException {
- return GovernanceShardingSphereDataSourceFactory.createDataSource(governanceConfiguration);
+ return GovernanceShardingSphereDataSourceFactory.createDataSource(governanceConfig);
}
}
diff --git a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/local/LocalEncryptConfiguration.java b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/local/LocalEncryptConfiguration.java
index cb76998..b211d1c 100644
--- a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/local/LocalEncryptConfiguration.java
+++ b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/local/LocalEncryptConfiguration.java
@@ -34,16 +34,16 @@ import java.util.Properties;
public final class LocalEncryptConfiguration implements ExampleConfiguration {
- private final GovernanceConfiguration governanceConfiguration;
+ private final GovernanceConfiguration governanceConfig;
- public LocalEncryptConfiguration(final GovernanceConfiguration governanceConfiguration) {
- this.governanceConfiguration = governanceConfiguration;
+ public LocalEncryptConfiguration(final GovernanceConfiguration governanceConfig) {
+ this.governanceConfig = governanceConfig;
}
@Override
public DataSource getDataSource() throws SQLException {
return GovernanceShardingSphereDataSourceFactory.createDataSource(
- DataSourceUtil.createDataSource("demo_ds"), Collections.singleton(getEncryptRuleConfiguration()), new Properties(), governanceConfiguration);
+ DataSourceUtil.createDataSource("demo_ds"), Collections.singleton(getEncryptRuleConfiguration()), new Properties(), governanceConfig);
}
private EncryptRuleConfiguration getEncryptRuleConfiguration() {
@@ -51,8 +51,8 @@ public final class LocalEncryptConfiguration implements ExampleConfiguration {
}
private EncryptTableRuleConfiguration createEncryptTableRuleConfiguration() {
- EncryptColumnRuleConfiguration encryptColumnRuleConfiguration = new EncryptColumnRuleConfiguration("status", "status", "", "", "status_encryptor");
- return new EncryptTableRuleConfiguration("t_order", Collections.singleton(encryptColumnRuleConfiguration));
+ EncryptColumnRuleConfiguration encryptColumnRuleConfig = new EncryptColumnRuleConfiguration("status", "status", "", "", "status_encryptor");
+ return new EncryptTableRuleConfiguration("t_order", Collections.singleton(encryptColumnRuleConfig));
}
private ShardingSphereAlgorithmConfiguration createEncryptAlgorithmConfiguration() {
diff --git a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/local/LocalShadowConfiguration.java b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/local/LocalShadowConfiguration.java
index 1dcf190..f50f9ee 100644
--- a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/local/LocalShadowConfiguration.java
+++ b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/local/LocalShadowConfiguration.java
@@ -32,20 +32,20 @@ import java.util.Properties;
public final class LocalShadowConfiguration implements ExampleConfiguration {
- private final GovernanceConfiguration governanceConfiguration;
+ private final GovernanceConfiguration governanceConfig;
- public LocalShadowConfiguration(final GovernanceConfiguration governanceConfiguration) {
- this.governanceConfiguration = governanceConfiguration;
+ public LocalShadowConfiguration(final GovernanceConfiguration governanceConfig) {
+ this.governanceConfig = governanceConfig;
}
@Override
public DataSource getDataSource() throws SQLException {
return GovernanceShardingSphereDataSourceFactory.createDataSource(
- createDataSourceMap(), Collections.singleton(getShadowRuleConfiguration()), new Properties(), governanceConfiguration);
+ createDataSourceMap(), Collections.singleton(getShadowRuleConfiguration()), new Properties(), governanceConfig);
}
private Map<String, DataSource> createDataSourceMap() {
- Map<String, DataSource> result = new HashMap<>();
+ Map<String, DataSource> result = new HashMap<>(2, 1);
result.put("ds", DataSourceUtil.createDataSource("demo_ds"));
result.put("shadow_ds", DataSourceUtil.createDataSource("shadow_demo_ds"));
return result;
diff --git a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/local/LocalShardingDatabasesAndTablesConfiguration.java b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/local/LocalShardingDatabasesAndTablesConfiguration.java
index 81c727c..2642ad3 100644
--- a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/local/LocalShardingDatabasesAndTablesConfiguration.java
+++ b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/local/LocalShardingDatabasesAndTablesConfiguration.java
@@ -36,10 +36,10 @@ import java.util.Properties;
public final class LocalShardingDatabasesAndTablesConfiguration implements ExampleConfiguration {
- private final GovernanceConfiguration governanceConfiguration;
+ private final GovernanceConfiguration governanceConfig;
- public LocalShardingDatabasesAndTablesConfiguration(final GovernanceConfiguration governanceConfiguration) {
- this.governanceConfiguration = governanceConfiguration;
+ public LocalShardingDatabasesAndTablesConfiguration(final GovernanceConfiguration governanceConfig) {
+ this.governanceConfig = governanceConfig;
}
private static KeyGenerateStrategyConfiguration getKeyGeneratorConfiguration() {
@@ -49,7 +49,7 @@ public final class LocalShardingDatabasesAndTablesConfiguration implements Examp
@Override
public DataSource getDataSource() throws SQLException {
return GovernanceShardingSphereDataSourceFactory.createDataSource(
- createDataSourceMap(), Collections.singleton(createShardingRuleConfiguration()), new Properties(), governanceConfiguration);
+ createDataSourceMap(), Collections.singleton(createShardingRuleConfiguration()), new Properties(), governanceConfig);
}
private ShardingRuleConfiguration createShardingRuleConfiguration() {
diff --git a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/local/LocalShardingDatabasesConfiguration.java b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/local/LocalShardingDatabasesConfiguration.java
index e83a71c..32e4ee9 100644
--- a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/local/LocalShardingDatabasesConfiguration.java
+++ b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/local/LocalShardingDatabasesConfiguration.java
@@ -36,10 +36,10 @@ import java.util.Properties;
public final class LocalShardingDatabasesConfiguration implements ExampleConfiguration {
- private final GovernanceConfiguration governanceConfiguration;
+ private final GovernanceConfiguration governanceConfig;
- public LocalShardingDatabasesConfiguration(final GovernanceConfiguration governanceConfiguration) {
- this.governanceConfiguration = governanceConfiguration;
+ public LocalShardingDatabasesConfiguration(final GovernanceConfiguration governanceConfig) {
+ this.governanceConfig = governanceConfig;
}
private static KeyGenerateStrategyConfiguration getKeyGeneratorConfiguration() {
@@ -49,7 +49,7 @@ public final class LocalShardingDatabasesConfiguration implements ExampleConfigu
@Override
public DataSource getDataSource() throws SQLException {
return GovernanceShardingSphereDataSourceFactory.createDataSource(
- createDataSourceMap(), Collections.singleton(createShardingRuleConfiguration()), new Properties(), governanceConfiguration);
+ createDataSourceMap(), Collections.singleton(createShardingRuleConfiguration()), new Properties(), governanceConfig);
}
private ShardingRuleConfiguration createShardingRuleConfiguration() {
diff --git a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/local/LocalShardingTablesConfiguration.java b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/local/LocalShardingTablesConfiguration.java
index 4d6ff22..8f63e99 100644
--- a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/local/LocalShardingTablesConfiguration.java
+++ b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/governance/raw/jdbc/config/local/LocalShardingTablesConfiguration.java
@@ -36,16 +36,16 @@ import java.util.Properties;
public final class LocalShardingTablesConfiguration implements ExampleConfiguration {
- private final GovernanceConfiguration governanceConfiguration;
+ private final GovernanceConfiguration governanceConfig;
- public LocalShardingTablesConfiguration(final GovernanceConfiguration governanceConfiguration) {
- this.governanceConfiguration = governanceConfiguration;
+ public LocalShardingTablesConfiguration(final GovernanceConfiguration governanceConfig) {
+ this.governanceConfig = governanceConfig;
}
@Override
public DataSource getDataSource() throws SQLException {
return GovernanceShardingSphereDataSourceFactory.createDataSource(
- createDataSourceMap(), Collections.singleton(createShardingRuleConfiguration()), new Properties(), governanceConfiguration);
+ createDataSourceMap(), Collections.singleton(createShardingRuleConfiguration()), new Properties(), governanceConfig);
}
private ShardingRuleConfiguration createShardingRuleConfiguration() {
diff --git a/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/encrypt/table/raw/jdbc/config/EncryptDatabasesConfiguration.java b/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/encrypt/table/raw/jdbc/config/EncryptDatabasesConfiguration.java
index 0db037e..4beb3c1 100644
--- a/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/encrypt/table/raw/jdbc/config/EncryptDatabasesConfiguration.java
+++ b/examples/shardingsphere-jdbc-example/other-feature-example/encrypt-example/encrypt-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/encrypt/table/raw/jdbc/config/EncryptDatabasesConfiguration.java
@@ -42,13 +42,13 @@ public final class EncryptDatabasesConfiguration implements ExampleConfiguration
props.setProperty("query-with-cipher-column", "true");
EncryptColumnRuleConfiguration columnConfigAes = new EncryptColumnRuleConfiguration("user_name", "user_name", "", "user_name_plain", "name_encryptor");
EncryptColumnRuleConfiguration columnConfigTest = new EncryptColumnRuleConfiguration("pwd", "pwd", "assisted_query_pwd", "", "pwd_encryptor");
- EncryptTableRuleConfiguration encryptTableRuleConfiguration = new EncryptTableRuleConfiguration("t_user", Arrays.asList(columnConfigAes, columnConfigTest));
- Map<String, ShardingSphereAlgorithmConfiguration> encryptAlgorithmConfigurations = new LinkedHashMap<>(2, 1);
- encryptAlgorithmConfigurations.put("name_encryptor", new ShardingSphereAlgorithmConfiguration("AES", props));
- encryptAlgorithmConfigurations.put("pwd_encryptor", new ShardingSphereAlgorithmConfiguration("assistedTest", props));
- EncryptRuleConfiguration encryptRuleConfiguration = new EncryptRuleConfiguration(Collections.singleton(encryptTableRuleConfiguration), encryptAlgorithmConfigurations);
+ EncryptTableRuleConfiguration encryptTableRuleConfig = new EncryptTableRuleConfiguration("t_user", Arrays.asList(columnConfigAes, columnConfigTest));
+ Map<String, ShardingSphereAlgorithmConfiguration> encryptAlgorithmConfigs = new LinkedHashMap<>(2, 1);
+ encryptAlgorithmConfigs.put("name_encryptor", new ShardingSphereAlgorithmConfiguration("AES", props));
+ encryptAlgorithmConfigs.put("pwd_encryptor", new ShardingSphereAlgorithmConfiguration("assistedTest", props));
+ EncryptRuleConfiguration encryptRuleConfig = new EncryptRuleConfiguration(Collections.singleton(encryptTableRuleConfig), encryptAlgorithmConfigs);
try {
- return ShardingSphereDataSourceFactory.createDataSource(DataSourceUtil.createDataSource("demo_ds"), Collections.singleton(encryptRuleConfiguration), props);
+ return ShardingSphereDataSourceFactory.createDataSource(DataSourceUtil.createDataSource("demo_ds"), Collections.singleton(encryptRuleConfig), props);
} catch (final SQLException ex) {
ex.printStackTrace();
return null;
diff --git a/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/table/raw/jdbc/config/EncryptShadowDatabasesConfiguration.java b/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/table/raw/jdbc/config/EncryptShadowDatabasesConfiguration.java
index ec14b5f..59669cf 100644
--- a/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/table/raw/jdbc/config/EncryptShadowDatabasesConfiguration.java
+++ b/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/table/raw/jdbc/config/EncryptShadowDatabasesConfiguration.java
@@ -42,15 +42,15 @@ public final class EncryptShadowDatabasesConfiguration implements ExampleConfigu
@Override
public DataSource getDataSource() throws SQLException {
- Map<String, DataSource> dataSourceMap = new HashMap<>();
+ Map<String, DataSource> dataSourceMap = new HashMap<>(2, 1);
dataSourceMap.put("ds", DataSourceUtil.createDataSource("demo_ds"));
dataSourceMap.put("ds_0", DataSourceUtil.createDataSource("shadow_demo_ds"));
- EncryptRuleConfiguration encryptRuleConfiguration = new EncryptRuleConfiguration(getEncryptTableRuleConfigurations(), getEncryptAlgorithmConfigurations());
+ EncryptRuleConfiguration encryptRuleConfig = new EncryptRuleConfiguration(getEncryptTableRuleConfigurations(), getEncryptAlgorithmConfigurations());
Properties props = new Properties();
props.setProperty(ConfigurationPropertyKey.SQL_SHOW.getKey(), "true");
props.setProperty(ConfigurationPropertyKey.QUERY_WITH_CIPHER_COLUMN.getKey(), "true");
- ShadowRuleConfiguration shadowRuleConfiguration = new ShadowRuleConfiguration("shadow", Collections.singletonList("ds"), Collections.singletonList("ds_0"));
- return ShardingSphereDataSourceFactory.createDataSource(dataSourceMap, Arrays.asList(shadowRuleConfiguration, encryptRuleConfiguration), props);
+ ShadowRuleConfiguration shadowRuleConfig = new ShadowRuleConfiguration("shadow", Collections.singletonList("ds"), Collections.singletonList("ds_0"));
+ return ShardingSphereDataSourceFactory.createDataSource(dataSourceMap, Arrays.asList(shadowRuleConfig, encryptRuleConfig), props);
}
private Collection<EncryptTableRuleConfiguration> getEncryptTableRuleConfigurations() {
diff --git a/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/table/raw/jdbc/config/ShadowDatabasesConfiguration.java b/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/table/raw/jdbc/config/ShadowDatabasesConfiguration.java
index 03a1883..c851209 100644
--- a/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/table/raw/jdbc/config/ShadowDatabasesConfiguration.java
+++ b/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/table/raw/jdbc/config/ShadowDatabasesConfiguration.java
@@ -32,10 +32,10 @@ public final class ShadowDatabasesConfiguration implements ExampleConfiguration
@Override
public DataSource getDataSource() throws SQLException {
- ShadowRuleConfiguration shadowRuleConfiguration = new ShadowRuleConfiguration("shadow", Collections.singletonList("ds"), Collections.singletonList("ds_0"));
- Map<String, DataSource> dataSourceMap = new HashMap<>();
+ ShadowRuleConfiguration shadowRuleConfig = new ShadowRuleConfiguration("shadow", Collections.singletonList("ds"), Collections.singletonList("ds_0"));
+ Map<String, DataSource> dataSourceMap = new HashMap<>(2, 1);
dataSourceMap.put("ds", DataSourceUtil.createDataSource("demo_ds"));
dataSourceMap.put("ds_0", DataSourceUtil.createDataSource("shadow_demo_ds"));
- return ShardingSphereDataSourceFactory.createDataSource(dataSourceMap, Collections.singleton(shadowRuleConfiguration), null);
+ return ShardingSphereDataSourceFactory.createDataSource(dataSourceMap, Collections.singleton(shadowRuleConfig), null);
}
}
diff --git a/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/table/raw/jdbc/config/ShardingShadowDatabasesConfiguration.java b/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/table/raw/jdbc/config/ShardingShadowDatabasesConfiguration.java
index 7ce655d..96f2bd9 100644
--- a/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/table/raw/jdbc/config/ShardingShadowDatabasesConfiguration.java
+++ b/examples/shardingsphere-jdbc-example/other-feature-example/shadow-example/shadow-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/shadow/table/raw/jdbc/config/ShardingShadowDatabasesConfiguration.java
@@ -39,22 +39,22 @@ public final class ShardingShadowDatabasesConfiguration implements ExampleConfig
@Override
public DataSource getDataSource() throws SQLException {
- Map<String, DataSource> dataSourceMap = new HashMap<>();
+ Map<String, DataSource> dataSourceMap = new HashMap<>(4, 1);
dataSourceMap.put("ds_0", DataSourceUtil.createDataSource("demo_ds_0"));
dataSourceMap.put("ds_1", DataSourceUtil.createDataSource("demo_ds_1"));
dataSourceMap.put("shadow_ds_0", DataSourceUtil.createDataSource("shadow_demo_ds_0"));
dataSourceMap.put("shadow_ds_1", DataSourceUtil.createDataSource("shadow_demo_ds_1"));
- ShardingRuleConfiguration shardingRuleConfiguration = new ShardingRuleConfiguration();
- shardingRuleConfiguration.getTables().add(getUserTableConfiguration());
+ ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration();
+ shardingRuleConfig.getTables().add(getUserTableConfiguration());
Properties props = new Properties();
props.setProperty("algorithm-expression", "ds_${user_id % 2}");
- shardingRuleConfiguration.getShardingAlgorithms() .put("database_inline", new ShardingSphereAlgorithmConfiguration("INLINE", props));
+ shardingRuleConfig.getShardingAlgorithms() .put("database_inline", new ShardingSphereAlgorithmConfiguration("INLINE", props));
props = new Properties();
props.setProperty("algorithm-expression", "t_user");
- shardingRuleConfiguration.getShardingAlgorithms() .put("table_inline", new ShardingSphereAlgorithmConfiguration("INLINE", props));
+ shardingRuleConfig.getShardingAlgorithms() .put("table_inline", new ShardingSphereAlgorithmConfiguration("INLINE", props));
props.setProperty(ConfigurationPropertyKey.SQL_SHOW.getKey(), "true");
- ShadowRuleConfiguration shadowRuleConfiguration = new ShadowRuleConfiguration("shadow", Arrays.asList("ds_0", "ds_1"), Arrays.asList("shadow_ds_0", "shadow_ds_1"));
- return ShardingSphereDataSourceFactory.createDataSource(dataSourceMap, Arrays.asList(shadowRuleConfiguration, shardingRuleConfiguration), props);
+ ShadowRuleConfiguration shadowRuleConfig = new ShadowRuleConfiguration("shadow", Arrays.asList("ds_0", "ds_1"), Arrays.asList("shadow_ds_0", "shadow_ds_1"));
+ return ShardingSphereDataSourceFactory.createDataSource(dataSourceMap, Arrays.asList(shadowRuleConfig, shardingRuleConfig), props);
}
private ShardingTableRuleConfiguration getUserTableConfiguration() {
diff --git a/shardingsphere-features/shardingsphere-consensus-replication/shardingsphere-consensus-replication-common/src/main/java/org/apache/shardingsphere/replication/consensus/rule/ConsensusReplicationTableRule.java b/shardingsphere-features/shardingsphere-consensus-replication/shardingsphere-consensus-replication-common/src/main/java/org/apache/shardingsphere/replication/consensus/rule/ConsensusReplicationTableRule.java
index e9527a5..17e9567 100644
--- a/shardingsphere-features/shardingsphere-consensus-replication/shardingsphere-consensus-replication-common/src/main/java/org/apache/shardingsphere/replication/consensus/rule/ConsensusReplicationTableRule.java
+++ b/shardingsphere-features/shardingsphere-consensus-replication/shardingsphere-consensus-replication-common/src/main/java/org/apache/shardingsphere/replication/consensus/rule/ConsensusReplicationTableRule.java
@@ -35,10 +35,10 @@ public final class ConsensusReplicationTableRule implements ShardingSphereRule {
private final String dataSourceName;
- public ConsensusReplicationTableRule(final ConsensusReplicationActualTableRuleConfiguration configuration) {
- physicsTable = configuration.getPhysicsTable();
- replicaGroupId = configuration.getReplicaGroupId();
- replicaPeers = configuration.getReplicaPeers();
- dataSourceName = configuration.getDataSourceName();
+ public ConsensusReplicationTableRule(final ConsensusReplicationActualTableRuleConfiguration config) {
+ physicsTable = config.getPhysicsTable();
+ replicaGroupId = config.getReplicaGroupId();
+ replicaPeers = config.getReplicaPeers();
+ dataSourceName = config.getDataSourceName();
}
}
diff --git a/shardingsphere-features/shardingsphere-consensus-replication/shardingsphere-consensus-replication-common/src/main/java/org/apache/shardingsphere/replication/consensus/yaml/swapper/ConsensusReplicationActualTableRuleConfigurationYamlSwapper.java b/shardingsphere-features/shardingsphere-consensus-replication/shardingsphere-consensus-replication-common/src/main/java/org/apache/shardingsphere/replication/consensus/yaml/swapper/ConsensusReplicationActualTableRuleConfigurationYamlS [...]
index de07d44..c7ecfbd 100644
--- a/shardingsphere-features/shardingsphere-consensus-replication/shardingsphere-consensus-replication-common/src/main/java/org/apache/shardingsphere/replication/consensus/yaml/swapper/ConsensusReplicationActualTableRuleConfigurationYamlSwapper.java
+++ b/shardingsphere-features/shardingsphere-consensus-replication/shardingsphere-consensus-replication-common/src/main/java/org/apache/shardingsphere/replication/consensus/yaml/swapper/ConsensusReplicationActualTableRuleConfigurationYamlSwapper.java
@@ -38,8 +38,8 @@ public final class ConsensusReplicationActualTableRuleConfigurationYamlSwapper
}
@Override
- public ConsensusReplicationActualTableRuleConfiguration swapToObject(final YamlConsensusReplicationActualTableRuleConfiguration yamlConfiguration) {
- return new ConsensusReplicationActualTableRuleConfiguration(yamlConfiguration.getPhysicsTable(), yamlConfiguration.getReplicaGroupId(),
- yamlConfiguration.getReplicaPeers(), yamlConfiguration.getDataSourceName());
+ public ConsensusReplicationActualTableRuleConfiguration swapToObject(final YamlConsensusReplicationActualTableRuleConfiguration yamlConfig) {
+ return new ConsensusReplicationActualTableRuleConfiguration(yamlConfig.getPhysicsTable(), yamlConfig.getReplicaGroupId(),
+ yamlConfig.getReplicaPeers(), yamlConfig.getDataSourceName());
}
}
diff --git a/shardingsphere-features/shardingsphere-consensus-replication/shardingsphere-consensus-replication-common/src/main/java/org/apache/shardingsphere/replication/consensus/yaml/swapper/ConsensusReplicationLogicTableRuleConfigurationYamlSwapper.java b/shardingsphere-features/shardingsphere-consensus-replication/shardingsphere-consensus-replication-common/src/main/java/org/apache/shardingsphere/replication/consensus/yaml/swapper/ConsensusReplicationLogicTableRuleConfigurationYamlSwa [...]
index 9855322..3b1f670 100644
--- a/shardingsphere-features/shardingsphere-consensus-replication/shardingsphere-consensus-replication-common/src/main/java/org/apache/shardingsphere/replication/consensus/yaml/swapper/ConsensusReplicationLogicTableRuleConfigurationYamlSwapper.java
+++ b/shardingsphere-features/shardingsphere-consensus-replication/shardingsphere-consensus-replication-common/src/main/java/org/apache/shardingsphere/replication/consensus/yaml/swapper/ConsensusReplicationLogicTableRuleConfigurationYamlSwapper.java
@@ -45,9 +45,9 @@ public final class ConsensusReplicationLogicTableRuleConfigurationYamlSwapper
}
@Override
- public ConsensusReplicationLogicTableRuleConfiguration swapToObject(final YamlConsensusReplicationLogicTableRuleConfiguration yamlConfiguration) {
- Collection<ConsensusReplicationActualTableRuleConfiguration> replicaGroups = yamlConfiguration.getReplicaGroups().stream()
+ public ConsensusReplicationLogicTableRuleConfiguration swapToObject(final YamlConsensusReplicationLogicTableRuleConfiguration yamlConfig) {
+ Collection<ConsensusReplicationActualTableRuleConfiguration> replicaGroups = yamlConfig.getReplicaGroups().stream()
.map(actualTableRuleConfigurationYamlSwapper::swapToObject).collect(Collectors.toList());
- return new ConsensusReplicationLogicTableRuleConfiguration(yamlConfiguration.getLogicTable(), replicaGroups);
+ return new ConsensusReplicationLogicTableRuleConfiguration(yamlConfig.getLogicTable(), replicaGroups);
}
}
diff --git a/shardingsphere-features/shardingsphere-consensus-replication/shardingsphere-consensus-replication-common/src/main/java/org/apache/shardingsphere/replication/consensus/yaml/swapper/ConsensusReplicationRuleConfigurationYamlSwapper.java b/shardingsphere-features/shardingsphere-consensus-replication/shardingsphere-consensus-replication-common/src/main/java/org/apache/shardingsphere/replication/consensus/yaml/swapper/ConsensusReplicationRuleConfigurationYamlSwapper.java
index 579d9f4..80f9358 100644
--- a/shardingsphere-features/shardingsphere-consensus-replication/shardingsphere-consensus-replication-common/src/main/java/org/apache/shardingsphere/replication/consensus/yaml/swapper/ConsensusReplicationRuleConfigurationYamlSwapper.java
+++ b/shardingsphere-features/shardingsphere-consensus-replication/shardingsphere-consensus-replication-common/src/main/java/org/apache/shardingsphere/replication/consensus/yaml/swapper/ConsensusReplicationRuleConfigurationYamlSwapper.java
@@ -45,8 +45,8 @@ public final class ConsensusReplicationRuleConfigurationYamlSwapper implements Y
}
@Override
- public ConsensusReplicationRuleConfiguration swapToObject(final YamlConsensusReplicationRuleConfiguration yamlConfiguration) {
- Collection<ConsensusReplicationLogicTableRuleConfiguration> tables = yamlConfiguration.getTables().stream()
+ public ConsensusReplicationRuleConfiguration swapToObject(final YamlConsensusReplicationRuleConfiguration yamlConfig) {
+ Collection<ConsensusReplicationLogicTableRuleConfiguration> tables = yamlConfig.getTables().stream()
.map(logicTableRuleConfigurationYamlSwapper::swapToObject)
.collect(Collectors.toList());
return new ConsensusReplicationRuleConfiguration(tables);
diff --git a/shardingsphere-features/shardingsphere-consensus-replication/shardingsphere-consensus-replication-common/src/test/java/org/apache/shardingsphere/replication/consensus/rule/ConsensusReplicationRuleTest.java b/shardingsphere-features/shardingsphere-consensus-replication/shardingsphere-consensus-replication-common/src/test/java/org/apache/shardingsphere/replication/consensus/rule/ConsensusReplicationRuleTest.java
index 9bc654f..6d5e45f 100644
--- a/shardingsphere-features/shardingsphere-consensus-replication/shardingsphere-consensus-replication-common/src/test/java/org/apache/shardingsphere/replication/consensus/rule/ConsensusReplicationRuleTest.java
+++ b/shardingsphere-features/shardingsphere-consensus-replication/shardingsphere-consensus-replication-common/src/test/java/org/apache/shardingsphere/replication/consensus/rule/ConsensusReplicationRuleTest.java
@@ -68,7 +68,7 @@ public final class ConsensusReplicationRuleTest {
ConsensusReplicationActualTableRuleConfiguration replicaGroup = new ConsensusReplicationActualTableRuleConfiguration(physicsTable, replicaGroupId, replicaPeers, dataSourceName);
Collection<ConsensusReplicationActualTableRuleConfiguration> replicaGroups = Collections.singleton(replicaGroup);
ConsensusReplicationLogicTableRuleConfiguration table = new ConsensusReplicationLogicTableRuleConfiguration(logicTableName, replicaGroups);
- ConsensusReplicationRuleConfiguration configuration = new ConsensusReplicationRuleConfiguration(Collections.singleton(table));
- return new ConsensusReplicationRule(configuration);
+ ConsensusReplicationRuleConfiguration config = new ConsensusReplicationRuleConfiguration(Collections.singleton(table));
+ return new ConsensusReplicationRule(config);
}
}
diff --git a/shardingsphere-features/shardingsphere-consensus-replication/shardingsphere-consensus-replication-common/src/test/java/org/apache/shardingsphere/replication/consensus/yaml/swapper/ConsensusReplicationActualTableRuleConfigurationYamlSwapperTest.java b/shardingsphere-features/shardingsphere-consensus-replication/shardingsphere-consensus-replication-common/src/test/java/org/apache/shardingsphere/replication/consensus/yaml/swapper/ConsensusReplicationActualTableRuleConfigurationY [...]
index a4c33db..f148704 100644
--- a/shardingsphere-features/shardingsphere-consensus-replication/shardingsphere-consensus-replication-common/src/test/java/org/apache/shardingsphere/replication/consensus/yaml/swapper/ConsensusReplicationActualTableRuleConfigurationYamlSwapperTest.java
+++ b/shardingsphere-features/shardingsphere-consensus-replication/shardingsphere-consensus-replication-common/src/test/java/org/apache/shardingsphere/replication/consensus/yaml/swapper/ConsensusReplicationActualTableRuleConfigurationYamlSwapperTest.java
@@ -43,12 +43,12 @@ public class ConsensusReplicationActualTableRuleConfigurationYamlSwapperTest {
@Test
public void assertSwapToYamlConfigurationWithMaxProperties() {
- YamlConsensusReplicationActualTableRuleConfiguration yamlConfiguration = swapper.swapToYamlConfiguration(
+ YamlConsensusReplicationActualTableRuleConfiguration yamlConfig = swapper.swapToYamlConfiguration(
new ConsensusReplicationActualTableRuleConfiguration(physicsTable, replicaGroupId, replicaPeers, dataSourceName));
- assertThat(yamlConfiguration.getDataSourceName(), is(dataSourceName));
- assertThat(yamlConfiguration.getPhysicsTable(), is(physicsTable));
- assertThat(yamlConfiguration.getReplicaGroupId(), is(replicaGroupId));
- assertThat(yamlConfiguration.getReplicaPeers(), is(replicaPeers));
+ assertThat(yamlConfig.getDataSourceName(), is(dataSourceName));
+ assertThat(yamlConfig.getPhysicsTable(), is(physicsTable));
+ assertThat(yamlConfig.getReplicaGroupId(), is(replicaGroupId));
+ assertThat(yamlConfig.getReplicaPeers(), is(replicaPeers));
}
@Test(expected = IllegalArgumentException.class)
@@ -58,15 +58,15 @@ public class ConsensusReplicationActualTableRuleConfigurationYamlSwapperTest {
@Test
public void assertSwapToObjectWithMaxProperties() {
- YamlConsensusReplicationActualTableRuleConfiguration yamlConfiguration = new YamlConsensusReplicationActualTableRuleConfiguration();
- yamlConfiguration.setPhysicsTable(physicsTable);
- yamlConfiguration.setReplicaGroupId(replicaGroupId);
- yamlConfiguration.setReplicaPeers(replicaPeers);
- yamlConfiguration.setDataSourceName(dataSourceName);
- ConsensusReplicationActualTableRuleConfiguration configuration = swapper.swapToObject(yamlConfiguration);
- assertThat(configuration.getDataSourceName(), is(dataSourceName));
- assertThat(configuration.getPhysicsTable(), is(physicsTable));
- assertThat(configuration.getReplicaGroupId(), is(replicaGroupId));
- assertThat(configuration.getReplicaPeers(), is(replicaPeers));
+ YamlConsensusReplicationActualTableRuleConfiguration yamlConfig = new YamlConsensusReplicationActualTableRuleConfiguration();
+ yamlConfig.setPhysicsTable(physicsTable);
+ yamlConfig.setReplicaGroupId(replicaGroupId);
+ yamlConfig.setReplicaPeers(replicaPeers);
+ yamlConfig.setDataSourceName(dataSourceName);
+ ConsensusReplicationActualTableRuleConfiguration config = swapper.swapToObject(yamlConfig);
+ assertThat(config.getDataSourceName(), is(dataSourceName));
+ assertThat(config.getPhysicsTable(), is(physicsTable));
+ assertThat(config.getReplicaGroupId(), is(replicaGroupId));
+ assertThat(config.getReplicaPeers(), is(replicaPeers));
}
}
diff --git a/shardingsphere-features/shardingsphere-consensus-replication/shardingsphere-consensus-replication-common/src/test/java/org/apache/shardingsphere/replication/consensus/yaml/swapper/ConsensusReplicationRuleConfigurationYamlSwapperTest.java b/shardingsphere-features/shardingsphere-consensus-replication/shardingsphere-consensus-replication-common/src/test/java/org/apache/shardingsphere/replication/consensus/yaml/swapper/ConsensusReplicationRuleConfigurationYamlSwapperTest.java
index 2c367e3..016a8ef 100644
--- a/shardingsphere-features/shardingsphere-consensus-replication/shardingsphere-consensus-replication-common/src/test/java/org/apache/shardingsphere/replication/consensus/yaml/swapper/ConsensusReplicationRuleConfigurationYamlSwapperTest.java
+++ b/shardingsphere-features/shardingsphere-consensus-replication/shardingsphere-consensus-replication-common/src/test/java/org/apache/shardingsphere/replication/consensus/yaml/swapper/ConsensusReplicationRuleConfigurationYamlSwapperTest.java
@@ -49,12 +49,12 @@ public final class ConsensusReplicationRuleConfigurationYamlSwapperTest {
@Test
public void assertSwapToYamlConfigurationWithMinProperties() {
- YamlConsensusReplicationRuleConfiguration yamlConfiguration = swapper.swapToYamlConfiguration(new ConsensusReplicationRuleConfiguration(
+ YamlConsensusReplicationRuleConfiguration yamlConfig = swapper.swapToYamlConfiguration(new ConsensusReplicationRuleConfiguration(
Collections.singleton(new ConsensusReplicationLogicTableRuleConfiguration(logicTableName, null))));
- assertNotNull(yamlConfiguration);
- assertNotNull(yamlConfiguration.getTables());
- assertThat(yamlConfiguration.getTables().size(), is(1));
- Collection<YamlConsensusReplicationActualTableRuleConfiguration> resultReplicaGroups = yamlConfiguration.getTables().iterator().next().getReplicaGroups();
+ assertNotNull(yamlConfig);
+ assertNotNull(yamlConfig.getTables());
+ assertThat(yamlConfig.getTables().size(), is(1));
+ Collection<YamlConsensusReplicationActualTableRuleConfiguration> resultReplicaGroups = yamlConfig.getTables().iterator().next().getReplicaGroups();
assertNotNull(resultReplicaGroups);
assertTrue(resultReplicaGroups.isEmpty());
}
@@ -64,11 +64,11 @@ public final class ConsensusReplicationRuleConfigurationYamlSwapperTest {
ConsensusReplicationActualTableRuleConfiguration replicaGroup = new ConsensusReplicationActualTableRuleConfiguration(physicsTable, replicaGroupId, replicaPeers, dataSourceName);
Collection<ConsensusReplicationActualTableRuleConfiguration> replicaGroups = Collections.singleton(replicaGroup);
ConsensusReplicationLogicTableRuleConfiguration table = new ConsensusReplicationLogicTableRuleConfiguration(logicTableName, replicaGroups);
- YamlConsensusReplicationRuleConfiguration yamlConfiguration = swapper.swapToYamlConfiguration(new ConsensusReplicationRuleConfiguration(Collections.singleton(table)));
- assertNotNull(yamlConfiguration);
- assertNotNull(yamlConfiguration.getTables());
- assertThat(yamlConfiguration.getTables().size(), is(1));
- Collection<YamlConsensusReplicationActualTableRuleConfiguration> resultReplicaGroups = yamlConfiguration.getTables().iterator().next().getReplicaGroups();
+ YamlConsensusReplicationRuleConfiguration yamlConfig = swapper.swapToYamlConfiguration(new ConsensusReplicationRuleConfiguration(Collections.singleton(table)));
+ assertNotNull(yamlConfig);
+ assertNotNull(yamlConfig.getTables());
+ assertThat(yamlConfig.getTables().size(), is(1));
+ Collection<YamlConsensusReplicationActualTableRuleConfiguration> resultReplicaGroups = yamlConfig.getTables().iterator().next().getReplicaGroups();
assertNotNull(resultReplicaGroups);
assertThat(resultReplicaGroups.size(), is(1));
YamlConsensusReplicationActualTableRuleConfiguration resultReplicaGroup = resultReplicaGroups.iterator().next();
@@ -82,13 +82,13 @@ public final class ConsensusReplicationRuleConfigurationYamlSwapperTest {
public void assertSwapToObjectWithMinProperties() {
YamlConsensusReplicationLogicTableRuleConfiguration yamlLogicTable = new YamlConsensusReplicationLogicTableRuleConfiguration();
yamlLogicTable.setLogicTable(logicTableName);
- YamlConsensusReplicationRuleConfiguration yamlConfiguration = new YamlConsensusReplicationRuleConfiguration();
- yamlConfiguration.setTables(Collections.singleton(yamlLogicTable));
- ConsensusReplicationRuleConfiguration configuration = swapper.swapToObject(yamlConfiguration);
- assertNotNull(configuration);
- assertNotNull(configuration.getTables());
- assertThat(configuration.getTables().size(), is(1));
- Collection<ConsensusReplicationActualTableRuleConfiguration> resultReplicaGroups = configuration.getTables().iterator().next().getReplicaGroups();
+ YamlConsensusReplicationRuleConfiguration yamlConfig = new YamlConsensusReplicationRuleConfiguration();
+ yamlConfig.setTables(Collections.singleton(yamlLogicTable));
+ ConsensusReplicationRuleConfiguration config = swapper.swapToObject(yamlConfig);
+ assertNotNull(config);
+ assertNotNull(config.getTables());
+ assertThat(config.getTables().size(), is(1));
+ Collection<ConsensusReplicationActualTableRuleConfiguration> resultReplicaGroups = config.getTables().iterator().next().getReplicaGroups();
assertNotNull(resultReplicaGroups);
assertTrue(resultReplicaGroups.isEmpty());
}
@@ -104,13 +104,13 @@ public final class ConsensusReplicationRuleConfigurationYamlSwapperTest {
YamlConsensusReplicationLogicTableRuleConfiguration table = new YamlConsensusReplicationLogicTableRuleConfiguration();
table.setLogicTable(logicTableName);
table.setReplicaGroups(replicaGroups);
- YamlConsensusReplicationRuleConfiguration yamlConfiguration = new YamlConsensusReplicationRuleConfiguration();
- yamlConfiguration.setTables(Collections.singleton(table));
- ConsensusReplicationRuleConfiguration configuration = swapper.swapToObject(yamlConfiguration);
- assertNotNull(configuration);
- assertNotNull(configuration.getTables());
- assertThat(configuration.getTables().size(), is(1));
- Collection<ConsensusReplicationActualTableRuleConfiguration> resultReplicaGroups = configuration.getTables().iterator().next().getReplicaGroups();
+ YamlConsensusReplicationRuleConfiguration yamlConfig = new YamlConsensusReplicationRuleConfiguration();
+ yamlConfig.setTables(Collections.singleton(table));
+ ConsensusReplicationRuleConfiguration config = swapper.swapToObject(yamlConfig);
+ assertNotNull(config);
+ assertNotNull(config.getTables());
+ assertThat(config.getTables().size(), is(1));
+ Collection<ConsensusReplicationActualTableRuleConfiguration> resultReplicaGroups = config.getTables().iterator().next().getReplicaGroups();
assertNotNull(resultReplicaGroups);
assertThat(resultReplicaGroups.size(), is(1));
ConsensusReplicationActualTableRuleConfiguration resultReplicaGroup = resultReplicaGroups.iterator().next();
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-common/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptRule.java b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-common/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptRule.java
index 662726e..d4f8e39 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-common/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptRule.java
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-common/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptRule.java
@@ -51,26 +51,26 @@ public final class EncryptRule implements ShardingSphereRule {
private final Map<String, EncryptTable> tables = new LinkedHashMap<>();
- public EncryptRule(final EncryptRuleConfiguration configuration) {
- Preconditions.checkArgument(isValidRuleConfiguration(configuration), "Invalid encrypt column configurations in EncryptTableRuleConfigurations.");
- configuration.getEncryptors().forEach((key, value) -> encryptors.put(key, ShardingSphereAlgorithmFactory.createAlgorithm(value, EncryptAlgorithm.class)));
- configuration.getTables().forEach(each -> tables.put(each.getName(), new EncryptTable(each)));
+ public EncryptRule(final EncryptRuleConfiguration config) {
+ Preconditions.checkArgument(isValidRuleConfiguration(config), "Invalid encrypt column configurations in EncryptTableRuleConfigurations.");
+ config.getEncryptors().forEach((key, value) -> encryptors.put(key, ShardingSphereAlgorithmFactory.createAlgorithm(value, EncryptAlgorithm.class)));
+ config.getTables().forEach(each -> tables.put(each.getName(), new EncryptTable(each)));
}
- public EncryptRule(final AlgorithmProvidedEncryptRuleConfiguration configuration) {
- Preconditions.checkArgument(isValidRuleConfigurationWithAlgorithmProvided(configuration), "Invalid encrypt column configurations in EncryptTableRuleConfigurations.");
- encryptors.putAll(configuration.getEncryptors());
- configuration.getTables().forEach(each -> tables.put(each.getName(), new EncryptTable(each)));
+ public EncryptRule(final AlgorithmProvidedEncryptRuleConfiguration config) {
+ Preconditions.checkArgument(isValidRuleConfigurationWithAlgorithmProvided(config), "Invalid encrypt column configurations in EncryptTableRuleConfigurations.");
+ encryptors.putAll(config.getEncryptors());
+ config.getTables().forEach(each -> tables.put(each.getName(), new EncryptTable(each)));
}
- private boolean isValidRuleConfiguration(final EncryptRuleConfiguration configuration) {
- return (configuration.getEncryptors().isEmpty() && configuration.getTables().isEmpty()) || isValidTableConfiguration(configuration);
+ private boolean isValidRuleConfiguration(final EncryptRuleConfiguration config) {
+ return (config.getEncryptors().isEmpty() && config.getTables().isEmpty()) || isValidTableConfiguration(config);
}
- private boolean isValidTableConfiguration(final EncryptRuleConfiguration configuration) {
- for (EncryptTableRuleConfiguration table : configuration.getTables()) {
+ private boolean isValidTableConfiguration(final EncryptRuleConfiguration config) {
+ for (EncryptTableRuleConfiguration table : config.getTables()) {
for (EncryptColumnRuleConfiguration column : table.getColumns()) {
- if (!isValidColumnConfiguration(configuration, column)) {
+ if (!isValidColumnConfiguration(config, column)) {
return false;
}
}
@@ -78,22 +78,22 @@ public final class EncryptRule implements ShardingSphereRule {
return true;
}
- private boolean isValidColumnConfiguration(final EncryptRuleConfiguration encryptRuleConfiguration, final EncryptColumnRuleConfiguration column) {
- return !Strings.isNullOrEmpty(column.getEncryptorName()) && !Strings.isNullOrEmpty(column.getCipherColumn()) && containsEncryptors(encryptRuleConfiguration, column);
+ private boolean isValidColumnConfiguration(final EncryptRuleConfiguration encryptRuleConfig, final EncryptColumnRuleConfiguration column) {
+ return !Strings.isNullOrEmpty(column.getEncryptorName()) && !Strings.isNullOrEmpty(column.getCipherColumn()) && containsEncryptors(encryptRuleConfig, column);
}
- private boolean containsEncryptors(final EncryptRuleConfiguration encryptRuleConfiguration, final EncryptColumnRuleConfiguration column) {
- return encryptRuleConfiguration.getEncryptors().keySet().stream().anyMatch(each -> each.equals(column.getEncryptorName()));
+ private boolean containsEncryptors(final EncryptRuleConfiguration encryptRuleConfig, final EncryptColumnRuleConfiguration column) {
+ return encryptRuleConfig.getEncryptors().keySet().stream().anyMatch(each -> each.equals(column.getEncryptorName()));
}
- private boolean isValidRuleConfigurationWithAlgorithmProvided(final AlgorithmProvidedEncryptRuleConfiguration configuration) {
- return (configuration.getEncryptors().isEmpty() && configuration.getTables().isEmpty()) || isValidTableConfigurationWithAlgorithmProvided(configuration);
+ private boolean isValidRuleConfigurationWithAlgorithmProvided(final AlgorithmProvidedEncryptRuleConfiguration config) {
+ return (config.getEncryptors().isEmpty() && config.getTables().isEmpty()) || isValidTableConfigurationWithAlgorithmProvided(config);
}
- private boolean isValidTableConfigurationWithAlgorithmProvided(final AlgorithmProvidedEncryptRuleConfiguration configuration) {
- for (EncryptTableRuleConfiguration table : configuration.getTables()) {
+ private boolean isValidTableConfigurationWithAlgorithmProvided(final AlgorithmProvidedEncryptRuleConfiguration config) {
+ for (EncryptTableRuleConfiguration table : config.getTables()) {
for (EncryptColumnRuleConfiguration column : table.getColumns()) {
- if (!isValidColumnConfigurationWithAlgorithmProvided(configuration, column)) {
+ if (!isValidColumnConfigurationWithAlgorithmProvided(config, column)) {
return false;
}
}
@@ -101,9 +101,9 @@ public final class EncryptRule implements ShardingSphereRule {
return true;
}
- private boolean isValidColumnConfigurationWithAlgorithmProvided(final AlgorithmProvidedEncryptRuleConfiguration encryptRuleConfiguration, final EncryptColumnRuleConfiguration column) {
+ private boolean isValidColumnConfigurationWithAlgorithmProvided(final AlgorithmProvidedEncryptRuleConfiguration encryptRuleConfig, final EncryptColumnRuleConfiguration column) {
return !Strings.isNullOrEmpty(column.getEncryptorName()) && !Strings.isNullOrEmpty(column.getCipherColumn())
- && encryptRuleConfiguration.getEncryptors().containsKey(column.getEncryptorName());
+ && encryptRuleConfig.getEncryptors().containsKey(column.getEncryptorName());
}
/**
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-common/src/main/java/org/apache/shardingsphere/encrypt/rule/builder/AlgorithmProvidedEncryptRuleBuilder.java b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-common/src/main/java/org/apache/shardingsphere/encrypt/rule/builder/AlgorithmProvidedEncryptRuleBuilder.java
index f4a7a39..640ec42 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-common/src/main/java/org/apache/shardingsphere/encrypt/rule/builder/AlgorithmProvidedEncryptRuleBuilder.java
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-common/src/main/java/org/apache/shardingsphere/encrypt/rule/builder/AlgorithmProvidedEncryptRuleBuilder.java
@@ -30,8 +30,8 @@ import java.util.Collection;
public final class AlgorithmProvidedEncryptRuleBuilder implements ShardingSphereRuleBuilder<EncryptRule, AlgorithmProvidedEncryptRuleConfiguration> {
@Override
- public EncryptRule build(final AlgorithmProvidedEncryptRuleConfiguration ruleConfiguration, final Collection<String> dataSourceNames) {
- return new EncryptRule(ruleConfiguration);
+ public EncryptRule build(final AlgorithmProvidedEncryptRuleConfiguration ruleConfig, final Collection<String> dataSourceNames) {
+ return new EncryptRule(ruleConfig);
}
@Override
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-common/src/main/java/org/apache/shardingsphere/encrypt/rule/builder/EncryptRuleBuilder.java b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-common/src/main/java/org/apache/shardingsphere/encrypt/rule/builder/EncryptRuleBuilder.java
index 7a43b6c..dc9cb82 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-common/src/main/java/org/apache/shardingsphere/encrypt/rule/builder/EncryptRuleBuilder.java
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-common/src/main/java/org/apache/shardingsphere/encrypt/rule/builder/EncryptRuleBuilder.java
@@ -30,8 +30,8 @@ import java.util.Collection;
public final class EncryptRuleBuilder implements ShardingSphereRuleBuilder<EncryptRule, EncryptRuleConfiguration> {
@Override
- public EncryptRule build(final EncryptRuleConfiguration ruleConfiguration, final Collection<String> dataSourceNames) {
- return new EncryptRule(ruleConfiguration);
+ public EncryptRule build(final EncryptRuleConfiguration ruleConfig, final Collection<String> dataSourceNames) {
+ return new EncryptRule(ruleConfig);
}
@Override
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-common/src/test/java/org/apache/shardingsphere/encrypt/yaml/swapper/rule/EncryptColumnRuleConfigurationYamlSwapperTest.java b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-common/src/test/java/org/apache/shardingsphere/encrypt/yaml/swapper/rule/EncryptColumnRuleConfigurationYamlSwapperTest.java
index e187137..5f69ae4 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-common/src/test/java/org/apache/shardingsphere/encrypt/yaml/swapper/rule/EncryptColumnRuleConfigurationYamlSwapperTest.java
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-common/src/test/java/org/apache/shardingsphere/encrypt/yaml/swapper/rule/EncryptColumnRuleConfigurationYamlSwapperTest.java
@@ -28,9 +28,9 @@ public final class EncryptColumnRuleConfigurationYamlSwapperTest {
@Test
public void assertSwapToYamlConfiguration() {
- EncryptColumnRuleConfigurationYamlSwapper encryptColumnRuleConfigurationYamlSwapper = new EncryptColumnRuleConfigurationYamlSwapper();
- EncryptColumnRuleConfiguration encryptColumnRuleConfiguration = new EncryptColumnRuleConfiguration("logicColumn", "cipherColumn", "assistedQueryColumn", "plainColumn", "encryptorName");
- YamlEncryptColumnRuleConfiguration actual = encryptColumnRuleConfigurationYamlSwapper.swapToYamlConfiguration(encryptColumnRuleConfiguration);
+ EncryptColumnRuleConfigurationYamlSwapper swapper = new EncryptColumnRuleConfigurationYamlSwapper();
+ EncryptColumnRuleConfiguration encryptColumnRuleConfig = new EncryptColumnRuleConfiguration("logicColumn", "cipherColumn", "assistedQueryColumn", "plainColumn", "encryptorName");
+ YamlEncryptColumnRuleConfiguration actual = swapper.swapToYamlConfiguration(encryptColumnRuleConfig);
assertThat(actual.getCipherColumn(), is("cipherColumn"));
assertThat(actual.getAssistedQueryColumn(), is("assistedQueryColumn"));
assertThat(actual.getPlainColumn(), is("plainColumn"));
@@ -39,14 +39,14 @@ public final class EncryptColumnRuleConfigurationYamlSwapperTest {
@Test
public void assertSwapToObject() {
- EncryptColumnRuleConfigurationYamlSwapper encryptColumnRuleConfigurationYamlSwapper = new EncryptColumnRuleConfigurationYamlSwapper();
- YamlEncryptColumnRuleConfiguration yamlEncryptColumnRuleConfiguration = new YamlEncryptColumnRuleConfiguration();
- yamlEncryptColumnRuleConfiguration.setLogicColumn("logicColumn");
- yamlEncryptColumnRuleConfiguration.setCipherColumn("cipherColumn");
- yamlEncryptColumnRuleConfiguration.setAssistedQueryColumn("assistedQueryColumn");
- yamlEncryptColumnRuleConfiguration.setPlainColumn("plainColumn");
- yamlEncryptColumnRuleConfiguration.setEncryptorName("encryptorName");
- EncryptColumnRuleConfiguration actual = encryptColumnRuleConfigurationYamlSwapper.swapToObject(yamlEncryptColumnRuleConfiguration);
+ EncryptColumnRuleConfigurationYamlSwapper swapper = new EncryptColumnRuleConfigurationYamlSwapper();
+ YamlEncryptColumnRuleConfiguration yamlEncryptColumnRuleConfig = new YamlEncryptColumnRuleConfiguration();
+ yamlEncryptColumnRuleConfig.setLogicColumn("logicColumn");
+ yamlEncryptColumnRuleConfig.setCipherColumn("cipherColumn");
+ yamlEncryptColumnRuleConfig.setAssistedQueryColumn("assistedQueryColumn");
+ yamlEncryptColumnRuleConfig.setPlainColumn("plainColumn");
+ yamlEncryptColumnRuleConfig.setEncryptorName("encryptorName");
+ EncryptColumnRuleConfiguration actual = swapper.swapToObject(yamlEncryptColumnRuleConfig);
assertThat(actual.getLogicColumn(), is("logicColumn"));
assertThat(actual.getCipherColumn(), is("cipherColumn"));
assertThat(actual.getAssistedQueryColumn(), is("assistedQueryColumn"));
diff --git a/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/main/java/org/apache/shardingsphere/replication/primaryreplica/rule/PrimaryReplicaReplicationDataSourceRule.java b/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/main/java/org/apache/shardingsphere/replication/primaryreplica/rule/PrimaryReplicaReplicationDataSourceRule.java
index 5b255e4..5e89e8a 100644
--- a/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/main/java/org/apache/shardingsphere/replication/primaryreplica/rule/PrimaryReplicaReplicationDataSourceRule.java
+++ b/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/main/java/org/apache/shardingsphere/replication/primaryreplica/rule/PrimaryReplicaReplicationDataSourceRule.java
@@ -57,10 +57,10 @@ public final class PrimaryReplicaReplicationDataSourceRule {
this.loadBalancer = loadBalancer;
}
- private void checkConfiguration(final PrimaryReplicaReplicationDataSourceRuleConfiguration configuration) {
- Preconditions.checkArgument(!Strings.isNullOrEmpty(configuration.getName()), "Name is required.");
- Preconditions.checkArgument(!Strings.isNullOrEmpty(configuration.getPrimaryDataSourceName()), "Primary data source name is required.");
- Preconditions.checkArgument(null != configuration.getReplicaDataSourceNames() && !configuration.getReplicaDataSourceNames().isEmpty(), "Replica data source names are required.");
+ private void checkConfiguration(final PrimaryReplicaReplicationDataSourceRuleConfiguration config) {
+ Preconditions.checkArgument(!Strings.isNullOrEmpty(config.getName()), "Name is required.");
+ Preconditions.checkArgument(!Strings.isNullOrEmpty(config.getPrimaryDataSourceName()), "Primary data source name is required.");
+ Preconditions.checkArgument(null != config.getReplicaDataSourceNames() && !config.getReplicaDataSourceNames().isEmpty(), "Replica data source names are required.");
}
/**
diff --git a/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/main/java/org/apache/shardingsphere/replication/primaryreplica/rule/biulder/AlgorithmProvidedPrimaryReplicaReplicationRuleBuilder.java b/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/main/java/org/apache/shardingsphere/replication/primaryreplica/rule/biulder/AlgorithmProvidedPrimaryR [...]
index 0d5904c..6a9bf7c 100644
--- a/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/main/java/org/apache/shardingsphere/replication/primaryreplica/rule/biulder/AlgorithmProvidedPrimaryReplicaReplicationRuleBuilder.java
+++ b/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/main/java/org/apache/shardingsphere/replication/primaryreplica/rule/biulder/AlgorithmProvidedPrimaryReplicaReplicationRuleBuilder.java
@@ -31,8 +31,8 @@ public final class AlgorithmProvidedPrimaryReplicaReplicationRuleBuilder
implements ShardingSphereRuleBuilder<PrimaryReplicaReplicationRule, AlgorithmProvidedPrimaryReplicaReplicationRuleConfiguration> {
@Override
- public PrimaryReplicaReplicationRule build(final AlgorithmProvidedPrimaryReplicaReplicationRuleConfiguration ruleConfiguration, final Collection<String> dataSourceNames) {
- return new PrimaryReplicaReplicationRule(ruleConfiguration);
+ public PrimaryReplicaReplicationRule build(final AlgorithmProvidedPrimaryReplicaReplicationRuleConfiguration ruleConfig, final Collection<String> dataSourceNames) {
+ return new PrimaryReplicaReplicationRule(ruleConfig);
}
@Override
diff --git a/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/main/java/org/apache/shardingsphere/replication/primaryreplica/rule/biulder/PrimaryReplicaReplicationRuleBuilder.java b/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/main/java/org/apache/shardingsphere/replication/primaryreplica/rule/biulder/PrimaryReplicaReplicationRuleBuilder.java
index e4b8cad..8c31150 100644
--- a/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/main/java/org/apache/shardingsphere/replication/primaryreplica/rule/biulder/PrimaryReplicaReplicationRuleBuilder.java
+++ b/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/main/java/org/apache/shardingsphere/replication/primaryreplica/rule/biulder/PrimaryReplicaReplicationRuleBuilder.java
@@ -30,8 +30,8 @@ import java.util.Collection;
public final class PrimaryReplicaReplicationRuleBuilder implements ShardingSphereRuleBuilder<PrimaryReplicaReplicationRule, PrimaryReplicaReplicationRuleConfiguration> {
@Override
- public PrimaryReplicaReplicationRule build(final PrimaryReplicaReplicationRuleConfiguration ruleConfiguration, final Collection<String> dataSourceNames) {
- return new PrimaryReplicaReplicationRule(ruleConfiguration);
+ public PrimaryReplicaReplicationRule build(final PrimaryReplicaReplicationRuleConfiguration ruleConfig, final Collection<String> dataSourceNames) {
+ return new PrimaryReplicaReplicationRule(ruleConfig);
}
@Override
diff --git a/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/main/java/org/apache/shardingsphere/replication/primaryreplica/yaml/swapper/PrimaryReplicaReplicationRuleAlgorithmProviderConfigurationYamlSwapper.java b/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/main/java/org/apache/shardingsphere/replication/primaryreplica/yaml/swapper/PrimaryR [...]
index 6501599..2f6ad47 100644
--- a/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/main/java/org/apache/shardingsphere/replication/primaryreplica/yaml/swapper/PrimaryReplicaReplicationRuleAlgorithmProviderConfigurationYamlSwapper.java
+++ b/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/main/java/org/apache/shardingsphere/replication/primaryreplica/yaml/swapper/PrimaryReplicaReplicationRuleAlgorithmProviderConfigurationYamlSwapper.java
@@ -63,9 +63,9 @@ public final class PrimaryReplicaReplicationRuleAlgorithmProviderConfigurationYa
for (Entry<String, YamlPrimaryReplicaReplicationDataSourceRuleConfiguration> entry : yamlConfig.getDataSources().entrySet()) {
dataSources.add(swapToObject(entry.getKey(), entry.getValue()));
}
- AlgorithmProvidedPrimaryReplicaReplicationRuleConfiguration ruleConfiguration = new AlgorithmProvidedPrimaryReplicaReplicationRuleConfiguration();
- ruleConfiguration.setDataSources(dataSources);
- return ruleConfiguration;
+ AlgorithmProvidedPrimaryReplicaReplicationRuleConfiguration ruleConfig = new AlgorithmProvidedPrimaryReplicaReplicationRuleConfiguration();
+ ruleConfig.setDataSources(dataSources);
+ return ruleConfig;
}
private PrimaryReplicaReplicationDataSourceRuleConfiguration swapToObject(final String name, final YamlPrimaryReplicaReplicationDataSourceRuleConfiguration yamlDataSourceRuleConfig) {
diff --git a/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/test/java/org/apache/shardingsphere/replication/primaryreplica/rule/biulder/AlgorithmProvidedPrimaryReplicaReplicationRuleBuilderTest.java b/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/test/java/org/apache/shardingsphere/replication/primaryreplica/rule/biulder/AlgorithmProvidedPrim [...]
index 0137d22..705b312 100644
--- a/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/test/java/org/apache/shardingsphere/replication/primaryreplica/rule/biulder/AlgorithmProvidedPrimaryReplicaReplicationRuleBuilderTest.java
+++ b/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/test/java/org/apache/shardingsphere/replication/primaryreplica/rule/biulder/AlgorithmProvidedPrimaryReplicaReplicationRuleBuilderTest.java
@@ -41,11 +41,12 @@ public final class AlgorithmProvidedPrimaryReplicaReplicationRuleBuilderTest {
@SuppressWarnings({"rawtypes", "unchecked"})
@Test
public void assertBuild() {
- AlgorithmProvidedPrimaryReplicaReplicationRuleConfiguration ruleConfig = mock(AlgorithmProvidedPrimaryReplicaReplicationRuleConfiguration.class);
- PrimaryReplicaReplicationDataSourceRuleConfiguration ruleConfiguration = new PrimaryReplicaReplicationDataSourceRuleConfiguration("name", "primaryDataSourceName",
- Collections.singletonList("name"), "loadBalancerName");
- when(ruleConfig.getDataSources()).thenReturn(Collections.singletonList(ruleConfiguration));
- ShardingSphereRuleBuilder builder = OrderedSPIRegistry.getRegisteredServices(Collections.singletonList(ruleConfig), ShardingSphereRuleBuilder.class).get(ruleConfig);
- assertThat(builder.build(ruleConfig, Collections.emptyList()), instanceOf(PrimaryReplicaReplicationRule.class));
+ AlgorithmProvidedPrimaryReplicaReplicationRuleConfiguration algorithmProvidedRuleConfig = mock(AlgorithmProvidedPrimaryReplicaReplicationRuleConfiguration.class);
+ PrimaryReplicaReplicationDataSourceRuleConfiguration ruleConfig = new PrimaryReplicaReplicationDataSourceRuleConfiguration(
+ "name", "primaryDataSourceName", Collections.singletonList("name"), "loadBalancerName");
+ when(algorithmProvidedRuleConfig.getDataSources()).thenReturn(Collections.singletonList(ruleConfig));
+ ShardingSphereRuleBuilder builder = OrderedSPIRegistry.getRegisteredServices(
+ Collections.singletonList(algorithmProvidedRuleConfig), ShardingSphereRuleBuilder.class).get(algorithmProvidedRuleConfig);
+ assertThat(builder.build(algorithmProvidedRuleConfig, Collections.emptyList()), instanceOf(PrimaryReplicaReplicationRule.class));
}
}
diff --git a/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/test/java/org/apache/shardingsphere/replication/primaryreplica/rule/biulder/PrimaryReplicaReplicationRuleBuilderTest.java b/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/test/java/org/apache/shardingsphere/replication/primaryreplica/rule/biulder/PrimaryReplicaReplicationRuleBuilderTest.java
index ccab7a8..1f2fa72 100644
--- a/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/test/java/org/apache/shardingsphere/replication/primaryreplica/rule/biulder/PrimaryReplicaReplicationRuleBuilderTest.java
+++ b/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/test/java/org/apache/shardingsphere/replication/primaryreplica/rule/biulder/PrimaryReplicaReplicationRuleBuilderTest.java
@@ -42,9 +42,9 @@ public final class PrimaryReplicaReplicationRuleBuilderTest {
@Test
public void assertBuild() {
PrimaryReplicaReplicationRuleConfiguration ruleConfig = mock(PrimaryReplicaReplicationRuleConfiguration.class);
- PrimaryReplicaReplicationDataSourceRuleConfiguration ruleConfiguration = new PrimaryReplicaReplicationDataSourceRuleConfiguration("name", "primaryDataSourceName",
- Collections.singletonList("name"), "loadBalancerName");
- when(ruleConfig.getDataSources()).thenReturn(Collections.singletonList(ruleConfiguration));
+ PrimaryReplicaReplicationDataSourceRuleConfiguration dataSourceRuleConfig = new PrimaryReplicaReplicationDataSourceRuleConfiguration(
+ "name", "primaryDataSourceName", Collections.singletonList("name"), "loadBalancerName");
+ when(ruleConfig.getDataSources()).thenReturn(Collections.singletonList(dataSourceRuleConfig));
ShardingSphereRuleBuilder builder = OrderedSPIRegistry.getRegisteredServices(Collections.singletonList(ruleConfig), ShardingSphereRuleBuilder.class).get(ruleConfig);
assertThat(builder.build(ruleConfig, Collections.emptyList()), instanceOf(PrimaryReplicaReplicationRule.class));
}
diff --git a/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/test/java/org/apache/shardingsphere/replication/primaryreplica/yaml/swapper/PrimaryReplicaReplicationRuleAlgorithmProviderConfigurationYamlSwapperTest.java b/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/test/java/org/apache/shardingsphere/replication/primaryreplica/yaml/swapper/Prim [...]
index 0f93bad..2e447e9 100644
--- a/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/test/java/org/apache/shardingsphere/replication/primaryreplica/yaml/swapper/PrimaryReplicaReplicationRuleAlgorithmProviderConfigurationYamlSwapperTest.java
+++ b/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/test/java/org/apache/shardingsphere/replication/primaryreplica/yaml/swapper/PrimaryReplicaReplicationRuleAlgorithmProviderConfigurationYamlSwapperTest.java
@@ -59,12 +59,12 @@ public final class PrimaryReplicaReplicationRuleAlgorithmProviderConfigurationYa
assertNotNull(actual);
assertNotNull(actual.getDataSources());
assertTrue(actual.getDataSources().iterator().hasNext());
- PrimaryReplicaReplicationDataSourceRuleConfiguration ruleConfiguration = actual.getDataSources().iterator().next();
- assertNotNull(ruleConfiguration);
- assertThat(ruleConfiguration.getName(), is("name"));
- assertThat(ruleConfiguration.getPrimaryDataSourceName(), is("primaryDataSourceName"));
- assertThat(ruleConfiguration.getLoadBalancerName(), is("loadBalancerName"));
- assertThat(ruleConfiguration.getReplicaDataSourceNames(), is(Collections.singletonList("replicaDataSourceName")));
+ PrimaryReplicaReplicationDataSourceRuleConfiguration ruleConfig = actual.getDataSources().iterator().next();
+ assertNotNull(ruleConfig);
+ assertThat(ruleConfig.getName(), is("name"));
+ assertThat(ruleConfig.getPrimaryDataSourceName(), is("primaryDataSourceName"));
+ assertThat(ruleConfig.getLoadBalancerName(), is("loadBalancerName"));
+ assertThat(ruleConfig.getReplicaDataSourceNames(), is(Collections.singletonList("replicaDataSourceName")));
assertThat(actual.getLoadBalanceAlgorithms(), is(Collections.emptyMap()));
}
@@ -84,9 +84,9 @@ public final class PrimaryReplicaReplicationRuleAlgorithmProviderConfigurationYa
}
private YamlPrimaryReplicaReplicationRuleConfiguration createYamlPrimaryReplicaReplicationRuleConfiguration() {
- PrimaryReplicaReplicationDataSourceRuleConfiguration ruleConfiguration = new PrimaryReplicaReplicationDataSourceRuleConfiguration("name", "primaryDataSourceName",
+ PrimaryReplicaReplicationDataSourceRuleConfiguration ruleConfig = new PrimaryReplicaReplicationDataSourceRuleConfiguration("name", "primaryDataSourceName",
Collections.singletonList("replicaDataSourceName"), "loadBalancerName");
return swapper.swapToYamlConfiguration(
- new AlgorithmProvidedPrimaryReplicaReplicationRuleConfiguration(Collections.singletonList(ruleConfiguration), ImmutableMap.of("name", new RandomReplicaLoadBalanceAlgorithm())));
+ new AlgorithmProvidedPrimaryReplicaReplicationRuleConfiguration(Collections.singletonList(ruleConfig), ImmutableMap.of("name", new RandomReplicaLoadBalanceAlgorithm())));
}
}
diff --git a/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/test/java/org/apache/shardingsphere/replication/primaryreplica/yaml/swapper/YamlRootRuleConfigurationsForYamlPrimaryReplicaReplicationRuleConfigurationTest.java b/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/test/java/org/apache/shardingsphere/replication/primaryreplica/yaml/swapper [...]
index 42d9fb1..5fdfd6c 100644
--- a/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/test/java/org/apache/shardingsphere/replication/primaryreplica/yaml/swapper/YamlRootRuleConfigurationsForYamlPrimaryReplicaReplicationRuleConfigurationTest.java
+++ b/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-common/src/test/java/org/apache/shardingsphere/replication/primaryreplica/yaml/swapper/YamlRootRuleConfigurationsForYamlPrimaryReplicaReplicationRuleConfigurationTest.java
@@ -39,9 +39,9 @@ public final class YamlRootRuleConfigurationsForYamlPrimaryReplicaReplicationRul
public void assertUnmarshalWithYamlFile() throws IOException {
URL url = getClass().getClassLoader().getResource("yaml/primary-replica-replication-rule.yaml");
assertNotNull(url);
- YamlRootRuleConfigurations rootRuleConfigurations = YamlEngine.unmarshal(new File(url.getFile()), YamlRootRuleConfigurations.class);
- assertThat(rootRuleConfigurations.getRules().size(), is(1));
- assertPrimaryReplicaReplicationRule((YamlPrimaryReplicaReplicationRuleConfiguration) rootRuleConfigurations.getRules().iterator().next());
+ YamlRootRuleConfigurations rootRuleConfigs = YamlEngine.unmarshal(new File(url.getFile()), YamlRootRuleConfigurations.class);
+ assertThat(rootRuleConfigs.getRules().size(), is(1));
+ assertPrimaryReplicaReplicationRule((YamlPrimaryReplicaReplicationRuleConfiguration) rootRuleConfigs.getRules().iterator().next());
}
@Test
diff --git a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-common/src/main/java/org/apache/shardingsphere/shadow/rule/ShadowRule.java b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-common/src/main/java/org/apache/shardingsphere/shadow/rule/ShadowRule.java
index e17d314..ccaee24 100644
--- a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-common/src/main/java/org/apache/shardingsphere/shadow/rule/ShadowRule.java
+++ b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-common/src/main/java/org/apache/shardingsphere/shadow/rule/ShadowRule.java
@@ -34,11 +34,11 @@ public final class ShadowRule implements ShardingSphereRule {
private final String column;
- public ShadowRule(final ShadowRuleConfiguration shadowRuleConfiguration) {
- column = shadowRuleConfiguration.getColumn();
- shadowMappings = new HashMap<>(shadowRuleConfiguration.getShadowDataSourceNames().size());
- for (int i = 0; i < shadowRuleConfiguration.getSourceDataSourceNames().size(); i++) {
- shadowMappings.put(shadowRuleConfiguration.getSourceDataSourceNames().get(i), shadowRuleConfiguration.getShadowDataSourceNames().get(i));
+ public ShadowRule(final ShadowRuleConfiguration shadowRuleConfig) {
+ column = shadowRuleConfig.getColumn();
+ shadowMappings = new HashMap<>(shadowRuleConfig.getShadowDataSourceNames().size());
+ for (int i = 0; i < shadowRuleConfig.getSourceDataSourceNames().size(); i++) {
+ shadowMappings.put(shadowRuleConfig.getSourceDataSourceNames().get(i), shadowRuleConfig.getShadowDataSourceNames().get(i));
}
}
}
diff --git a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-common/src/main/java/org/apache/shardingsphere/shadow/rule/builder/ShadowRuleBuilder.java b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-common/src/main/java/org/apache/shardingsphere/shadow/rule/builder/ShadowRuleBuilder.java
index 9403378..1fb28ae 100644
--- a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-common/src/main/java/org/apache/shardingsphere/shadow/rule/builder/ShadowRuleBuilder.java
+++ b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-common/src/main/java/org/apache/shardingsphere/shadow/rule/builder/ShadowRuleBuilder.java
@@ -30,8 +30,8 @@ import java.util.Collection;
public final class ShadowRuleBuilder implements ShardingSphereRuleBuilder<ShadowRule, ShadowRuleConfiguration> {
@Override
- public ShadowRule build(final ShadowRuleConfiguration ruleConfiguration, final Collection<String> dataSourceNames) {
- return new ShadowRule(ruleConfiguration);
+ public ShadowRule build(final ShadowRuleConfiguration ruleConfig, final Collection<String> dataSourceNames) {
+ return new ShadowRule(ruleConfig);
}
@Override
diff --git a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-common/src/test/java/org/apache/shardingsphere/shadow/rule/ShadowRuleTest.java b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-common/src/test/java/org/apache/shardingsphere/shadow/rule/ShadowRuleTest.java
index 484f5a2..b3431df 100644
--- a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-common/src/test/java/org/apache/shardingsphere/shadow/rule/ShadowRuleTest.java
+++ b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-common/src/test/java/org/apache/shardingsphere/shadow/rule/ShadowRuleTest.java
@@ -39,8 +39,7 @@ public final class ShadowRuleTest {
}
private ShadowRule createShadowRule() {
- ShadowRuleConfiguration configuration = new ShadowRuleConfiguration("shadow", Arrays.asList("ds", "ds1"), Arrays.asList("shadow_ds", "shadow_ds1"));
- return new ShadowRule(configuration);
+ return new ShadowRule(new ShadowRuleConfiguration("shadow", Arrays.asList("ds", "ds1"), Arrays.asList("shadow_ds", "shadow_ds1")));
}
private void assertShadowRule(final ShadowRule rule) {
diff --git a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-common/src/test/java/org/apache/shardingsphere/shadow/yaml/swapper/ShadowRuleConfigurationYamlSwapperTest.java b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-common/src/test/java/org/apache/shardingsphere/shadow/yaml/swapper/ShadowRuleConfigurationYamlSwapperTest.java
index 325a6f2..d0cd91b 100644
--- a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-common/src/test/java/org/apache/shardingsphere/shadow/yaml/swapper/ShadowRuleConfigurationYamlSwapperTest.java
+++ b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-common/src/test/java/org/apache/shardingsphere/shadow/yaml/swapper/ShadowRuleConfigurationYamlSwapperTest.java
@@ -30,8 +30,8 @@ public final class ShadowRuleConfigurationYamlSwapperTest {
@Test
public void assertSwapToYamlConfiguration() {
- ShadowRuleConfiguration shadowRuleConfiguration = new ShadowRuleConfiguration("shadow", Arrays.asList("ds", "ds1"), Arrays.asList("shadow_ds", "shadow_ds1"));
- YamlShadowRuleConfiguration actual = new ShadowRuleConfigurationYamlSwapper().swapToYamlConfiguration(shadowRuleConfiguration);
+ ShadowRuleConfiguration shadowRuleConfig = new ShadowRuleConfiguration("shadow", Arrays.asList("ds", "ds1"), Arrays.asList("shadow_ds", "shadow_ds1"));
+ YamlShadowRuleConfiguration actual = new ShadowRuleConfigurationYamlSwapper().swapToYamlConfiguration(shadowRuleConfig);
assertThat(actual.getColumn(), is("shadow"));
assertThat(actual.getSourceDataSourceNames().size(), is(actual.getShadowDataSourceNames().size()));
assertThat(actual.getSourceDataSourceNames(), is(Arrays.asList("ds", "ds1")));
diff --git a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-route/src/test/java/org/apache/shardingsphere/shadow/route/engine/judge/impl/PreparedShadowDataSourceRouterTest.java b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-route/src/test/java/org/apache/shardingsphere/shadow/route/engine/judge/impl/PreparedShadowDataSourceRouterTest.java
index 782fc06..65d7994 100644
--- a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-route/src/test/java/org/apache/shardingsphere/shadow/route/engine/judge/impl/PreparedShadowDataSourceRouterTest.java
+++ b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-route/src/test/java/org/apache/shardingsphere/shadow/route/engine/judge/impl/PreparedShadowDataSourceRouterTest.java
@@ -53,8 +53,8 @@ public final class PreparedShadowDataSourceRouterTest {
public void isShadowSQL() {
SchemaMetaData schemaMetaData = mock(SchemaMetaData.class);
when(schemaMetaData.getAllColumnNames("tbl")).thenReturn(Arrays.asList("id", "name", "shadow"));
- ShadowRuleConfiguration shadowRuleConfiguration = new ShadowRuleConfiguration("shadow", Collections.singletonList("ds"), Collections.singletonList("shadow_ds"));
- ShadowRule shadowRule = new ShadowRule(shadowRuleConfiguration);
+ ShadowRuleConfiguration shadowRuleConfig = new ShadowRuleConfiguration("shadow", Collections.singletonList("ds"), Collections.singletonList("shadow_ds"));
+ ShadowRule shadowRule = new ShadowRule(shadowRuleConfig);
InsertStatement insertStatement = new MySQLInsertStatement();
insertStatement.setTable(new SimpleTableSegment(0, 0, new IdentifierValue("tbl")));
InsertColumnsSegment insertColumnsSegment = new InsertColumnsSegment(0, 0,
@@ -93,8 +93,8 @@ public final class PreparedShadowDataSourceRouterTest {
private void isShadowSQLInLiteralExpression(final SelectStatement selectStatement) {
SchemaMetaData schemaMetaData = mock(SchemaMetaData.class);
when(schemaMetaData.getAllColumnNames("tbl")).thenReturn(Arrays.asList("id", "name", "shadow"));
- ShadowRuleConfiguration shadowRuleConfiguration = new ShadowRuleConfiguration("shadow", Collections.singletonList("ds"), Collections.singletonList("shadow_ds"));
- ShadowRule shadowRule = new ShadowRule(shadowRuleConfiguration);
+ ShadowRuleConfiguration shadowRuleConfig = new ShadowRuleConfiguration("shadow", Collections.singletonList("ds"), Collections.singletonList("shadow_ds"));
+ ShadowRule shadowRule = new ShadowRule(shadowRuleConfig);
PreparedShadowDataSourceJudgeEngine preparedShadowDataSourceRouter = new PreparedShadowDataSourceJudgeEngine(shadowRule,
selectStatementContext(selectStatement), Arrays.asList(1, "Tom", true));
assertTrue("should be shadow", preparedShadowDataSourceRouter.isShadow());
diff --git a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-route/src/test/java/org/apache/shardingsphere/shadow/route/engine/judge/impl/SimpleShadowDataSourceRouterTest.java b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-route/src/test/java/org/apache/shardingsphere/shadow/route/engine/judge/impl/SimpleShadowDataSourceRouterTest.java
index d5c2f04..019a45c 100644
--- a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-route/src/test/java/org/apache/shardingsphere/shadow/route/engine/judge/impl/SimpleShadowDataSourceRouterTest.java
+++ b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-route/src/test/java/org/apache/shardingsphere/shadow/route/engine/judge/impl/SimpleShadowDataSourceRouterTest.java
@@ -65,8 +65,7 @@ public final class SimpleShadowDataSourceRouterTest {
public void setUp() {
schemaMetaData = mock(SchemaMetaData.class);
when(schemaMetaData.getAllColumnNames("tbl")).thenReturn(Arrays.asList("id", "name", "shadow"));
- ShadowRuleConfiguration shadowRuleConfiguration = new ShadowRuleConfiguration("shadow", Collections.singletonList("ds"), Collections.singletonList("shadow_ds"));
- shadowRule = new ShadowRule(shadowRuleConfiguration);
+ shadowRule = new ShadowRule(new ShadowRuleConfiguration("shadow", Collections.singletonList("ds"), Collections.singletonList("shadow_ds")));
}
@Test
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/rule/ShardingRule.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/rule/ShardingRule.java
index 580d944..ff784dd 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/rule/ShardingRule.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/rule/ShardingRule.java
@@ -165,9 +165,9 @@ public final class ShardingRule implements DataNodeRoutedRule {
return new BindingTableRule(Splitter.on(",").trimResults().splitToList(bindingTableGroup).stream().map(this::getTableRule).collect(Collectors.toList()));
}
- private ShardingStrategy createDefaultShardingStrategy(final ShardingStrategyConfiguration shardingStrategyConfiguration) {
- return null == shardingStrategyConfiguration ? new NoneShardingStrategy()
- : ShardingStrategyFactory.newInstance(shardingStrategyConfiguration, shardingAlgorithms.get(shardingStrategyConfiguration.getShardingAlgorithmName()));
+ private ShardingStrategy createDefaultShardingStrategy(final ShardingStrategyConfiguration shardingStrategyConfig) {
+ return null == shardingStrategyConfig ? new NoneShardingStrategy()
+ : ShardingStrategyFactory.newInstance(shardingStrategyConfig, shardingAlgorithms.get(shardingStrategyConfig.getShardingAlgorithmName()));
}
/**
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/rule/TableRule.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/rule/TableRule.java
index e6cf474..13551bf 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/rule/TableRule.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/rule/TableRule.java
@@ -99,9 +99,9 @@ public final class TableRule {
actualTables = getActualTables();
databaseShardingStrategy = createShardingStrategy(tableRuleConfig.getDatabaseShardingStrategy(), databaseShardingAlgorithm);
tableShardingStrategy = createShardingStrategy(tableRuleConfig.getTableShardingStrategy(), tableShardingAlgorithm);
- KeyGenerateStrategyConfiguration keyGeneratorConfiguration = tableRuleConfig.getKeyGenerateStrategy();
- generateKeyColumn = null != keyGeneratorConfiguration && !Strings.isNullOrEmpty(keyGeneratorConfiguration.getColumn()) ? keyGeneratorConfiguration.getColumn() : defaultGenerateKeyColumn;
- keyGeneratorName = null == keyGeneratorConfiguration ? null : keyGeneratorConfiguration.getKeyGeneratorName();
+ KeyGenerateStrategyConfiguration keyGeneratorConfig = tableRuleConfig.getKeyGenerateStrategy();
+ generateKeyColumn = null != keyGeneratorConfig && !Strings.isNullOrEmpty(keyGeneratorConfig.getColumn()) ? keyGeneratorConfig.getColumn() : defaultGenerateKeyColumn;
+ keyGeneratorName = null == keyGeneratorConfig ? null : keyGeneratorConfig.getKeyGeneratorName();
checkRule(dataNodes);
}
@@ -116,14 +116,14 @@ public final class TableRule {
dataNodeIndexMap = new HashMap<>(dataNodes.size(), 1);
actualDataNodes = isEmptyDataNodes(dataNodes) ? generateDataNodes(tableRuleConfig.getLogicTable(), dataSourceNames) : generateDataNodes(dataNodes, dataSourceNames);
actualTables = getActualTables();
- KeyGenerateStrategyConfiguration keyGeneratorConfiguration = tableRuleConfig.getKeyGenerateStrategy();
- generateKeyColumn = null != keyGeneratorConfiguration && !Strings.isNullOrEmpty(keyGeneratorConfiguration.getColumn()) ? keyGeneratorConfiguration.getColumn() : defaultGenerateKeyColumn;
- keyGeneratorName = null == keyGeneratorConfiguration ? null : keyGeneratorConfiguration.getKeyGeneratorName();
+ KeyGenerateStrategyConfiguration keyGeneratorConfig = tableRuleConfig.getKeyGenerateStrategy();
+ generateKeyColumn = null != keyGeneratorConfig && !Strings.isNullOrEmpty(keyGeneratorConfig.getColumn()) ? keyGeneratorConfig.getColumn() : defaultGenerateKeyColumn;
+ keyGeneratorName = null == keyGeneratorConfig ? null : keyGeneratorConfig.getKeyGeneratorName();
checkRule(dataNodes);
}
- private ShardingStrategy createShardingStrategy(final ShardingStrategyConfiguration shardingStrategyConfiguration, final ShardingAlgorithm shardingAlgorithm) {
- return null == shardingStrategyConfiguration ? null : ShardingStrategyFactory.newInstance(shardingStrategyConfiguration, shardingAlgorithm);
+ private ShardingStrategy createShardingStrategy(final ShardingStrategyConfiguration shardingStrategyConfig, final ShardingAlgorithm shardingAlgorithm) {
+ return null == shardingStrategyConfig ? null : ShardingStrategyFactory.newInstance(shardingStrategyConfig, shardingAlgorithm);
}
private List<String> getDataNodes(final ShardingAutoTableRuleConfiguration tableRuleConfig, final Collection<String> dataSourceNames) {
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/rule/builder/AlgorithmProvidedShardingRuleBuilder.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/rule/builder/AlgorithmProvidedShardingRuleBuilder.java
index 96f5e32..9eb0dd1 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/rule/builder/AlgorithmProvidedShardingRuleBuilder.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/rule/builder/AlgorithmProvidedShardingRuleBuilder.java
@@ -30,8 +30,8 @@ import java.util.Collection;
public final class AlgorithmProvidedShardingRuleBuilder implements ShardingSphereRuleBuilder<ShardingRule, AlgorithmProvidedShardingRuleConfiguration> {
@Override
- public ShardingRule build(final AlgorithmProvidedShardingRuleConfiguration ruleConfiguration, final Collection<String> dataSourceNames) {
- return new ShardingRule(ruleConfiguration, dataSourceNames);
+ public ShardingRule build(final AlgorithmProvidedShardingRuleConfiguration ruleConfig, final Collection<String> dataSourceNames) {
+ return new ShardingRule(ruleConfig, dataSourceNames);
}
@Override
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/rule/builder/ShardingRuleBuilder.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/rule/builder/ShardingRuleBuilder.java
index 2675fd1..b64b83f 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/rule/builder/ShardingRuleBuilder.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/rule/builder/ShardingRuleBuilder.java
@@ -30,8 +30,8 @@ import java.util.Collection;
public final class ShardingRuleBuilder implements ShardingSphereRuleBuilder<ShardingRule, ShardingRuleConfiguration> {
@Override
- public ShardingRule build(final ShardingRuleConfiguration ruleConfiguration, final Collection<String> dataSourceNames) {
- return new ShardingRule(ruleConfiguration, dataSourceNames);
+ public ShardingRule build(final ShardingRuleConfiguration ruleConfig, final Collection<String> dataSourceNames) {
+ return new ShardingRule(ruleConfig, dataSourceNames);
}
@Override
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/strategy/ShardingStrategyFactory.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/strategy/ShardingStrategyFactory.java
index 62b38f0..9f5d60e 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/strategy/ShardingStrategyFactory.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/strategy/ShardingStrategyFactory.java
@@ -40,16 +40,16 @@ public final class ShardingStrategyFactory {
/**
* Create sharding strategy.
*
- * @param shardingStrategyConfiguration sharding strategy configuration
+ * @param shardingStrategyConfig sharding strategy configuration
* @param shardingAlgorithm sharding algorithm
* @return sharding strategy instance
*/
- public static ShardingStrategy newInstance(final ShardingStrategyConfiguration shardingStrategyConfiguration, final ShardingAlgorithm shardingAlgorithm) {
+ public static ShardingStrategy newInstance(final ShardingStrategyConfiguration shardingStrategyConfig, final ShardingAlgorithm shardingAlgorithm) {
if (shardingAlgorithm instanceof StandardShardingAlgorithm) {
- return new StandardShardingStrategy(((StandardShardingStrategyConfiguration) shardingStrategyConfiguration).getShardingColumn(), (StandardShardingAlgorithm) shardingAlgorithm);
+ return new StandardShardingStrategy(((StandardShardingStrategyConfiguration) shardingStrategyConfig).getShardingColumn(), (StandardShardingAlgorithm) shardingAlgorithm);
}
if (shardingAlgorithm instanceof ComplexKeysShardingAlgorithm) {
- return new ComplexShardingStrategy(((ComplexShardingStrategyConfiguration) shardingStrategyConfiguration).getShardingColumns(), (ComplexKeysShardingAlgorithm) shardingAlgorithm);
+ return new ComplexShardingStrategy(((ComplexShardingStrategyConfiguration) shardingStrategyConfig).getShardingColumns(), (ComplexKeysShardingAlgorithm) shardingAlgorithm);
}
if (shardingAlgorithm instanceof HintShardingAlgorithm) {
return new HintShardingStrategy((HintShardingAlgorithm) shardingAlgorithm);
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleAlgorithmProviderConfigurationYamlSwapper.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleAlgorithmProviderConfigurationYamlSwapper.java
index 2046156..3f23263 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleAlgorithmProviderConfigurationYamlSwapper.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleAlgorithmProviderConfigurationYamlSwapper.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.sharding.yaml.swapper;
-import java.util.Map.Entry;
import org.apache.shardingsphere.infra.yaml.config.algorithm.YamlShardingSphereAlgorithmConfiguration;
import org.apache.shardingsphere.infra.yaml.swapper.YamlRuleConfigurationSwapper;
import org.apache.shardingsphere.sharding.algorithm.config.AlgorithmProvidedShardingRuleConfiguration;
@@ -30,6 +29,8 @@ import org.apache.shardingsphere.sharding.yaml.swapper.rule.ShardingTableRuleCon
import org.apache.shardingsphere.sharding.yaml.swapper.strategy.KeyGenerateStrategyConfigurationYamlSwapper;
import org.apache.shardingsphere.sharding.yaml.swapper.strategy.ShardingStrategyConfigurationYamlSwapper;
+import java.util.Map.Entry;
+
/**
* Algorithm provider sharding rule configuration YAML swapper.
*/
@@ -74,16 +75,15 @@ public final class ShardingRuleAlgorithmProviderConfigurationYamlSwapper impleme
return result;
}
- private void setDefaultStrategies(final YamlShardingRuleConfiguration yamlConfiguration,
- final AlgorithmProvidedShardingRuleConfiguration ruleConfiguration) {
- if (null != yamlConfiguration.getDefaultDatabaseStrategy()) {
- ruleConfiguration.setDefaultDatabaseShardingStrategy(shardingStrategyYamlSwapper.swapToObject(yamlConfiguration.getDefaultDatabaseStrategy()));
+ private void setDefaultStrategies(final YamlShardingRuleConfiguration yamlConfig, final AlgorithmProvidedShardingRuleConfiguration ruleConfig) {
+ if (null != yamlConfig.getDefaultDatabaseStrategy()) {
+ ruleConfig.setDefaultDatabaseShardingStrategy(shardingStrategyYamlSwapper.swapToObject(yamlConfig.getDefaultDatabaseStrategy()));
}
- if (null != yamlConfiguration.getDefaultTableStrategy()) {
- ruleConfiguration.setDefaultTableShardingStrategy(shardingStrategyYamlSwapper.swapToObject(yamlConfiguration.getDefaultTableStrategy()));
+ if (null != yamlConfig.getDefaultTableStrategy()) {
+ ruleConfig.setDefaultTableShardingStrategy(shardingStrategyYamlSwapper.swapToObject(yamlConfig.getDefaultTableStrategy()));
}
- if (null != yamlConfiguration.getDefaultKeyGenerateStrategy()) {
- ruleConfiguration.setDefaultKeyGenerateStrategy(keyGenerateStrategyYamlSwapper.swapToObject(yamlConfiguration.getDefaultKeyGenerateStrategy()));
+ if (null != yamlConfig.getDefaultKeyGenerateStrategy()) {
+ ruleConfig.setDefaultKeyGenerateStrategy(keyGenerateStrategyYamlSwapper.swapToObject(yamlConfig.getDefaultKeyGenerateStrategy()));
}
}
@@ -102,24 +102,24 @@ public final class ShardingRuleAlgorithmProviderConfigurationYamlSwapper impleme
return ShardingOrder.ALGORITHM_PROVIDER_SHARDING_ORDER;
}
- private void setYamlDefaultStrategies(final AlgorithmProvidedShardingRuleConfiguration data, final YamlShardingRuleConfiguration yamlConfiguration) {
+ private void setYamlDefaultStrategies(final AlgorithmProvidedShardingRuleConfiguration data, final YamlShardingRuleConfiguration yamlConfig) {
if (null != data.getDefaultDatabaseShardingStrategy()) {
- yamlConfiguration.setDefaultDatabaseStrategy(shardingStrategyYamlSwapper.swapToYamlConfiguration(data.getDefaultDatabaseShardingStrategy()));
+ yamlConfig.setDefaultDatabaseStrategy(shardingStrategyYamlSwapper.swapToYamlConfiguration(data.getDefaultDatabaseShardingStrategy()));
}
if (null != data.getDefaultTableShardingStrategy()) {
- yamlConfiguration.setDefaultTableStrategy(shardingStrategyYamlSwapper.swapToYamlConfiguration(data.getDefaultTableShardingStrategy()));
+ yamlConfig.setDefaultTableStrategy(shardingStrategyYamlSwapper.swapToYamlConfiguration(data.getDefaultTableShardingStrategy()));
}
if (null != data.getDefaultKeyGenerateStrategy()) {
- yamlConfiguration.setDefaultKeyGenerateStrategy(keyGenerateStrategyYamlSwapper.swapToYamlConfiguration(data.getDefaultKeyGenerateStrategy()));
+ yamlConfig.setDefaultKeyGenerateStrategy(keyGenerateStrategyYamlSwapper.swapToYamlConfiguration(data.getDefaultKeyGenerateStrategy()));
}
}
- private void setYamlAlgorithms(final AlgorithmProvidedShardingRuleConfiguration data, final YamlShardingRuleConfiguration yamlConfiguration) {
+ private void setYamlAlgorithms(final AlgorithmProvidedShardingRuleConfiguration data, final YamlShardingRuleConfiguration yamlConfig) {
if (null != data.getShardingAlgorithms()) {
- data.getShardingAlgorithms().forEach((key, value) -> yamlConfiguration.getShardingAlgorithms().put(key, YamlShardingSphereAlgorithmConfiguration.buildByTypedSPI(value)));
+ data.getShardingAlgorithms().forEach((key, value) -> yamlConfig.getShardingAlgorithms().put(key, YamlShardingSphereAlgorithmConfiguration.buildByTypedSPI(value)));
}
if (null != data.getKeyGenerators()) {
- data.getKeyGenerators().forEach((key, value) -> yamlConfiguration.getKeyGenerators().put(key, YamlShardingSphereAlgorithmConfiguration.buildByTypedSPI(value)));
+ data.getKeyGenerators().forEach((key, value) -> yamlConfig.getKeyGenerators().put(key, YamlShardingSphereAlgorithmConfiguration.buildByTypedSPI(value)));
}
}
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleConfigurationYamlSwapper.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleConfigurationYamlSwapper.java
index 3d9a4ac..8d94747 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleConfigurationYamlSwapper.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleConfigurationYamlSwapper.java
@@ -58,24 +58,24 @@ public final class ShardingRuleConfigurationYamlSwapper implements YamlRuleConfi
return result;
}
- private void setYamlDefaultStrategies(final ShardingRuleConfiguration data, final YamlShardingRuleConfiguration yamlConfiguration) {
+ private void setYamlDefaultStrategies(final ShardingRuleConfiguration data, final YamlShardingRuleConfiguration yamlConfig) {
if (null != data.getDefaultDatabaseShardingStrategy()) {
- yamlConfiguration.setDefaultDatabaseStrategy(shardingStrategyYamlSwapper.swapToYamlConfiguration(data.getDefaultDatabaseShardingStrategy()));
+ yamlConfig.setDefaultDatabaseStrategy(shardingStrategyYamlSwapper.swapToYamlConfiguration(data.getDefaultDatabaseShardingStrategy()));
}
if (null != data.getDefaultTableShardingStrategy()) {
- yamlConfiguration.setDefaultTableStrategy(shardingStrategyYamlSwapper.swapToYamlConfiguration(data.getDefaultTableShardingStrategy()));
+ yamlConfig.setDefaultTableStrategy(shardingStrategyYamlSwapper.swapToYamlConfiguration(data.getDefaultTableShardingStrategy()));
}
if (null != data.getDefaultKeyGenerateStrategy()) {
- yamlConfiguration.setDefaultKeyGenerateStrategy(keyGenerateStrategyYamlSwapper.swapToYamlConfiguration(data.getDefaultKeyGenerateStrategy()));
+ yamlConfig.setDefaultKeyGenerateStrategy(keyGenerateStrategyYamlSwapper.swapToYamlConfiguration(data.getDefaultKeyGenerateStrategy()));
}
}
- private void setYamlAlgorithms(final ShardingRuleConfiguration data, final YamlShardingRuleConfiguration yamlConfiguration) {
+ private void setYamlAlgorithms(final ShardingRuleConfiguration data, final YamlShardingRuleConfiguration yamlConfig) {
if (null != data.getShardingAlgorithms()) {
- data.getShardingAlgorithms().forEach((key, value) -> yamlConfiguration.getShardingAlgorithms().put(key, algorithmSwapper.swapToYamlConfiguration(value)));
+ data.getShardingAlgorithms().forEach((key, value) -> yamlConfig.getShardingAlgorithms().put(key, algorithmSwapper.swapToYamlConfiguration(value)));
}
if (null != data.getKeyGenerators()) {
- data.getKeyGenerators().forEach((key, value) -> yamlConfiguration.getKeyGenerators().put(key, algorithmSwapper.swapToYamlConfiguration(value)));
+ data.getKeyGenerators().forEach((key, value) -> yamlConfig.getKeyGenerators().put(key, algorithmSwapper.swapToYamlConfiguration(value)));
}
}
@@ -99,24 +99,24 @@ public final class ShardingRuleConfigurationYamlSwapper implements YamlRuleConfi
return result;
}
- private void setDefaultStrategies(final YamlShardingRuleConfiguration yamlConfiguration, final ShardingRuleConfiguration ruleConfiguration) {
- if (null != yamlConfiguration.getDefaultDatabaseStrategy()) {
- ruleConfiguration.setDefaultDatabaseShardingStrategy(shardingStrategyYamlSwapper.swapToObject(yamlConfiguration.getDefaultDatabaseStrategy()));
+ private void setDefaultStrategies(final YamlShardingRuleConfiguration yamlConfig, final ShardingRuleConfiguration ruleConfig) {
+ if (null != yamlConfig.getDefaultDatabaseStrategy()) {
+ ruleConfig.setDefaultDatabaseShardingStrategy(shardingStrategyYamlSwapper.swapToObject(yamlConfig.getDefaultDatabaseStrategy()));
}
- if (null != yamlConfiguration.getDefaultTableStrategy()) {
- ruleConfiguration.setDefaultTableShardingStrategy(shardingStrategyYamlSwapper.swapToObject(yamlConfiguration.getDefaultTableStrategy()));
+ if (null != yamlConfig.getDefaultTableStrategy()) {
+ ruleConfig.setDefaultTableShardingStrategy(shardingStrategyYamlSwapper.swapToObject(yamlConfig.getDefaultTableStrategy()));
}
- if (null != yamlConfiguration.getDefaultKeyGenerateStrategy()) {
- ruleConfiguration.setDefaultKeyGenerateStrategy(keyGenerateStrategyYamlSwapper.swapToObject(yamlConfiguration.getDefaultKeyGenerateStrategy()));
+ if (null != yamlConfig.getDefaultKeyGenerateStrategy()) {
+ ruleConfig.setDefaultKeyGenerateStrategy(keyGenerateStrategyYamlSwapper.swapToObject(yamlConfig.getDefaultKeyGenerateStrategy()));
}
}
- private void setAlgorithms(final YamlShardingRuleConfiguration yamlConfiguration, final ShardingRuleConfiguration ruleConfiguration) {
- if (null != yamlConfiguration.getShardingAlgorithms()) {
- yamlConfiguration.getShardingAlgorithms().forEach((key, value) -> ruleConfiguration.getShardingAlgorithms().put(key, algorithmSwapper.swapToObject(value)));
+ private void setAlgorithms(final YamlShardingRuleConfiguration yamlConfig, final ShardingRuleConfiguration ruleConfig) {
+ if (null != yamlConfig.getShardingAlgorithms()) {
+ yamlConfig.getShardingAlgorithms().forEach((key, value) -> ruleConfig.getShardingAlgorithms().put(key, algorithmSwapper.swapToObject(value)));
}
- if (null != yamlConfiguration.getKeyGenerators()) {
- yamlConfiguration.getKeyGenerators().forEach((key, value) -> ruleConfiguration.getKeyGenerators().put(key, algorithmSwapper.swapToObject(value)));
+ if (null != yamlConfig.getKeyGenerators()) {
+ yamlConfig.getKeyGenerators().forEach((key, value) -> ruleConfig.getKeyGenerators().put(key, algorithmSwapper.swapToObject(value)));
}
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/strategy/ShardingStrategyConfigurationYamlSwapper.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/strategy/ShardingStrategyConfigurationYamlSwapper.java
index 3ec7425..3277364 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/strategy/ShardingStrategyConfigurationYamlSwapper.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/yaml/swapper/strategy/ShardingStrategyConfigurationYamlSwapper.java
@@ -97,15 +97,15 @@ public final class ShardingStrategyConfigurationYamlSwapper implements YamlSwapp
return result;
}
- private StandardShardingStrategyConfiguration createStandardShardingStrategyConfiguration(final YamlStandardShardingStrategyConfiguration yamlConfiguration) {
- return new StandardShardingStrategyConfiguration(yamlConfiguration.getShardingColumn(), yamlConfiguration.getShardingAlgorithmName());
+ private StandardShardingStrategyConfiguration createStandardShardingStrategyConfiguration(final YamlStandardShardingStrategyConfiguration yamlConfig) {
+ return new StandardShardingStrategyConfiguration(yamlConfig.getShardingColumn(), yamlConfig.getShardingAlgorithmName());
}
- private ComplexShardingStrategyConfiguration createComplexShardingStrategyConfiguration(final YamlComplexShardingStrategyConfiguration yamlConfiguration) {
- return new ComplexShardingStrategyConfiguration(yamlConfiguration.getShardingColumns(), yamlConfiguration.getShardingAlgorithmName());
+ private ComplexShardingStrategyConfiguration createComplexShardingStrategyConfiguration(final YamlComplexShardingStrategyConfiguration yamlConfig) {
+ return new ComplexShardingStrategyConfiguration(yamlConfig.getShardingColumns(), yamlConfig.getShardingAlgorithmName());
}
- private HintShardingStrategyConfiguration createHintShardingStrategyConfiguration(final YamlHintShardingStrategyConfiguration yamlConfiguration) {
- return new HintShardingStrategyConfiguration(yamlConfiguration.getShardingAlgorithmName());
+ private HintShardingStrategyConfiguration createHintShardingStrategyConfiguration(final YamlHintShardingStrategyConfiguration yamlConfig) {
+ return new HintShardingStrategyConfiguration(yamlConfig.getShardingAlgorithmName());
}
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/rule/ShardingRuleTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/rule/ShardingRuleTest.java
index d270515..d58ce0e 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/rule/ShardingRuleTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/rule/ShardingRuleTest.java
@@ -311,10 +311,10 @@ public final class ShardingRuleTest {
@Test(expected = IllegalArgumentException.class)
public void assertConstructShardingRuleWithNullDataSourceNames() {
- ShardingRuleConfiguration shardingRuleConfiguration = new ShardingRuleConfiguration();
- ShardingTableRuleConfiguration shardingTableRuleConfiguration = createTableRuleConfiguration("LOGIC_TABLE", "pr_ds_${0..1}.table_${0..2}");
- shardingRuleConfiguration.getTables().add(shardingTableRuleConfiguration);
- new ShardingRule(shardingRuleConfiguration, null);
+ ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration();
+ ShardingTableRuleConfiguration shardingTableRuleConfig = createTableRuleConfiguration("LOGIC_TABLE", "pr_ds_${0..1}.table_${0..2}");
+ shardingRuleConfig.getTables().add(shardingTableRuleConfig);
+ new ShardingRule(shardingRuleConfig, null);
}
@Test
@@ -333,36 +333,36 @@ public final class ShardingRuleTest {
}
private ShardingRule createMaximumShardingRule() {
- ShardingRuleConfiguration shardingRuleConfiguration = new ShardingRuleConfiguration();
- ShardingTableRuleConfiguration shardingTableRuleConfiguration = createTableRuleConfiguration("LOGIC_TABLE", "ds_${0..1}.table_${0..2}");
- shardingTableRuleConfiguration.setKeyGenerateStrategy(new KeyGenerateStrategyConfiguration("id", "increment"));
- ShardingTableRuleConfiguration subTableRuleConfiguration = createTableRuleConfiguration("SUB_LOGIC_TABLE", "ds_${0..1}.sub_table_${0..2}");
- shardingRuleConfiguration.getTables().add(shardingTableRuleConfiguration);
- shardingRuleConfiguration.getTables().add(subTableRuleConfiguration);
- shardingRuleConfiguration.getBindingTableGroups().add(shardingTableRuleConfiguration.getLogicTable() + "," + subTableRuleConfiguration.getLogicTable());
- shardingRuleConfiguration.getBroadcastTables().add("BROADCAST_TABLE");
+ ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration();
+ ShardingTableRuleConfiguration shardingTableRuleConfig = createTableRuleConfiguration("LOGIC_TABLE", "ds_${0..1}.table_${0..2}");
+ shardingTableRuleConfig.setKeyGenerateStrategy(new KeyGenerateStrategyConfiguration("id", "increment"));
+ ShardingTableRuleConfiguration subTableRuleConfig = createTableRuleConfiguration("SUB_LOGIC_TABLE", "ds_${0..1}.sub_table_${0..2}");
+ shardingRuleConfig.getTables().add(shardingTableRuleConfig);
+ shardingRuleConfig.getTables().add(subTableRuleConfig);
+ shardingRuleConfig.getBindingTableGroups().add(shardingTableRuleConfig.getLogicTable() + "," + subTableRuleConfig.getLogicTable());
+ shardingRuleConfig.getBroadcastTables().add("BROADCAST_TABLE");
InlineShardingAlgorithm shardingAlgorithmDB = new InlineShardingAlgorithm();
Properties props = new Properties();
props.setProperty("algorithm-expression", "ds_%{ds_id % 2}");
shardingAlgorithmDB.setProps(props);
- shardingRuleConfiguration.setDefaultDatabaseShardingStrategy(new StandardShardingStrategyConfiguration("ds_id", "standard"));
+ shardingRuleConfig.setDefaultDatabaseShardingStrategy(new StandardShardingStrategyConfiguration("ds_id", "standard"));
InlineShardingAlgorithm shardingAlgorithmTBL = new InlineShardingAlgorithm();
props = new Properties();
props.setProperty("algorithm-expression", "table_%{table_id % 2}");
shardingAlgorithmTBL.setProps(props);
- shardingRuleConfiguration.setDefaultTableShardingStrategy(new StandardShardingStrategyConfiguration("table_id", "standard"));
- shardingRuleConfiguration.setDefaultKeyGenerateStrategy(new KeyGenerateStrategyConfiguration("id", "default"));
- shardingRuleConfiguration.getShardingAlgorithms().put("standard", new ShardingSphereAlgorithmConfiguration("STANDARD_TEST", new Properties()));
- shardingRuleConfiguration.getKeyGenerators().put("increment", new ShardingSphereAlgorithmConfiguration("INCREMENT", new Properties()));
- shardingRuleConfiguration.getKeyGenerators().put("default", new ShardingSphereAlgorithmConfiguration("INCREMENT", new Properties()));
- return new ShardingRule(shardingRuleConfiguration, createDataSourceNames());
+ shardingRuleConfig.setDefaultTableShardingStrategy(new StandardShardingStrategyConfiguration("table_id", "standard"));
+ shardingRuleConfig.setDefaultKeyGenerateStrategy(new KeyGenerateStrategyConfiguration("id", "default"));
+ shardingRuleConfig.getShardingAlgorithms().put("standard", new ShardingSphereAlgorithmConfiguration("STANDARD_TEST", new Properties()));
+ shardingRuleConfig.getKeyGenerators().put("increment", new ShardingSphereAlgorithmConfiguration("INCREMENT", new Properties()));
+ shardingRuleConfig.getKeyGenerators().put("default", new ShardingSphereAlgorithmConfiguration("INCREMENT", new Properties()));
+ return new ShardingRule(shardingRuleConfig, createDataSourceNames());
}
private ShardingRule createMinimumShardingRule() {
- ShardingRuleConfiguration shardingRuleConfiguration = new ShardingRuleConfiguration();
- ShardingTableRuleConfiguration shardingTableRuleConfiguration = createTableRuleConfiguration("LOGIC_TABLE", "ds_${0..1}.table_${0..2}");
- shardingRuleConfiguration.getTables().add(shardingTableRuleConfiguration);
- return new ShardingRule(shardingRuleConfiguration, createDataSourceNames());
+ ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration();
+ ShardingTableRuleConfiguration shardingTableRuleConfig = createTableRuleConfiguration("LOGIC_TABLE", "ds_${0..1}.table_${0..2}");
+ shardingRuleConfig.getTables().add(shardingTableRuleConfig);
+ return new ShardingRule(shardingRuleConfig, createDataSourceNames());
}
private ShardingTableRuleConfiguration createTableRuleConfiguration(final String logicTableName, final String actualDataNodes) {
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/rule/TableRuleTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/rule/TableRuleTest.java
index a79a17f..e0d1ee1 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/rule/TableRuleTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/rule/TableRuleTest.java
@@ -163,11 +163,11 @@ public final class TableRuleTest {
@Test(expected = ShardingSphereConfigurationException.class)
public void assertActualDataNodesNotConfigured() {
- ShardingTableRuleConfiguration shardingTableRuleConfiguration = new ShardingTableRuleConfiguration("LOGIC_TABLE", "");
- shardingTableRuleConfiguration.setTableShardingStrategy(new StandardShardingStrategyConfiguration("shardingColumn", "INLINE"));
+ ShardingTableRuleConfiguration shardingTableRuleConfig = new ShardingTableRuleConfiguration("LOGIC_TABLE", "");
+ shardingTableRuleConfig.setTableShardingStrategy(new StandardShardingStrategyConfiguration("shardingColumn", "INLINE"));
InlineShardingAlgorithm inlineShardingAlgorithm = new InlineShardingAlgorithm();
inlineShardingAlgorithm.getProps().setProperty("algorithm-expression", "xxx");
inlineShardingAlgorithm.init();
- new TableRule(shardingTableRuleConfiguration, Arrays.asList("ds0", "ds1"), null, inlineShardingAlgorithm, null);
+ new TableRule(shardingTableRuleConfig, Arrays.asList("ds0", "ds1"), null, inlineShardingAlgorithm, null);
}
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleConfigurationYamlSwapperTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleConfigurationYamlSwapperTest.java
index 24bff0f..dd29cb5 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleConfigurationYamlSwapperTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/ShardingRuleConfigurationYamlSwapperTest.java
@@ -81,9 +81,9 @@ public final class ShardingRuleConfigurationYamlSwapperTest {
@Test
public void assertSwapToYamlWithMinProperties() {
- ShardingRuleConfiguration shardingRuleConfiguration = new ShardingRuleConfiguration();
- shardingRuleConfiguration.getTables().add(mock(ShardingTableRuleConfiguration.class));
- YamlShardingRuleConfiguration actual = shardingRuleConfigurationYamlSwapper.swapToYamlConfiguration(shardingRuleConfiguration);
+ ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration();
+ shardingRuleConfig.getTables().add(mock(ShardingTableRuleConfiguration.class));
+ YamlShardingRuleConfiguration actual = shardingRuleConfigurationYamlSwapper.swapToYamlConfiguration(shardingRuleConfig);
assertThat(actual.getTables().size(), is(1));
assertTrue(actual.getBindingTables().isEmpty());
assertTrue(actual.getBroadcastTables().isEmpty());
@@ -94,14 +94,14 @@ public final class ShardingRuleConfigurationYamlSwapperTest {
@Test
public void assertSwapToYamlWithMaxProperties() {
- ShardingRuleConfiguration shardingRuleConfiguration = new ShardingRuleConfiguration();
- shardingRuleConfiguration.getTables().add(mock(ShardingTableRuleConfiguration.class));
- shardingRuleConfiguration.getBindingTableGroups().add("tbl, sub_tbl");
- shardingRuleConfiguration.getBroadcastTables().add("dict");
- shardingRuleConfiguration.setDefaultDatabaseShardingStrategy(mock(ShardingStrategyConfiguration.class));
- shardingRuleConfiguration.setDefaultTableShardingStrategy(mock(ShardingStrategyConfiguration.class));
- shardingRuleConfiguration.setDefaultKeyGenerateStrategy(mock(KeyGenerateStrategyConfiguration.class));
- YamlShardingRuleConfiguration actual = shardingRuleConfigurationYamlSwapper.swapToYamlConfiguration(shardingRuleConfiguration);
+ ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration();
+ shardingRuleConfig.getTables().add(mock(ShardingTableRuleConfiguration.class));
+ shardingRuleConfig.getBindingTableGroups().add("tbl, sub_tbl");
+ shardingRuleConfig.getBroadcastTables().add("dict");
+ shardingRuleConfig.setDefaultDatabaseShardingStrategy(mock(ShardingStrategyConfiguration.class));
+ shardingRuleConfig.setDefaultTableShardingStrategy(mock(ShardingStrategyConfiguration.class));
+ shardingRuleConfig.setDefaultKeyGenerateStrategy(mock(KeyGenerateStrategyConfiguration.class));
+ YamlShardingRuleConfiguration actual = shardingRuleConfigurationYamlSwapper.swapToYamlConfiguration(shardingRuleConfig);
assertThat(actual.getTables().size(), is(1));
assertThat(actual.getBindingTables().size(), is(1));
assertThat(actual.getBindingTables().iterator().next(), is("tbl, sub_tbl"));
@@ -114,9 +114,9 @@ public final class ShardingRuleConfigurationYamlSwapperTest {
@Test
public void assertSwapToObjectWithMinProperties() {
- YamlShardingRuleConfiguration yamlConfiguration = new YamlShardingRuleConfiguration();
- yamlConfiguration.getTables().put("tbl", mock(YamlTableRuleConfiguration.class));
- ShardingRuleConfiguration actual = shardingRuleConfigurationYamlSwapper.swapToObject(yamlConfiguration);
+ YamlShardingRuleConfiguration yamlConfig = new YamlShardingRuleConfiguration();
+ yamlConfig.getTables().put("tbl", mock(YamlTableRuleConfiguration.class));
+ ShardingRuleConfiguration actual = shardingRuleConfigurationYamlSwapper.swapToObject(yamlConfig);
assertThat(actual.getTables().size(), is(1));
assertTrue(actual.getBindingTableGroups().isEmpty());
assertTrue(actual.getBroadcastTables().isEmpty());
@@ -127,14 +127,14 @@ public final class ShardingRuleConfigurationYamlSwapperTest {
@Test
public void assertSwapToObjectWithMaxProperties() {
- YamlShardingRuleConfiguration yamlConfiguration = new YamlShardingRuleConfiguration();
- yamlConfiguration.getTables().put("tbl", mock(YamlTableRuleConfiguration.class));
- yamlConfiguration.getBindingTables().add("tbl, sub_tbl");
- yamlConfiguration.getBroadcastTables().add("dict");
- yamlConfiguration.setDefaultDatabaseStrategy(mock(YamlShardingStrategyConfiguration.class));
- yamlConfiguration.setDefaultTableStrategy(mock(YamlShardingStrategyConfiguration.class));
- yamlConfiguration.setDefaultKeyGenerateStrategy(mock(YamlKeyGenerateStrategyConfiguration.class));
- ShardingRuleConfiguration actual = shardingRuleConfigurationYamlSwapper.swapToObject(yamlConfiguration);
+ YamlShardingRuleConfiguration yamlConfig = new YamlShardingRuleConfiguration();
+ yamlConfig.getTables().put("tbl", mock(YamlTableRuleConfiguration.class));
+ yamlConfig.getBindingTables().add("tbl, sub_tbl");
+ yamlConfig.getBroadcastTables().add("dict");
+ yamlConfig.setDefaultDatabaseStrategy(mock(YamlShardingStrategyConfiguration.class));
+ yamlConfig.setDefaultTableStrategy(mock(YamlShardingStrategyConfiguration.class));
+ yamlConfig.setDefaultKeyGenerateStrategy(mock(YamlKeyGenerateStrategyConfiguration.class));
+ ShardingRuleConfiguration actual = shardingRuleConfigurationYamlSwapper.swapToObject(yamlConfig);
assertThat(actual.getTables().size(), is(1));
assertThat(actual.getBindingTableGroups().size(), is(1));
assertThat(actual.getBindingTableGroups().iterator().next(), is("tbl, sub_tbl"));
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/YamlRootRuleConfigurationsForYamlShardingRuleConfigurationTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/YamlRootRuleConfigurationsForYamlShardingRuleConfigurationTest.java
index 2bd558b..36df42b 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/YamlRootRuleConfigurationsForYamlShardingRuleConfigurationTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/YamlRootRuleConfigurationsForYamlShardingRuleConfigurationTest.java
@@ -69,16 +69,16 @@ public final class YamlRootRuleConfigurationsForYamlShardingRuleConfigurationTes
private void assertYamlShardingConfiguration(final YamlRootRuleConfigurations actual) {
assertDataSourceMap(actual);
- Optional<YamlShardingRuleConfiguration> shardingRuleConfiguration = actual.getRules().stream().filter(
- each -> each instanceof YamlShardingRuleConfiguration).findFirst().map(configuration -> (YamlShardingRuleConfiguration) configuration);
- assertTrue(shardingRuleConfiguration.isPresent());
- assertThat(shardingRuleConfiguration.get().getTables().size(), is(4));
- assertTUser(shardingRuleConfiguration.get());
- assertTStock(shardingRuleConfiguration.get());
- assertTOrder(shardingRuleConfiguration.get());
- assertTOrderItem(shardingRuleConfiguration.get());
- assertBindingTable(shardingRuleConfiguration.get());
- assertBroadcastTable(shardingRuleConfiguration.get());
+ Optional<YamlShardingRuleConfiguration> shardingRuleConfig = actual.getRules().stream().filter(
+ each -> each instanceof YamlShardingRuleConfiguration).findFirst().map(config -> (YamlShardingRuleConfiguration) config);
+ assertTrue(shardingRuleConfig.isPresent());
+ assertThat(shardingRuleConfig.get().getTables().size(), is(4));
+ assertTUser(shardingRuleConfig.get());
+ assertTStock(shardingRuleConfig.get());
+ assertTOrder(shardingRuleConfig.get());
+ assertTOrderItem(shardingRuleConfig.get());
+ assertBindingTable(shardingRuleConfig.get());
+ assertBroadcastTable(shardingRuleConfig.get());
assertProps(actual);
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/rule/ShardingAutoTableRuleConfigurationYamlSwapperTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/rule/ShardingAutoTableRuleConfigurationYamlSwapperTest.java
index 639df8c..ee86456 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/rule/ShardingAutoTableRuleConfigurationYamlSwapperTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/rule/ShardingAutoTableRuleConfigurationYamlSwapperTest.java
@@ -78,10 +78,10 @@ public final class ShardingAutoTableRuleConfigurationYamlSwapperTest {
@Test
public void assertSwapToYamlWithMaxProperties() {
- ShardingAutoTableRuleConfiguration shardingTableRuleConfiguration = new ShardingAutoTableRuleConfiguration("tbl", "ds0,ds1");
- shardingTableRuleConfiguration.setShardingStrategy(mock(StandardShardingStrategyConfiguration.class));
- shardingTableRuleConfiguration.setKeyGenerateStrategy(mock(KeyGenerateStrategyConfiguration.class));
- YamlShardingAutoTableRuleConfiguration actual = tableYamlSwapper.swapToYamlConfiguration(shardingTableRuleConfiguration);
+ ShardingAutoTableRuleConfiguration shardingTableRuleConfig = new ShardingAutoTableRuleConfiguration("tbl", "ds0,ds1");
+ shardingTableRuleConfig.setShardingStrategy(mock(StandardShardingStrategyConfiguration.class));
+ shardingTableRuleConfig.setKeyGenerateStrategy(mock(KeyGenerateStrategyConfiguration.class));
+ YamlShardingAutoTableRuleConfiguration actual = tableYamlSwapper.swapToYamlConfiguration(shardingTableRuleConfig);
assertThat(actual.getLogicTable(), is("tbl"));
assertThat(actual.getActualDataSources(), is("ds0,ds1"));
assertNotNull(actual.getShardingStrategy());
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/rule/TableRuleConfigurationYamlSwapperTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/rule/TableRuleConfigurationYamlSwapperTest.java
index 4f70ffe..5e290ce 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/rule/TableRuleConfigurationYamlSwapperTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/rule/TableRuleConfigurationYamlSwapperTest.java
@@ -82,11 +82,11 @@ public final class TableRuleConfigurationYamlSwapperTest {
@Test
public void assertSwapToYamlWithMaxProperties() {
- ShardingTableRuleConfiguration shardingTableRuleConfiguration = new ShardingTableRuleConfiguration("tbl", "ds_$->{0..1}.tbl_$->{0..1}");
- shardingTableRuleConfiguration.setDatabaseShardingStrategy(mock(StandardShardingStrategyConfiguration.class));
- shardingTableRuleConfiguration.setTableShardingStrategy(mock(StandardShardingStrategyConfiguration.class));
- shardingTableRuleConfiguration.setKeyGenerateStrategy(mock(KeyGenerateStrategyConfiguration.class));
- YamlTableRuleConfiguration actual = tableYamlSwapper.swapToYamlConfiguration(shardingTableRuleConfiguration);
+ ShardingTableRuleConfiguration shardingTableRuleConfig = new ShardingTableRuleConfiguration("tbl", "ds_$->{0..1}.tbl_$->{0..1}");
+ shardingTableRuleConfig.setDatabaseShardingStrategy(mock(StandardShardingStrategyConfiguration.class));
+ shardingTableRuleConfig.setTableShardingStrategy(mock(StandardShardingStrategyConfiguration.class));
+ shardingTableRuleConfig.setKeyGenerateStrategy(mock(KeyGenerateStrategyConfiguration.class));
+ YamlTableRuleConfiguration actual = tableYamlSwapper.swapToYamlConfiguration(shardingTableRuleConfig);
assertThat(actual.getLogicTable(), is("tbl"));
assertThat(actual.getActualDataNodes(), is("ds_$->{0..1}.tbl_$->{0..1}"));
assertNotNull(actual.getDatabaseStrategy());
@@ -101,10 +101,10 @@ public final class TableRuleConfigurationYamlSwapperTest {
@Test
public void assertSwapToObjectWithMinProperties() {
- YamlTableRuleConfiguration yamlConfiguration = new YamlTableRuleConfiguration();
- yamlConfiguration.setLogicTable("tbl");
- yamlConfiguration.setActualDataNodes("ds_$->{0..1}.tbl_$->{0..1}");
- ShardingTableRuleConfiguration actual = tableYamlSwapper.swapToObject(yamlConfiguration);
+ YamlTableRuleConfiguration yamlConfig = new YamlTableRuleConfiguration();
+ yamlConfig.setLogicTable("tbl");
+ yamlConfig.setActualDataNodes("ds_$->{0..1}.tbl_$->{0..1}");
+ ShardingTableRuleConfiguration actual = tableYamlSwapper.swapToObject(yamlConfig);
assertThat(actual.getLogicTable(), is("tbl"));
assertThat(actual.getActualDataNodes(), is("ds_$->{0..1}.tbl_$->{0..1}"));
assertNull(actual.getDatabaseShardingStrategy());
@@ -114,13 +114,13 @@ public final class TableRuleConfigurationYamlSwapperTest {
@Test
public void assertSwapToObjectWithMaxProperties() {
- YamlTableRuleConfiguration yamlConfiguration = new YamlTableRuleConfiguration();
- yamlConfiguration.setLogicTable("tbl");
- yamlConfiguration.setActualDataNodes("ds_$->{0..1}.tbl_$->{0..1}");
- yamlConfiguration.setDatabaseStrategy(mock(YamlShardingStrategyConfiguration.class));
- yamlConfiguration.setTableStrategy(mock(YamlShardingStrategyConfiguration.class));
- yamlConfiguration.setKeyGenerateStrategy(mock(YamlKeyGenerateStrategyConfiguration.class));
- ShardingTableRuleConfiguration actual = tableYamlSwapper.swapToObject(yamlConfiguration);
+ YamlTableRuleConfiguration yamlConfig = new YamlTableRuleConfiguration();
+ yamlConfig.setLogicTable("tbl");
+ yamlConfig.setActualDataNodes("ds_$->{0..1}.tbl_$->{0..1}");
+ yamlConfig.setDatabaseStrategy(mock(YamlShardingStrategyConfiguration.class));
+ yamlConfig.setTableStrategy(mock(YamlShardingStrategyConfiguration.class));
+ yamlConfig.setKeyGenerateStrategy(mock(YamlKeyGenerateStrategyConfiguration.class));
+ ShardingTableRuleConfiguration actual = tableYamlSwapper.swapToObject(yamlConfig);
assertThat(actual.getLogicTable(), is("tbl"));
assertThat(actual.getActualDataNodes(), is("ds_$->{0..1}.tbl_$->{0..1}"));
assertNotNull(actual.getDatabaseShardingStrategy());
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/strategy/KeyGenerateStrategyConfigurationYamlSwapperTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/strategy/KeyGenerateStrategyConfigurationYamlSwapperTest.java
index 73cf64f..cceaa7b 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/strategy/KeyGenerateStrategyConfigurationYamlSwapperTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/strategy/KeyGenerateStrategyConfigurationYamlSwapperTest.java
@@ -35,10 +35,10 @@ public final class KeyGenerateStrategyConfigurationYamlSwapperTest {
@Test
public void assertSwapToObject() {
- YamlKeyGenerateStrategyConfiguration yamlConfiguration = new YamlKeyGenerateStrategyConfiguration();
- yamlConfiguration.setColumn("id");
- yamlConfiguration.setKeyGeneratorName("test");
- KeyGenerateStrategyConfiguration actual = new KeyGenerateStrategyConfigurationYamlSwapper().swapToObject(yamlConfiguration);
+ YamlKeyGenerateStrategyConfiguration yamlConfig = new YamlKeyGenerateStrategyConfiguration();
+ yamlConfig.setColumn("id");
+ yamlConfig.setKeyGeneratorName("test");
+ KeyGenerateStrategyConfiguration actual = new KeyGenerateStrategyConfigurationYamlSwapper().swapToObject(yamlConfig);
assertThat(actual.getColumn(), is("id"));
assertThat(actual.getKeyGeneratorName(), is("test"));
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/strategy/ShardingStrategyConfigurationYamlSwapperTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/strategy/ShardingStrategyConfigurationYamlSwapperTest.java
index 077ba9e..c51c3f5 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/strategy/ShardingStrategyConfigurationYamlSwapperTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/strategy/ShardingStrategyConfigurationYamlSwapperTest.java
@@ -95,11 +95,11 @@ public final class ShardingStrategyConfigurationYamlSwapperTest {
}
private YamlShardingStrategyConfiguration createStandardShardingStrategyConfiguration() {
- YamlStandardShardingStrategyConfiguration yamlStandardShardingStrategyConfiguration = new YamlStandardShardingStrategyConfiguration();
- yamlStandardShardingStrategyConfiguration.setShardingColumn("id");
- yamlStandardShardingStrategyConfiguration.setShardingAlgorithmName("standard");
+ YamlStandardShardingStrategyConfiguration yamlStandardShardingStrategyConfig = new YamlStandardShardingStrategyConfiguration();
+ yamlStandardShardingStrategyConfig.setShardingColumn("id");
+ yamlStandardShardingStrategyConfig.setShardingAlgorithmName("standard");
YamlShardingStrategyConfiguration result = new YamlShardingStrategyConfiguration();
- result.setStandard(yamlStandardShardingStrategyConfiguration);
+ result.setStandard(yamlStandardShardingStrategyConfig);
return result;
}
@@ -111,11 +111,11 @@ public final class ShardingStrategyConfigurationYamlSwapperTest {
}
private YamlShardingStrategyConfiguration createComplexShardingStrategyConfiguration() {
- YamlComplexShardingStrategyConfiguration yamlComplexShardingStrategyConfiguration = new YamlComplexShardingStrategyConfiguration();
- yamlComplexShardingStrategyConfiguration.setShardingColumns("id, creation_date");
- yamlComplexShardingStrategyConfiguration.setShardingAlgorithmName("complex");
+ YamlComplexShardingStrategyConfiguration yamlComplexShardingStrategyConfig = new YamlComplexShardingStrategyConfiguration();
+ yamlComplexShardingStrategyConfig.setShardingColumns("id, creation_date");
+ yamlComplexShardingStrategyConfig.setShardingAlgorithmName("complex");
YamlShardingStrategyConfiguration result = new YamlShardingStrategyConfiguration();
- result.setComplex(yamlComplexShardingStrategyConfiguration);
+ result.setComplex(yamlComplexShardingStrategyConfig);
return result;
}
@@ -126,10 +126,10 @@ public final class ShardingStrategyConfigurationYamlSwapperTest {
}
private YamlShardingStrategyConfiguration createHintShardingStrategyConfiguration() {
- YamlHintShardingStrategyConfiguration yamlHintShardingStrategyConfiguration = new YamlHintShardingStrategyConfiguration();
- yamlHintShardingStrategyConfiguration.setShardingAlgorithmName("hint");
+ YamlHintShardingStrategyConfiguration yamlHintShardingStrategyConfig = new YamlHintShardingStrategyConfiguration();
+ yamlHintShardingStrategyConfig.setShardingAlgorithmName("hint");
YamlShardingStrategyConfiguration result = new YamlShardingStrategyConfiguration();
- result.setHint(yamlHintShardingStrategyConfiguration);
+ result.setHint(yamlHintShardingStrategyConfig);
return result;
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-boot-starter/src/test/java/org/apache/shardingsphere/sharding/spring/boot/ShardingSpringBootStarterTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-boot-starter/src/test/java/org/apache/shardingsphere/sharding/spring/boot/ShardingSpringBootStarterTest.java
index 59a0cfd..8203c7a 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-boot-starter/src/test/java/org/apache/shardingsphere/sharding/spring/boot/ShardingSpringBootStarterTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-boot-starter/src/test/java/org/apache/shardingsphere/sharding/spring/boot/ShardingSpringBootStarterTest.java
@@ -58,7 +58,7 @@ public class ShardingSpringBootStarterTest {
private SnowflakeKeyGenerateAlgorithm keyGenerator;
@Resource
- private AlgorithmProvidedShardingRuleConfiguration shardingRuleConfiguration;
+ private AlgorithmProvidedShardingRuleConfiguration shardingRuleConfig;
@Test
public void assertShardingAlgorithm() {
@@ -83,65 +83,65 @@ public class ShardingSpringBootStarterTest {
}
private void assertShardingConfigurationTables() {
- assertThat(shardingRuleConfiguration.getTables().size(), is(2));
- assertThat(shardingRuleConfiguration.getAutoTables().size(), is(1));
- List<ShardingTableRuleConfiguration> shardingTableRuleConfigurationList = Lists.newArrayList(shardingRuleConfiguration.getTables());
- assertThat(shardingTableRuleConfigurationList.get(0).getLogicTable(), is("t_order"));
- assertThat(shardingTableRuleConfigurationList.get(0).getActualDataNodes(), is("ds_$->{0..1}.t_order_$->{0..1}"));
- assertThat(shardingTableRuleConfigurationList.get(0).getTableShardingStrategy(), instanceOf(StandardShardingStrategyConfiguration.class));
- assertThat(((StandardShardingStrategyConfiguration) shardingTableRuleConfigurationList.get(0).getTableShardingStrategy()).getShardingColumn(), is("order_id"));
- assertThat(shardingTableRuleConfigurationList.get(0).getTableShardingStrategy().getShardingAlgorithmName(), is("orderTableShardingAlgorithm"));
- assertThat(shardingTableRuleConfigurationList.get(0).getKeyGenerateStrategy().getColumn(), is("order_id"));
- assertThat(shardingTableRuleConfigurationList.get(0).getKeyGenerateStrategy().getKeyGeneratorName(), is("keyGenerator"));
- assertThat(shardingTableRuleConfigurationList.get(1).getLogicTable(), is("t_order_item"));
- assertThat(shardingTableRuleConfigurationList.get(1).getActualDataNodes(), is("ds_$->{0..1}.t_order_item_$->{0..1}"));
- assertThat(shardingTableRuleConfigurationList.get(1).getTableShardingStrategy(), instanceOf(StandardShardingStrategyConfiguration.class));
- assertThat(((StandardShardingStrategyConfiguration) shardingTableRuleConfigurationList.get(1).getTableShardingStrategy()).getShardingColumn(), is("order_id"));
- assertThat(shardingTableRuleConfigurationList.get(1).getTableShardingStrategy().getShardingAlgorithmName(), is("orderItemTableShardingAlgorithm"));
- assertThat(shardingTableRuleConfigurationList.get(1).getKeyGenerateStrategy().getColumn(), is("order_item_id"));
- assertThat(shardingTableRuleConfigurationList.get(1).getKeyGenerateStrategy().getKeyGeneratorName(), is("keyGenerator"));
- List<ShardingAutoTableRuleConfiguration> autoShardingTableRuleConfigurationList = Lists.newArrayList(shardingRuleConfiguration.getAutoTables());
- assertThat(autoShardingTableRuleConfigurationList.get(0).getLogicTable(), is("t_order_auto"));
- assertThat(autoShardingTableRuleConfigurationList.get(0).getActualDataSources(), is("ds0, ds1"));
- assertThat(autoShardingTableRuleConfigurationList.get(0).getShardingStrategy(), instanceOf(StandardShardingStrategyConfiguration.class));
- assertThat(((StandardShardingStrategyConfiguration) autoShardingTableRuleConfigurationList.get(0).getShardingStrategy()).getShardingColumn(), is("order_id"));
- assertThat(autoShardingTableRuleConfigurationList.get(0).getShardingStrategy().getShardingAlgorithmName(), is("mod"));
+ assertThat(shardingRuleConfig.getTables().size(), is(2));
+ assertThat(shardingRuleConfig.getAutoTables().size(), is(1));
+ List<ShardingTableRuleConfiguration> shardingTableRuleConfigs = Lists.newArrayList(shardingRuleConfig.getTables());
+ assertThat(shardingTableRuleConfigs.get(0).getLogicTable(), is("t_order"));
+ assertThat(shardingTableRuleConfigs.get(0).getActualDataNodes(), is("ds_$->{0..1}.t_order_$->{0..1}"));
+ assertThat(shardingTableRuleConfigs.get(0).getTableShardingStrategy(), instanceOf(StandardShardingStrategyConfiguration.class));
+ assertThat(((StandardShardingStrategyConfiguration) shardingTableRuleConfigs.get(0).getTableShardingStrategy()).getShardingColumn(), is("order_id"));
+ assertThat(shardingTableRuleConfigs.get(0).getTableShardingStrategy().getShardingAlgorithmName(), is("orderTableShardingAlgorithm"));
+ assertThat(shardingTableRuleConfigs.get(0).getKeyGenerateStrategy().getColumn(), is("order_id"));
+ assertThat(shardingTableRuleConfigs.get(0).getKeyGenerateStrategy().getKeyGeneratorName(), is("keyGenerator"));
+ assertThat(shardingTableRuleConfigs.get(1).getLogicTable(), is("t_order_item"));
+ assertThat(shardingTableRuleConfigs.get(1).getActualDataNodes(), is("ds_$->{0..1}.t_order_item_$->{0..1}"));
+ assertThat(shardingTableRuleConfigs.get(1).getTableShardingStrategy(), instanceOf(StandardShardingStrategyConfiguration.class));
+ assertThat(((StandardShardingStrategyConfiguration) shardingTableRuleConfigs.get(1).getTableShardingStrategy()).getShardingColumn(), is("order_id"));
+ assertThat(shardingTableRuleConfigs.get(1).getTableShardingStrategy().getShardingAlgorithmName(), is("orderItemTableShardingAlgorithm"));
+ assertThat(shardingTableRuleConfigs.get(1).getKeyGenerateStrategy().getColumn(), is("order_item_id"));
+ assertThat(shardingTableRuleConfigs.get(1).getKeyGenerateStrategy().getKeyGeneratorName(), is("keyGenerator"));
+ List<ShardingAutoTableRuleConfiguration> autoShardingTableRuleConfigs = Lists.newArrayList(shardingRuleConfig.getAutoTables());
+ assertThat(autoShardingTableRuleConfigs.get(0).getLogicTable(), is("t_order_auto"));
+ assertThat(autoShardingTableRuleConfigs.get(0).getActualDataSources(), is("ds0, ds1"));
+ assertThat(autoShardingTableRuleConfigs.get(0).getShardingStrategy(), instanceOf(StandardShardingStrategyConfiguration.class));
+ assertThat(((StandardShardingStrategyConfiguration) autoShardingTableRuleConfigs.get(0).getShardingStrategy()).getShardingColumn(), is("order_id"));
+ assertThat(autoShardingTableRuleConfigs.get(0).getShardingStrategy().getShardingAlgorithmName(), is("mod"));
}
private void assertShardingConfigurationBindingTableGroups() {
- assertThat(shardingRuleConfiguration.getBindingTableGroups().size(), is(2));
- List<String> bindingTableGroupsList = new ArrayList<>(shardingRuleConfiguration.getBindingTableGroups());
+ assertThat(shardingRuleConfig.getBindingTableGroups().size(), is(2));
+ List<String> bindingTableGroupsList = new ArrayList<>(shardingRuleConfig.getBindingTableGroups());
assertThat(bindingTableGroupsList.get(0), is("t_order"));
assertThat(bindingTableGroupsList.get(1), is("t_order_item"));
}
private void assertShardingConfigurationBroadcastTables() {
- assertThat(shardingRuleConfiguration.getBroadcastTables().size(), is(1));
- assertThat(shardingRuleConfiguration.getBroadcastTables().iterator().next(), is("t_config"));
+ assertThat(shardingRuleConfig.getBroadcastTables().size(), is(1));
+ assertThat(shardingRuleConfig.getBroadcastTables().iterator().next(), is("t_config"));
}
private void assertShardingConfigurationDefaultDatabaseShardingStrategy() {
- assertThat(shardingRuleConfiguration.getDefaultDatabaseShardingStrategy(), instanceOf(StandardShardingStrategyConfiguration.class));
- assertThat(((StandardShardingStrategyConfiguration) shardingRuleConfiguration.getDefaultDatabaseShardingStrategy()).getShardingColumn(), is("user_id"));
- assertThat(shardingRuleConfiguration.getDefaultDatabaseShardingStrategy().getShardingAlgorithmName(), is("databaseShardingAlgorithm"));
+ assertThat(shardingRuleConfig.getDefaultDatabaseShardingStrategy(), instanceOf(StandardShardingStrategyConfiguration.class));
+ assertThat(((StandardShardingStrategyConfiguration) shardingRuleConfig.getDefaultDatabaseShardingStrategy()).getShardingColumn(), is("user_id"));
+ assertThat(shardingRuleConfig.getDefaultDatabaseShardingStrategy().getShardingAlgorithmName(), is("databaseShardingAlgorithm"));
}
private void assertShardingConfigurationShardingAlgorithms() {
- assertThat(shardingRuleConfiguration.getShardingAlgorithms().size(), is(3));
- assertThat(shardingRuleConfiguration.getShardingAlgorithms().get("orderItemTableShardingAlgorithm"), instanceOf(InlineShardingAlgorithm.class));
- assertThat(shardingRuleConfiguration.getShardingAlgorithms().get("orderItemTableShardingAlgorithm").getType(), is("INLINE"));
- assertThat(shardingRuleConfiguration.getShardingAlgorithms().get("orderItemTableShardingAlgorithm").getProps().getProperty("algorithm-expression"), is("t_order_item_$->{order_id % 2}"));
- assertThat(shardingRuleConfiguration.getShardingAlgorithms().get("databaseShardingAlgorithm"), instanceOf(InlineShardingAlgorithm.class));
- assertThat(shardingRuleConfiguration.getShardingAlgorithms().get("databaseShardingAlgorithm").getType(), is("INLINE"));
- assertThat(shardingRuleConfiguration.getShardingAlgorithms().get("databaseShardingAlgorithm").getProps().getProperty("algorithm-expression"), is("ds_$->{user_id % 2}"));
- assertThat(shardingRuleConfiguration.getShardingAlgorithms().get("orderTableShardingAlgorithm"), instanceOf(InlineShardingAlgorithm.class));
- assertThat(shardingRuleConfiguration.getShardingAlgorithms().get("orderTableShardingAlgorithm").getType(), is("INLINE"));
- assertThat(shardingRuleConfiguration.getShardingAlgorithms().get("orderTableShardingAlgorithm").getProps().getProperty("algorithm-expression"), is("t_order_$->{order_id % 2}"));
+ assertThat(shardingRuleConfig.getShardingAlgorithms().size(), is(3));
+ assertThat(shardingRuleConfig.getShardingAlgorithms().get("orderItemTableShardingAlgorithm"), instanceOf(InlineShardingAlgorithm.class));
+ assertThat(shardingRuleConfig.getShardingAlgorithms().get("orderItemTableShardingAlgorithm").getType(), is("INLINE"));
+ assertThat(shardingRuleConfig.getShardingAlgorithms().get("orderItemTableShardingAlgorithm").getProps().getProperty("algorithm-expression"), is("t_order_item_$->{order_id % 2}"));
+ assertThat(shardingRuleConfig.getShardingAlgorithms().get("databaseShardingAlgorithm"), instanceOf(InlineShardingAlgorithm.class));
+ assertThat(shardingRuleConfig.getShardingAlgorithms().get("databaseShardingAlgorithm").getType(), is("INLINE"));
+ assertThat(shardingRuleConfig.getShardingAlgorithms().get("databaseShardingAlgorithm").getProps().getProperty("algorithm-expression"), is("ds_$->{user_id % 2}"));
+ assertThat(shardingRuleConfig.getShardingAlgorithms().get("orderTableShardingAlgorithm"), instanceOf(InlineShardingAlgorithm.class));
+ assertThat(shardingRuleConfig.getShardingAlgorithms().get("orderTableShardingAlgorithm").getType(), is("INLINE"));
+ assertThat(shardingRuleConfig.getShardingAlgorithms().get("orderTableShardingAlgorithm").getProps().getProperty("algorithm-expression"), is("t_order_$->{order_id % 2}"));
}
private void assertShardingConfigurationKeyGenerators() {
- assertThat(shardingRuleConfiguration.getKeyGenerators().size(), is(1));
- assertThat(shardingRuleConfiguration.getKeyGenerators().get("keyGenerator"), instanceOf(SnowflakeKeyGenerateAlgorithm.class));
- assertThat(shardingRuleConfiguration.getKeyGenerators().get("keyGenerator").getProps().getProperty("worker-id"), is("123"));
+ assertThat(shardingRuleConfig.getKeyGenerators().size(), is(1));
+ assertThat(shardingRuleConfig.getKeyGenerators().get("keyGenerator"), instanceOf(SnowflakeKeyGenerateAlgorithm.class));
+ assertThat(shardingRuleConfig.getKeyGenerators().get("keyGenerator").getProps().getProperty("worker-id"), is("123"));
}
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/test/java/org/apache/shardingsphere/sharding/spring/namespace/ShardingSpringNamespaceTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/test/java/org/apache/shardingsphere/sharding/spring/namespace/ShardingSpringNamespaceTest.java
index a42ea52..d2d5107 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/test/java/org/apache/shardingsphere/sharding/spring/namespace/ShardingSpringNamespaceTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/test/java/org/apache/shardingsphere/sharding/spring/namespace/ShardingSpringNamespaceTest.java
@@ -187,20 +187,20 @@ public final class ShardingSpringNamespaceTest extends AbstractJUnit4SpringConte
public void assertSimpleRule() {
Collection<ShardingTableRuleConfiguration> actualSimpleRuleConfigs = simpleRule.getTables();
assertThat(actualSimpleRuleConfigs.size(), is(1));
- ShardingTableRuleConfiguration actualSimpleRuleConfiguration = actualSimpleRuleConfigs.iterator().next();
- assertThat(actualSimpleRuleConfiguration.getLogicTable(), is("t_order"));
+ ShardingTableRuleConfiguration actualSimpleRuleConfig = actualSimpleRuleConfigs.iterator().next();
+ assertThat(actualSimpleRuleConfig.getLogicTable(), is("t_order"));
}
@Test
public void assertComplexRule() {
Collection<ShardingTableRuleConfiguration> actualComplexRuleConfigs = complexRule.getTables();
assertThat(actualComplexRuleConfigs.size(), is(1));
- ShardingTableRuleConfiguration actualComplexRuleConfiguration = actualComplexRuleConfigs.iterator().next();
- assertThat(actualComplexRuleConfiguration.getLogicTable(), is("t_order"));
- assertThat(actualComplexRuleConfiguration.getActualDataNodes(), is("ds_$->{0..1}.t_order_$->{0..3}"));
- assertThat(actualComplexRuleConfiguration.getDatabaseShardingStrategy().getShardingAlgorithmName(), is("dataSourceShardingAlgorithm"));
- assertThat(actualComplexRuleConfiguration.getTableShardingStrategy().getShardingAlgorithmName(), is("orderTableShardingAlgorithm"));
- assertThat(actualComplexRuleConfiguration.getKeyGenerateStrategy().getKeyGeneratorName(), is("incrementAlgorithm"));
+ ShardingTableRuleConfiguration actualComplexRuleConfig = actualComplexRuleConfigs.iterator().next();
+ assertThat(actualComplexRuleConfig.getLogicTable(), is("t_order"));
+ assertThat(actualComplexRuleConfig.getActualDataNodes(), is("ds_$->{0..1}.t_order_$->{0..3}"));
+ assertThat(actualComplexRuleConfig.getDatabaseShardingStrategy().getShardingAlgorithmName(), is("dataSourceShardingAlgorithm"));
+ assertThat(actualComplexRuleConfig.getTableShardingStrategy().getShardingAlgorithmName(), is("orderTableShardingAlgorithm"));
+ assertThat(actualComplexRuleConfig.getKeyGenerateStrategy().getKeyGeneratorName(), is("incrementAlgorithm"));
assertThat(complexRule.getDefaultKeyGenerateStrategy().getKeyGeneratorName(), is("incrementAlgorithm"));
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-time-service/src/main/java/org/apache/shardingsphere/sharding/route/time/impl/TimeServiceFactory.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-time-service/src/main/java/org/apache/shardingsphere/sharding/route/time/impl/TimeServiceFactory.java
index 8105f7d..3839a87 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-time-service/src/main/java/org/apache/shardingsphere/sharding/route/time/impl/TimeServiceFactory.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-time-service/src/main/java/org/apache/shardingsphere/sharding/route/time/impl/TimeServiceFactory.java
@@ -35,7 +35,7 @@ public final class TimeServiceFactory {
* @return time service instance
*/
public static TimeService createTimeService() {
- TimeServiceConfiguration timeServiceConfiguration = TimeServiceConfiguration.getInstance();
- return new DatabaseTimeService(timeServiceConfiguration.getDataSource(), new SPIDataBaseSQLEntry(timeServiceConfiguration.getDriverClassName()).getSQL());
+ TimeServiceConfiguration timeServiceConfig = TimeServiceConfiguration.getInstance();
+ return new DatabaseTimeService(timeServiceConfig.getDataSource(), new SPIDataBaseSQLEntry(timeServiceConfig.getDriverClassName()).getSQL());
}
}
diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/yaml/swapper/DataSourceConfigurationYamlSwapper.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/yaml/swapper/DataSourceConfigurationYamlSwapper.java
index f51e323..29aebc7 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/yaml/swapper/DataSourceConfigurationYamlSwapper.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/yaml/swapper/DataSourceConfigurationYamlSwapper.java
@@ -27,10 +27,10 @@ import org.apache.shardingsphere.infra.yaml.swapper.YamlSwapper;
public final class DataSourceConfigurationYamlSwapper implements YamlSwapper<YamlDataSourceConfiguration, DataSourceConfiguration> {
@Override
- public YamlDataSourceConfiguration swapToYamlConfiguration(final DataSourceConfiguration configuration) {
+ public YamlDataSourceConfiguration swapToYamlConfiguration(final DataSourceConfiguration config) {
YamlDataSourceConfiguration result = new YamlDataSourceConfiguration();
- result.setDataSourceClassName(configuration.getDataSourceClassName());
- result.setProps(configuration.getProps());
+ result.setDataSourceClassName(config.getDataSourceClassName());
+ result.setProps(config.getProps());
return result;
}
diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/yaml/swapper/DataSourceConfigurationYamlSwapperTest.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/yaml/swapper/DataSourceConfigurationYamlSwapperTest.java
index ad9786a..affd277 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/yaml/swapper/DataSourceConfigurationYamlSwapperTest.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/yaml/swapper/DataSourceConfigurationYamlSwapperTest.java
@@ -30,10 +30,10 @@ public final class DataSourceConfigurationYamlSwapperTest {
@Test
public void assertSwapToYaml() {
- DataSourceConfiguration dataSourceConfiguration = new DataSourceConfiguration("xxx.jdbc.driver");
- dataSourceConfiguration.getProps().put("url", "xx:xxx");
- dataSourceConfiguration.getProps().put("username", "root");
- YamlDataSourceConfiguration actual = dataSourceConfigurationYamlSwapper.swapToYamlConfiguration(dataSourceConfiguration);
+ DataSourceConfiguration dataSourceConfig = new DataSourceConfiguration("xxx.jdbc.driver");
+ dataSourceConfig.getProps().put("url", "xx:xxx");
+ dataSourceConfig.getProps().put("username", "root");
+ YamlDataSourceConfiguration actual = dataSourceConfigurationYamlSwapper.swapToYamlConfiguration(dataSourceConfig);
assertThat(actual.getDataSourceClassName(), is("xxx.jdbc.driver"));
assertThat(actual.getProps().size(), is(2));
assertThat(actual.getProps().get("url").toString(), is("xx:xxx"));
@@ -42,11 +42,11 @@ public final class DataSourceConfigurationYamlSwapperTest {
@Test
public void assertSwapToConfiguration() {
- YamlDataSourceConfiguration yamlConfiguration = new YamlDataSourceConfiguration();
- yamlConfiguration.setDataSourceClassName("xxx.jdbc.driver");
- yamlConfiguration.getProps().put("url", "xx:xxx");
- yamlConfiguration.getProps().put("username", "root");
- DataSourceConfiguration actual = dataSourceConfigurationYamlSwapper.swapToObject(yamlConfiguration);
+ YamlDataSourceConfiguration yamlConfig = new YamlDataSourceConfiguration();
+ yamlConfig.setDataSourceClassName("xxx.jdbc.driver");
+ yamlConfig.getProps().put("url", "xx:xxx");
+ yamlConfig.getProps().put("username", "root");
+ DataSourceConfiguration actual = dataSourceConfigurationYamlSwapper.swapToObject(yamlConfig);
assertThat(actual.getDataSourceClassName(), is("xxx.jdbc.driver"));
assertThat(actual.getProps().size(), is(2));
assertThat(actual.getProps().get("url").toString(), is("xx:xxx"));
diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/yaml/swapper/GovernanceCenterConfigurationYamlSwapperTest.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/yaml/swapper/GovernanceCenterConfigurationYamlSwapperTest.java
index b0ff5b0..affedd9 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/yaml/swapper/GovernanceCenterConfigurationYamlSwapperTest.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/yaml/swapper/GovernanceCenterConfigurationYamlSwapperTest.java
@@ -39,11 +39,11 @@ public final class GovernanceCenterConfigurationYamlSwapperTest {
@Test
public void assertSwapToObject() {
- YamlGovernanceCenterConfiguration yamlConfiguration = getYamlGovernanceCenterConfiguration();
- GovernanceCenterConfiguration governanceCenterConfig = new GovernanceCenterConfigurationYamlSwapper().swapToObject(yamlConfiguration);
- assertThat(governanceCenterConfig.getType(), is(yamlConfiguration.getType()));
- assertThat(governanceCenterConfig.getServerLists(), is(yamlConfiguration.getServerLists()));
- assertThat(governanceCenterConfig.getProps(), is(yamlConfiguration.getProps()));
+ YamlGovernanceCenterConfiguration yamlConfig = getYamlGovernanceCenterConfiguration();
+ GovernanceCenterConfiguration governanceCenterConfig = new GovernanceCenterConfigurationYamlSwapper().swapToObject(yamlConfig);
+ assertThat(governanceCenterConfig.getType(), is(yamlConfig.getType()));
+ assertThat(governanceCenterConfig.getServerLists(), is(yamlConfig.getServerLists()));
+ assertThat(governanceCenterConfig.getProps(), is(yamlConfig.getProps()));
}
private YamlGovernanceCenterConfiguration getYamlGovernanceCenterConfiguration() {
diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/main/java/org/apache/shardingsphere/governance/core/config/ConfigCenter.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/main/java/org/apache/shardingsphere/governance/core/config/ConfigCenter.java
index 42cd68a..f602e1c 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/main/java/org/apache/shardingsphere/governance/core/config/ConfigCenter.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/main/java/org/apache/shardingsphere/governance/core/config/ConfigCenter.java
@@ -166,54 +166,54 @@ public final class ConfigCenter {
}
private void persistRuleConfigurations(final String schemaName, final Collection<RuleConfiguration> ruleConfigurations) {
- Collection<RuleConfiguration> configurations = new LinkedList<>();
+ Collection<RuleConfiguration> configs = new LinkedList<>();
for (RuleConfiguration each : ruleConfigurations) {
if (each instanceof ShardingRuleConfiguration) {
ShardingRuleConfiguration config = (ShardingRuleConfiguration) each;
Preconditions.checkState(hasAvailableTableConfigurations(config),
- "No available rule configurations in `%s` for governance.", schemaName);
- configurations.add(each);
+ "No available rule configs in `%s` for governance.", schemaName);
+ configs.add(each);
} else if (each instanceof AlgorithmProvidedShardingRuleConfiguration) {
AlgorithmProvidedShardingRuleConfiguration config = (AlgorithmProvidedShardingRuleConfiguration) each;
Preconditions.checkState(hasAvailableTableConfigurations(config),
- "No available rule configurations in `%s` for governance.", schemaName);
- configurations.add(each);
+ "No available rule configs in `%s` for governance.", schemaName);
+ configs.add(each);
} else if (each instanceof AlgorithmProvidedPrimaryReplicaReplicationRuleConfiguration) {
AlgorithmProvidedPrimaryReplicaReplicationRuleConfiguration config = (AlgorithmProvidedPrimaryReplicaReplicationRuleConfiguration) each;
config.getDataSources().forEach(group -> Preconditions.checkState(
!group.getPrimaryDataSourceName().isEmpty(), "No available primary-replica-replication rule configuration in `%s` for governance.", schemaName));
- configurations.add(each);
+ configs.add(each);
} else if (each instanceof AlgorithmProvidedEncryptRuleConfiguration) {
AlgorithmProvidedEncryptRuleConfiguration config = (AlgorithmProvidedEncryptRuleConfiguration) each;
Preconditions.checkState(!config.getEncryptors().isEmpty(), "No available encrypt rule configuration in `%s` for governance.", schemaName);
- configurations.add(each);
+ configs.add(each);
} else if (each instanceof PrimaryReplicaReplicationRuleConfiguration) {
PrimaryReplicaReplicationRuleConfiguration config = (PrimaryReplicaReplicationRuleConfiguration) each;
config.getDataSources().forEach(group -> Preconditions.checkState(
!group.getPrimaryDataSourceName().isEmpty(), "No available primary-replica-replication rule configuration in `%s` for governance.", schemaName));
- configurations.add(each);
+ configs.add(each);
} else if (each instanceof EncryptRuleConfiguration) {
EncryptRuleConfiguration config = (EncryptRuleConfiguration) each;
Preconditions.checkState(!config.getEncryptors().isEmpty(), "No available encrypt rule configuration in `%s` for governance.", schemaName);
- configurations.add(each);
+ configs.add(each);
} else if (each instanceof ShadowRuleConfiguration) {
ShadowRuleConfiguration config = (ShadowRuleConfiguration) each;
boolean isShadow = !config.getColumn().isEmpty() && null != config.getSourceDataSourceNames() && null != config.getShadowDataSourceNames();
Preconditions.checkState(isShadow, "No available shadow rule configuration in `%s` for governance.", schemaName);
- configurations.add(each);
+ configs.add(each);
}
}
- YamlRootRuleConfigurations yamlRuleConfigurations = new YamlRootRuleConfigurations();
- yamlRuleConfigurations.setRules(new YamlRuleConfigurationSwapperEngine().swapToYamlConfigurations(configurations));
- repository.persist(node.getRulePath(schemaName), YamlEngine.marshal(yamlRuleConfigurations));
+ YamlRootRuleConfigurations yamlRuleConfigs = new YamlRootRuleConfigurations();
+ yamlRuleConfigs.setRules(new YamlRuleConfigurationSwapperEngine().swapToYamlConfigurations(configs));
+ repository.persist(node.getRulePath(schemaName), YamlEngine.marshal(yamlRuleConfigs));
}
- private boolean hasAvailableTableConfigurations(final ShardingRuleConfiguration configuration) {
- return !configuration.getTables().isEmpty() || null != configuration.getDefaultTableShardingStrategy() || !configuration.getAutoTables().isEmpty();
+ private boolean hasAvailableTableConfigurations(final ShardingRuleConfiguration config) {
+ return !config.getTables().isEmpty() || null != config.getDefaultTableShardingStrategy() || !config.getAutoTables().isEmpty();
}
- private boolean hasAvailableTableConfigurations(final AlgorithmProvidedShardingRuleConfiguration configuration) {
- return !configuration.getTables().isEmpty() || null != configuration.getDefaultTableShardingStrategy() || !configuration.getAutoTables().isEmpty();
+ private boolean hasAvailableTableConfigurations(final AlgorithmProvidedShardingRuleConfiguration config) {
+ return !config.getTables().isEmpty() || null != config.getDefaultTableShardingStrategy() || !config.getAutoTables().isEmpty();
}
private void persistAuthentication(final Authentication authentication, final boolean isOverwrite) {
@@ -249,8 +249,7 @@ public final class ConfigCenter {
private void persistSchema(final String schemaName, final boolean isDrop) {
String schemaNames = repository.get(node.getSchemasPath());
- Collection<String> schemas = Strings.isNullOrEmpty(schemaNames) ? new LinkedHashSet<>()
- : new LinkedHashSet<>(Splitter.on(",").splitToList(schemaNames));
+ Collection<String> schemas = Strings.isNullOrEmpty(schemaNames) ? new LinkedHashSet<>() : new LinkedHashSet<>(Splitter.on(",").splitToList(schemaNames));
if (isDrop) {
schemas.remove(schemaName);
} else if (!schemas.contains(schemaName)) {
diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/java/org/apache/shardingsphere/governance/core/config/ConfigCenterTest.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/java/org/apache/shardingsphere/governance/core/config/ConfigCenterTest.java
index f479b35..6e43040 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/java/org/apache/shardingsphere/governance/core/config/ConfigCenterTest.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/java/org/apache/shardingsphere/governance/core/config/ConfigCenterTest.java
@@ -320,15 +320,15 @@ public final class ConfigCenterTest {
assertThat(ruleConfigurations.size(), is(2));
for (RuleConfiguration each : ruleConfigurations) {
if (each instanceof ShardingRuleConfiguration) {
- ShardingRuleConfiguration shardingRuleConfiguration = (ShardingRuleConfiguration) each;
- assertThat(shardingRuleConfiguration.getTables().size(), is(1));
- assertThat(shardingRuleConfiguration.getTables().iterator().next().getLogicTable(), is("t_order"));
+ ShardingRuleConfiguration shardingRuleConfig = (ShardingRuleConfiguration) each;
+ assertThat(shardingRuleConfig.getTables().size(), is(1));
+ assertThat(shardingRuleConfig.getTables().iterator().next().getLogicTable(), is("t_order"));
} else if (each instanceof EncryptRuleConfiguration) {
- EncryptRuleConfiguration encryptRuleConfiguration = (EncryptRuleConfiguration) each;
- assertThat(encryptRuleConfiguration.getEncryptors().size(), is(2));
- ShardingSphereAlgorithmConfiguration encryptAlgorithmConfiguration = encryptRuleConfiguration.getEncryptors().get("aes_encryptor");
- assertThat(encryptAlgorithmConfiguration.getType(), is("AES"));
- assertThat(encryptAlgorithmConfiguration.getProps().get("aes-key-value").toString(), is("123456abcd"));
+ EncryptRuleConfiguration encryptRuleConfig = (EncryptRuleConfiguration) each;
+ assertThat(encryptRuleConfig.getEncryptors().size(), is(2));
+ ShardingSphereAlgorithmConfiguration encryptAlgorithmConfig = encryptRuleConfig.getEncryptors().get("aes_encryptor");
+ assertThat(encryptAlgorithmConfig.getType(), is("AES"));
+ assertThat(encryptAlgorithmConfig.getProps().get("aes-key-value").toString(), is("123456abcd"));
}
}
}
@@ -361,9 +361,9 @@ public final class ConfigCenterTest {
ConfigCenter configCenter = new ConfigCenter(configurationRepository);
EncryptRuleConfiguration actual = (EncryptRuleConfiguration) configCenter.loadRuleConfigurations("sharding_db").iterator().next();
assertThat(actual.getEncryptors().size(), is(1));
- ShardingSphereAlgorithmConfiguration encryptAlgorithmConfiguration = actual.getEncryptors().get("order_encryptor");
- assertThat(encryptAlgorithmConfiguration.getType(), is("AES"));
- assertThat(encryptAlgorithmConfiguration.getProps().get("aes-key-value").toString(), is("123456"));
+ ShardingSphereAlgorithmConfiguration encryptAlgorithmConfig = actual.getEncryptors().get("order_encryptor");
+ assertThat(encryptAlgorithmConfig.getType(), is("AES"));
+ assertThat(encryptAlgorithmConfig.getProps().get("aes-key-value").toString(), is("123456"));
}
@Test
diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/java/org/apache/shardingsphere/governance/core/config/listener/SchemaChangedListenerTest.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/java/org/apache/shardingsphere/governance/core/config/listener/SchemaChangedListenerTest.java
index ca88c16..53f8f39 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/java/org/apache/shardingsphere/governance/core/config/listener/SchemaChangedListenerTest.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/java/org/apache/shardingsphere/governance/core/config/listener/SchemaChangedListenerTest.java
@@ -97,9 +97,9 @@ public final class SchemaChangedListenerTest {
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
assertThat(((RuleConfigurationsChangedEvent) actual.get()).getSchemaName(), is("sharding_db"));
- Collection<RuleConfiguration> ruleConfigurations = ((RuleConfigurationsChangedEvent) actual.get()).getRuleConfigurations();
- assertThat(ruleConfigurations.size(), is(1));
- assertThat(((ShardingRuleConfiguration) ruleConfigurations.iterator().next()).getTables().size(), is(1));
+ Collection<RuleConfiguration> ruleConfigs = ((RuleConfigurationsChangedEvent) actual.get()).getRuleConfigurations();
+ assertThat(ruleConfigs.size(), is(1));
+ assertThat(((ShardingRuleConfiguration) ruleConfigs.iterator().next()).getTables().size(), is(1));
}
@Test
diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-facade/src/test/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacadeTest.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-facade/src/test/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacadeTest.java
index 6af055f..68d1751 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-facade/src/test/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacadeTest.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-facade/src/test/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacadeTest.java
@@ -62,8 +62,8 @@ public final class GovernanceFacadeTest {
@Before
public void setUp() {
- GovernanceConfiguration governanceConfiguration = new GovernanceConfiguration("test_name", new GovernanceCenterConfiguration("ALL", "127.0.0.1", new Properties()), false);
- governanceFacade.init(governanceConfiguration, Arrays.asList("sharding_db", "primary_replica_replication_db"));
+ GovernanceConfiguration governanceConfig = new GovernanceConfiguration("test_name", new GovernanceCenterConfiguration("ALL", "127.0.0.1", new Properties()), false);
+ governanceFacade.init(governanceConfig, Arrays.asList("sharding_db", "primary_replica_replication_db"));
FieldUtil.setField(governanceFacade, "repositoryFacade", repositoryFacade);
FieldUtil.setField(governanceFacade, "configCenter", configCenter);
FieldUtil.setField(governanceFacade, "registryCenter", registryCenter);
@@ -72,14 +72,14 @@ public final class GovernanceFacadeTest {
@Test
public void assertOnlineInstanceWithParameters() {
- Map<String, DataSourceConfiguration> dataSourceConfigurationMap = Collections.singletonMap("test_ds", mock(DataSourceConfiguration.class));
+ Map<String, DataSourceConfiguration> dataSourceConfigMap = Collections.singletonMap("test_ds", mock(DataSourceConfiguration.class));
Map<String, Collection<RuleConfiguration>> ruleConfigurationMap = Collections.singletonMap("sharding_db", Collections.singletonList(mock(RuleConfiguration.class)));
ProxyUser proxyUser = new ProxyUser("root", Collections.singleton("db1"));
Authentication authentication = new Authentication();
authentication.getUsers().put("root", proxyUser);
Properties props = new Properties();
- governanceFacade.onlineInstance(Collections.singletonMap("sharding_db", dataSourceConfigurationMap), ruleConfigurationMap, authentication, props);
- verify(configCenter).persistConfigurations("sharding_db", dataSourceConfigurationMap, ruleConfigurationMap.get("sharding_db"), false);
+ governanceFacade.onlineInstance(Collections.singletonMap("sharding_db", dataSourceConfigMap), ruleConfigurationMap, authentication, props);
+ verify(configCenter).persistConfigurations("sharding_db", dataSourceConfigMap, ruleConfigurationMap.get("sharding_db"), false);
verify(configCenter).persistGlobalConfiguration(authentication, props, false);
verify(registryCenter).persistInstanceOnline();
verify(registryCenter).persistDataNodes();
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/algorithm/ShardingSphereAlgorithmFactory.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/algorithm/ShardingSphereAlgorithmFactory.java
index 951edfc..719e897 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/algorithm/ShardingSphereAlgorithmFactory.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/algorithm/ShardingSphereAlgorithmFactory.java
@@ -31,14 +31,14 @@ public final class ShardingSphereAlgorithmFactory {
/**
* Create algorithm.
*
- * @param typedSPIConfiguration typed SPI configuration
+ * @param typedSPIConfig typed SPI configuration
* @param algorithmClass algorithm class
* @param <T> type of algorithm
* @return algorithm
*/
@SuppressWarnings("unchecked")
- public static <T extends ShardingSphereAlgorithm> T createAlgorithm(final TypedSPIConfiguration typedSPIConfiguration, final Class<? extends ShardingSphereAlgorithm> algorithmClass) {
- T result = (T) TypedSPIRegistry.getRegisteredService(algorithmClass, typedSPIConfiguration.getType(), typedSPIConfiguration.getProps());
+ public static <T extends ShardingSphereAlgorithm> T createAlgorithm(final TypedSPIConfiguration typedSPIConfig, final Class<? extends ShardingSphereAlgorithm> algorithmClass) {
+ T result = (T) TypedSPIRegistry.getRegisteredService(algorithmClass, typedSPIConfig.getType(), typedSPIConfig.getProps());
if (result instanceof ShardingSphereAlgorithmPostProcessor) {
((ShardingSphereAlgorithmPostProcessor) result).init();
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/rule/ShardingSphereRuleBuilder.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/rule/ShardingSphereRuleBuilder.java
index 4cab877..7ea6af0 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/rule/ShardingSphereRuleBuilder.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/rule/ShardingSphereRuleBuilder.java
@@ -33,9 +33,9 @@ public interface ShardingSphereRuleBuilder<R extends ShardingSphereRule, T exten
/**
* Build ShardingSphere rule.
*
- * @param ruleConfiguration rule configuration
+ * @param ruleConfig rule configuration
* @param dataSourceNames data source names
* @return ShardingSphere rule
*/
- R build(T ruleConfiguration, Collection<String> dataSourceNames);
+ R build(T ruleConfig, Collection<String> dataSourceNames);
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/auth/yaml/swapper/ProxyUserYamlSwapperTest.java b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/auth/yaml/swapper/ProxyUserYamlSwapperTest.java
index 18ed6c6..298db4e 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/auth/yaml/swapper/ProxyUserYamlSwapperTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/auth/yaml/swapper/ProxyUserYamlSwapperTest.java
@@ -37,19 +37,19 @@ public final class ProxyUserYamlSwapperTest {
@Test
public void assertSwapToObject() {
- YamlProxyUserConfiguration yamlProxyUserConfiguration = new YamlProxyUserConfiguration();
- yamlProxyUserConfiguration.setAuthorizedSchemas("db1");
- yamlProxyUserConfiguration.setPassword("pwd");
- ProxyUser actual = new ProxyUserYamlSwapper().swapToObject(yamlProxyUserConfiguration);
+ YamlProxyUserConfiguration yamlProxyUserConfig = new YamlProxyUserConfiguration();
+ yamlProxyUserConfig.setAuthorizedSchemas("db1");
+ yamlProxyUserConfig.setPassword("pwd");
+ ProxyUser actual = new ProxyUserYamlSwapper().swapToObject(yamlProxyUserConfig);
assertThat(actual.getAuthorizedSchemas().iterator().next(), is("db1"));
assertThat(actual.getPassword(), is("pwd"));
}
@Test
public void assertSwapToObjectWithoutAuthorizedSchemas() {
- YamlProxyUserConfiguration yamlProxyUserConfiguration = new YamlProxyUserConfiguration();
- yamlProxyUserConfiguration.setPassword("pwd");
- ProxyUser actual = new ProxyUserYamlSwapper().swapToObject(yamlProxyUserConfiguration);
+ YamlProxyUserConfiguration yamlProxyUserConfig = new YamlProxyUserConfiguration();
+ yamlProxyUserConfig.setPassword("pwd");
+ ProxyUser actual = new ProxyUserYamlSwapper().swapToObject(yamlProxyUserConfig);
assertThat(actual.getAuthorizedSchemas().size(), is(0));
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/DataSourceConfigurationTest.java b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/DataSourceConfigurationTest.java
index b343e71..40500eb 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/DataSourceConfigurationTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/DataSourceConfigurationTest.java
@@ -95,23 +95,23 @@ public final class DataSourceConfigurationTest {
@Test
public void assertEquals() {
DataSourceConfiguration originalDataSourceConfig = new DataSourceConfiguration(HikariDataSource.class.getName());
- DataSourceConfiguration targetDataSourceConfiguration = new DataSourceConfiguration(HikariDataSource.class.getName());
+ DataSourceConfiguration targetDataSourceConfig = new DataSourceConfiguration(HikariDataSource.class.getName());
assertThat(originalDataSourceConfig, is(originalDataSourceConfig));
- assertThat(originalDataSourceConfig, is(targetDataSourceConfiguration));
+ assertThat(originalDataSourceConfig, is(targetDataSourceConfig));
originalDataSourceConfig.getProps().put("username", "root");
- targetDataSourceConfiguration.getProps().put("username", "root");
- assertThat(originalDataSourceConfig, is(targetDataSourceConfiguration));
- targetDataSourceConfiguration.getProps().put("password", "root");
- assertThat(originalDataSourceConfig, is(targetDataSourceConfiguration));
+ targetDataSourceConfig.getProps().put("username", "root");
+ assertThat(originalDataSourceConfig, is(targetDataSourceConfig));
+ targetDataSourceConfig.getProps().put("password", "root");
+ assertThat(originalDataSourceConfig, is(targetDataSourceConfig));
}
@Test
public void assertNotEquals() {
DataSourceConfiguration originalDataSourceConfig = new DataSourceConfiguration(HikariDataSource.class.getName());
- DataSourceConfiguration targetDataSourceConfiguration = new DataSourceConfiguration(HikariDataSource.class.getName());
+ DataSourceConfiguration targetDataSourceConfig = new DataSourceConfiguration(HikariDataSource.class.getName());
originalDataSourceConfig.getProps().put("username", "root");
- targetDataSourceConfiguration.getProps().put("username", "root0");
- assertThat(originalDataSourceConfig, not(targetDataSourceConfiguration));
+ targetDataSourceConfig.getProps().put("username", "root0");
+ assertThat(originalDataSourceConfig, not(targetDataSourceConfig));
}
@Test
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/rule/ShardingSphereRulesBuilderTest.java b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/rule/ShardingSphereRulesBuilderTest.java
index 1287aa2..8b027cf 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/rule/ShardingSphereRulesBuilderTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/rule/ShardingSphereRulesBuilderTest.java
@@ -32,8 +32,8 @@ public final class ShardingSphereRulesBuilderTest {
@Test
public void assertBuild() {
- RuleConfiguration ruleConfiguration = new TestRuleConfiguration();
- Collection<ShardingSphereRule> shardingSphereRules = ShardingSphereRulesBuilder.build(Collections.singletonList(ruleConfiguration), Collections.singletonList(""));
+ RuleConfiguration ruleConfig = new TestRuleConfiguration();
+ Collection<ShardingSphereRule> shardingSphereRules = ShardingSphereRulesBuilder.build(Collections.singletonList(ruleConfig), Collections.singletonList(""));
assertThat(shardingSphereRules, is(Collections.singletonList(TestShardingSphereRuleBuilder.getShardingSphereRule())));
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/rule/fixture/TestShardingSphereRuleBuilder.java b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/rule/fixture/TestShardingSphereRuleBuilder.java
index e4843b7..dfe9ec4 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/rule/fixture/TestShardingSphereRuleBuilder.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/rule/fixture/TestShardingSphereRuleBuilder.java
@@ -30,7 +30,7 @@ public final class TestShardingSphereRuleBuilder implements ShardingSphereRuleBu
private static ShardingSphereRule shardingSphereRule = new TestShardingSphereRule();
@Override
- public ShardingSphereRule build(final RuleConfiguration ruleConfiguration, final Collection dataSourceNames) {
+ public ShardingSphereRule build(final RuleConfiguration ruleConfig, final Collection dataSourceNames) {
return shardingSphereRule;
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/yaml/swapper/YamlRuleConfigurationSwapperEngineTest.java b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/yaml/swapper/YamlRuleConfigurationSwapperEngineTest.java
index e2089a5..7297142 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/yaml/swapper/YamlRuleConfigurationSwapperEngineTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/yaml/swapper/YamlRuleConfigurationSwapperEngineTest.java
@@ -34,18 +34,18 @@ public final class YamlRuleConfigurationSwapperEngineTest {
@Test
public void assertSwapToYamlConfigurations() {
- FixtureRuleConfiguration ruleConfiguration = new FixtureRuleConfiguration();
- ruleConfiguration.setName("test");
- Collection<YamlRuleConfiguration> actual = new YamlRuleConfigurationSwapperEngine().swapToYamlConfigurations(Collections.singletonList(ruleConfiguration));
+ FixtureRuleConfiguration ruleConfig = new FixtureRuleConfiguration();
+ ruleConfig.setName("test");
+ Collection<YamlRuleConfiguration> actual = new YamlRuleConfigurationSwapperEngine().swapToYamlConfigurations(Collections.singletonList(ruleConfig));
assertThat(actual.size(), is(1));
assertThat(((FixtureYamlRuleConfiguration) actual.iterator().next()).getName(), is("test"));
}
@Test
public void assertSwapToRuleConfigurations() {
- FixtureYamlRuleConfiguration yamlRuleConfiguration = new FixtureYamlRuleConfiguration();
- yamlRuleConfiguration.setName("test");
- Collection<RuleConfiguration> actual = new YamlRuleConfigurationSwapperEngine().swapToRuleConfigurations(Collections.singletonList(yamlRuleConfiguration));
+ FixtureYamlRuleConfiguration yamlRuleConfig = new FixtureYamlRuleConfiguration();
+ yamlRuleConfig.setName("test");
+ Collection<RuleConfiguration> actual = new YamlRuleConfigurationSwapperEngine().swapToRuleConfigurations(Collections.singletonList(yamlRuleConfig));
assertThat(actual.size(), is(1));
assertThat(((FixtureRuleConfiguration) actual.iterator().next()).getName(), is("test"));
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/yaml/swapper/algorithm/ShardingSphereAlgorithmConfigurationYamlSwapperTest.java b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/yaml/swapper/algorithm/ShardingSphereAlgorithmConfigurationYamlSwapperTest.java
index 36176fe..6aa2755 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/yaml/swapper/algorithm/ShardingSphereAlgorithmConfigurationYamlSwapperTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/yaml/swapper/algorithm/ShardingSphereAlgorithmConfigurationYamlSwapperTest.java
@@ -38,10 +38,10 @@ public final class ShardingSphereAlgorithmConfigurationYamlSwapperTest {
@Test
public void assertSwapToObject() {
- YamlShardingSphereAlgorithmConfiguration yamlConfiguration = new YamlShardingSphereAlgorithmConfiguration();
- yamlConfiguration.setType("TEST");
- yamlConfiguration.setProps(createProps());
- ShardingSphereAlgorithmConfiguration actual = new ShardingSphereAlgorithmConfigurationYamlSwapper().swapToObject(yamlConfiguration);
+ YamlShardingSphereAlgorithmConfiguration yamlConfig = new YamlShardingSphereAlgorithmConfiguration();
+ yamlConfig.setType("TEST");
+ yamlConfig.setProps(createProps());
+ ShardingSphereAlgorithmConfiguration actual = new ShardingSphereAlgorithmConfigurationYamlSwapper().swapToObject(yamlConfig);
assertThat(actual.getType(), is("TEST"));
assertThat(actual.getProps().getProperty("key"), is("value"));
}
diff --git a/shardingsphere-infra/shardingsphere-infra-context/src/test/java/org/apache/shardingsphere/infra/context/fixture/FixtureRuleBuilder.java b/shardingsphere-infra/shardingsphere-infra-context/src/test/java/org/apache/shardingsphere/infra/context/fixture/FixtureRuleBuilder.java
index 649031d..b00b3f2 100644
--- a/shardingsphere-infra/shardingsphere-infra-context/src/test/java/org/apache/shardingsphere/infra/context/fixture/FixtureRuleBuilder.java
+++ b/shardingsphere-infra/shardingsphere-infra-context/src/test/java/org/apache/shardingsphere/infra/context/fixture/FixtureRuleBuilder.java
@@ -24,7 +24,7 @@ import java.util.Collection;
public final class FixtureRuleBuilder implements ShardingSphereRuleBuilder<FixtureRule, FixtureRuleConfiguration> {
@Override
- public FixtureRule build(final FixtureRuleConfiguration ruleConfiguration, final Collection<String> dataSourceNames) {
+ public FixtureRule build(final FixtureRuleConfiguration ruleConfig, final Collection<String> dataSourceNames) {
return new FixtureRule();
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaDataTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaDataTest.java
index 7ed00c4..3611034 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaDataTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/metadata/ShardingSphereDatabaseMetaDataTest.java
@@ -101,8 +101,8 @@ public final class ShardingSphereDatabaseMetaDataTest {
private ShardingRule mockShardingRule() {
ShardingRuleConfiguration ruleConfig = new ShardingRuleConfiguration();
- ShardingTableRuleConfiguration shardingTableRuleConfiguration = new ShardingTableRuleConfiguration(TABLE_NAME, DATA_SOURCE_NAME + "." + TABLE_NAME);
- ruleConfig.setTables(Collections.singletonList(shardingTableRuleConfiguration));
+ ShardingTableRuleConfiguration shardingTableRuleConfig = new ShardingTableRuleConfiguration(TABLE_NAME, DATA_SOURCE_NAME + "." + TABLE_NAME);
+ ruleConfig.setTables(Collections.singletonList(shardingTableRuleConfig));
return new ShardingRule(ruleConfig, Collections.singletonList(DATA_SOURCE_NAME));
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/GovernanceShardingSphereDataSourceFactoryTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/GovernanceShardingSphereDataSourceFactoryTest.java
index 17771a5..e076088 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/GovernanceShardingSphereDataSourceFactoryTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/GovernanceShardingSphereDataSourceFactoryTest.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.driver.governance.api;
-import lombok.SneakyThrows;
import org.apache.shardingsphere.driver.governance.internal.datasource.GovernanceShardingSphereDataSource;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceCenterConfiguration;
import org.apache.shardingsphere.governance.repository.api.config.GovernanceConfiguration;
@@ -25,10 +24,10 @@ import org.apache.shardingsphere.infra.config.RuleConfiguration;
import org.junit.Test;
import javax.sql.DataSource;
-
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
+import java.sql.SQLException;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -42,30 +41,27 @@ public final class GovernanceShardingSphereDataSourceFactoryTest {
private static final String TABLE_TYPE = "TABLE";
- @SneakyThrows
@Test
- public void assertCreateDataSourceWhenRuleConfigurationsNotEmpty() {
+ public void assertCreateDataSourceWhenRuleConfigurationsNotEmpty() throws SQLException {
DataSource dataSource = GovernanceShardingSphereDataSourceFactory.createDataSource(createDataSourceMap(), Collections.singletonList(mock(RuleConfiguration.class)),
new Properties(), createGovernanceConfiguration());
assertTrue(dataSource instanceof GovernanceShardingSphereDataSource);
}
- @SneakyThrows
@Test
- public void assertCreateDataSourceWithGivenDataSource() {
+ public void assertCreateDataSourceWithGivenDataSource() throws SQLException {
DataSource dataSource = GovernanceShardingSphereDataSourceFactory.createDataSource(createDataSource(), Collections.singletonList(mock(RuleConfiguration.class)),
new Properties(), createGovernanceConfiguration());
assertTrue(dataSource instanceof GovernanceShardingSphereDataSource);
}
- private Map<String, DataSource> createDataSourceMap() {
- Map<String, DataSource> result = new HashMap<>();
+ private Map<String, DataSource> createDataSourceMap() throws SQLException {
+ Map<String, DataSource> result = new HashMap<>(1, 1);
result.put("dataSourceMapKey", createDataSource());
return result;
}
- @SneakyThrows
- private DataSource createDataSource() {
+ private DataSource createDataSource() throws SQLException {
DataSource result = mock(DataSource.class);
Connection connection = mock(Connection.class);
DatabaseMetaData databaseMetaData = mock(DatabaseMetaData.class);
@@ -79,9 +75,9 @@ public final class GovernanceShardingSphereDataSourceFactoryTest {
private GovernanceConfiguration createGovernanceConfiguration() {
GovernanceConfiguration result = mock(GovernanceConfiguration.class);
- GovernanceCenterConfiguration governanceCenterConfiguration = mock(GovernanceCenterConfiguration.class);
- when(result.getRegistryCenterConfiguration()).thenReturn(governanceCenterConfiguration);
- when(governanceCenterConfiguration.getType()).thenReturn("REG_TEST");
+ GovernanceCenterConfiguration governanceCenterConfig = mock(GovernanceCenterConfiguration.class);
+ when(result.getRegistryCenterConfiguration()).thenReturn(governanceCenterConfig);
+ when(governanceCenterConfig.getType()).thenReturn("REG_TEST");
return result;
}
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/main/java/org/apache/shardingsphere/spring/boot/governance/GovernanceSpringBootConfiguration.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/main/java/org/apache/shardingsphere/spring/boot/governance/GovernanceSpringBootConfiguration.java
index 646c6ab..4cb32a6 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/main/java/org/apache/shardingsphere/spring/boot/governance/GovernanceSpringBootConfiguration.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/main/java/org/apache/shardingsphere/spring/boot/governance/GovernanceSpringBootConfiguration.java
@@ -85,29 +85,29 @@ public class GovernanceSpringBootConfiguration implements EnvironmentAware {
* Get governance ShardingSphere data source bean by local configuration.
*
* @param rules rules configuration
- * @param governanceConfiguration governance configuration
+ * @param governanceConfig governance configuration
* @return governance sharding data source bean
* @throws SQLException SQL exception
*/
@Bean
@Conditional(LocalRulesCondition.class)
@Autowired(required = false)
- public DataSource localShardingSphereDataSource(final ObjectProvider<List<RuleConfiguration>> rules, final GovernanceConfiguration governanceConfiguration) throws SQLException {
+ public DataSource localShardingSphereDataSource(final ObjectProvider<List<RuleConfiguration>> rules, final GovernanceConfiguration governanceConfig) throws SQLException {
List<RuleConfiguration> ruleConfigurations = Optional.ofNullable(rules.getIfAvailable()).orElse(Collections.emptyList());
- return createDataSourceWithRules(ruleConfigurations, governanceConfiguration);
+ return createDataSourceWithRules(ruleConfigurations, governanceConfig);
}
/**
* Get data source bean from registry center.
*
- * @param governanceConfiguration governance configuration
+ * @param governanceConfig governance configuration
* @return data source bean
* @throws SQLException SQL Exception
*/
@Bean
@ConditionalOnMissingBean(DataSource.class)
- public DataSource dataSource(final GovernanceConfiguration governanceConfiguration) throws SQLException {
- return createDataSourceWithoutRules(governanceConfiguration);
+ public DataSource dataSource(final GovernanceConfiguration governanceConfig) throws SQLException {
+ return createDataSourceWithoutRules(governanceConfig);
}
@Override
@@ -115,12 +115,11 @@ public class GovernanceSpringBootConfiguration implements EnvironmentAware {
dataSourceMap.putAll(DataSourceMapSetter.getDataSourceMap(environment));
}
- private DataSource createDataSourceWithRules(final List<RuleConfiguration> ruleConfigurations,
- final GovernanceConfiguration governanceConfiguration) throws SQLException {
- return new GovernanceShardingSphereDataSource(dataSourceMap, ruleConfigurations, root.getProps(), governanceConfiguration);
+ private DataSource createDataSourceWithRules(final List<RuleConfiguration> ruleConfigs, final GovernanceConfiguration governanceConfig) throws SQLException {
+ return new GovernanceShardingSphereDataSource(dataSourceMap, ruleConfigs, root.getProps(), governanceConfig);
}
- private DataSource createDataSourceWithoutRules(final GovernanceConfiguration governanceConfiguration) throws SQLException {
- return new GovernanceShardingSphereDataSource(governanceConfiguration);
+ private DataSource createDataSourceWithoutRules(final GovernanceConfiguration governanceConfig) throws SQLException {
+ return new GovernanceShardingSphereDataSource(governanceConfig);
}
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/governance/type/GovernanceSpringBootRegistryEncryptTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/governance/type/GovernanceSpringBootRegis [...]
index 2578dcd..ac7ce57 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/governance/type/GovernanceSpringBootRegistryEncryptTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/governance/type/GovernanceSpringBootRegistryEncryptTest.java
@@ -80,11 +80,11 @@ public class GovernanceSpringBootRegistryEncryptTest {
BasicDataSource embedDataSource = (BasicDataSource) schemaContexts.getDefaultSchema().getDataSources().values().iterator().next();
assertThat(embedDataSource.getMaxTotal(), is(100));
assertThat(embedDataSource.getUsername(), is("sa"));
- EncryptRuleConfiguration configuration = (EncryptRuleConfiguration) schemaContexts.getDefaultSchema().getConfigurations().iterator().next();
- assertThat(configuration.getEncryptors().size(), is(1));
- ShardingSphereAlgorithmConfiguration encryptAlgorithmConfiguration = configuration.getEncryptors().get("order_encrypt");
- assertThat(encryptAlgorithmConfiguration, instanceOf(ShardingSphereAlgorithmConfiguration.class));
- assertThat(encryptAlgorithmConfiguration.getType(), is("AES"));
+ EncryptRuleConfiguration config = (EncryptRuleConfiguration) schemaContexts.getDefaultSchema().getConfigurations().iterator().next();
+ assertThat(config.getEncryptors().size(), is(1));
+ ShardingSphereAlgorithmConfiguration encryptAlgorithmConfig = config.getEncryptors().get("order_encrypt");
+ assertThat(encryptAlgorithmConfig, instanceOf(ShardingSphereAlgorithmConfiguration.class));
+ assertThat(encryptAlgorithmConfig.getType(), is("AES"));
}
@SneakyThrows
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/GovernanceEncryptNamespaceTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/GovernanceEncryptNamespaceTest.java
index 6010de4..ed192ae 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/GovernanceEncryptNamespaceTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/GovernanceEncryptNamespaceTest.java
@@ -61,16 +61,16 @@ public final class GovernanceEncryptNamespaceTest extends AbstractJUnit4SpringCo
return (AlgorithmProvidedEncryptRuleConfiguration) schemaContexts.getDefaultSchema().getConfigurations().iterator().next();
}
- private void assertEncryptRule(final AlgorithmProvidedEncryptRuleConfiguration configuration) {
- assertThat(configuration.getEncryptors().size(), is(2));
- assertThat(configuration.getTables().size(), is(1));
- EncryptTableRuleConfiguration encryptTableRuleConfiguration = configuration.getTables().iterator().next();
- Iterator<EncryptColumnRuleConfiguration> encryptColumnRuleConfigs = encryptTableRuleConfiguration.getColumns().iterator();
- EncryptColumnRuleConfiguration userIdColumnRuleConfiguration = encryptColumnRuleConfigs.next();
- EncryptColumnRuleConfiguration orderIdColumnRuleConfiguration = encryptColumnRuleConfigs.next();
- assertThat(userIdColumnRuleConfiguration.getCipherColumn(), is("user_encrypt"));
- assertThat(orderIdColumnRuleConfiguration.getPlainColumn(), is("order_decrypt"));
- Map<String, EncryptAlgorithm> encryptAlgorithms = configuration.getEncryptors();
+ private void assertEncryptRule(final AlgorithmProvidedEncryptRuleConfiguration config) {
+ assertThat(config.getEncryptors().size(), is(2));
+ assertThat(config.getTables().size(), is(1));
+ EncryptTableRuleConfiguration encryptTableRuleConfig = config.getTables().iterator().next();
+ Iterator<EncryptColumnRuleConfiguration> encryptColumnRuleConfigs = encryptTableRuleConfig.getColumns().iterator();
+ EncryptColumnRuleConfiguration userIdColumnRuleConfig = encryptColumnRuleConfigs.next();
+ EncryptColumnRuleConfiguration orderIdColumnRuleConfig = encryptColumnRuleConfigs.next();
+ assertThat(userIdColumnRuleConfig.getCipherColumn(), is("user_encrypt"));
+ assertThat(orderIdColumnRuleConfig.getPlainColumn(), is("order_decrypt"));
+ Map<String, EncryptAlgorithm> encryptAlgorithms = config.getEncryptors();
assertThat(encryptAlgorithms.size(), is(2));
assertThat(encryptAlgorithms.get("aes_encryptor").getType(), is("AES"));
assertThat(encryptAlgorithms.get("aes_encryptor").getProps().getProperty("aes-key-value"), is("123456"));
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-spring-infra/shardingsphere-jdbc-spring-boot-starter-infra/src/main/java/org/apache/shardingsphere/spring/boot/registry/AbstractAlgorithmProvidedBeanRegistry.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-spring-infra/shardingsphere-jdbc-spring-boot-starter-infra/src/main/java/org/apache/shardingsphere/spring/boot/registry/AbstractAlgorithmProvidedBeanRegistry.java
index 9e2f652..91710ec 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-spring-infra/shardingsphere-jdbc-spring-boot-starter-infra/src/main/java/org/apache/shardingsphere/spring/boot/registry/AbstractAlgorithmProvidedBeanRegistry.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-spring-infra/shardingsphere-jdbc-spring-boot-starter-infra/src/main/java/org/apache/shardingsphere/spring/boot/registry/AbstractAlgorithmProvidedBeanRegistry.java
@@ -55,10 +55,10 @@ public abstract class AbstractAlgorithmProvidedBeanRegistry<T extends ShardingSp
keys.forEach(each -> {
String type = environment.getProperty(preFix + each + ".type");
Map<String, Object> propsMap = PropertyUtil.handle(environment, preFix + each + ".props", Map.class);
- YamlShardingSphereAlgorithmConfiguration configuration = new YamlShardingSphereAlgorithmConfiguration();
- configuration.setType(type);
- configuration.getProps().putAll(propsMap);
- shardingAlgorithmMap.put(each, configuration);
+ YamlShardingSphereAlgorithmConfiguration config = new YamlShardingSphereAlgorithmConfiguration();
+ config.setType(type);
+ config.getProps().putAll(propsMap);
+ shardingAlgorithmMap.put(each, config);
});
ShardingSphereServiceLoader.register(algorithmClass);
shardingAlgorithmMap.forEach((k, v) -> {
diff --git a/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/util/DataSourceParameterConverter.java b/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/util/DataSourceParameterConverter.java
index 627a82a..3d08b2d 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/util/DataSourceParameterConverter.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/util/DataSourceParameterConverter.java
@@ -88,12 +88,12 @@ public final class DataSourceParameterConverter {
return result;
}
- private static void bindSynonym(final DataSourceConfiguration dataSourceConfiguration) {
- dataSourceConfiguration.addPropertySynonym("url", "jdbcUrl");
- dataSourceConfiguration.addPropertySynonym("user", "username");
- dataSourceConfiguration.addPropertySynonym("connectionTimeout", "connectionTimeoutMilliseconds");
- dataSourceConfiguration.addPropertySynonym("maxLifetime", "maxLifetimeMilliseconds");
- dataSourceConfiguration.addPropertySynonym("idleTimeout", "idleTimeoutMilliseconds");
+ private static void bindSynonym(final DataSourceConfiguration dataSourceConfig) {
+ dataSourceConfig.addPropertySynonym("url", "jdbcUrl");
+ dataSourceConfig.addPropertySynonym("user", "username");
+ dataSourceConfig.addPropertySynonym("connectionTimeout", "connectionTimeoutMilliseconds");
+ dataSourceConfig.addPropertySynonym("maxLifetime", "maxLifetimeMilliseconds");
+ dataSourceConfig.addPropertySynonym("idleTimeout", "idleTimeoutMilliseconds");
}
/**
diff --git a/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/ProxyConfigurationLoaderTest.java b/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/ProxyConfigurationLoaderTest.java
index 2e52a0f..3a06d67 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/ProxyConfigurationLoaderTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/ProxyConfigurationLoaderTest.java
@@ -55,10 +55,10 @@ public final class ProxyConfigurationLoaderTest {
assertNull(actual.getDataSource());
assertDataSourceParameter(actual.getDataSources().get("ds_0"), "jdbc:mysql://127.0.0.1:3306/ds_0");
assertDataSourceParameter(actual.getDataSources().get("ds_1"), "jdbc:mysql://127.0.0.1:3306/ds_1");
- Optional<YamlShardingRuleConfiguration> shardingRuleConfiguration = actual.getRules().stream().filter(
- each -> each instanceof YamlShardingRuleConfiguration).findFirst().map(configuration -> (YamlShardingRuleConfiguration) configuration);
- assertTrue(shardingRuleConfiguration.isPresent());
- assertShardingRuleConfiguration(shardingRuleConfiguration.get());
+ Optional<YamlShardingRuleConfiguration> shardingRuleConfig = actual.getRules().stream().filter(
+ each -> each instanceof YamlShardingRuleConfiguration).findFirst().map(config -> (YamlShardingRuleConfiguration) config);
+ assertTrue(shardingRuleConfig.isPresent());
+ assertShardingRuleConfiguration(shardingRuleConfig.get());
assertFalse(actual.getRules().stream().filter(
each -> each instanceof YamlEncryptRuleConfiguration).findFirst().map(configuration -> (YamlEncryptRuleConfiguration) configuration).isPresent());
}
@@ -108,10 +108,10 @@ public final class ProxyConfigurationLoaderTest {
assertDataSourceParameter(actual.getDataSources().get("dataSource"), "jdbc:mysql://127.0.0.1:3306/encrypt_ds");
assertFalse(actual.getRules().stream().filter(
each -> each instanceof YamlShardingRuleConfiguration).findFirst().map(configuration -> (YamlShardingRuleConfiguration) configuration).isPresent());
- Optional<YamlEncryptRuleConfiguration> encryptRuleConfiguration = actual.getRules().stream().filter(
+ Optional<YamlEncryptRuleConfiguration> encryptRuleConfig = actual.getRules().stream().filter(
each -> each instanceof YamlEncryptRuleConfiguration).findFirst().map(configuration -> (YamlEncryptRuleConfiguration) configuration);
- assertTrue(encryptRuleConfiguration.isPresent());
- assertEncryptRuleConfiguration(encryptRuleConfiguration.get());
+ assertTrue(encryptRuleConfig.isPresent());
+ assertEncryptRuleConfiguration(encryptRuleConfig.get());
}
private void assertEncryptRuleConfiguration(final YamlEncryptRuleConfiguration actual) {
diff --git a/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/yaml/swapper/YamlProxyConfigurationSwapperTest.java b/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/yaml/swapper/YamlProxyConfigurationSwapperTest.java
index 4e880e4..7c2b126 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/yaml/swapper/YamlProxyConfigurationSwapperTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/yaml/swapper/YamlProxyConfigurationSwapperTest.java
@@ -134,8 +134,8 @@ public final class YamlProxyConfigurationSwapperTest {
private void prepareRules(final YamlProxyRuleConfiguration yamlProxyRuleConfig) {
Collection<YamlRuleConfiguration> rules = new LinkedList<>();
- YamlRuleConfiguration testRuleConfiguration = new YamlPrimaryReplicaReplicationRuleConfiguration();
- rules.add(testRuleConfiguration);
+ YamlRuleConfiguration testRuleConfig = new YamlPrimaryReplicaReplicationRuleConfiguration();
+ rules.add(testRuleConfig);
when(yamlProxyRuleConfig.getRules()).thenReturn(rules);
}
@@ -221,10 +221,10 @@ public final class YamlProxyConfigurationSwapperTest {
private void prepareAuthentication(final YamlProxyServerConfiguration yamlProxyServerConfig) {
Map<String, YamlProxyUserConfiguration> yamlProxyUserConfigurationMap = new HashMap<>(1, 1);
- YamlProxyUserConfiguration yamlProxyUserConfiguration = mock(YamlProxyUserConfiguration.class);
- when(yamlProxyUserConfiguration.getPassword()).thenReturn("pass");
- when(yamlProxyUserConfiguration.getAuthorizedSchemas()).thenReturn("db1");
- yamlProxyUserConfigurationMap.put("user1", yamlProxyUserConfiguration);
+ YamlProxyUserConfiguration yamlProxyUserConfig = mock(YamlProxyUserConfiguration.class);
+ when(yamlProxyUserConfig.getPassword()).thenReturn("pass");
+ when(yamlProxyUserConfig.getAuthorizedSchemas()).thenReturn("db1");
+ yamlProxyUserConfigurationMap.put("user1", yamlProxyUserConfig);
YamlAuthenticationConfiguration yamlAuthenticationConfig = mock(YamlAuthenticationConfiguration.class);
when(yamlAuthenticationConfig.getUsers()).thenReturn(yamlProxyUserConfigurationMap);
when(yamlProxyServerConfig.getAuthentication()).thenReturn(yamlAuthenticationConfig);
diff --git a/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/main/java/org/apache/shardingsphere/scaling/Bootstrap.java b/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/main/java/org/apache/shardingsphere/scaling/Bootstrap.java
index 509824e..735470c 100755
--- a/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/main/java/org/apache/shardingsphere/scaling/Bootstrap.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/main/java/org/apache/shardingsphere/scaling/Bootstrap.java
@@ -68,7 +68,7 @@ public final class Bootstrap {
.channel(NioServerSocketChannel.class)
.handler(new LoggingHandler(LogLevel.INFO))
.childHandler(new HttpServerInitializer());
- int port = ScalingContext.getInstance().getServerConfiguration().getPort();
+ int port = ScalingContext.getInstance().getServerConfig().getPort();
Channel channel = bootstrap.bind(port).sync().channel();
log.info("ShardingSphere-Scaling is server on http://127.0.0.1:{}/", port);
channel.closeFuture().sync();
@@ -81,8 +81,8 @@ public final class Bootstrap {
private static void initServerConfig() throws IOException {
log.info("Init server config");
File yamlFile = new File(Resources.getResource(DEFAULT_CONFIG_PATH + DEFAULT_CONFIG_FILE_NAME).getPath());
- ServerConfiguration serverConfiguration = YamlEngine.unmarshal(yamlFile, ServerConfiguration.class);
- Preconditions.checkNotNull(serverConfiguration, "Server configuration file `%s` is invalid.", yamlFile.getName());
- ScalingContext.getInstance().init(serverConfiguration);
+ ServerConfiguration serverConfig = YamlEngine.unmarshal(yamlFile, ServerConfiguration.class);
+ Preconditions.checkNotNull(serverConfig, "Server configuration file `%s` is invalid.", yamlFile.getName());
+ ScalingContext.getInstance().init(serverConfig);
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/main/java/org/apache/shardingsphere/scaling/web/HttpServerHandler.java b/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/main/java/org/apache/shardingsphere/scaling/web/HttpServerHandler.java
index 31463c7..ce1682a 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/main/java/org/apache/shardingsphere/scaling/web/HttpServerHandler.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/main/java/org/apache/shardingsphere/scaling/web/HttpServerHandler.java
@@ -91,9 +91,9 @@ public final class HttpServerHandler extends SimpleChannelInboundHandler<FullHtt
}
private void startJob(final ChannelHandlerContext context, final String requestBody) {
- ScalingConfiguration scalingConfiguration = GSON.fromJson(requestBody, ScalingConfiguration.class);
- ShardingScalingJob shardingScalingJob = new ShardingScalingJob(scalingConfiguration);
- shardingScalingJob.getSyncConfigurations().addAll(SyncConfigurationUtil.toSyncConfigurations(scalingConfiguration));
+ ScalingConfiguration scalingConfig = GSON.fromJson(requestBody, ScalingConfiguration.class);
+ ShardingScalingJob shardingScalingJob = new ShardingScalingJob(scalingConfig);
+ shardingScalingJob.getSyncConfigurations().addAll(SyncConfigurationUtil.toSyncConfigurations(scalingConfig));
log.info("start job : {}", requestBody);
SCALING_JOB_CONTROLLER.start(shardingScalingJob);
response(GSON.toJson(ResponseContentUtil.success()), context, HttpResponseStatus.OK);
diff --git a/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/test/java/org/apache/shardingsphere/scaling/web/HttpServerHandlerTest.java b/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/test/java/org/apache/shardingsphere/scaling/web/HttpServerHandlerTest.java
index 9ae9a18..2613e74 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/test/java/org/apache/shardingsphere/scaling/web/HttpServerHandlerTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/test/java/org/apache/shardingsphere/scaling/web/HttpServerHandlerTest.java
@@ -59,7 +59,7 @@ public final class HttpServerHandlerTest {
private HttpServerHandler httpServerHandler;
- private ScalingConfiguration scalingConfiguration;
+ private ScalingConfiguration scalingConfig;
@Before
public void setUp() {
@@ -159,7 +159,7 @@ public final class HttpServerHandlerTest {
}
private void startScalingJob() {
- ByteBuf byteBuf = Unpooled.copiedBuffer(GSON.toJson(scalingConfiguration), CharsetUtil.UTF_8);
+ ByteBuf byteBuf = Unpooled.copiedBuffer(GSON.toJson(scalingConfig), CharsetUtil.UTF_8);
fullHttpRequest = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.POST, "/scaling/job/start", byteBuf);
httpServerHandler.channelRead0(channelHandlerContext, fullHttpRequest);
}
@@ -167,6 +167,6 @@ public final class HttpServerHandlerTest {
private void initConfig(final String configFile) {
InputStream fileInputStream = HttpServerHandlerTest.class.getResourceAsStream(configFile);
InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream);
- scalingConfiguration = GSON.fromJson(inputStreamReader, ScalingConfiguration.class);
+ scalingConfig = GSON.fromJson(inputStreamReader, ScalingConfiguration.class);
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/check/AbstractDataConsistencyChecker.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/check/AbstractDataConsistencyChecker.java
index 5561496..3ae595f 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/check/AbstractDataConsistencyChecker.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/check/AbstractDataConsistencyChecker.java
@@ -23,7 +23,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.scaling.core.datasource.DataSourceFactory;
import org.apache.shardingsphere.scaling.core.datasource.DataSourceWrapper;
import org.apache.shardingsphere.scaling.core.exception.DataCheckFailException;
-import org.apache.shardingsphere.scaling.core.execute.executor.importer.AbstractSqlBuilder;
+import org.apache.shardingsphere.scaling.core.execute.executor.importer.AbstractSQLBuilder;
import org.apache.shardingsphere.scaling.core.job.ShardingScalingJob;
import javax.sql.DataSource;
@@ -83,5 +83,5 @@ public abstract class AbstractDataConsistencyChecker implements DataConsistencyC
return new DataSourceFactory().newInstance(shardingScalingJob.getScalingConfiguration().getRuleConfiguration().getTarget().toTypedDataSourceConfiguration());
}
- protected abstract AbstractSqlBuilder getSqlBuilder();
+ protected abstract AbstractSQLBuilder getSqlBuilder();
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/DataSourceConfiguration.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/DataSourceConfiguration.java
index d42b94c..48b2dc3 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/DataSourceConfiguration.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/DataSourceConfiguration.java
@@ -22,6 +22,7 @@ import org.apache.shardingsphere.infra.database.type.DatabaseType;
/**
* Data source configuration.
*/
+// TODO rename class name, should not conflict with other class name
public interface DataSourceConfiguration {
/**
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/ScalingContext.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/ScalingContext.java
index 0d45ffb..d7d2156 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/ScalingContext.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/ScalingContext.java
@@ -32,7 +32,7 @@ public final class ScalingContext {
private static final ScalingContext INSTANCE = new ScalingContext();
- private ServerConfiguration serverConfiguration;
+ private ServerConfiguration serverConfig;
private ShardingScalingExecuteEngine taskExecuteEngine;
@@ -50,11 +50,11 @@ public final class ScalingContext {
/**
* Initialize ShardingSphere-Scaling context.
*
- * @param serverConfiguration serverConfiguration
+ * @param serverConfig server configuration
*/
- public void init(final ServerConfiguration serverConfiguration) {
- this.serverConfiguration = serverConfiguration;
+ public void init(final ServerConfiguration serverConfig) {
+ this.serverConfig = serverConfig;
taskExecuteEngine = ShardingScalingExecuteEngine.newCachedThreadInstance();
- importerExecuteEngine = ShardingScalingExecuteEngine.newFixedThreadInstance(serverConfiguration.getWorkerThread());
+ importerExecuteEngine = ShardingScalingExecuteEngine.newFixedThreadInstance(serverConfig.getWorkerThread());
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/datasource/DataSourceFactory.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/datasource/DataSourceFactory.java
index e9ba95c..7785ff9 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/datasource/DataSourceFactory.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/datasource/DataSourceFactory.java
@@ -39,31 +39,31 @@ public final class DataSourceFactory {
/**
* New instance data source.
*
- * @param dataSourceConfiguration data source configuration
+ * @param dataSourceConfig data source configuration
* @return new data source
*/
- public DataSourceWrapper newInstance(final DataSourceConfiguration dataSourceConfiguration) {
- if (dataSourceConfiguration instanceof JDBCDataSourceConfiguration) {
- return newInstanceDataSourceByJDBC((JDBCDataSourceConfiguration) dataSourceConfiguration);
- } else if (dataSourceConfiguration instanceof ShardingSphereJDBCConfiguration) {
- return newInstanceDataSourceByShardingSphereJDBC((ShardingSphereJDBCConfiguration) dataSourceConfiguration);
+ public DataSourceWrapper newInstance(final DataSourceConfiguration dataSourceConfig) {
+ if (dataSourceConfig instanceof JDBCDataSourceConfiguration) {
+ return newInstanceDataSourceByJDBC((JDBCDataSourceConfiguration) dataSourceConfig);
+ } else if (dataSourceConfig instanceof ShardingSphereJDBCConfiguration) {
+ return newInstanceDataSourceByShardingSphereJDBC((ShardingSphereJDBCConfiguration) dataSourceConfig);
}
throw new UnsupportedOperationException("Unsupported data source configuration");
}
- private DataSourceWrapper newInstanceDataSourceByJDBC(final JDBCDataSourceConfiguration dataSourceConfiguration) {
+ private DataSourceWrapper newInstanceDataSourceByJDBC(final JDBCDataSourceConfiguration dataSourceConfig) {
HikariDataSource result = new HikariDataSource();
- result.setJdbcUrl(dataSourceConfiguration.getJdbcUrl());
- result.setUsername(dataSourceConfiguration.getUsername());
- result.setPassword(dataSourceConfiguration.getPassword());
+ result.setJdbcUrl(dataSourceConfig.getJdbcUrl());
+ result.setUsername(dataSourceConfig.getUsername());
+ result.setPassword(dataSourceConfig.getPassword());
return new DataSourceWrapper(result);
}
@SneakyThrows
- private DataSourceWrapper newInstanceDataSourceByShardingSphereJDBC(final ShardingSphereJDBCConfiguration dataSourceConfiguration) {
+ private DataSourceWrapper newInstanceDataSourceByShardingSphereJDBC(final ShardingSphereJDBCConfiguration dataSourceConfig) {
Map<String, DataSource> dataSourceMap = DataSourceConverter.getDataSourceMap(
- ConfigurationYamlConverter.loadDataSourceConfigurations(dataSourceConfiguration.getDataSource()));
- ShardingRuleConfiguration ruleConfiguration = ConfigurationYamlConverter.loadShardingRuleConfiguration(dataSourceConfiguration.getRule());
- return new DataSourceWrapper(ShardingSphereDataSourceFactory.createDataSource(dataSourceMap, Lists.newArrayList(ruleConfiguration), null));
+ ConfigurationYamlConverter.loadDataSourceConfigurations(dataSourceConfig.getDataSource()));
+ ShardingRuleConfiguration ruleConfig = ConfigurationYamlConverter.loadShardingRuleConfiguration(dataSourceConfig.getRule());
+ return new DataSourceWrapper(ShardingSphereDataSourceFactory.createDataSource(dataSourceMap, Lists.newArrayList(ruleConfig), null));
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/channel/MemoryChannel.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/channel/MemoryChannel.java
index 0d6a832..bc1185b 100755
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/channel/MemoryChannel.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/channel/MemoryChannel.java
@@ -32,7 +32,7 @@ import java.util.concurrent.BlockingQueue;
*/
public final class MemoryChannel implements Channel {
- private final BlockingQueue<Record> queue = new ArrayBlockingQueue<>(ScalingContext.getInstance().getServerConfiguration().getBlockQueueSize());
+ private final BlockingQueue<Record> queue = new ArrayBlockingQueue<>(ScalingContext.getInstance().getServerConfig().getBlockQueueSize());
private final AckCallback ackCallback;
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/dumper/AbstractJDBCDumper.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/dumper/AbstractJDBCDumper.java
index 30da411..2ad5696 100755
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/dumper/AbstractJDBCDumper.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/dumper/AbstractJDBCDumper.java
@@ -63,11 +63,11 @@ public abstract class AbstractJDBCDumper extends AbstractShardingScalingExecutor
@Setter
private Channel channel;
- protected AbstractJDBCDumper(final InventoryDumperConfiguration inventoryDumperConfiguration, final DataSourceManager dataSourceManager) {
- if (!JDBCDataSourceConfiguration.class.equals(inventoryDumperConfiguration.getDataSourceConfiguration().getClass())) {
+ protected AbstractJDBCDumper(final InventoryDumperConfiguration inventoryDumperConfig, final DataSourceManager dataSourceManager) {
+ if (!JDBCDataSourceConfiguration.class.equals(inventoryDumperConfig.getDataSourceConfiguration().getClass())) {
throw new UnsupportedOperationException("AbstractJDBCDumper only support JDBCDataSourceConfiguration");
}
- this.inventoryDumperConfiguration = inventoryDumperConfiguration;
+ inventoryDumperConfiguration = inventoryDumperConfig;
this.dataSourceManager = dataSourceManager;
tableMetaData = createTableMetaData();
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/dumper/DumperFactory.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/dumper/DumperFactory.java
index 6a355fd..9759b64 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/dumper/DumperFactory.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/dumper/DumperFactory.java
@@ -36,52 +36,52 @@ public final class DumperFactory {
/**
* New instance of JDBC dumper.
*
- * @param inventoryDumperConfiguration inventory dumper configuration
+ * @param inventoryDumperConfig inventory dumper configuration
* @param dataSourceManager data source factory
* @return JDBC dumper
*/
@SneakyThrows
- public static JDBCDumper newInstanceJdbcDumper(final InventoryDumperConfiguration inventoryDumperConfiguration, final DataSourceManager dataSourceManager) {
- return newInstanceJdbcDumper(inventoryDumperConfiguration.getDataSourceConfiguration().getDatabaseType().getName(), inventoryDumperConfiguration, dataSourceManager);
+ public static JDBCDumper newInstanceJdbcDumper(final InventoryDumperConfiguration inventoryDumperConfig, final DataSourceManager dataSourceManager) {
+ return newInstanceJdbcDumper(inventoryDumperConfig.getDataSourceConfiguration().getDatabaseType().getName(), inventoryDumperConfig, dataSourceManager);
}
/**
* New instance of JDBC dumper.
*
* @param databaseType database type
- * @param inventoryDumperConfiguration inventory dumper configuration
+ * @param inventoryDumperConfig inventory dumper configuration
* @param dataSourceManager data source factory
* @return JDBC dumper
*/
@SneakyThrows
- public static JDBCDumper newInstanceJdbcDumper(final String databaseType, final InventoryDumperConfiguration inventoryDumperConfiguration, final DataSourceManager dataSourceManager) {
+ public static JDBCDumper newInstanceJdbcDumper(final String databaseType, final InventoryDumperConfiguration inventoryDumperConfig, final DataSourceManager dataSourceManager) {
ScalingEntry scalingEntry = ScalingEntryLoader.getScalingEntryByDatabaseType(databaseType);
- return scalingEntry.getJdbcDumperClass().getConstructor(InventoryDumperConfiguration.class, DataSourceManager.class).newInstance(inventoryDumperConfiguration, dataSourceManager);
+ return scalingEntry.getJdbcDumperClass().getConstructor(InventoryDumperConfiguration.class, DataSourceManager.class).newInstance(inventoryDumperConfig, dataSourceManager);
}
/**
* New instance of log dumper.
*
- * @param dumperConfiguration rdbms configuration
+ * @param dumperConfig rdbms configuration
* @param position position
* @return log dumper
*/
@SneakyThrows
- public static LogDumper newInstanceLogDumper(final DumperConfiguration dumperConfiguration, final Position position) {
- return newInstanceLogDumper(dumperConfiguration.getDataSourceConfiguration().getDatabaseType().getName(), dumperConfiguration, position);
+ public static LogDumper newInstanceLogDumper(final DumperConfiguration dumperConfig, final Position position) {
+ return newInstanceLogDumper(dumperConfig.getDataSourceConfiguration().getDatabaseType().getName(), dumperConfig, position);
}
/**
* New instance of log dumper.
*
* @param databaseType database type
- * @param dumperConfiguration rdbms configuration
+ * @param dumperConfig rdbms configuration
* @param position position
* @return log dumper
*/
@SneakyThrows
- public static LogDumper newInstanceLogDumper(final String databaseType, final DumperConfiguration dumperConfiguration, final Position position) {
+ public static LogDumper newInstanceLogDumper(final String databaseType, final DumperConfiguration dumperConfig, final Position position) {
ScalingEntry scalingEntry = ScalingEntryLoader.getScalingEntryByDatabaseType(databaseType);
- return scalingEntry.getLogDumperClass().getConstructor(DumperConfiguration.class, Position.class).newInstance(dumperConfiguration, position);
+ return scalingEntry.getLogDumperClass().getConstructor(DumperConfiguration.class, Position.class).newInstance(dumperConfig, position);
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/importer/AbstractJDBCImporter.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/importer/AbstractJDBCImporter.java
index a92a10e..0b0cb7d 100755
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/importer/AbstractJDBCImporter.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/importer/AbstractJDBCImporter.java
@@ -47,27 +47,27 @@ import java.util.List;
@Slf4j
public abstract class AbstractJDBCImporter extends AbstractShardingScalingExecutor<IncrementalPosition> implements Importer {
- private final ImporterConfiguration importerConfiguration;
+ private final ImporterConfiguration importerConfig;
private final DataSourceManager dataSourceManager;
- private final AbstractSqlBuilder sqlBuilder;
+ private final AbstractSQLBuilder sqlBuilder;
@Setter
private Channel channel;
- protected AbstractJDBCImporter(final ImporterConfiguration importerConfiguration, final DataSourceManager dataSourceManager) {
- this.importerConfiguration = importerConfiguration;
+ protected AbstractJDBCImporter(final ImporterConfiguration importerConfig, final DataSourceManager dataSourceManager) {
+ this.importerConfig = importerConfig;
this.dataSourceManager = dataSourceManager;
- sqlBuilder = createSqlBuilder();
+ sqlBuilder = createSQLBuilder();
}
/**
- * Create sql builder.
+ * Create SQL builder.
*
- * @return sql builder
+ * @return SQL builder
*/
- protected abstract AbstractSqlBuilder createSqlBuilder();
+ protected abstract AbstractSQLBuilder createSQLBuilder();
@Override
public final void start() {
@@ -80,7 +80,7 @@ public abstract class AbstractJDBCImporter extends AbstractShardingScalingExecut
while (isRunning()) {
List<Record> records = channel.fetchRecords(100, 3);
if (null != records && !records.isEmpty()) {
- flush(dataSourceManager.getDataSource(importerConfiguration.getDataSourceConfiguration()), records);
+ flush(dataSourceManager.getDataSource(importerConfig.getDataSourceConfiguration()), records);
if (FinishedRecord.class.equals(records.get(records.size() - 1).getClass())) {
channel.ack();
break;
@@ -98,7 +98,7 @@ public abstract class AbstractJDBCImporter extends AbstractShardingScalingExecut
}
private boolean tryFlush(final DataSource dataSource, final List<Record> buffer) {
- int retryTimes = importerConfiguration.getRetryTimes();
+ int retryTimes = importerConfig.getRetryTimes();
List<Record> unflushed = buffer;
do {
unflushed = doFlush(dataSource, unflushed);
@@ -152,7 +152,7 @@ public abstract class AbstractJDBCImporter extends AbstractShardingScalingExecut
}
private void executeUpdate(final Connection connection, final DataRecord record) throws SQLException {
- List<Column> conditionColumns = RecordUtil.extractConditionColumns(record, importerConfiguration.getShardingColumnsMap().get(record.getTableName()));
+ List<Column> conditionColumns = RecordUtil.extractConditionColumns(record, importerConfig.getShardingColumnsMap().get(record.getTableName()));
List<Column> values = new ArrayList<>();
values.addAll(RecordUtil.extractUpdatedColumns(record));
values.addAll(conditionColumns);
@@ -165,7 +165,7 @@ public abstract class AbstractJDBCImporter extends AbstractShardingScalingExecut
}
private void executeDelete(final Connection connection, final DataRecord record) throws SQLException {
- List<Column> conditionColumns = RecordUtil.extractConditionColumns(record, importerConfiguration.getShardingColumnsMap().get(record.getTableName()));
+ List<Column> conditionColumns = RecordUtil.extractConditionColumns(record, importerConfig.getShardingColumnsMap().get(record.getTableName()));
String deleteSql = sqlBuilder.buildDeleteSQL(record, conditionColumns);
PreparedStatement ps = connection.prepareStatement(deleteSql);
for (int i = 0; i < conditionColumns.size(); i++) {
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/importer/AbstractSqlBuilder.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/importer/AbstractSQLBuilder.java
similarity index 99%
rename from shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/importer/AbstractSqlBuilder.java
rename to shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/importer/AbstractSQLBuilder.java
index 26abefe..e102b05 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/importer/AbstractSqlBuilder.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/importer/AbstractSQLBuilder.java
@@ -29,7 +29,7 @@ import java.util.concurrent.ConcurrentMap;
/**
* Abstract SQL builder.
*/
-public abstract class AbstractSqlBuilder {
+public abstract class AbstractSQLBuilder {
private static final String INSERT_SQL_CACHE_KEY_PREFIX = "INSERT_";
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/importer/ImporterFactory.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/importer/ImporterFactory.java
index c43de59..72314e0 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/importer/ImporterFactory.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/execute/executor/importer/ImporterFactory.java
@@ -34,25 +34,25 @@ public final class ImporterFactory {
/**
* New instance of importer.
*
- * @param importerConfiguration rdbms configuration
+ * @param importerConfig rdbms configuration
* @param dataSourceManager data source factory
* @return importer
*/
- public static Importer newInstance(final ImporterConfiguration importerConfiguration, final DataSourceManager dataSourceManager) {
- return newInstance(importerConfiguration.getDataSourceConfiguration().getDatabaseType().getName(), importerConfiguration, dataSourceManager);
+ public static Importer newInstance(final ImporterConfiguration importerConfig, final DataSourceManager dataSourceManager) {
+ return newInstance(importerConfig.getDataSourceConfiguration().getDatabaseType().getName(), importerConfig, dataSourceManager);
}
/**
* New instance of importer.
*
* @param databaseType database type
- * @param importerConfiguration rdbms configuration
+ * @param importerConfig rdbms configuration
* @param dataSourceManager data source factory
* @return importer
*/
@SneakyThrows
- public static Importer newInstance(final String databaseType, final ImporterConfiguration importerConfiguration, final DataSourceManager dataSourceManager) {
+ public static Importer newInstance(final String databaseType, final ImporterConfiguration importerConfig, final DataSourceManager dataSourceManager) {
ScalingEntry scalingEntry = ScalingEntryLoader.getScalingEntryByDatabaseType(databaseType);
- return scalingEntry.getImporterClass().getConstructor(ImporterConfiguration.class, DataSourceManager.class).newInstance(importerConfiguration, dataSourceManager);
+ return scalingEntry.getImporterClass().getConstructor(ImporterConfiguration.class, DataSourceManager.class).newInstance(importerConfig, dataSourceManager);
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/ShardingScalingJob.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/ShardingScalingJob.java
index f85cea3..0fc4fd8 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/ShardingScalingJob.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/ShardingScalingJob.java
@@ -59,9 +59,9 @@ public final class ShardingScalingJob {
private String status = SyncTaskControlStatus.RUNNING.name();
- public ShardingScalingJob(final ScalingConfiguration scalingConfiguration) {
- this.scalingConfiguration = scalingConfiguration;
- jobName = Optional.ofNullable(scalingConfiguration.getJobConfiguration().getJobName()).orElse(jobName);
- shardingItem = scalingConfiguration.getJobConfiguration().getShardingItem();
+ public ShardingScalingJob(final ScalingConfiguration scalingConfig) {
+ scalingConfiguration = scalingConfig;
+ jobName = Optional.ofNullable(scalingConfig.getJobConfiguration().getJobName()).orElse(jobName);
+ shardingItem = scalingConfig.getJobConfiguration().getShardingItem();
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/RepositoryResumeBreakPointManager.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/RepositoryResumeBreakPointManager.java
index 2705c3a..9d03536 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/RepositoryResumeBreakPointManager.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/RepositoryResumeBreakPointManager.java
@@ -112,7 +112,7 @@ public final class RepositoryResumeBreakPointManager extends AbstractResumeBreak
private static RegistryRepository getInstance() {
RegistryRepository result = null;
- YamlGovernanceConfiguration resumeBreakPoint = ScalingContext.getInstance().getServerConfiguration().getResumeBreakPoint();
+ YamlGovernanceConfiguration resumeBreakPoint = ScalingContext.getInstance().getServerConfig().getResumeBreakPoint();
if (resumeBreakPoint != null) {
result = createRegistryRepository(new GovernanceConfigurationYamlSwapper().swapToObject(resumeBreakPoint));
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/preparer/ShardingScalingJobPreparer.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/preparer/ShardingScalingJobPreparer.java
index e3fd139..92f9f5c 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/preparer/ShardingScalingJobPreparer.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/preparer/ShardingScalingJobPreparer.java
@@ -105,8 +105,8 @@ public final class ShardingScalingJobPreparer {
private void initIncrementalDataTasks(final String databaseType, final ShardingScalingJob shardingScalingJob, final DataSourceManager dataSourceManager) {
for (SyncConfiguration each : shardingScalingJob.getSyncConfigurations()) {
- DataSourceConfiguration dataSourceConfiguration = each.getDumperConfiguration().getDataSourceConfiguration();
- each.getDumperConfiguration().setPositionManager(initPositionManager(databaseType, dataSourceManager.getDataSource(dataSourceConfiguration)));
+ DataSourceConfiguration dataSourceConfig = each.getDumperConfiguration().getDataSourceConfiguration();
+ each.getDumperConfiguration().setPositionManager(initPositionManager(databaseType, dataSourceManager.getDataSource(dataSourceConfig)));
shardingScalingJob.getIncrementalDataTasks().add(syncTaskFactory.createIncrementalDataSyncTask(each.getConcurrency(), each.getDumperConfiguration(), each.getImporterConfiguration()));
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/preparer/resumer/SyncPositionResumer.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/preparer/resumer/SyncPositionResumer.java
index 5aa146a..2830a68 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/preparer/resumer/SyncPositionResumer.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/preparer/resumer/SyncPositionResumer.java
@@ -67,8 +67,8 @@ public final class SyncPositionResumer {
}
}
- private List<ScalingTask<InventoryPosition>> getAllInventoryDataTasks(
- final ShardingScalingJob shardingScalingJob, final DataSourceManager dataSourceManager, final ResumeBreakPointManager resumeBreakPointManager) {
+ private List<ScalingTask<InventoryPosition>> getAllInventoryDataTasks(final ShardingScalingJob shardingScalingJob,
+ final DataSourceManager dataSourceManager, final ResumeBreakPointManager resumeBreakPointManager) {
List<ScalingTask<InventoryPosition>> result = new LinkedList<>();
for (SyncConfiguration each : shardingScalingJob.getSyncConfigurations()) {
MetaDataManager metaDataManager = new MetaDataManager(dataSourceManager.getDataSource(each.getDumperConfiguration().getDataSourceConfiguration()));
@@ -79,10 +79,10 @@ public final class SyncPositionResumer {
return result;
}
- private InventoryDumperConfiguration newInventoryDumperConfiguration(
- final DumperConfiguration dumperConfiguration, final MetaDataManager metaDataManager, final Entry<String, PositionManager<InventoryPosition>> entry) {
+ private InventoryDumperConfiguration newInventoryDumperConfiguration(final DumperConfiguration dumperConfig,
+ final MetaDataManager metaDataManager, final Entry<String, PositionManager<InventoryPosition>> entry) {
String[] splitTable = entry.getKey().split("#");
- InventoryDumperConfiguration result = new InventoryDumperConfiguration(dumperConfiguration);
+ InventoryDumperConfiguration result = new InventoryDumperConfiguration(dumperConfig);
result.setTableName(splitTable[0].split("\\.")[1]);
result.setPositionManager(entry.getValue());
if (2 == splitTable.length) {
@@ -92,9 +92,8 @@ public final class SyncPositionResumer {
return result;
}
- private Map<String, PositionManager<InventoryPosition>> getInventoryPositionMap(
- final DumperConfiguration dumperConfiguration, final ResumeBreakPointManager resumeBreakPointManager) {
- Pattern pattern = Pattern.compile(String.format("%s\\.\\w+(#\\d+)?", dumperConfiguration.getDataSourceName()));
+ private Map<String, PositionManager<InventoryPosition>> getInventoryPositionMap(final DumperConfiguration dumperConfig, final ResumeBreakPointManager resumeBreakPointManager) {
+ Pattern pattern = Pattern.compile(String.format("%s\\.\\w+(#\\d+)?", dumperConfig.getDataSourceName()));
return resumeBreakPointManager.getInventoryPositionManagerMap().entrySet().stream()
.filter(entry -> pattern.matcher(entry.getKey()).find())
.collect(Collectors.toMap(Entry::getKey, Map.Entry::getValue));
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/preparer/splitter/InventoryDataTaskSplitter.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/preparer/splitter/InventoryDataTaskSplitter.java
index 8d5f98c..799ff3a 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/preparer/splitter/InventoryDataTaskSplitter.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/preparer/splitter/InventoryDataTaskSplitter.java
@@ -54,23 +54,23 @@ public final class InventoryDataTaskSplitter {
/**
* Split inventory data to multi-tasks.
*
- * @param syncConfiguration synchronize configuration
+ * @param syncConfig synchronize configuration
* @param dataSourceManager data source manager
* @return split inventory data task
*/
- public Collection<ScalingTask<InventoryPosition>> splitInventoryData(final SyncConfiguration syncConfiguration, final DataSourceManager dataSourceManager) {
+ public Collection<ScalingTask<InventoryPosition>> splitInventoryData(final SyncConfiguration syncConfig, final DataSourceManager dataSourceManager) {
Collection<ScalingTask<InventoryPosition>> result = new LinkedList<>();
- for (InventoryDumperConfiguration each : splitDumperConfiguration(syncConfiguration.getConcurrency(), syncConfiguration.getDumperConfiguration(), dataSourceManager)) {
- result.add(syncTaskFactory.createInventoryDataSyncTask(each, syncConfiguration.getImporterConfiguration()));
+ for (InventoryDumperConfiguration each : splitDumperConfiguration(syncConfig.getConcurrency(), syncConfig.getDumperConfiguration(), dataSourceManager)) {
+ result.add(syncTaskFactory.createInventoryDataSyncTask(each, syncConfig.getImporterConfiguration()));
}
return result;
}
- private Collection<InventoryDumperConfiguration> splitDumperConfiguration(final int concurrency, final DumperConfiguration dumperConfiguration, final DataSourceManager dataSourceManager) {
+ private Collection<InventoryDumperConfiguration> splitDumperConfiguration(final int concurrency, final DumperConfiguration dumperConfig, final DataSourceManager dataSourceManager) {
Collection<InventoryDumperConfiguration> result = new LinkedList<>();
- DataSource dataSource = dataSourceManager.getDataSource(dumperConfiguration.getDataSourceConfiguration());
+ DataSource dataSource = dataSourceManager.getDataSource(dumperConfig.getDataSourceConfiguration());
MetaDataManager metaDataManager = new MetaDataManager(dataSource);
- for (InventoryDumperConfiguration each : splitByTable(dumperConfiguration)) {
+ for (InventoryDumperConfiguration each : splitByTable(dumperConfig)) {
if (isSpiltByPrimaryKeyRange(each, metaDataManager)) {
result.addAll(splitByPrimaryKeyRange(concurrency, each, metaDataManager, dataSource));
} else {
@@ -80,35 +80,35 @@ public final class InventoryDataTaskSplitter {
return result;
}
- private Collection<InventoryDumperConfiguration> splitByTable(final DumperConfiguration dumperConfiguration) {
+ private Collection<InventoryDumperConfiguration> splitByTable(final DumperConfiguration dumperConfig) {
Collection<InventoryDumperConfiguration> result = new LinkedList<>();
- for (String each : dumperConfiguration.getTableNameMap().keySet()) {
- InventoryDumperConfiguration dumperConfig = new InventoryDumperConfiguration(dumperConfiguration);
- dumperConfig.setTableName(each);
- dumperConfig.setPositionManager(new InventoryPositionManager<>(new PlaceholderInventoryPosition()));
- result.add(dumperConfig);
+ for (String each : dumperConfig.getTableNameMap().keySet()) {
+ InventoryDumperConfiguration inventoryDumperConfig = new InventoryDumperConfiguration(dumperConfig);
+ inventoryDumperConfig.setTableName(each);
+ inventoryDumperConfig.setPositionManager(new InventoryPositionManager<>(new PlaceholderInventoryPosition()));
+ result.add(inventoryDumperConfig);
}
return result;
}
- private boolean isSpiltByPrimaryKeyRange(final InventoryDumperConfiguration inventoryDumperConfiguration, final MetaDataManager metaDataManager) {
- TableMetaData tableMetaData = metaDataManager.getTableMetaData(inventoryDumperConfiguration.getTableName());
+ private boolean isSpiltByPrimaryKeyRange(final InventoryDumperConfiguration inventoryDumperConfig, final MetaDataManager metaDataManager) {
+ TableMetaData tableMetaData = metaDataManager.getTableMetaData(inventoryDumperConfig.getTableName());
if (null == tableMetaData) {
- log.warn("Can't split range for table {}, reason: can not get table metadata ", inventoryDumperConfiguration.getTableName());
+ log.warn("Can't split range for table {}, reason: can not get table metadata ", inventoryDumperConfig.getTableName());
return false;
}
List<String> primaryKeys = tableMetaData.getPrimaryKeyColumns();
if (null == primaryKeys || primaryKeys.isEmpty()) {
- log.warn("Can't split range for table {}, reason: no primary key", inventoryDumperConfiguration.getTableName());
+ log.warn("Can't split range for table {}, reason: no primary key", inventoryDumperConfig.getTableName());
return false;
}
if (primaryKeys.size() > 1) {
- log.warn("Can't split range for table {}, reason: primary key is union primary", inventoryDumperConfiguration.getTableName());
+ log.warn("Can't split range for table {}, reason: primary key is union primary", inventoryDumperConfig.getTableName());
return false;
}
int index = tableMetaData.findColumnIndex(primaryKeys.get(0));
if (isNotIntegerPrimary(tableMetaData.getColumnMetaData(index).getDataType())) {
- log.warn("Can't split range for table {}, reason: primary key is not integer number", inventoryDumperConfiguration.getTableName());
+ log.warn("Can't split range for table {}, reason: primary key is not integer number", inventoryDumperConfig.getTableName());
return false;
}
return true;
@@ -118,21 +118,21 @@ public final class InventoryDataTaskSplitter {
return Types.INTEGER != columnType && Types.BIGINT != columnType && Types.SMALLINT != columnType && Types.TINYINT != columnType;
}
- private Collection<InventoryDumperConfiguration> splitByPrimaryKeyRange(final int concurrency, final InventoryDumperConfiguration inventoryDumperConfiguration,
- final MetaDataManager metaDataManager, final DataSource dataSource) {
+ private Collection<InventoryDumperConfiguration> splitByPrimaryKeyRange(final int concurrency, final InventoryDumperConfiguration inventoryDumperConfig,
+ final MetaDataManager metaDataManager, final DataSource dataSource) {
Collection<InventoryDumperConfiguration> result = new LinkedList<>();
- String tableName = inventoryDumperConfiguration.getTableName();
+ String tableName = inventoryDumperConfig.getTableName();
String primaryKey = metaDataManager.getTableMetaData(tableName).getPrimaryKeyColumns().get(0);
- inventoryDumperConfiguration.setPrimaryKey(primaryKey);
+ inventoryDumperConfig.setPrimaryKey(primaryKey);
try (Connection connection = dataSource.getConnection()) {
- PreparedStatement ps = connection.prepareStatement(String.format("SELECT MIN(%s),MAX(%s) FROM %s LIMIT 1", primaryKey, primaryKey, inventoryDumperConfiguration.getTableName()));
+ PreparedStatement ps = connection.prepareStatement(String.format("SELECT MIN(%s),MAX(%s) FROM %s LIMIT 1", primaryKey, primaryKey, inventoryDumperConfig.getTableName()));
ResultSet rs = ps.executeQuery();
rs.next();
long min = rs.getLong(1);
long max = rs.getLong(2);
long step = (max - min) / concurrency;
for (int i = 0; i < concurrency && min <= max; i++) {
- InventoryDumperConfiguration splitDumperConfig = new InventoryDumperConfiguration(inventoryDumperConfiguration);
+ InventoryDumperConfiguration splitDumperConfig = new InventoryDumperConfiguration(inventoryDumperConfig);
if (i < concurrency - 1) {
splitDumperConfig.setPositionManager(new InventoryPositionManager<>(new PrimaryKeyPosition(min, min + step)));
min += step + 1;
@@ -145,7 +145,7 @@ public final class InventoryDataTaskSplitter {
result.add(splitDumperConfig);
}
} catch (final SQLException ex) {
- throw new PrepareFailedException(String.format("Split task for table %s by primary key %s error", inventoryDumperConfiguration.getTableName(), primaryKey), ex);
+ throw new PrepareFailedException(String.format("Split task for table %s by primary key %s error", inventoryDumperConfig.getTableName(), primaryKey), ex);
}
return result;
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/task/DefaultSyncTaskFactory.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/task/DefaultSyncTaskFactory.java
index 96b5bd2..a51936b 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/task/DefaultSyncTaskFactory.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/task/DefaultSyncTaskFactory.java
@@ -38,12 +38,12 @@ public final class DefaultSyncTaskFactory implements SyncTaskFactory {
}
@Override
- public InventoryDataScalingTask createInventoryDataSyncTask(final InventoryDumperConfiguration inventoryDumperConfiguration, final ImporterConfiguration importerConfiguration) {
- return new InventoryDataScalingTask(inventoryDumperConfiguration, importerConfiguration);
+ public InventoryDataScalingTask createInventoryDataSyncTask(final InventoryDumperConfiguration inventoryDumperConfig, final ImporterConfiguration importerConfig) {
+ return new InventoryDataScalingTask(inventoryDumperConfig, importerConfig);
}
@Override
- public IncrementalDataScalingTask createIncrementalDataSyncTask(final int concurrency, final DumperConfiguration dumperConfiguration, final ImporterConfiguration importerConfiguration) {
- return new IncrementalDataScalingTask(concurrency, dumperConfiguration, importerConfiguration);
+ public IncrementalDataScalingTask createIncrementalDataSyncTask(final int concurrency, final DumperConfiguration dumperConfig, final ImporterConfiguration importerConfig) {
+ return new IncrementalDataScalingTask(concurrency, dumperConfig, importerConfig);
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/task/SyncTaskFactory.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/task/SyncTaskFactory.java
index fca7928..0aafa33 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/task/SyncTaskFactory.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/task/SyncTaskFactory.java
@@ -43,19 +43,19 @@ public interface SyncTaskFactory {
/**
* Create inventory data sync task.
*
- * @param inventoryDumperConfiguration inventory dumper configuration
- * @param importerConfiguration importer configuration
+ * @param inventoryDumperConfig inventory dumper configuration
+ * @param importerConfig importer configuration
* @return inventory data sync task
*/
- InventoryDataScalingTask createInventoryDataSyncTask(InventoryDumperConfiguration inventoryDumperConfiguration, ImporterConfiguration importerConfiguration);
+ InventoryDataScalingTask createInventoryDataSyncTask(InventoryDumperConfiguration inventoryDumperConfig, ImporterConfiguration importerConfig);
/**
* Create incremental data sync task.
*
* @param concurrency concurrency
- * @param dumperConfiguration dumper configuration
- * @param importerConfiguration importer configuration
+ * @param dumperConfig dumper configuration
+ * @param importerConfig importer configuration
* @return incremental data sync task
*/
- IncrementalDataScalingTask createIncrementalDataSyncTask(int concurrency, DumperConfiguration dumperConfiguration, ImporterConfiguration importerConfiguration);
+ IncrementalDataScalingTask createIncrementalDataSyncTask(int concurrency, DumperConfiguration dumperConfig, ImporterConfiguration importerConfig);
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/task/incremental/IncrementalDataScalingTask.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/task/incremental/IncrementalDataScalingTask.java
index c63928a..d1b04b6 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/task/incremental/IncrementalDataScalingTask.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/task/incremental/IncrementalDataScalingTask.java
@@ -49,9 +49,9 @@ public final class IncrementalDataScalingTask extends AbstractShardingScalingExe
private final int concurrency;
- private final DumperConfiguration dumperConfiguration;
+ private final DumperConfiguration dumperConfig;
- private final ImporterConfiguration importerConfiguration;
+ private final ImporterConfiguration importerConfig;
private final DataSourceManager dataSourceManager;
@@ -60,18 +60,18 @@ public final class IncrementalDataScalingTask extends AbstractShardingScalingExe
private long delayMillisecond = Long.MAX_VALUE;
@SuppressWarnings("unchecked")
- public IncrementalDataScalingTask(final int concurrency, final DumperConfiguration dumperConfiguration, final ImporterConfiguration importerConfiguration) {
+ public IncrementalDataScalingTask(final int concurrency, final DumperConfiguration dumperConfig, final ImporterConfiguration importerConfig) {
this.concurrency = concurrency;
- this.dumperConfiguration = dumperConfiguration;
- this.importerConfiguration = importerConfiguration;
+ this.dumperConfig = dumperConfig;
+ this.importerConfig = importerConfig;
dataSourceManager = new DataSourceManager();
- setTaskId(dumperConfiguration.getDataSourceName());
- setPositionManager(dumperConfiguration.getPositionManager());
+ setTaskId(dumperConfig.getDataSourceName());
+ setPositionManager(dumperConfig.getPositionManager());
}
@Override
public void start() {
- dumper = DumperFactory.newInstanceLogDumper(dumperConfiguration, getPositionManager().getPosition());
+ dumper = DumperFactory.newInstanceLogDumper(dumperConfig, getPositionManager().getPosition());
Collection<Importer> importers = instanceImporters();
instanceChannel(importers);
Future<?> future = ScalingContext.getInstance().getTaskExecuteEngine().submitAll(importers, new ExecuteCallback() {
@@ -94,7 +94,7 @@ public final class IncrementalDataScalingTask extends AbstractShardingScalingExe
private List<Importer> instanceImporters() {
List<Importer> result = new ArrayList<>(concurrency);
for (int i = 0; i < concurrency; i++) {
- result.add(ImporterFactory.newInstance(importerConfiguration, dataSourceManager));
+ result.add(ImporterFactory.newInstance(importerConfig, dataSourceManager));
}
return result;
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/task/inventory/InventoryDataScalingTask.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/task/inventory/InventoryDataScalingTask.java
index 236dbf1..1c3c210 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/task/inventory/InventoryDataScalingTask.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/task/inventory/InventoryDataScalingTask.java
@@ -52,9 +52,9 @@ import java.util.concurrent.atomic.AtomicLong;
@Slf4j
public final class InventoryDataScalingTask extends AbstractShardingScalingExecutor<InventoryPosition> implements ScalingTask<InventoryPosition> {
- private final InventoryDumperConfiguration inventoryDumperConfiguration;
+ private final InventoryDumperConfiguration inventoryDumperConfig;
- private final ImporterConfiguration importerConfiguration;
+ private final ImporterConfiguration importerConfig;
private final DataSourceManager dataSourceManager;
@@ -64,29 +64,29 @@ public final class InventoryDataScalingTask extends AbstractShardingScalingExecu
private Dumper dumper;
- public InventoryDataScalingTask(final InventoryDumperConfiguration inventoryDumperConfiguration, final ImporterConfiguration importerConfiguration) {
- this(inventoryDumperConfiguration, importerConfiguration, new DataSourceManager());
+ public InventoryDataScalingTask(final InventoryDumperConfiguration inventoryDumperConfig, final ImporterConfiguration importerConfig) {
+ this(inventoryDumperConfig, importerConfig, new DataSourceManager());
}
@SuppressWarnings("unchecked")
- public InventoryDataScalingTask(final InventoryDumperConfiguration inventoryDumperConfiguration, final ImporterConfiguration importerConfiguration, final DataSourceManager dataSourceManager) {
- this.inventoryDumperConfiguration = inventoryDumperConfiguration;
- this.importerConfiguration = importerConfiguration;
+ public InventoryDataScalingTask(final InventoryDumperConfiguration inventoryDumperConfig, final ImporterConfiguration importerConfig, final DataSourceManager dataSourceManager) {
+ this.inventoryDumperConfig = inventoryDumperConfig;
+ this.importerConfig = importerConfig;
this.dataSourceManager = dataSourceManager;
- setTaskId(generateSyncTaskId(inventoryDumperConfiguration));
- setPositionManager(inventoryDumperConfiguration.getPositionManager());
+ setTaskId(generateSyncTaskId(inventoryDumperConfig));
+ setPositionManager(inventoryDumperConfig.getPositionManager());
}
- private String generateSyncTaskId(final InventoryDumperConfiguration inventoryDumperConfiguration) {
- String result = String.format("%s.%s", inventoryDumperConfiguration.getDataSourceName(), inventoryDumperConfiguration.getTableName());
- return null == inventoryDumperConfiguration.getSpiltNum() ? result : result + "#" + inventoryDumperConfiguration.getSpiltNum();
+ private String generateSyncTaskId(final InventoryDumperConfiguration inventoryDumperConfig) {
+ String result = String.format("%s.%s", inventoryDumperConfig.getDataSourceName(), inventoryDumperConfig.getTableName());
+ return null == inventoryDumperConfig.getSpiltNum() ? result : result + "#" + inventoryDumperConfig.getSpiltNum();
}
@Override
public void start() {
getEstimatedRows();
instanceDumper();
- Importer importer = ImporterFactory.newInstance(importerConfiguration, dataSourceManager);
+ Importer importer = ImporterFactory.newInstance(importerConfig, dataSourceManager);
instanceChannel(importer);
Future<?> future = ScalingContext.getInstance().getImporterExecuteEngine().submit(importer, new ExecuteCallback() {
@@ -106,11 +106,11 @@ public final class InventoryDataScalingTask extends AbstractShardingScalingExecu
}
private void getEstimatedRows() {
- DataSource dataSource = dataSourceManager.getDataSource(inventoryDumperConfiguration.getDataSourceConfiguration());
+ DataSource dataSource = dataSourceManager.getDataSource(inventoryDumperConfig.getDataSourceConfiguration());
try (Connection connection = dataSource.getConnection()) {
ResultSet resultSet = connection.prepareStatement(String.format("SELECT COUNT(*) FROM %s %s",
- inventoryDumperConfiguration.getTableName(),
- RdbmsConfigurationUtil.getWhereCondition(inventoryDumperConfiguration)))
+ inventoryDumperConfig.getTableName(),
+ RdbmsConfigurationUtil.getWhereCondition(inventoryDumperConfig)))
.executeQuery();
resultSet.next();
estimatedRows = resultSet.getInt(1);
@@ -120,7 +120,7 @@ public final class InventoryDataScalingTask extends AbstractShardingScalingExecu
}
private void instanceDumper() {
- dumper = DumperFactory.newInstanceJdbcDumper(inventoryDumperConfiguration, dataSourceManager);
+ dumper = DumperFactory.newInstanceJdbcDumper(inventoryDumperConfig, dataSourceManager);
}
private void instanceChannel(final Importer importer) {
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/utils/ConfigurationYamlConverter.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/utils/ConfigurationYamlConverter.java
index 250a537..6fe96e4 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/utils/ConfigurationYamlConverter.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/utils/ConfigurationYamlConverter.java
@@ -60,8 +60,8 @@ public final class ConfigurationYamlConverter {
*/
public static ShardingRuleConfiguration loadShardingRuleConfiguration(final String data) {
YamlRootRuleConfigurations rootRuleConfigurations = YamlEngine.unmarshal(data, YamlRootRuleConfigurations.class);
- Optional<YamlRuleConfiguration> ruleConfiguration = rootRuleConfigurations.getRules().stream().filter(each -> each instanceof YamlShardingRuleConfiguration).findFirst();
- Preconditions.checkState(ruleConfiguration.isPresent(), "No available sharding rule to load for governance.");
- return new ShardingRuleConfigurationYamlSwapper().swapToObject((YamlShardingRuleConfiguration) ruleConfiguration.get());
+ Optional<YamlRuleConfiguration> ruleConfig = rootRuleConfigurations.getRules().stream().filter(each -> each instanceof YamlShardingRuleConfiguration).findFirst();
+ Preconditions.checkState(ruleConfig.isPresent(), "No available sharding rule to load for governance.");
+ return new ShardingRuleConfigurationYamlSwapper().swapToObject((YamlShardingRuleConfiguration) ruleConfig.get());
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/utils/RdbmsConfigurationUtil.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/utils/RdbmsConfigurationUtil.java
index a0abb07..fb924f3 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/utils/RdbmsConfigurationUtil.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/utils/RdbmsConfigurationUtil.java
@@ -32,12 +32,12 @@ public final class RdbmsConfigurationUtil {
/**
* Get SQL where condition whit primary key.
*
- * @param inventoryDumperConfiguration rdbms configuration
+ * @param inventoryDumperConfig rdbms configuration
* @return SQL where condition
*/
@SuppressWarnings("unchecked")
- public static String getWhereCondition(final InventoryDumperConfiguration inventoryDumperConfiguration) {
- return getWhereCondition(inventoryDumperConfiguration.getPrimaryKey(), inventoryDumperConfiguration.getPositionManager());
+ public static String getWhereCondition(final InventoryDumperConfiguration inventoryDumperConfig) {
+ return getWhereCondition(inventoryDumperConfig.getPrimaryKey(), inventoryDumperConfig.getPositionManager());
}
private static String getWhereCondition(final String primaryKey, final PositionManager<PrimaryKeyPosition> positionManager) {
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/utils/SyncConfigurationUtil.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/utils/SyncConfigurationUtil.java
index 7bf1e20..87140ca 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/utils/SyncConfigurationUtil.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/utils/SyncConfigurationUtil.java
@@ -58,56 +58,56 @@ public final class SyncConfigurationUtil {
/**
* Split Scaling configuration to Sync configurations.
*
- * @param scalingConfiguration scaling configuration
+ * @param scalingConfig scaling configuration
* @return list of sync configurations
*/
- public static Collection<SyncConfiguration> toSyncConfigurations(final ScalingConfiguration scalingConfiguration) {
+ public static Collection<SyncConfiguration> toSyncConfigurations(final ScalingConfiguration scalingConfig) {
Collection<SyncConfiguration> result = new LinkedList<>();
- ShardingSphereJDBCConfiguration sourceConfiguration = getSourceConfiguration(scalingConfiguration);
- Map<String, DataSourceConfiguration> sourceDataSource = ConfigurationYamlConverter.loadDataSourceConfigurations(sourceConfiguration.getDataSource());
- ShardingRuleConfiguration sourceRule = ConfigurationYamlConverter.loadShardingRuleConfiguration(sourceConfiguration.getRule());
+ ShardingSphereJDBCConfiguration sourceConfig = getSourceConfiguration(scalingConfig);
+ Map<String, DataSourceConfiguration> sourceDataSource = ConfigurationYamlConverter.loadDataSourceConfigurations(sourceConfig.getDataSource());
+ ShardingRuleConfiguration sourceRule = ConfigurationYamlConverter.loadShardingRuleConfiguration(sourceConfig.getRule());
Map<String, Map<String, String>> dataSourceTableNameMap = toDataSourceTableNameMap(sourceRule, sourceDataSource.keySet());
- Optional<ShardingRuleConfiguration> targetRule = getTargetRuleConfiguration(scalingConfiguration);
- filterByShardingDataSourceTables(dataSourceTableNameMap, scalingConfiguration.getJobConfiguration());
+ Optional<ShardingRuleConfiguration> targetRule = getTargetRuleConfiguration(scalingConfig);
+ filterByShardingDataSourceTables(dataSourceTableNameMap, scalingConfig.getJobConfiguration());
for (Entry<String, Map<String, String>> entry : dataSourceTableNameMap.entrySet()) {
- DumperConfiguration dumperConfiguration = createDumperConfiguration(entry.getKey(), sourceDataSource.get(entry.getKey()), entry.getValue());
- ImporterConfiguration importerConfiguration = createImporterConfiguration(scalingConfiguration, targetRule.orElse(sourceRule));
- importerConfiguration.setRetryTimes(scalingConfiguration.getJobConfiguration().getRetryTimes());
- result.add(new SyncConfiguration(scalingConfiguration.getJobConfiguration().getConcurrency(), dumperConfiguration, importerConfiguration));
+ DumperConfiguration dumperConfig = createDumperConfiguration(entry.getKey(), sourceDataSource.get(entry.getKey()), entry.getValue());
+ ImporterConfiguration importerConfig = createImporterConfiguration(scalingConfig, targetRule.orElse(sourceRule));
+ importerConfig.setRetryTimes(scalingConfig.getJobConfiguration().getRetryTimes());
+ result.add(new SyncConfiguration(scalingConfig.getJobConfiguration().getConcurrency(), dumperConfig, importerConfig));
}
return result;
}
- private static ShardingSphereJDBCConfiguration getSourceConfiguration(final ScalingConfiguration scalingConfiguration) {
- org.apache.shardingsphere.scaling.core.config.DataSourceConfiguration dataSourceConfiguration = scalingConfiguration.getRuleConfiguration().getSource().toTypedDataSourceConfiguration();
- Preconditions.checkArgument(dataSourceConfiguration instanceof ShardingSphereJDBCConfiguration, "Only support ShardingSphere source data source.");
- return (ShardingSphereJDBCConfiguration) dataSourceConfiguration;
+ private static ShardingSphereJDBCConfiguration getSourceConfiguration(final ScalingConfiguration scalingConfig) {
+ org.apache.shardingsphere.scaling.core.config.DataSourceConfiguration result = scalingConfig.getRuleConfiguration().getSource().toTypedDataSourceConfiguration();
+ Preconditions.checkArgument(result instanceof ShardingSphereJDBCConfiguration, "Only support ShardingSphere source data source.");
+ return (ShardingSphereJDBCConfiguration) result;
}
- private static Optional<ShardingRuleConfiguration> getTargetRuleConfiguration(final ScalingConfiguration scalingConfiguration) {
- org.apache.shardingsphere.scaling.core.config.DataSourceConfiguration dataSourceConfiguration = scalingConfiguration.getRuleConfiguration().getTarget().toTypedDataSourceConfiguration();
- if (dataSourceConfiguration instanceof ShardingSphereJDBCConfiguration) {
- return Optional.of(ConfigurationYamlConverter.loadShardingRuleConfiguration(((ShardingSphereJDBCConfiguration) dataSourceConfiguration).getRule()));
+ private static Optional<ShardingRuleConfiguration> getTargetRuleConfiguration(final ScalingConfiguration scalingConfig) {
+ org.apache.shardingsphere.scaling.core.config.DataSourceConfiguration dataSourceConfig = scalingConfig.getRuleConfiguration().getTarget().toTypedDataSourceConfiguration();
+ if (dataSourceConfig instanceof ShardingSphereJDBCConfiguration) {
+ return Optional.of(ConfigurationYamlConverter.loadShardingRuleConfiguration(((ShardingSphereJDBCConfiguration) dataSourceConfig).getRule()));
}
return Optional.empty();
}
- private static void filterByShardingDataSourceTables(final Map<String, Map<String, String>> dataSourceTableNameMap, final JobConfiguration jobConfiguration) {
- if (null == jobConfiguration.getShardingTables()) {
+ private static void filterByShardingDataSourceTables(final Map<String, Map<String, String>> dataSourceTableNameMap, final JobConfiguration jobConfig) {
+ if (null == jobConfig.getShardingTables()) {
return;
}
- Map<String, Set<String>> shardingDataSourceTableMap = toDataSourceTableNameMap(getShardingDataSourceTables(jobConfiguration));
+ Map<String, Set<String>> shardingDataSourceTableMap = toDataSourceTableNameMap(getShardingDataSourceTables(jobConfig));
dataSourceTableNameMap.entrySet().removeIf(entry -> !shardingDataSourceTableMap.containsKey(entry.getKey()));
for (Entry<String, Map<String, String>> entry : dataSourceTableNameMap.entrySet()) {
filterByShardingTables(entry.getValue(), shardingDataSourceTableMap.get(entry.getKey()));
}
}
- private static String getShardingDataSourceTables(final JobConfiguration jobConfiguration) {
- if (jobConfiguration.getShardingItem() >= jobConfiguration.getShardingTables().length) {
+ private static String getShardingDataSourceTables(final JobConfiguration jobConfig) {
+ if (jobConfig.getShardingItem() >= jobConfig.getShardingTables().length) {
return "";
}
- return jobConfiguration.getShardingTables()[jobConfiguration.getShardingItem()];
+ return jobConfig.getShardingTables()[jobConfig.getShardingItem()];
}
private static void filterByShardingTables(final Map<String, String> fullTables, final Set<String> shardingTables) {
@@ -167,21 +167,21 @@ public final class SyncConfigurationUtil {
}
}
- private static DumperConfiguration createDumperConfiguration(final String dataSourceName, final DataSourceConfiguration dataSourceConfiguration, final Map<String, String> tableMap) {
+ private static DumperConfiguration createDumperConfiguration(final String dataSourceName, final DataSourceConfiguration dataSourceConfig, final Map<String, String> tableMap) {
DumperConfiguration result = new DumperConfiguration();
result.setDataSourceName(dataSourceName);
- Map<String, Object> dataSourceProperties = dataSourceConfiguration.getProps();
- JDBCDataSourceConfiguration dumperDataSourceConfiguration = new JDBCDataSourceConfiguration(
+ Map<String, Object> dataSourceProperties = dataSourceConfig.getProps();
+ JDBCDataSourceConfiguration dumperDataSourceConfig = new JDBCDataSourceConfiguration(
dataSourceProperties.containsKey("jdbcUrl") ? dataSourceProperties.get("jdbcUrl").toString() : dataSourceProperties.get("url").toString(),
dataSourceProperties.get("username").toString(), dataSourceProperties.get("password").toString());
- result.setDataSourceConfiguration(dumperDataSourceConfiguration);
+ result.setDataSourceConfiguration(dumperDataSourceConfig);
result.setTableNameMap(tableMap);
return result;
}
- private static ImporterConfiguration createImporterConfiguration(final ScalingConfiguration scalingConfiguration, final ShardingRuleConfiguration shardingRuleConfig) {
+ private static ImporterConfiguration createImporterConfiguration(final ScalingConfiguration scalingConfig, final ShardingRuleConfiguration shardingRuleConfig) {
ImporterConfiguration result = new ImporterConfiguration();
- result.setDataSourceConfiguration(scalingConfiguration.getRuleConfiguration().getTarget().toTypedDataSourceConfiguration());
+ result.setDataSourceConfiguration(scalingConfig.getRuleConfiguration().getTarget().toTypedDataSourceConfiguration());
result.setShardingColumnsMap(toShardingColumnsMap(shardingRuleConfig));
return result;
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/ScalingJobControllerTest.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/ScalingJobControllerTest.java
index 353a841..a8fdd47 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/ScalingJobControllerTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/ScalingJobControllerTest.java
@@ -149,11 +149,11 @@ public final class ScalingJobControllerTest {
}
private DumperConfiguration mockDumperConfig() {
- DataSourceConfiguration dataSourceConfiguration = new JDBCDataSourceConfiguration(DATA_SOURCE_URL, USERNAME, PASSWORD);
+ DataSourceConfiguration dataSourceConfig = new JDBCDataSourceConfiguration(DATA_SOURCE_URL, USERNAME, PASSWORD);
DumperConfiguration result = new DumperConfiguration();
result.setDataSourceName("ds0");
- result.setDataSourceConfiguration(dataSourceConfiguration);
- Map<String, String> tableMap = new HashMap<>();
+ result.setDataSourceConfiguration(dataSourceConfig);
+ Map<String, String> tableMap = new HashMap<>(1, 1);
tableMap.put("t_order", "t_order");
result.setTableNameMap(tableMap);
return result;
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/check/AbstractDataConsistencyCheckerTest.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/check/AbstractDataConsistencyCheckerTest.java
index 6724112..15f89a5 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/check/AbstractDataConsistencyCheckerTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/check/AbstractDataConsistencyCheckerTest.java
@@ -63,8 +63,8 @@ public final class AbstractDataConsistencyCheckerTest {
}
@SneakyThrows(SQLException.class)
- private void initTableData(final DataSourceConfiguration dataSourceConfiguration) {
- DataSource dataSource = new DataSourceManager().getDataSource(dataSourceConfiguration);
+ private void initTableData(final DataSourceConfiguration dataSourceConfig) {
+ DataSource dataSource = new DataSourceManager().getDataSource(dataSourceConfig);
try (Connection connection = dataSource.getConnection();
Statement statement = connection.createStatement()) {
statement.execute("DROP TABLE IF EXISTS t1");
@@ -76,8 +76,8 @@ public final class AbstractDataConsistencyCheckerTest {
private void mockShardingScalingJob() {
InputStream fileInputStream = AbstractDataConsistencyCheckerTest.class.getResourceAsStream("/config.json");
InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream);
- ScalingConfiguration scalingConfiguration = GSON.fromJson(inputStreamReader, ScalingConfiguration.class);
- shardingScalingJob = new ShardingScalingJob(scalingConfiguration);
- shardingScalingJob.getSyncConfigurations().addAll(SyncConfigurationUtil.toSyncConfigurations(scalingConfiguration));
+ ScalingConfiguration scalingConfig = GSON.fromJson(inputStreamReader, ScalingConfiguration.class);
+ shardingScalingJob = new ShardingScalingJob(scalingConfig);
+ shardingScalingJob.getSyncConfigurations().addAll(SyncConfigurationUtil.toSyncConfigurations(scalingConfig));
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/config/JDBCDataSourceConfigurationTest.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/config/JDBCDataSourceConfigurationTest.java
index fa32f25..a201460 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/config/JDBCDataSourceConfigurationTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/config/JDBCDataSourceConfigurationTest.java
@@ -28,18 +28,18 @@ public final class JDBCDataSourceConfigurationTest {
@Test
public void assertJDBCDataSourceConfigurationEquals() {
- JDBCDataSourceConfiguration sourceConfiguration = new JDBCDataSourceConfiguration("jdbc:mysql://127.0.0.1:3306/test2?serverTimezone=UTC&useSSL=false", "root", "root");
- JDBCDataSourceConfiguration targetConfiguration = new JDBCDataSourceConfiguration("jdbc:mysql://127.0.0.1:3306/test2?serverTimezone=UTC&useSSL=false", "root", "root");
- assertThat(sourceConfiguration, is(targetConfiguration));
- sourceConfiguration.setDatabaseType(new MySQLDatabaseType());
- targetConfiguration.setDatabaseType(new MySQLDatabaseType());
- assertThat(sourceConfiguration, is(targetConfiguration));
+ JDBCDataSourceConfiguration sourceConfig = new JDBCDataSourceConfiguration("jdbc:mysql://127.0.0.1:3306/test2?serverTimezone=UTC&useSSL=false", "root", "root");
+ JDBCDataSourceConfiguration targetConfig = new JDBCDataSourceConfiguration("jdbc:mysql://127.0.0.1:3306/test2?serverTimezone=UTC&useSSL=false", "root", "root");
+ assertThat(sourceConfig, is(targetConfig));
+ sourceConfig.setDatabaseType(new MySQLDatabaseType());
+ targetConfig.setDatabaseType(new MySQLDatabaseType());
+ assertThat(sourceConfig, is(targetConfig));
}
@Test
public void assertJDBCDataSourceConfigurationNotEquals() {
- JDBCDataSourceConfiguration sourceConfiguration = new JDBCDataSourceConfiguration("jdbc:mysql://127.0.0.1:3306/test2?serverTimezone=UTC&useSSL=false", "sa", "root");
- JDBCDataSourceConfiguration targetConfiguration = new JDBCDataSourceConfiguration("jdbc:mysql://127.0.0.1:3306/test2?serverTimezone=UTC&useSSL=false", "root", "root");
- assertThat(sourceConfiguration, not(targetConfiguration));
+ JDBCDataSourceConfiguration sourceConfig = new JDBCDataSourceConfiguration("jdbc:mysql://127.0.0.1:3306/test2?serverTimezone=UTC&useSSL=false", "sa", "root");
+ JDBCDataSourceConfiguration targetConfig = new JDBCDataSourceConfiguration("jdbc:mysql://127.0.0.1:3306/test2?serverTimezone=UTC&useSSL=false", "root", "root");
+ assertThat(sourceConfig, not(targetConfig));
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/config/RuleConfigurationTest.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/config/RuleConfigurationTest.java
index 07a2d36..7df3c23 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/config/RuleConfigurationTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/config/RuleConfigurationTest.java
@@ -37,10 +37,10 @@ public class RuleConfigurationTest {
dataSourceConf.setParameter(mockJDBCConfiguration(jdbcUrl, username, password));
DataSourceConfiguration actual = dataSourceConf.toTypedDataSourceConfiguration();
assertThat(actual, instanceOf(JDBCDataSourceConfiguration.class));
- JDBCDataSourceConfiguration jdbcDataSourceConfiguration = (JDBCDataSourceConfiguration) actual;
- assertThat(jdbcDataSourceConfiguration.getJdbcUrl(), is(jdbcUrl));
- assertThat(jdbcDataSourceConfiguration.getUsername(), is(username));
- assertThat(jdbcDataSourceConfiguration.getPassword(), is(password));
+ JDBCDataSourceConfiguration jdbcDataSourceConfig = (JDBCDataSourceConfiguration) actual;
+ assertThat(jdbcDataSourceConfig.getJdbcUrl(), is(jdbcUrl));
+ assertThat(jdbcDataSourceConfig.getUsername(), is(username));
+ assertThat(jdbcDataSourceConfig.getPassword(), is(password));
}
private JsonObject mockJDBCConfiguration(final String jdbcUrl, final String username, final String password) {
@@ -60,9 +60,9 @@ public class RuleConfigurationTest {
dataSourceConf.setParameter(mockShardingSphereJDBCConfiguration(dataSource, rule));
DataSourceConfiguration actual = dataSourceConf.toTypedDataSourceConfiguration();
assertThat(actual, instanceOf(ShardingSphereJDBCConfiguration.class));
- ShardingSphereJDBCConfiguration shardingSphereJDBCConfiguration = (ShardingSphereJDBCConfiguration) actual;
- assertThat(shardingSphereJDBCConfiguration.getDataSource(), is(dataSource));
- assertThat(shardingSphereJDBCConfiguration.getRule(), is(rule));
+ ShardingSphereJDBCConfiguration shardingSphereJDBCConfig = (ShardingSphereJDBCConfiguration) actual;
+ assertThat(shardingSphereJDBCConfig.getDataSource(), is(dataSource));
+ assertThat(shardingSphereJDBCConfig.getRule(), is(rule));
}
private JsonObject mockShardingSphereJDBCConfiguration(final String dataSource, final String rule) {
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/config/ShardingSphereJDBCConfigurationTest.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/config/ShardingSphereJDBCConfigurationTest.java
index f40cec8..6e2d2ea 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/config/ShardingSphereJDBCConfigurationTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/config/ShardingSphereJDBCConfigurationTest.java
@@ -28,9 +28,9 @@ public class ShardingSphereJDBCConfigurationTest {
@Test
public void assertShardingSphereJDBCDataSourceConfigurationDatabaseType() {
- ShardingSphereJDBCConfiguration shardingSphereJDBCConfiguration = new ShardingSphereJDBCConfiguration(
+ ShardingSphereJDBCConfiguration shardingSphereJDBCConfig = new ShardingSphereJDBCConfiguration(
FixtureShardingSphereJDBCConfiguration.DATA_SOURCE,
FixtureShardingSphereJDBCConfiguration.RULE);
- assertThat(shardingSphereJDBCConfiguration.getDatabaseType(), instanceOf(H2DatabaseType.class));
+ assertThat(shardingSphereJDBCConfig.getDatabaseType(), instanceOf(H2DatabaseType.class));
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/datasource/DataSourceFactoryTest.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/datasource/DataSourceFactoryTest.java
index d4ed0ab..1cb4858 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/datasource/DataSourceFactoryTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/datasource/DataSourceFactoryTest.java
@@ -30,20 +30,19 @@ public class DataSourceFactoryTest {
@Test
public void assertNewJDBCInstance() {
- JDBCDataSourceConfiguration jdbcDataSourceConfiguration = new JDBCDataSourceConfiguration(
+ JDBCDataSourceConfiguration jdbcDataSourceConfig = new JDBCDataSourceConfiguration(
"jdbc:h2:mem:test_db_2;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL",
"root",
"password");
- DataSourceWrapper actual = new DataSourceFactory().newInstance(jdbcDataSourceConfiguration);
+ DataSourceWrapper actual = new DataSourceFactory().newInstance(jdbcDataSourceConfig);
assertThat(actual, is(notNullValue()));
}
@Test
public void assertNewShardingSphereJDBCInstance() {
- ShardingSphereJDBCConfiguration shardingSphereJDBCConfiguration = new ShardingSphereJDBCConfiguration(
- FixtureShardingSphereJDBCConfiguration.DATA_SOURCE,
- FixtureShardingSphereJDBCConfiguration.RULE);
- DataSourceWrapper actual = new DataSourceFactory().newInstance(shardingSphereJDBCConfiguration);
+ ShardingSphereJDBCConfiguration shardingSphereJDBCConfig = new ShardingSphereJDBCConfiguration(
+ FixtureShardingSphereJDBCConfiguration.DATA_SOURCE, FixtureShardingSphereJDBCConfiguration.RULE);
+ DataSourceWrapper actual = new DataSourceFactory().newInstance(shardingSphereJDBCConfig);
assertThat(actual, is(notNullValue()));
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/datasource/DataSourceManagerTest.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/datasource/DataSourceManagerTest.java
index 3bf71f4..fe0eb43 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/datasource/DataSourceManagerTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/datasource/DataSourceManagerTest.java
@@ -74,7 +74,7 @@ public final class DataSourceManagerTest {
private void initConfig(final String configFile) {
InputStream fileInputStream = DataSourceManagerTest.class.getResourceAsStream(configFile);
InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream);
- ScalingConfiguration scalingConfiguration = GSON.fromJson(inputStreamReader, ScalingConfiguration.class);
- syncConfigurations = (List<SyncConfiguration>) SyncConfigurationUtil.toSyncConfigurations(scalingConfiguration);
+ ScalingConfiguration scalingConfig = GSON.fromJson(inputStreamReader, ScalingConfiguration.class);
+ syncConfigurations = (List<SyncConfiguration>) SyncConfigurationUtil.toSyncConfigurations(scalingConfig);
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/execute/executor/importer/AbstractJDBCImporterTest.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/execute/executor/importer/AbstractJDBCImporterTest.java
index 0bc8161..17a707e 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/execute/executor/importer/AbstractJDBCImporterTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/execute/executor/importer/AbstractJDBCImporterTest.java
@@ -64,10 +64,10 @@ public final class AbstractJDBCImporterTest {
private DataSourceManager dataSourceManager;
@Mock
- private AbstractSqlBuilder sqlBuilder;
+ private AbstractSQLBuilder sqlBuilder;
@Mock
- private DataSourceConfiguration dataSourceConfiguration;
+ private DataSourceConfiguration dataSourceConfig;
@Mock
private Channel channel;
@@ -88,12 +88,12 @@ public final class AbstractJDBCImporterTest {
jdbcImporter = new AbstractJDBCImporter(getImporterConfiguration(), dataSourceManager) {
@Override
- protected AbstractSqlBuilder createSqlBuilder() {
+ protected AbstractSQLBuilder createSQLBuilder() {
return sqlBuilder;
}
};
jdbcImporter.setChannel(channel);
- when(dataSourceManager.getDataSource(dataSourceConfiguration)).thenReturn(dataSource);
+ when(dataSourceManager.getDataSource(dataSourceConfig)).thenReturn(dataSource);
when(dataSource.getConnection()).thenReturn(connection);
}
@@ -160,7 +160,7 @@ public final class AbstractJDBCImporterTest {
private ImporterConfiguration getImporterConfiguration() {
ImporterConfiguration result = new ImporterConfiguration();
- result.setDataSourceConfiguration(dataSourceConfiguration);
+ result.setDataSourceConfiguration(dataSourceConfig);
Map<String, Set<String>> shardingColumnsMap = Maps.newHashMap();
shardingColumnsMap.put("test_table", Sets.newHashSet("user"));
result.setShardingColumnsMap(shardingColumnsMap);
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/execute/executor/importer/AbstractSqlBuilderTest.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/execute/executor/importer/AbstractSqlBuilderTest.java
index 3419d46..efe2971 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/execute/executor/importer/AbstractSqlBuilderTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/execute/executor/importer/AbstractSqlBuilderTest.java
@@ -33,12 +33,12 @@ import static org.junit.Assert.assertThat;
public class AbstractSqlBuilderTest {
- private AbstractSqlBuilder sqlBuilder;
+ private AbstractSQLBuilder sqlBuilder;
@Before
@SneakyThrows
public void setUp() {
- sqlBuilder = new AbstractSqlBuilder() {
+ sqlBuilder = new AbstractSQLBuilder() {
@Override
protected String getLeftIdentifierQuoteString() {
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureDataConsistencyChecker.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureDataConsistencyChecker.java
index 5bd3f53..f5f315e 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureDataConsistencyChecker.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureDataConsistencyChecker.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.scaling.core.fixture;
import org.apache.shardingsphere.scaling.core.check.AbstractDataConsistencyChecker;
import org.apache.shardingsphere.scaling.core.check.DataConsistencyCheckResult;
import org.apache.shardingsphere.scaling.core.check.DataConsistencyChecker;
-import org.apache.shardingsphere.scaling.core.execute.executor.importer.AbstractSqlBuilder;
+import org.apache.shardingsphere.scaling.core.execute.executor.importer.AbstractSQLBuilder;
import org.apache.shardingsphere.scaling.core.job.ShardingScalingJob;
import java.util.Collections;
@@ -43,8 +43,8 @@ public final class FixtureDataConsistencyChecker extends AbstractDataConsistency
}
@Override
- protected AbstractSqlBuilder getSqlBuilder() {
- return new AbstractSqlBuilder() {
+ protected AbstractSQLBuilder getSqlBuilder() {
+ return new AbstractSQLBuilder() {
@Override
protected String getLeftIdentifierQuoteString() {
return "`";
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureH2JDBCDumper.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureH2JDBCDumper.java
index a29b8cb..a48bf18 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureH2JDBCDumper.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureH2JDBCDumper.java
@@ -27,8 +27,8 @@ import java.sql.SQLException;
public final class FixtureH2JDBCDumper extends AbstractJDBCDumper {
- public FixtureH2JDBCDumper(final InventoryDumperConfiguration dumperConfiguration, final DataSourceManager dataSourceManager) {
- super(dumperConfiguration, dataSourceManager);
+ public FixtureH2JDBCDumper(final InventoryDumperConfiguration dumperConfig, final DataSourceManager dataSourceManager) {
+ super(dumperConfig, dataSourceManager);
}
@Override
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureH2LogDumper.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureH2LogDumper.java
index 86ea5a3..09abf10 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureH2LogDumper.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureH2LogDumper.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.scaling.core.job.position.Position;
public final class FixtureH2LogDumper implements LogDumper {
- public FixtureH2LogDumper(final DumperConfiguration dumperConfiguration, final Position position) {
+ public FixtureH2LogDumper(final DumperConfiguration dumperConfig, final Position position) {
}
@Override
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureNopImporter.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureNopImporter.java
index 9db5ce1..de1e35e 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureNopImporter.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/fixture/FixtureNopImporter.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.scaling.core.execute.executor.importer.Importer
public final class FixtureNopImporter implements Importer {
- public FixtureNopImporter(final ImporterConfiguration importerConfiguration, final DataSourceManager dataSourceManager) {
+ public FixtureNopImporter(final ImporterConfiguration importerConfig, final DataSourceManager dataSourceManager) {
}
@Override
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/preparer/resumer/SyncPositionResumerTest.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/preparer/resumer/SyncPositionResumerTest.java
index 8f96940..b0effeb 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/preparer/resumer/SyncPositionResumerTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/preparer/resumer/SyncPositionResumerTest.java
@@ -98,10 +98,10 @@ public final class SyncPositionResumerTest {
}
private DumperConfiguration mockDumperConfig() {
- DataSourceConfiguration dataSourceConfiguration = new JDBCDataSourceConfiguration(DATA_SOURCE_URL, USERNAME, PASSWORD);
+ DataSourceConfiguration dataSourceConfig = new JDBCDataSourceConfiguration(DATA_SOURCE_URL, USERNAME, PASSWORD);
DumperConfiguration result = new DumperConfiguration();
result.setDataSourceName("ds0");
- result.setDataSourceConfiguration(dataSourceConfiguration);
+ result.setDataSourceConfiguration(dataSourceConfig);
Map<String, String> tableMap = new HashMap<>();
tableMap.put("t_order", "t_order");
result.setTableNameMap(tableMap);
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/preparer/splitter/InventoryDataTaskSplitterTest.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/preparer/splitter/InventoryDataTaskSplitterTest.java
index 943e2bd..7adb570 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/preparer/splitter/InventoryDataTaskSplitterTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/preparer/splitter/InventoryDataTaskSplitterTest.java
@@ -49,7 +49,7 @@ public final class InventoryDataTaskSplitterTest {
private static final String PASSWORD = "password";
- private SyncConfiguration syncConfiguration;
+ private SyncConfiguration syncConfig;
private DataSourceManager dataSourceManager;
@@ -59,7 +59,7 @@ public final class InventoryDataTaskSplitterTest {
public void setUp() {
DumperConfiguration dumperConfig = mockDumperConfig();
ImporterConfiguration importerConfig = new ImporterConfiguration();
- syncConfiguration = new SyncConfiguration(3, dumperConfig, importerConfig);
+ syncConfig = new SyncConfiguration(3, dumperConfig, importerConfig);
dataSourceManager = new DataSourceManager();
inventoryDataTaskSplitter = new InventoryDataTaskSplitter();
}
@@ -71,32 +71,32 @@ public final class InventoryDataTaskSplitterTest {
@Test
public void assertSplitInventoryDataWithIntPrimary() throws SQLException {
- initIntPrimaryEnvironment(syncConfiguration.getDumperConfiguration());
- Collection<ScalingTask<InventoryPosition>> actual = inventoryDataTaskSplitter.splitInventoryData(syncConfiguration, dataSourceManager);
+ initIntPrimaryEnvironment(syncConfig.getDumperConfiguration());
+ Collection<ScalingTask<InventoryPosition>> actual = inventoryDataTaskSplitter.splitInventoryData(syncConfig, dataSourceManager);
assertNotNull(actual);
assertThat(actual.size(), is(3));
}
@Test
public void assertSplitInventoryDataWithCharPrimary() throws SQLException {
- initCharPrimaryEnvironment(syncConfiguration.getDumperConfiguration());
- Collection<ScalingTask<InventoryPosition>> actual = inventoryDataTaskSplitter.splitInventoryData(syncConfiguration, dataSourceManager);
+ initCharPrimaryEnvironment(syncConfig.getDumperConfiguration());
+ Collection<ScalingTask<InventoryPosition>> actual = inventoryDataTaskSplitter.splitInventoryData(syncConfig, dataSourceManager);
assertNotNull(actual);
assertThat(actual.size(), is(1));
}
@Test
public void assertSplitInventoryDataWithUnionPrimary() throws SQLException {
- initUnionPrimaryEnvironment(syncConfiguration.getDumperConfiguration());
- Collection<ScalingTask<InventoryPosition>> actual = inventoryDataTaskSplitter.splitInventoryData(syncConfiguration, dataSourceManager);
+ initUnionPrimaryEnvironment(syncConfig.getDumperConfiguration());
+ Collection<ScalingTask<InventoryPosition>> actual = inventoryDataTaskSplitter.splitInventoryData(syncConfig, dataSourceManager);
assertNotNull(actual);
assertThat(actual.size(), is(1));
}
@Test
public void assertSplitInventoryDataWithoutPrimary() throws SQLException {
- initNoPrimaryEnvironment(syncConfiguration.getDumperConfiguration());
- Collection<ScalingTask<InventoryPosition>> actual = inventoryDataTaskSplitter.splitInventoryData(syncConfiguration, dataSourceManager);
+ initNoPrimaryEnvironment(syncConfig.getDumperConfiguration());
+ Collection<ScalingTask<InventoryPosition>> actual = inventoryDataTaskSplitter.splitInventoryData(syncConfig, dataSourceManager);
assertNotNull(actual);
assertThat(actual.size(), is(1));
}
@@ -142,9 +142,9 @@ public final class InventoryDataTaskSplitterTest {
}
private DumperConfiguration mockDumperConfig() {
- DataSourceConfiguration dataSourceConfiguration = new JDBCDataSourceConfiguration(DATA_SOURCE_URL, USERNAME, PASSWORD);
+ DataSourceConfiguration dataSourceConfig = new JDBCDataSourceConfiguration(DATA_SOURCE_URL, USERNAME, PASSWORD);
DumperConfiguration result = new DumperConfiguration();
- result.setDataSourceConfiguration(dataSourceConfiguration);
+ result.setDataSourceConfiguration(dataSourceConfig);
Map<String, String> tableMap = new HashMap<>();
tableMap.put("t_order", "t_order");
result.setTableNameMap(tableMap);
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/task/incremental/IncrementalDataScalingTaskTest.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/task/incremental/IncrementalDataScalingTaskTest.java
index f0cff8e..fc0a7cc 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/task/incremental/IncrementalDataScalingTaskTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/task/incremental/IncrementalDataScalingTaskTest.java
@@ -76,10 +76,10 @@ public final class IncrementalDataScalingTaskTest {
}
private DumperConfiguration mockDumperConfig() {
- DataSourceConfiguration dataSourceConfiguration = new JDBCDataSourceConfiguration(DATA_SOURCE_URL, USERNAME, PASSWORD);
+ DataSourceConfiguration dataSourceConfig = new JDBCDataSourceConfiguration(DATA_SOURCE_URL, USERNAME, PASSWORD);
DumperConfiguration result = new DumperConfiguration();
result.setDataSourceName("ds0");
- result.setDataSourceConfiguration(dataSourceConfiguration);
+ result.setDataSourceConfiguration(dataSourceConfig);
Map<String, String> tableMap = new HashMap<>(1, 1);
tableMap.put("t_order", "t_order");
result.setTableNameMap(tableMap);
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/task/inventory/InventoryDataScalingTaskTest.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/task/inventory/InventoryDataScalingTaskTest.java
index 2a54c34..b6cfaa4 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/task/inventory/InventoryDataScalingTaskTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/task/inventory/InventoryDataScalingTaskTest.java
@@ -50,7 +50,7 @@ public final class InventoryDataScalingTaskTest {
private static final String PASSWORD = "password";
- private SyncConfiguration syncConfiguration;
+ private SyncConfiguration syncConfig;
private DataSourceManager dataSourceManager;
@@ -59,7 +59,7 @@ public final class InventoryDataScalingTaskTest {
DumperConfiguration dumperConfig = mockDumperConfig();
ImporterConfiguration importerConfig = mockImporterConfig();
ScalingContext.getInstance().init(new ServerConfiguration());
- syncConfiguration = new SyncConfiguration(3, dumperConfig, importerConfig);
+ syncConfig = new SyncConfiguration(3, dumperConfig, importerConfig);
dataSourceManager = new DataSourceManager();
}
@@ -70,21 +70,19 @@ public final class InventoryDataScalingTaskTest {
@Test(expected = SyncTaskExecuteException.class)
public void assertStartWithGetEstimatedRowsFailure() {
- InventoryDumperConfiguration inventoryDumperConfiguration = new InventoryDumperConfiguration(syncConfiguration.getDumperConfiguration());
- inventoryDumperConfiguration.setTableName("t_non_exist");
- InventoryDataScalingTask inventoryDataSyncTask = new InventoryDataScalingTask(
- inventoryDumperConfiguration, syncConfiguration.getImporterConfiguration(), dataSourceManager);
+ InventoryDumperConfiguration inventoryDumperConfig = new InventoryDumperConfiguration(syncConfig.getDumperConfiguration());
+ inventoryDumperConfig.setTableName("t_non_exist");
+ InventoryDataScalingTask inventoryDataSyncTask = new InventoryDataScalingTask(inventoryDumperConfig, syncConfig.getImporterConfiguration(), dataSourceManager);
inventoryDataSyncTask.start();
}
@Test
public void assertGetProgress() throws SQLException {
- initTableData(syncConfiguration.getDumperConfiguration());
- InventoryDumperConfiguration inventoryDumperConfiguration = new InventoryDumperConfiguration(syncConfiguration.getDumperConfiguration());
- inventoryDumperConfiguration.setTableName("t_order");
- inventoryDumperConfiguration.setPositionManager(syncConfiguration.getDumperConfiguration().getPositionManager());
- InventoryDataScalingTask inventoryDataSyncTask = new InventoryDataScalingTask(
- inventoryDumperConfiguration, syncConfiguration.getImporterConfiguration(), dataSourceManager);
+ initTableData(syncConfig.getDumperConfiguration());
+ InventoryDumperConfiguration inventoryDumperConfig = new InventoryDumperConfiguration(syncConfig.getDumperConfiguration());
+ inventoryDumperConfig.setTableName("t_order");
+ inventoryDumperConfig.setPositionManager(syncConfig.getDumperConfiguration().getPositionManager());
+ InventoryDataScalingTask inventoryDataSyncTask = new InventoryDataScalingTask(inventoryDumperConfig, syncConfig.getImporterConfiguration(), dataSourceManager);
inventoryDataSyncTask.start();
assertThat(((InventoryDataSyncTaskProgress) inventoryDataSyncTask.getProgress()).getEstimatedRows(), is(2L));
}
@@ -100,18 +98,18 @@ public final class InventoryDataScalingTaskTest {
}
private DumperConfiguration mockDumperConfig() {
- DataSourceConfiguration dataSourceConfiguration = new JDBCDataSourceConfiguration(DATA_SOURCE_URL, USERNAME, PASSWORD);
+ DataSourceConfiguration dataSourceConfig = new JDBCDataSourceConfiguration(DATA_SOURCE_URL, USERNAME, PASSWORD);
DumperConfiguration result = new DumperConfiguration();
- result.setDataSourceConfiguration(dataSourceConfiguration);
+ result.setDataSourceConfiguration(dataSourceConfig);
result.setPositionManager(new InventoryPositionManager<>(new PrimaryKeyPosition(1, 100)));
result.setTableNameMap(Collections.emptyMap());
return result;
}
private ImporterConfiguration mockImporterConfig() {
- DataSourceConfiguration dataSourceConfiguration = new JDBCDataSourceConfiguration(DATA_SOURCE_URL, USERNAME, PASSWORD);
+ DataSourceConfiguration dataSourceConfig = new JDBCDataSourceConfiguration(DATA_SOURCE_URL, USERNAME, PASSWORD);
ImporterConfiguration result = new ImporterConfiguration();
- result.setDataSourceConfiguration(dataSourceConfiguration);
+ result.setDataSourceConfiguration(dataSourceConfig);
return result;
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/util/SyncConfigurationUtilTest.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/util/SyncConfigurationUtilTest.java
index 36fd65c..b78aafb 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/util/SyncConfigurationUtilTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/util/SyncConfigurationUtilTest.java
@@ -35,7 +35,7 @@ public final class SyncConfigurationUtilTest {
private static final Gson GSON = new Gson();
- private ScalingConfiguration scalingConfiguration;
+ private ScalingConfiguration scalingConfig;
@Before
public void setUp() {
@@ -44,13 +44,13 @@ public final class SyncConfigurationUtilTest {
@Test
public void assertFilterByShardingDataSourceTables() {
- List<SyncConfiguration> syncConfigurations = (List<SyncConfiguration>) SyncConfigurationUtil.toSyncConfigurations(scalingConfiguration);
- assertThat(syncConfigurations.get(0).getDumperConfiguration().getTableNameMap().size(), is(1));
+ List<SyncConfiguration> syncConfigs = (List<SyncConfiguration>) SyncConfigurationUtil.toSyncConfigurations(scalingConfig);
+ assertThat(syncConfigs.get(0).getDumperConfiguration().getTableNameMap().size(), is(1));
}
private void initConfig(final String configFile) {
InputStream fileInputStream = SyncConfigurationUtilTest.class.getResourceAsStream(configFile);
InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream);
- scalingConfiguration = GSON.fromJson(inputStreamReader, ScalingConfiguration.class);
+ scalingConfig = GSON.fromJson(inputStreamReader, ScalingConfiguration.class);
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/MySQLBinlogDumper.java b/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/MySQLBinlogDumper.java
index b5c91c9..afe7c08 100755
--- a/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/MySQLBinlogDumper.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/MySQLBinlogDumper.java
@@ -59,7 +59,7 @@ public final class MySQLBinlogDumper extends AbstractShardingScalingExecutor<Bin
private final BinlogPosition binlogPosition;
- private final DumperConfiguration dumperConfiguration;
+ private final DumperConfiguration dumperConfig;
private final MetaDataManager metaDataManager;
@@ -68,13 +68,13 @@ public final class MySQLBinlogDumper extends AbstractShardingScalingExecutor<Bin
@Setter
private Channel channel;
- public MySQLBinlogDumper(final DumperConfiguration dumperConfiguration, final Position binlogPosition) {
+ public MySQLBinlogDumper(final DumperConfiguration dumperConfig, final Position binlogPosition) {
this.binlogPosition = (BinlogPosition) binlogPosition;
- if (!JDBCDataSourceConfiguration.class.equals(dumperConfiguration.getDataSourceConfiguration().getClass())) {
+ if (!JDBCDataSourceConfiguration.class.equals(dumperConfig.getDataSourceConfiguration().getClass())) {
throw new UnsupportedOperationException("MySQLBinlogDumper only support JDBCDataSourceConfiguration");
}
- this.dumperConfiguration = dumperConfiguration;
- metaDataManager = new MetaDataManager(new DataSourceFactory().newInstance(dumperConfiguration.getDataSourceConfiguration()));
+ this.dumperConfig = dumperConfig;
+ metaDataManager = new MetaDataManager(new DataSourceFactory().newInstance(dumperConfig.getDataSourceConfiguration()));
}
@Override
@@ -84,7 +84,7 @@ public final class MySQLBinlogDumper extends AbstractShardingScalingExecutor<Bin
}
private void dump() {
- JDBCDataSourceConfiguration jdbcDataSourceConfig = (JDBCDataSourceConfiguration) dumperConfiguration.getDataSourceConfiguration();
+ JDBCDataSourceConfiguration jdbcDataSourceConfig = (JDBCDataSourceConfiguration) dumperConfig.getDataSourceConfiguration();
JdbcUri uri = new JdbcUri(jdbcDataSourceConfig.getJdbcUrl());
MySQLClient client = new MySQLClient(new ConnectInfo(random.nextInt(), uri.getHostname(), uri.getPort(), jdbcDataSourceConfig.getUsername(), jdbcDataSourceConfig.getPassword()));
client.connect();
@@ -113,7 +113,7 @@ public final class MySQLBinlogDumper extends AbstractShardingScalingExecutor<Bin
}
private boolean filter(final String database, final AbstractRowsEvent event) {
- return !event.getSchemaName().equals(database) || !dumperConfiguration.getTableNameMap().containsKey(event.getTableName());
+ return !event.getSchemaName().equals(database) || !dumperConfig.getTableNameMap().containsKey(event.getTableName());
}
private void handleWriteRowsEvent(final WriteRowsEvent event) {
@@ -158,7 +158,7 @@ public final class MySQLBinlogDumper extends AbstractShardingScalingExecutor<Bin
private DataRecord createDataRecord(final AbstractRowsEvent rowsEvent, final int columnCount) {
DataRecord result = new DataRecord(new BinlogPosition(rowsEvent.getFileName(), rowsEvent.getPosition(), rowsEvent.getServerId()), columnCount);
- result.setTableName(dumperConfiguration.getTableNameMap().get(rowsEvent.getTableName()));
+ result.setTableName(dumperConfig.getTableNameMap().get(rowsEvent.getTableName()));
result.setCommitTime(rowsEvent.getTimestamp() * 1000);
return result;
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/MySQLDataConsistencyChecker.java b/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/MySQLDataConsistencyChecker.java
index 8a6557b..77dcf2f 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/MySQLDataConsistencyChecker.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/MySQLDataConsistencyChecker.java
@@ -94,7 +94,7 @@ public final class MySQLDataConsistencyChecker extends AbstractDataConsistencyCh
}
@Override
- protected MySQLSqlBuilder getSqlBuilder() {
- return new MySQLSqlBuilder();
+ protected MySQLSQLBuilder getSqlBuilder() {
+ return new MySQLSQLBuilder();
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/MySQLImporter.java b/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/MySQLImporter.java
index bb45dd9..a22f5ac 100755
--- a/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/MySQLImporter.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/MySQLImporter.java
@@ -20,19 +20,19 @@ package org.apache.shardingsphere.scaling.mysql;
import org.apache.shardingsphere.scaling.core.config.ImporterConfiguration;
import org.apache.shardingsphere.scaling.core.datasource.DataSourceManager;
import org.apache.shardingsphere.scaling.core.execute.executor.importer.AbstractJDBCImporter;
-import org.apache.shardingsphere.scaling.core.execute.executor.importer.AbstractSqlBuilder;
+import org.apache.shardingsphere.scaling.core.execute.executor.importer.AbstractSQLBuilder;
/**
* MySQL importer.
*/
public final class MySQLImporter extends AbstractJDBCImporter {
- public MySQLImporter(final ImporterConfiguration importerConfiguration, final DataSourceManager dataSourceManager) {
- super(importerConfiguration, dataSourceManager);
+ public MySQLImporter(final ImporterConfiguration importerConfig, final DataSourceManager dataSourceManager) {
+ super(importerConfig, dataSourceManager);
}
@Override
- protected AbstractSqlBuilder createSqlBuilder() {
- return new MySQLSqlBuilder();
+ protected AbstractSQLBuilder createSQLBuilder() {
+ return new MySQLSQLBuilder();
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/MySQLJdbcDumper.java b/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/MySQLJdbcDumper.java
index baba817..3d4e048 100755
--- a/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/MySQLJdbcDumper.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/MySQLJdbcDumper.java
@@ -36,10 +36,10 @@ import java.util.Map.Entry;
*/
public final class MySQLJdbcDumper extends AbstractJDBCDumper {
- public MySQLJdbcDumper(final InventoryDumperConfiguration inventoryDumperConfiguration, final DataSourceManager dataSourceManager) {
- super(inventoryDumperConfiguration, dataSourceManager);
- JDBCDataSourceConfiguration jdbcDataSourceConfiguration = (JDBCDataSourceConfiguration) getInventoryDumperConfiguration().getDataSourceConfiguration();
- jdbcDataSourceConfiguration.setJdbcUrl(fixMySQLUrl(jdbcDataSourceConfiguration.getJdbcUrl()));
+ public MySQLJdbcDumper(final InventoryDumperConfiguration inventoryDumperConfig, final DataSourceManager dataSourceManager) {
+ super(inventoryDumperConfig, dataSourceManager);
+ JDBCDataSourceConfiguration jdbcDataSourceConfig = (JDBCDataSourceConfiguration) getInventoryDumperConfiguration().getDataSourceConfiguration();
+ jdbcDataSourceConfig.setJdbcUrl(fixMySQLUrl(jdbcDataSourceConfig.getJdbcUrl()));
}
private String fixMySQLUrl(final String url) {
diff --git a/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/MySQLSqlBuilder.java b/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/MySQLSQLBuilder.java
similarity index 92%
rename from shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/MySQLSqlBuilder.java
rename to shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/MySQLSQLBuilder.java
index e48c3da..f9960b6 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/MySQLSqlBuilder.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/MySQLSQLBuilder.java
@@ -17,12 +17,12 @@
package org.apache.shardingsphere.scaling.mysql;
-import org.apache.shardingsphere.scaling.core.execute.executor.importer.AbstractSqlBuilder;
+import org.apache.shardingsphere.scaling.core.execute.executor.importer.AbstractSQLBuilder;
/**
- * MySQL sql builder.
+ * MySQL SQL builder.
*/
-public final class MySQLSqlBuilder extends AbstractSqlBuilder {
+public final class MySQLSQLBuilder extends AbstractSQLBuilder {
@Override
public String getLeftIdentifierQuoteString() {
diff --git a/shardingsphere-scaling/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/MySQLBinlogDumperTest.java b/shardingsphere-scaling/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/MySQLBinlogDumperTest.java
index 46614f7..d30b53d 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/MySQLBinlogDumperTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/MySQLBinlogDumperTest.java
@@ -64,11 +64,11 @@ public final class MySQLBinlogDumperTest {
@Before
public void setUp() {
ScalingContext.getInstance().init(new ServerConfiguration());
- DumperConfiguration dumperConfiguration = mockDumperConfiguration();
- initTableData(dumperConfiguration);
+ DumperConfiguration dumperConfig = mockDumperConfiguration();
+ initTableData(dumperConfig);
channel = new MemoryChannel(records -> {
});
- mySQLBinlogDumper = new MySQLBinlogDumper(dumperConfiguration, new BinlogPosition("binlog-000001", 4L));
+ mySQLBinlogDumper = new MySQLBinlogDumper(dumperConfig, new BinlogPosition("binlog-000001", 4L));
mySQLBinlogDumper.setChannel(channel);
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/MySQLImporterTest.java b/shardingsphere-scaling/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/MySQLImporterTest.java
index dc32867..7d8e7f2 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/MySQLImporterTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/MySQLImporterTest.java
@@ -34,15 +34,15 @@ import static org.junit.Assert.assertThat;
public final class MySQLImporterTest {
@Mock
- private ImporterConfiguration importerConfiguration;
+ private ImporterConfiguration importerConfig;
@Mock
private DataSourceManager dataSourceManager;
@Test
public void assertCreateSqlBuilder() {
- MySQLImporter mySQLImporter = new MySQLImporter(importerConfiguration, dataSourceManager);
- String insertSQL = mySQLImporter.createSqlBuilder().buildInsertSQL(mockDataRecord());
+ MySQLImporter mySQLImporter = new MySQLImporter(importerConfig, dataSourceManager);
+ String insertSQL = mySQLImporter.createSQLBuilder().buildInsertSQL(mockDataRecord());
assertThat(insertSQL, is("INSERT INTO `t_order`(`id`,`name`) VALUES(?,?)"));
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/MySQLJdbcDumperTest.java b/shardingsphere-scaling/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/MySQLJdbcDumperTest.java
index 652e03a..cb6d99d 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/MySQLJdbcDumperTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/MySQLJdbcDumperTest.java
@@ -53,9 +53,9 @@ public final class MySQLJdbcDumperTest {
}
private InventoryDumperConfiguration mockInventoryDumperConfiguration() {
- DumperConfiguration dumperConfiguration = mockDumperConfiguration();
- initTableData(dumperConfiguration);
- InventoryDumperConfiguration result = new InventoryDumperConfiguration(dumperConfiguration);
+ DumperConfiguration dumperConfig = mockDumperConfiguration();
+ initTableData(dumperConfig);
+ InventoryDumperConfiguration result = new InventoryDumperConfiguration(dumperConfig);
result.setTableName("t_order");
return result;
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLDataConsistencyChecker.java b/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLDataConsistencyChecker.java
index e859e5b..97f2712 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLDataConsistencyChecker.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLDataConsistencyChecker.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.scaling.postgresql;
import org.apache.shardingsphere.scaling.core.check.AbstractDataConsistencyChecker;
import org.apache.shardingsphere.scaling.core.check.DataConsistencyChecker;
-import org.apache.shardingsphere.scaling.core.execute.executor.importer.AbstractSqlBuilder;
+import org.apache.shardingsphere.scaling.core.execute.executor.importer.AbstractSQLBuilder;
import org.apache.shardingsphere.scaling.core.job.ShardingScalingJob;
import java.util.Collections;
@@ -40,7 +40,7 @@ public final class PostgreSQLDataConsistencyChecker extends AbstractDataConsiste
}
@Override
- protected AbstractSqlBuilder getSqlBuilder() {
- return new PostgreSQLSqlBuilder();
+ protected AbstractSQLBuilder getSqlBuilder() {
+ return new PostgreSQLSQLBuilder();
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLImporter.java b/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLImporter.java
index f28c2da..0422d4b 100755
--- a/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLImporter.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLImporter.java
@@ -20,20 +20,20 @@ package org.apache.shardingsphere.scaling.postgresql;
import org.apache.shardingsphere.scaling.core.config.ImporterConfiguration;
import org.apache.shardingsphere.scaling.core.datasource.DataSourceManager;
import org.apache.shardingsphere.scaling.core.execute.executor.importer.AbstractJDBCImporter;
-import org.apache.shardingsphere.scaling.core.execute.executor.importer.AbstractSqlBuilder;
+import org.apache.shardingsphere.scaling.core.execute.executor.importer.AbstractSQLBuilder;
/**
* postgreSQL importer.
*/
public final class PostgreSQLImporter extends AbstractJDBCImporter {
- public PostgreSQLImporter(final ImporterConfiguration importerConfiguration, final DataSourceManager dataSourceManager) {
- super(importerConfiguration, dataSourceManager);
+ public PostgreSQLImporter(final ImporterConfiguration importerConfig, final DataSourceManager dataSourceManager) {
+ super(importerConfig, dataSourceManager);
}
@Override
- protected AbstractSqlBuilder createSqlBuilder() {
- return new PostgreSQLSqlBuilder();
+ protected AbstractSQLBuilder createSQLBuilder() {
+ return new PostgreSQLSQLBuilder();
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLJdbcDumper.java b/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLJdbcDumper.java
index ad4da9a..9520882 100755
--- a/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLJdbcDumper.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLJdbcDumper.java
@@ -31,13 +31,13 @@ import java.sql.SQLException;
*/
public final class PostgreSQLJdbcDumper extends AbstractJDBCDumper {
- public PostgreSQLJdbcDumper(final InventoryDumperConfiguration inventoryDumperConfiguration, final DataSourceManager dataSourceManager) {
- super(inventoryDumperConfiguration, dataSourceManager);
+ public PostgreSQLJdbcDumper(final InventoryDumperConfiguration inventoryDumperConfig, final DataSourceManager dataSourceManager) {
+ super(inventoryDumperConfig, dataSourceManager);
}
@Override
- protected PreparedStatement createPreparedStatement(final Connection conn, final String sql) throws SQLException {
- PreparedStatement result = conn.prepareStatement(sql, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
+ protected PreparedStatement createPreparedStatement(final Connection connection, final String sql) throws SQLException {
+ PreparedStatement result = connection.prepareStatement(sql, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
result.setFetchSize(100);
return result;
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLSqlBuilder.java b/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLSQLBuilder.java
similarity index 95%
rename from shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLSqlBuilder.java
rename to shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLSQLBuilder.java
index df28be6..e59fb36 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLSqlBuilder.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLSQLBuilder.java
@@ -20,12 +20,12 @@ package org.apache.shardingsphere.scaling.postgresql;
import org.apache.shardingsphere.scaling.core.execute.executor.record.Column;
import org.apache.shardingsphere.scaling.core.execute.executor.record.DataRecord;
import org.apache.shardingsphere.scaling.core.execute.executor.record.RecordUtil;
-import org.apache.shardingsphere.scaling.core.execute.executor.importer.AbstractSqlBuilder;
+import org.apache.shardingsphere.scaling.core.execute.executor.importer.AbstractSQLBuilder;
/**
* PostgreSQL SQL builder.
*/
-public final class PostgreSQLSqlBuilder extends AbstractSqlBuilder {
+public final class PostgreSQLSQLBuilder extends AbstractSQLBuilder {
@Override
public String getLeftIdentifierQuoteString() {
diff --git a/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLWalDumper.java b/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLWalDumper.java
index 50f5b10..7747f01 100755
--- a/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLWalDumper.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLWalDumper.java
@@ -47,7 +47,7 @@ public final class PostgreSQLWalDumper extends AbstractShardingScalingExecutor<W
private final WalPosition walPosition;
- private final DumperConfiguration dumperConfiguration;
+ private final DumperConfiguration dumperConfig;
private final LogicalReplication logicalReplication = new LogicalReplication();
@@ -56,13 +56,13 @@ public final class PostgreSQLWalDumper extends AbstractShardingScalingExecutor<W
@Setter
private Channel channel;
- public PostgreSQLWalDumper(final DumperConfiguration dumperConfiguration, final Position position) {
+ public PostgreSQLWalDumper(final DumperConfiguration dumperConfig, final Position position) {
walPosition = (WalPosition) position;
- if (!JDBCDataSourceConfiguration.class.equals(dumperConfiguration.getDataSourceConfiguration().getClass())) {
+ if (!JDBCDataSourceConfiguration.class.equals(dumperConfig.getDataSourceConfiguration().getClass())) {
throw new UnsupportedOperationException("PostgreSQLWalDumper only support JDBCDataSourceConfiguration");
}
- this.dumperConfiguration = dumperConfiguration;
- walEventConverter = new WalEventConverter(dumperConfiguration);
+ this.dumperConfig = dumperConfig;
+ walEventConverter = new WalEventConverter(dumperConfig);
}
@Override
@@ -73,17 +73,17 @@ public final class PostgreSQLWalDumper extends AbstractShardingScalingExecutor<W
private void dump() {
try {
- Connection pgConnection = logicalReplication.createPgConnection((JDBCDataSourceConfiguration) dumperConfiguration.getDataSourceConfiguration());
+ Connection pgConnection = logicalReplication.createPgConnection((JDBCDataSourceConfiguration) dumperConfig.getDataSourceConfiguration());
DecodingPlugin decodingPlugin = new TestDecodingPlugin(pgConnection.unwrap(PgConnection.class).getTimestampUtils());
PGReplicationStream stream = logicalReplication.createReplicationStream(pgConnection,
PostgreSQLPositionManager.SLOT_NAME, walPosition.getLogSequenceNumber());
while (isRunning()) {
- ByteBuffer msg = stream.readPending();
- if (msg == null) {
+ ByteBuffer message = stream.readPending();
+ if (null == message) {
ThreadUtil.sleep(10L);
continue;
}
- AbstractWalEvent event = decodingPlugin.decode(msg, stream.getLastReceiveLSN());
+ AbstractWalEvent event = decodingPlugin.decode(message, stream.getLastReceiveLSN());
pushRecord(walEventConverter.convert(event));
}
} catch (final SQLException ex) {
diff --git a/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/wal/WalEventConverter.java b/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/wal/WalEventConverter.java
index ad11953..418e279 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/wal/WalEventConverter.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/wal/WalEventConverter.java
@@ -42,13 +42,13 @@ import java.util.List;
*/
public final class WalEventConverter {
- private final DumperConfiguration dumperConfiguration;
+ private final DumperConfiguration dumperConfig;
private final MetaDataManager metaDataManager;
- public WalEventConverter(final DumperConfiguration dumperConfiguration) {
- this.dumperConfiguration = dumperConfiguration;
- metaDataManager = new MetaDataManager(new DataSourceFactory().newInstance(dumperConfiguration.getDataSourceConfiguration()));
+ public WalEventConverter(final DumperConfiguration dumperConfig) {
+ this.dumperConfig = dumperConfig;
+ metaDataManager = new MetaDataManager(new DataSourceFactory().newInstance(dumperConfig.getDataSourceConfiguration()));
}
/**
@@ -58,7 +58,7 @@ public final class WalEventConverter {
* @return record
*/
public Record convert(final AbstractWalEvent event) {
- JdbcUri uri = new JdbcUri(((JDBCDataSourceConfiguration) dumperConfiguration.getDataSourceConfiguration()).getJdbcUrl());
+ JdbcUri uri = new JdbcUri(((JDBCDataSourceConfiguration) dumperConfig.getDataSourceConfiguration()).getJdbcUrl());
if (filter(uri.getDatabase(), event)) {
return createPlaceholderRecord(event);
} else if (event instanceof WriteRowEvent) {
@@ -76,7 +76,7 @@ public final class WalEventConverter {
private boolean filter(final String database, final AbstractWalEvent event) {
if (isRowEvent(event)) {
AbstractRowEvent rowEvent = (AbstractRowEvent) event;
- return !rowEvent.getSchemaName().equals(database) || !dumperConfiguration.getTableNameMap().containsKey(rowEvent.getTableName());
+ return !rowEvent.getSchemaName().equals(database) || !dumperConfig.getTableNameMap().containsKey(rowEvent.getTableName());
}
return false;
}
@@ -118,7 +118,7 @@ public final class WalEventConverter {
private DataRecord createDataRecord(final AbstractRowEvent rowsEvent, final int columnCount) {
DataRecord result = new DataRecord(new WalPosition(rowsEvent.getLogSequenceNumber()), columnCount);
- result.setTableName(dumperConfiguration.getTableNameMap().get(rowsEvent.getTableName()));
+ result.setTableName(dumperConfig.getTableNameMap().get(rowsEvent.getTableName()));
return result;
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLImporterTest.java b/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLImporterTest.java
index f79b5f5..f7b4e68 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLImporterTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLImporterTest.java
@@ -35,15 +35,15 @@ import static org.junit.Assert.assertThat;
public final class PostgreSQLImporterTest {
@Mock
- private ImporterConfiguration importerConfiguration;
+ private ImporterConfiguration importerConfig;
@Mock
private DataSourceManager dataSourceManager;
@Test
- public void assertCreateSqlBuilder() {
- PostgreSQLImporter postgreSQLImporter = new PostgreSQLImporter(importerConfiguration, dataSourceManager);
- String insertSQL = postgreSQLImporter.createSqlBuilder().buildInsertSQL(mockDataRecord());
+ public void assertCreateSQLBuilder() {
+ PostgreSQLImporter postgreSQLImporter = new PostgreSQLImporter(importerConfig, dataSourceManager);
+ String insertSQL = postgreSQLImporter.createSQLBuilder().buildInsertSQL(mockDataRecord());
assertThat(insertSQL, is("INSERT INTO \"t_order\"(\"id\",\"name\") VALUES(?,?) ON CONFLICT (id) DO NOTHING"));
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLJdbcDumperTest.java b/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLJdbcDumperTest.java
index 3b390fb..c7e956b 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLJdbcDumperTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLJdbcDumperTest.java
@@ -47,9 +47,9 @@ public final class PostgreSQLJdbcDumperTest {
}
private InventoryDumperConfiguration mockInventoryDumperConfiguration() {
- DumperConfiguration dumperConfiguration = mockDumperConfiguration();
- initTableData(dumperConfiguration);
- InventoryDumperConfiguration result = new InventoryDumperConfiguration(dumperConfiguration);
+ DumperConfiguration dumperConfig = mockDumperConfiguration();
+ initTableData(dumperConfig);
+ InventoryDumperConfiguration result = new InventoryDumperConfiguration(dumperConfig);
result.setTableName("t_order");
return result;
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLSqlBuilderTest.java b/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLSqlBuilderTest.java
index c13ace9..3f14f4c 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLSqlBuilderTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLSqlBuilderTest.java
@@ -30,7 +30,7 @@ public final class PostgreSQLSqlBuilderTest {
@Test
public void assertBuildInsertSQL() {
- String actual = new PostgreSQLSqlBuilder().buildInsertSQL(mockDataRecord());
+ String actual = new PostgreSQLSQLBuilder().buildInsertSQL(mockDataRecord());
assertThat(actual, is("INSERT INTO \"t_order\"(\"id\",\"name\") VALUES(?,?) ON CONFLICT (id) DO NOTHING"));
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLWalDumperTest.java b/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLWalDumperTest.java
index 3ea14f3..0592d4f 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLWalDumperTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLWalDumperTest.java
@@ -59,7 +59,7 @@ public final class PostgreSQLWalDumperTest {
private PostgreSQLWalDumper postgreSQLWalDumper;
- private JDBCDataSourceConfiguration jdbcDataSourceConfiguration;
+ private JDBCDataSourceConfiguration jdbcDataSourceConfig;
private MemoryChannel channel;
@@ -74,9 +74,9 @@ public final class PostgreSQLWalDumperTest {
}
private DumperConfiguration mockDumperConfiguration() {
- jdbcDataSourceConfiguration = new JDBCDataSourceConfiguration("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=PostgreSQL", "root", "root");
+ jdbcDataSourceConfig = new JDBCDataSourceConfiguration("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=PostgreSQL", "root", "root");
DumperConfiguration result = new DumperConfiguration();
- result.setDataSourceConfiguration(jdbcDataSourceConfiguration);
+ result.setDataSourceConfiguration(jdbcDataSourceConfig);
return result;
}
@@ -85,7 +85,7 @@ public final class PostgreSQLWalDumperTest {
public void assertStart() {
try {
ReflectionUtil.setFieldValueToClass(postgreSQLWalDumper, "logicalReplication", logicalReplication);
- when(logicalReplication.createPgConnection(jdbcDataSourceConfiguration)).thenReturn(pgConnection);
+ when(logicalReplication.createPgConnection(jdbcDataSourceConfig)).thenReturn(pgConnection);
when(pgConnection.unwrap(PgConnection.class)).thenReturn(pgConnection);
when(pgConnection.getTimestampUtils()).thenReturn(null);
when(logicalReplication.createReplicationStream(pgConnection, PostgreSQLPositionManager.SLOT_NAME, position.getLogSequenceNumber())).thenReturn(pgReplicationStream);
diff --git a/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/wal/WalEventConverterTest.java b/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/wal/WalEventConverterTest.java
index 10d99b1..862348f 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/wal/WalEventConverterTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/wal/WalEventConverterTest.java
@@ -51,18 +51,18 @@ public final class WalEventConverterTest {
@Before
public void setUp() {
- DumperConfiguration dumperConfiguration = mockDumperConfiguration();
- walEventConverter = new WalEventConverter(dumperConfiguration);
- initTableData(dumperConfiguration);
+ DumperConfiguration dumperConfig = mockDumperConfiguration();
+ walEventConverter = new WalEventConverter(dumperConfig);
+ initTableData(dumperConfig);
}
private DumperConfiguration mockDumperConfiguration() {
- DumperConfiguration reslut = new DumperConfiguration();
- reslut.setDataSourceConfiguration(new JDBCDataSourceConfiguration("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=PostgreSQL", "root", "root"));
+ DumperConfiguration result = new DumperConfiguration();
+ result.setDataSourceConfiguration(new JDBCDataSourceConfiguration("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=PostgreSQL", "root", "root"));
Map<String, String> tableNameMap = Maps.newHashMap();
tableNameMap.put("t_order", "t_order");
- reslut.setTableNameMap(tableNameMap);
- return reslut;
+ result.setTableNameMap(tableNameMap);
+ return result;
}
@SneakyThrows(SQLException.class)
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/core/parser/SQLParserFactory.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/core/parser/SQLParserFactory.java
index 0b1eebf..0da6013 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/core/parser/SQLParserFactory.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/core/parser/SQLParserFactory.java
@@ -50,10 +50,10 @@ public final class SQLParserFactory {
}
@SneakyThrows(ReflectiveOperationException.class)
- private static SQLParser createSQLParser(final String sql, final SQLParserConfiguration configuration) {
+ private static SQLParser createSQLParser(final String sql, final SQLParserConfiguration config) {
CodePointBuffer buffer = CodePointBuffer.withChars(CharBuffer.wrap(sql.toCharArray()));
CodePointCharStream codePointCharStream = CodePointCharStream.fromBuffer(buffer);
- Lexer lexer = (Lexer) configuration.getLexerClass().getConstructor(CharStream.class).newInstance(codePointCharStream);
- return configuration.getParserClass().getConstructor(TokenStream.class).newInstance(new CommonTokenStream(lexer));
+ Lexer lexer = (Lexer) config.getLexerClass().getConstructor(CharStream.class).newInstance(codePointCharStream);
+ return config.getParserClass().getConstructor(TokenStream.class).newInstance(new CommonTokenStream(lexer));
}
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/core/visitor/ParseTreeVisitorFactory.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/core/visitor/ParseTreeVisitorFactory.java
index dde2862..4a10953 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/core/visitor/ParseTreeVisitorFactory.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/core/visitor/ParseTreeVisitorFactory.java
@@ -45,8 +45,8 @@ public final class ParseTreeVisitorFactory {
}
@SneakyThrows
- private static ParseTreeVisitor createParseTreeVisitor(final SQLParserConfiguration configuration, final SQLStatementType type) {
- SQLVisitorFacade visitorFacade = configuration.getVisitorFacadeClass().getConstructor().newInstance();
+ private static ParseTreeVisitor createParseTreeVisitor(final SQLParserConfiguration config, final SQLStatementType type) {
+ SQLVisitorFacade visitorFacade = config.getVisitorFacadeClass().getConstructor().newInstance();
switch (type) {
case DML:
return (ParseTreeVisitor) visitorFacade.getDMLVisitorClass().getConstructor().newInstance();
diff --git a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/main/java/org/apache/shardingsphere/transaction/xa/jta/datasource/swapper/DataSourceSwapper.java b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/main/java/org/apache/shardingsphere/transaction/xa/jta/datasource/swapper/DataSourceSwapper.java
index aa74261..898ab19 100644
--- a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/main/java/org/apache/shardingsphere/transaction/xa/jta/datasource/swapper/DataSourceSwapper.java
+++ b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/main/java/org/apache/shardingsphere/transaction/xa/jta/datasource/swapper/DataSourceSwapper.java
@@ -111,8 +111,8 @@ public final class DataSourceSwapper {
}
@SneakyThrows(ReflectiveOperationException.class)
- private void setProperties(final XADataSource xaDataSource, final Map<String, Object> databaseAccessConfiguration) {
- for (Entry<String, Object> entry : databaseAccessConfiguration.entrySet()) {
+ private void setProperties(final XADataSource xaDataSource, final Map<String, Object> databaseAccessConfig) {
+ for (Entry<String, Object> entry : databaseAccessConfig.entrySet()) {
Optional<Method> method = findSetterMethod(xaDataSource.getClass().getMethods(), entry.getKey());
if (method.isPresent()) {
method.get().invoke(xaDataSource, entry.getValue());
diff --git a/shardingsphere-transaction/shardingsphere-transaction-base/shardingsphere-transaction-base-seata-at/src/main/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingTransactionManager.java b/shardingsphere-transaction/shardingsphere-transaction-base/shardingsphere-transaction-base-seata-at/src/main/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingTransactionManager.java
index 3ad193b..bd8cf24 100644
--- a/shardingsphere-transaction/shardingsphere-transaction-base/shardingsphere-transaction-base-seata-at/src/main/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingTransactionManager.java
+++ b/shardingsphere-transaction/shardingsphere-transaction-base/shardingsphere-transaction-base-seata-at/src/main/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingTransactionManager.java
@@ -54,10 +54,10 @@ public final class SeataATShardingTransactionManager implements ShardingTransact
private final boolean enableSeataAT;
public SeataATShardingTransactionManager() {
- FileConfiguration configuration = new FileConfiguration("seata.conf");
- enableSeataAT = configuration.getBoolean("sharding.transaction.seata.at.enable", true);
- applicationId = configuration.getConfig("client.application.id");
- transactionServiceGroup = configuration.getConfig("client.transaction.service.group", "default");
+ FileConfiguration config = new FileConfiguration("seata.conf");
+ enableSeataAT = config.getBoolean("sharding.transaction.seata.at.enable", true);
+ applicationId = config.getConfig("client.application.id");
+ transactionServiceGroup = config.getConfig("client.transaction.service.group", "default");
}
@Override