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 2022/11/12 01:07:21 UTC
[shardingsphere] branch master updated: Rename variable name from configuration to config (#22092)
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 2a1f812f443 Rename variable name from configuration to config (#22092)
2a1f812f443 is described below
commit 2a1f812f44370528fa2783cafbe377687bd52d7a
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Nov 12 09:07:15 2022 +0800
Rename variable name from configuration to config (#22092)
---
...rDatabaseDiscoveryRuleStatementUpdaterTest.java | 10 ++--
...pDatabaseDiscoveryRuleStatementUpdaterTest.java | 5 +-
.../ReplicaLoadBalanceAlgorithmFactoryTest.java | 3 +-
.../AbstractShadowRuleConfigurationChecker.java | 4 +-
.../factory/KeyGenerateAlgorithmFactoryTest.java | 3 +-
.../factory/ShardingAlgorithmFactoryTest.java | 3 +-
.../factory/ShardingAuditAlgorithmFactoryTest.java | 11 ++--
.../shardingsphere/sharding/rule/ShardingRule.java | 68 +++++++++++-----------
.../ShardingRuleConfigurationCheckerTest.java | 8 +--
...eAlgorithmProviderConfigurationSwapperTest.java | 12 ++--
...rdingAutoTableRuleConfigurationSwapperTest.java | 19 +++---
.../AlterShardingAuditorStatementUpdaterTest.java | 4 +-
.../checker/ShardingRouteCacheableCheckerTest.java | 24 ++++----
.../rule/builder/ShardingCacheRuleBuilderTest.java | 6 +-
...lShardingCacheRuleConfigurationSwapperTest.java | 10 ++--
.../scenario/migration/MigrationJobAPIImpl.java | 12 ++--
.../rule/builder/SQLParserRuleBuilderTest.java | 19 +++---
...LParserCacheOptionConfigurationSwapperTest.java | 22 ++-----
.../YamlSQLParserRuleConfigurationSwapperTest.java | 49 +++++-----------
.../TrafficLoadBalanceAlgorithmFactoryTest.java | 3 +-
.../config/ProxyConfigurationLoaderTest.java | 12 ++--
.../distsql/DistSQLBackendHandlerFactoryTest.java | 56 +++++-------------
.../RegisterStorageUnitBackendHandlerTest.java | 3 +-
.../atomic/storage/impl/MySQLContainer.java | 12 ++--
.../atomic/storage/impl/OpenGaussContainer.java | 12 ++--
.../atomic/storage/impl/PostgreSQLContainer.java | 12 ++--
26 files changed, 171 insertions(+), 231 deletions(-)
diff --git a/features/db-discovery/distsql/handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabaseDiscoveryRuleStatementUpdaterTest.java b/features/db-discovery/distsql/handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabaseDiscoveryRuleStatementUpdaterTest.java
index 7fd10795391..f85ec3cdd0f 100644
--- a/features/db-discovery/distsql/handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabaseDiscoveryRuleStatementUpdaterTest.java
+++ b/features/db-discovery/distsql/handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/AlterDatabaseDiscoveryRuleStatementUpdaterTest.java
@@ -103,13 +103,13 @@ public final class AlterDatabaseDiscoveryRuleStatementUpdaterTest {
public void assertBuild() {
AlgorithmSegment algorithmSegment = new AlgorithmSegment("MySQL.MGR", new Properties());
DatabaseDiscoveryDefinitionSegment definitionSegment = new DatabaseDiscoveryDefinitionSegment("readwrite_ds_1", Arrays.asList("ds_read_0", "ds_read_1"), algorithmSegment, new Properties());
- DatabaseDiscoveryRuleConfiguration databaseDiscoveryRuleConfiguration =
+ DatabaseDiscoveryRuleConfiguration databaseDiscoveryRuleConfig =
(DatabaseDiscoveryRuleConfiguration) updater.buildToBeAlteredRuleConfiguration(new AlterDatabaseDiscoveryRuleStatement(Collections.singletonList(definitionSegment)));
- assertThat(databaseDiscoveryRuleConfiguration.getDataSources().size(), is(1));
- assertTrue(databaseDiscoveryRuleConfiguration.getDataSources().stream().map(DatabaseDiscoveryDataSourceRuleConfiguration::getGroupName)
+ assertThat(databaseDiscoveryRuleConfig.getDataSources().size(), is(1));
+ assertTrue(databaseDiscoveryRuleConfig.getDataSources().stream().map(DatabaseDiscoveryDataSourceRuleConfiguration::getGroupName)
.collect(Collectors.toList()).removeAll(Collections.singletonList("readwrite_ds_1")));
- assertTrue(databaseDiscoveryRuleConfiguration.getDiscoveryTypes().containsKey("readwrite_ds_1_mysql_mgr"));
- assertTrue(databaseDiscoveryRuleConfiguration.getDiscoveryHeartbeats().containsKey("readwrite_ds_1_heartbeat"));
+ assertTrue(databaseDiscoveryRuleConfig.getDiscoveryTypes().containsKey("readwrite_ds_1_mysql_mgr"));
+ assertTrue(databaseDiscoveryRuleConfig.getDiscoveryHeartbeats().containsKey("readwrite_ds_1_heartbeat"));
}
@Test
diff --git a/features/db-discovery/distsql/handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryRuleStatementUpdaterTest.java b/features/db-discovery/distsql/handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryRuleStatementUpdaterTest.java
index 1d5a256eeab..495f817bab5 100644
--- a/features/db-discovery/distsql/handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryRuleStatementUpdaterTest.java
+++ b/features/db-discovery/distsql/handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryRuleStatementUpdaterTest.java
@@ -75,9 +75,8 @@ public final class DropDatabaseDiscoveryRuleStatementUpdaterTest {
ExportableRule exportableRule = mock(ExportableRule.class);
when(exportableRule.getExportData()).thenReturn(getExportData());
when(database.getRuleMetaData().findRules(ExportableRule.class)).thenReturn(Collections.singleton(exportableRule));
- DatabaseDiscoveryDataSourceRuleConfiguration configuration = new DatabaseDiscoveryDataSourceRuleConfiguration("ha_group", null, null, null);
- updater.checkSQLStatement(database, createSQLStatement(),
- new DatabaseDiscoveryRuleConfiguration(Collections.singletonList(configuration), Collections.emptyMap(), Collections.emptyMap()));
+ DatabaseDiscoveryDataSourceRuleConfiguration config = new DatabaseDiscoveryDataSourceRuleConfiguration("ha_group", null, null, null);
+ updater.checkSQLStatement(database, createSQLStatement(), new DatabaseDiscoveryRuleConfiguration(Collections.singletonList(config), Collections.emptyMap(), Collections.emptyMap()));
}
private Map<String, Object> getExportData() {
diff --git a/features/readwrite-splitting/api/src/test/java/org/apache/shardingsphere/readwritesplitting/factory/ReplicaLoadBalanceAlgorithmFactoryTest.java b/features/readwrite-splitting/api/src/test/java/org/apache/shardingsphere/readwritesplitting/factory/ReplicaLoadBalanceAlgorithmFactoryTest.java
index 23b6e806287..024f14101ea 100644
--- a/features/readwrite-splitting/api/src/test/java/org/apache/shardingsphere/readwritesplitting/factory/ReplicaLoadBalanceAlgorithmFactoryTest.java
+++ b/features/readwrite-splitting/api/src/test/java/org/apache/shardingsphere/readwritesplitting/factory/ReplicaLoadBalanceAlgorithmFactoryTest.java
@@ -36,8 +36,7 @@ public final class ReplicaLoadBalanceAlgorithmFactoryTest {
@Test
public void assertNewInstanceWithAlgorithmConfiguration() {
- AlgorithmConfiguration configuration = new AlgorithmConfiguration("FIXTURE", new Properties());
- assertThat(ReadQueryLoadBalanceAlgorithmFactory.newInstance(configuration), instanceOf(ReadQueryLoadBalanceAlgorithmFixture.class));
+ assertThat(ReadQueryLoadBalanceAlgorithmFactory.newInstance(new AlgorithmConfiguration("FIXTURE", new Properties())), instanceOf(ReadQueryLoadBalanceAlgorithmFixture.class));
}
@Test
diff --git a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/checker/AbstractShadowRuleConfigurationChecker.java b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/checker/AbstractShadowRuleConfigurationChecker.java
index 1d8f761f600..8dca86ec7db 100644
--- a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/checker/AbstractShadowRuleConfigurationChecker.java
+++ b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/checker/AbstractShadowRuleConfigurationChecker.java
@@ -50,8 +50,8 @@ public abstract class AbstractShadowRuleConfigurationChecker<T extends RuleConfi
protected void checkDataSources(final Map<String, ShadowDataSourceConfiguration> shadowDataSources, final Map<String, DataSource> dataSourceMap) {
Set<String> dataSource = dataSourceMap.keySet();
for (Entry<String, ShadowDataSourceConfiguration> entry : shadowDataSources.entrySet()) {
- ShadowDataSourceConfiguration shadowConfiguration = entry.getValue();
- boolean shadowDataSourceState = dataSource.contains(shadowConfiguration.getProductionDataSourceName()) && dataSource.contains(shadowConfiguration.getShadowDataSourceName());
+ ShadowDataSourceConfiguration shadowConfig = entry.getValue();
+ boolean shadowDataSourceState = dataSource.contains(shadowConfig.getProductionDataSourceName()) && dataSource.contains(shadowConfig.getShadowDataSourceName());
Preconditions.checkState(shadowDataSourceState, "No available data source for shadow data source mapping configuration");
}
}
diff --git a/features/sharding/api/src/test/java/org/apache/shardingsphere/sharding/factory/KeyGenerateAlgorithmFactoryTest.java b/features/sharding/api/src/test/java/org/apache/shardingsphere/sharding/factory/KeyGenerateAlgorithmFactoryTest.java
index 36fdf4a9f81..8fef7cbcf8f 100644
--- a/features/sharding/api/src/test/java/org/apache/shardingsphere/sharding/factory/KeyGenerateAlgorithmFactoryTest.java
+++ b/features/sharding/api/src/test/java/org/apache/shardingsphere/sharding/factory/KeyGenerateAlgorithmFactoryTest.java
@@ -36,8 +36,7 @@ public final class KeyGenerateAlgorithmFactoryTest {
@Test
public void assertNewInstanceWithAlgorithmConfiguration() {
- AlgorithmConfiguration configuration = new AlgorithmConfiguration("FIXTURE", new Properties());
- assertThat(KeyGenerateAlgorithmFactory.newInstance(configuration), instanceOf(KeyGenerateAlgorithmFixture.class));
+ assertThat(KeyGenerateAlgorithmFactory.newInstance(new AlgorithmConfiguration("FIXTURE", new Properties())), instanceOf(KeyGenerateAlgorithmFixture.class));
}
@Test
diff --git a/features/sharding/api/src/test/java/org/apache/shardingsphere/sharding/factory/ShardingAlgorithmFactoryTest.java b/features/sharding/api/src/test/java/org/apache/shardingsphere/sharding/factory/ShardingAlgorithmFactoryTest.java
index 67f91e584fd..b7962edb650 100644
--- a/features/sharding/api/src/test/java/org/apache/shardingsphere/sharding/factory/ShardingAlgorithmFactoryTest.java
+++ b/features/sharding/api/src/test/java/org/apache/shardingsphere/sharding/factory/ShardingAlgorithmFactoryTest.java
@@ -31,8 +31,7 @@ public final class ShardingAlgorithmFactoryTest {
@Test
public void assertNewInstance() {
- AlgorithmConfiguration configuration = new AlgorithmConfiguration("FIXTURE", new Properties());
- assertThat(ShardingAlgorithmFactory.newInstance(configuration), instanceOf(ShardingAlgorithmFixture.class));
+ assertThat(ShardingAlgorithmFactory.newInstance(new AlgorithmConfiguration("FIXTURE", new Properties())), instanceOf(ShardingAlgorithmFixture.class));
}
@Test
diff --git a/features/sharding/api/src/test/java/org/apache/shardingsphere/sharding/factory/ShardingAuditAlgorithmFactoryTest.java b/features/sharding/api/src/test/java/org/apache/shardingsphere/sharding/factory/ShardingAuditAlgorithmFactoryTest.java
index 48debe764f8..ac733d0137a 100644
--- a/features/sharding/api/src/test/java/org/apache/shardingsphere/sharding/factory/ShardingAuditAlgorithmFactoryTest.java
+++ b/features/sharding/api/src/test/java/org/apache/shardingsphere/sharding/factory/ShardingAuditAlgorithmFactoryTest.java
@@ -17,22 +17,21 @@
package org.apache.shardingsphere.sharding.factory;
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertTrue;
-
import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration;
import org.apache.shardingsphere.sharding.fixture.ShardingAuditAlgorithmFixture;
import org.junit.Test;
import java.util.Properties;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertTrue;
+
public final class ShardingAuditAlgorithmFactoryTest {
@Test
public void assertNewInstance() {
- AlgorithmConfiguration configuration = new AlgorithmConfiguration("FIXTURE", new Properties());
- assertThat(ShardingAuditAlgorithmFactory.newInstance(configuration), instanceOf(ShardingAuditAlgorithmFixture.class));
+ assertThat(ShardingAuditAlgorithmFactory.newInstance(new AlgorithmConfiguration("FIXTURE", new Properties())), instanceOf(ShardingAuditAlgorithmFixture.class));
}
@Test
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/ShardingRule.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/ShardingRule.java
index 542baeebf8f..a17ff782f64 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/ShardingRule.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/ShardingRule.java
@@ -115,25 +115,25 @@ public final class ShardingRule implements DatabaseRule, DataNodeContainedRule,
private final Map<String, Collection<DataNode>> shardingTableDataNodes;
- public ShardingRule(final ShardingRuleConfiguration config, final Collection<String> dataSourceNames, final InstanceContext instanceContext) {
- configuration = config;
- this.dataSourceNames = getDataSourceNames(config.getTables(), config.getAutoTables(), dataSourceNames);
- config.getShardingAlgorithms().forEach((key, value) -> shardingAlgorithms.put(key, ShardingAlgorithmFactory.newInstance(value)));
- config.getKeyGenerators().forEach((key, value) -> keyGenerators.put(key, KeyGenerateAlgorithmFactory.newInstance(value)));
- config.getAuditors().forEach((key, value) -> auditors.put(key, ShardingAuditAlgorithmFactory.newInstance(value)));
- tableRules.putAll(createTableRules(config.getTables(), config.getDefaultKeyGenerateStrategy()));
- tableRules.putAll(createAutoTableRules(config.getAutoTables(), config.getDefaultKeyGenerateStrategy()));
- broadcastTables = createBroadcastTables(config.getBroadcastTables());
- bindingTableRules.putAll(createBindingTableRules(config.getBindingTableGroups()));
- defaultDatabaseShardingStrategyConfig = null == config.getDefaultDatabaseShardingStrategy() ? new NoneShardingStrategyConfiguration() : config.getDefaultDatabaseShardingStrategy();
- defaultTableShardingStrategyConfig = null == config.getDefaultTableShardingStrategy() ? new NoneShardingStrategyConfiguration() : config.getDefaultTableShardingStrategy();
- defaultAuditStrategy = null == config.getDefaultAuditStrategy() ? new ShardingAuditStrategyConfiguration(Collections.emptyList(), true) : config.getDefaultAuditStrategy();
- defaultKeyGenerateAlgorithm = null == config.getDefaultKeyGenerateStrategy()
+ public ShardingRule(final ShardingRuleConfiguration ruleConfig, final Collection<String> dataSourceNames, final InstanceContext instanceContext) {
+ configuration = ruleConfig;
+ this.dataSourceNames = getDataSourceNames(ruleConfig.getTables(), ruleConfig.getAutoTables(), dataSourceNames);
+ ruleConfig.getShardingAlgorithms().forEach((key, value) -> shardingAlgorithms.put(key, ShardingAlgorithmFactory.newInstance(value)));
+ ruleConfig.getKeyGenerators().forEach((key, value) -> keyGenerators.put(key, KeyGenerateAlgorithmFactory.newInstance(value)));
+ ruleConfig.getAuditors().forEach((key, value) -> auditors.put(key, ShardingAuditAlgorithmFactory.newInstance(value)));
+ tableRules.putAll(createTableRules(ruleConfig.getTables(), ruleConfig.getDefaultKeyGenerateStrategy()));
+ tableRules.putAll(createAutoTableRules(ruleConfig.getAutoTables(), ruleConfig.getDefaultKeyGenerateStrategy()));
+ broadcastTables = createBroadcastTables(ruleConfig.getBroadcastTables());
+ bindingTableRules.putAll(createBindingTableRules(ruleConfig.getBindingTableGroups()));
+ defaultDatabaseShardingStrategyConfig = null == ruleConfig.getDefaultDatabaseShardingStrategy() ? new NoneShardingStrategyConfiguration() : ruleConfig.getDefaultDatabaseShardingStrategy();
+ defaultTableShardingStrategyConfig = null == ruleConfig.getDefaultTableShardingStrategy() ? new NoneShardingStrategyConfiguration() : ruleConfig.getDefaultTableShardingStrategy();
+ defaultAuditStrategy = null == ruleConfig.getDefaultAuditStrategy() ? new ShardingAuditStrategyConfiguration(Collections.emptyList(), true) : ruleConfig.getDefaultAuditStrategy();
+ defaultKeyGenerateAlgorithm = null == ruleConfig.getDefaultKeyGenerateStrategy()
? KeyGenerateAlgorithmFactory.newInstance()
- : keyGenerators.get(config.getDefaultKeyGenerateStrategy().getKeyGeneratorName());
- defaultShardingColumn = config.getDefaultShardingColumn();
+ : keyGenerators.get(ruleConfig.getDefaultKeyGenerateStrategy().getKeyGeneratorName());
+ defaultShardingColumn = ruleConfig.getDefaultShardingColumn();
shardingTableDataNodes = createShardingTableDataNodes(tableRules);
- Preconditions.checkArgument(isValidBindingTableConfiguration(tableRules, new BindingTableCheckedConfiguration(this.dataSourceNames, shardingAlgorithms, config.getBindingTableGroups(),
+ Preconditions.checkArgument(isValidBindingTableConfiguration(tableRules, new BindingTableCheckedConfiguration(this.dataSourceNames, shardingAlgorithms, ruleConfig.getBindingTableGroups(),
broadcastTables, defaultDatabaseShardingStrategyConfig, defaultTableShardingStrategyConfig, defaultShardingColumn)),
"Invalid binding table configuration in ShardingRuleConfiguration.");
keyGenerators.values().stream().filter(each -> each instanceof InstanceContextAware).forEach(each -> ((InstanceContextAware) each).setInstanceContext(instanceContext));
@@ -142,25 +142,25 @@ public final class ShardingRule implements DatabaseRule, DataNodeContainedRule,
}
}
- public ShardingRule(final AlgorithmProvidedShardingRuleConfiguration config, final Collection<String> dataSourceNames, final InstanceContext instanceContext) {
- configuration = config;
- this.dataSourceNames = getDataSourceNames(config.getTables(), config.getAutoTables(), dataSourceNames);
- shardingAlgorithms.putAll(config.getShardingAlgorithms());
- keyGenerators.putAll(config.getKeyGenerators());
- auditors.putAll(config.getAuditors());
- tableRules.putAll(createTableRules(config.getTables(), config.getDefaultKeyGenerateStrategy()));
- tableRules.putAll(createAutoTableRules(config.getAutoTables(), config.getDefaultKeyGenerateStrategy()));
- broadcastTables = createBroadcastTables(config.getBroadcastTables());
- bindingTableRules.putAll(createBindingTableRules(config.getBindingTableGroups()));
- defaultDatabaseShardingStrategyConfig = null == config.getDefaultDatabaseShardingStrategy() ? new NoneShardingStrategyConfiguration() : config.getDefaultDatabaseShardingStrategy();
- defaultTableShardingStrategyConfig = null == config.getDefaultTableShardingStrategy() ? new NoneShardingStrategyConfiguration() : config.getDefaultTableShardingStrategy();
- defaultAuditStrategy = null == config.getDefaultAuditStrategy() ? new ShardingAuditStrategyConfiguration(Collections.emptyList(), true) : config.getDefaultAuditStrategy();
- defaultKeyGenerateAlgorithm = null == config.getDefaultKeyGenerateStrategy()
+ public ShardingRule(final AlgorithmProvidedShardingRuleConfiguration ruleConfig, final Collection<String> dataSourceNames, final InstanceContext instanceContext) {
+ configuration = ruleConfig;
+ this.dataSourceNames = getDataSourceNames(ruleConfig.getTables(), ruleConfig.getAutoTables(), dataSourceNames);
+ shardingAlgorithms.putAll(ruleConfig.getShardingAlgorithms());
+ keyGenerators.putAll(ruleConfig.getKeyGenerators());
+ auditors.putAll(ruleConfig.getAuditors());
+ tableRules.putAll(createTableRules(ruleConfig.getTables(), ruleConfig.getDefaultKeyGenerateStrategy()));
+ tableRules.putAll(createAutoTableRules(ruleConfig.getAutoTables(), ruleConfig.getDefaultKeyGenerateStrategy()));
+ broadcastTables = createBroadcastTables(ruleConfig.getBroadcastTables());
+ bindingTableRules.putAll(createBindingTableRules(ruleConfig.getBindingTableGroups()));
+ defaultDatabaseShardingStrategyConfig = null == ruleConfig.getDefaultDatabaseShardingStrategy() ? new NoneShardingStrategyConfiguration() : ruleConfig.getDefaultDatabaseShardingStrategy();
+ defaultTableShardingStrategyConfig = null == ruleConfig.getDefaultTableShardingStrategy() ? new NoneShardingStrategyConfiguration() : ruleConfig.getDefaultTableShardingStrategy();
+ defaultAuditStrategy = null == ruleConfig.getDefaultAuditStrategy() ? new ShardingAuditStrategyConfiguration(Collections.emptyList(), true) : ruleConfig.getDefaultAuditStrategy();
+ defaultKeyGenerateAlgorithm = null == ruleConfig.getDefaultKeyGenerateStrategy()
? KeyGenerateAlgorithmFactory.newInstance()
- : keyGenerators.get(config.getDefaultKeyGenerateStrategy().getKeyGeneratorName());
- defaultShardingColumn = config.getDefaultShardingColumn();
+ : keyGenerators.get(ruleConfig.getDefaultKeyGenerateStrategy().getKeyGeneratorName());
+ defaultShardingColumn = ruleConfig.getDefaultShardingColumn();
shardingTableDataNodes = createShardingTableDataNodes(tableRules);
- Preconditions.checkArgument(isValidBindingTableConfiguration(tableRules, new BindingTableCheckedConfiguration(this.dataSourceNames, shardingAlgorithms, config.getBindingTableGroups(),
+ Preconditions.checkArgument(isValidBindingTableConfiguration(tableRules, new BindingTableCheckedConfiguration(this.dataSourceNames, shardingAlgorithms, ruleConfig.getBindingTableGroups(),
broadcastTables, defaultDatabaseShardingStrategyConfig, defaultTableShardingStrategyConfig, defaultShardingColumn)),
"Invalid binding table configuration in ShardingRuleConfiguration.");
keyGenerators.values().stream().filter(each -> each instanceof InstanceContextAware).forEach(each -> ((InstanceContextAware) each).setInstanceContext(instanceContext));
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/ShardingRuleConfigurationCheckerTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/ShardingRuleConfigurationCheckerTest.java
index ca4b595efcb..195110340eb 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/ShardingRuleConfigurationCheckerTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/ShardingRuleConfigurationCheckerTest.java
@@ -49,10 +49,10 @@ public final class ShardingRuleConfigurationCheckerTest {
@Test(expected = IllegalStateException.class)
public void assertCheckTableConfigurationFailed() {
- ShardingRuleConfiguration configuration = createRuleConfiguration();
- configuration.setTables(Collections.singletonList(createShardingTableRuleConfiguration(null, null, null)));
- configuration.setAutoTables(Collections.singleton(createShardingAutoTableRuleConfiguration(null, null, null)));
- getChecker(configuration).check("foo_db", configuration, Collections.emptyMap(), Collections.emptyList());
+ ShardingRuleConfiguration ruleConfig = createRuleConfiguration();
+ ruleConfig.setTables(Collections.singletonList(createShardingTableRuleConfiguration(null, null, null)));
+ ruleConfig.setAutoTables(Collections.singleton(createShardingAutoTableRuleConfiguration(null, null, null)));
+ getChecker(ruleConfig).check("foo_db", ruleConfig, Collections.emptyMap(), Collections.emptyList());
}
private ShardingRuleConfiguration createRuleConfiguration() {
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/YamlShardingRuleAlgorithmProviderConfigurationSwapperTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/YamlShardingRuleAlgorithmProviderConfigurationSwapperTest.java
index db8c5c0760e..b5427b441c1 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/YamlShardingRuleAlgorithmProviderConfigurationSwapperTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/YamlShardingRuleAlgorithmProviderConfigurationSwapperTest.java
@@ -78,16 +78,16 @@ public final class YamlShardingRuleAlgorithmProviderConfigurationSwapperTest {
YamlTableRuleConfiguration yamlTableRuleConfig = new YamlTableRuleConfiguration();
yamlTableRuleConfig.setLogicTable("foo_tbl");
result.getTables().put("foo_key", yamlTableRuleConfig);
- YamlShardingAutoTableRuleConfiguration yamlShardingAutoTableRuleConfiguration = new YamlShardingAutoTableRuleConfiguration();
- yamlShardingAutoTableRuleConfiguration.setLogicTable("foo_auto_tbl");
- result.getAutoTables().put("foo_auto_key", yamlShardingAutoTableRuleConfiguration);
+ YamlShardingAutoTableRuleConfiguration yamlShardingAutoTableRuleConfig = new YamlShardingAutoTableRuleConfiguration();
+ yamlShardingAutoTableRuleConfig.setLogicTable("foo_auto_tbl");
+ result.getAutoTables().put("foo_auto_key", yamlShardingAutoTableRuleConfig);
result.setBindingTables(Collections.singleton("foo_btb"));
result.setBroadcastTables(Collections.singleton("foo_ctb"));
result.setDefaultDatabaseStrategy(mock(YamlShardingStrategyConfiguration.class));
result.setDefaultTableStrategy(mock(YamlShardingStrategyConfiguration.class));
- YamlKeyGenerateStrategyConfiguration yamlKeyGenerateStrategyConfiguration = new YamlKeyGenerateStrategyConfiguration();
- yamlKeyGenerateStrategyConfiguration.setColumn("foo_column");
- result.setDefaultKeyGenerateStrategy(yamlKeyGenerateStrategyConfiguration);
+ YamlKeyGenerateStrategyConfiguration yamlKeyGenerateStrategyConfig = new YamlKeyGenerateStrategyConfiguration();
+ yamlKeyGenerateStrategyConfig.setColumn("foo_column");
+ result.setDefaultKeyGenerateStrategy(yamlKeyGenerateStrategyConfig);
result.setDefaultAuditStrategy(mock(YamlShardingAuditStrategyConfiguration.class));
result.setDefaultShardingColumn("foo_column");
return result;
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/rule/YamlShardingAutoTableRuleConfigurationSwapperTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/rule/YamlShardingAutoTableRuleConfigurationSwapperTest.java
index 8aad9b4d53d..8ca9bacf1a6 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/rule/YamlShardingAutoTableRuleConfigurationSwapperTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/yaml/swapper/rule/YamlShardingAutoTableRuleConfigurationSwapperTest.java
@@ -74,18 +74,17 @@ public final class YamlShardingAutoTableRuleConfigurationSwapperTest {
@Test
public void assertSwapToObject() {
- YamlShardingStrategyConfiguration yamlShardingStrategyConfiguration = new YamlShardingStrategyConfiguration();
- YamlStandardShardingStrategyConfiguration standard = new YamlStandardShardingStrategyConfiguration();
- standard.setShardingColumn("col");
- standard.setShardingAlgorithmName("foo_algorithm");
- yamlShardingStrategyConfiguration.setStandard(standard);
- YamlShardingAutoTableRuleConfiguration configuration = swapper.swapToYamlConfiguration(
- new ShardingAutoTableRuleConfiguration("tbl", "ds0,ds1"));
- configuration.setShardingStrategy(yamlShardingStrategyConfiguration);
+ YamlShardingStrategyConfiguration yamlShardingStrategyConfig = new YamlShardingStrategyConfiguration();
+ YamlStandardShardingStrategyConfiguration yamlStandardShardingStrategyConfig = new YamlStandardShardingStrategyConfiguration();
+ yamlStandardShardingStrategyConfig.setShardingColumn("col");
+ yamlStandardShardingStrategyConfig.setShardingAlgorithmName("foo_algorithm");
+ yamlShardingStrategyConfig.setStandard(yamlStandardShardingStrategyConfig);
+ YamlShardingAutoTableRuleConfiguration yamlShardingAutoTableRuleConfig = swapper.swapToYamlConfiguration(new ShardingAutoTableRuleConfiguration("tbl", "ds0,ds1"));
+ yamlShardingAutoTableRuleConfig.setShardingStrategy(yamlShardingStrategyConfig);
YamlKeyGenerateStrategyConfiguration keyGenerateStrategy = new YamlKeyGenerateStrategyConfiguration();
keyGenerateStrategy.setColumn("col");
- configuration.setKeyGenerateStrategy(keyGenerateStrategy);
- ShardingAutoTableRuleConfiguration actual = new YamlShardingAutoTableRuleConfigurationSwapper().swapToObject(configuration);
+ yamlShardingAutoTableRuleConfig.setKeyGenerateStrategy(keyGenerateStrategy);
+ ShardingAutoTableRuleConfiguration actual = new YamlShardingAutoTableRuleConfigurationSwapper().swapToObject(yamlShardingAutoTableRuleConfig);
assertThat(actual.getLogicTable(), is("tbl"));
assertThat(actual.getActualDataSources(), is("ds0,ds1"));
assertNotNull(actual.getShardingStrategy());
diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingAuditorStatementUpdaterTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingAuditorStatementUpdaterTest.java
index 7409578c74e..814cc512adc 100644
--- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingAuditorStatementUpdaterTest.java
+++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingAuditorStatementUpdaterTest.java
@@ -85,8 +85,8 @@ public final class AlterShardingAuditorStatementUpdaterTest {
ShardingRuleConfiguration currentRuleConfig = new ShardingRuleConfiguration();
currentRuleConfig.getAuditors().put("exist_auditor_name", new AlgorithmConfiguration("DML_SHARDING_CONDITIONS", createProperties()));
AlterShardingAuditorStatement statement = new AlterShardingAuditorStatement(Collections.singletonList(auditorSegment));
- ShardingRuleConfiguration toBeAlteredRuleConfiguration = updater.buildToBeAlteredRuleConfiguration(statement);
- updater.updateCurrentRuleConfiguration(currentRuleConfig, toBeAlteredRuleConfiguration);
+ ShardingRuleConfiguration toBeAlteredRuleConfig = updater.buildToBeAlteredRuleConfiguration(statement);
+ updater.updateCurrentRuleConfiguration(currentRuleConfig, toBeAlteredRuleConfig);
assertThat(currentRuleConfig.getAuditors().get("exist_auditor_name").getType(), is("DML_SHARDING_CONDITIONS"));
}
diff --git a/features/sharding/plugin/cache/src/test/java/org/apache/shardingsphere/sharding/cache/checker/ShardingRouteCacheableCheckerTest.java b/features/sharding/plugin/cache/src/test/java/org/apache/shardingsphere/sharding/cache/checker/ShardingRouteCacheableCheckerTest.java
index d34d583445c..efa565b20e2 100644
--- a/features/sharding/plugin/cache/src/test/java/org/apache/shardingsphere/sharding/cache/checker/ShardingRouteCacheableCheckerTest.java
+++ b/features/sharding/plugin/cache/src/test/java/org/apache/shardingsphere/sharding/cache/checker/ShardingRouteCacheableCheckerTest.java
@@ -119,28 +119,28 @@ public final class ShardingRouteCacheableCheckerTest {
}
private ShardingRule prepareShardingRule() {
- ShardingRuleConfiguration configuration = new ShardingRuleConfiguration();
- configuration.getBroadcastTables().add("t_broadcast_table");
- configuration.getBindingTableGroups().add("t_order,t_order_item");
+ ShardingRuleConfiguration ruleConfig = new ShardingRuleConfiguration();
+ ruleConfig.getBroadcastTables().add("t_broadcast_table");
+ ruleConfig.getBindingTableGroups().add("t_order,t_order_item");
Properties modShardingAlgorithmProps = new Properties();
modShardingAlgorithmProps.setProperty("sharding-count", "2");
- configuration.getShardingAlgorithms().put("mod", new AlgorithmConfiguration("MOD", modShardingAlgorithmProps));
+ ruleConfig.getShardingAlgorithms().put("mod", new AlgorithmConfiguration("MOD", modShardingAlgorithmProps));
Properties inlineShardingAlgorithmProps = new Properties();
inlineShardingAlgorithmProps.setProperty("algorithm-expression", "ds_${id % 2}");
- configuration.getShardingAlgorithms().put("inline", new AlgorithmConfiguration("INLINE", inlineShardingAlgorithmProps));
- configuration.setDefaultDatabaseShardingStrategy(new StandardShardingStrategyConfiguration("warehouse_id", "mod"));
+ ruleConfig.getShardingAlgorithms().put("inline", new AlgorithmConfiguration("INLINE", inlineShardingAlgorithmProps));
+ ruleConfig.setDefaultDatabaseShardingStrategy(new StandardShardingStrategyConfiguration("warehouse_id", "mod"));
ShardingTableRuleConfiguration warehouse = new ShardingTableRuleConfiguration("t_warehouse", "ds_${0..1}.t_warehouse");
warehouse.setDatabaseShardingStrategy(new StandardShardingStrategyConfiguration("id", "mod"));
- configuration.getTables().add(warehouse);
- configuration.getTables().add(new ShardingTableRuleConfiguration("t_order", "ds_${0..1}.t_order"));
- configuration.getTables().add(new ShardingTableRuleConfiguration("t_order_item", "ds_${0..1}.t_order_item"));
+ ruleConfig.getTables().add(warehouse);
+ ruleConfig.getTables().add(new ShardingTableRuleConfiguration("t_order", "ds_${0..1}.t_order"));
+ ruleConfig.getTables().add(new ShardingTableRuleConfiguration("t_order_item", "ds_${0..1}.t_order_item"));
ShardingTableRuleConfiguration nonCacheableDatabaseSharding = new ShardingTableRuleConfiguration("t_non_cacheable_database_sharding", "ds_${0..1}.t_non_cacheable_database_sharding");
nonCacheableDatabaseSharding.setDatabaseShardingStrategy(new StandardShardingStrategyConfiguration("id", "inline"));
- configuration.getTables().add(nonCacheableDatabaseSharding);
+ ruleConfig.getTables().add(nonCacheableDatabaseSharding);
ShardingTableRuleConfiguration nonCacheableTableSharding = new ShardingTableRuleConfiguration("t_non_cacheable_table_sharding", "ds_0.t_non_cacheable_table_sharding_${0..1}");
nonCacheableTableSharding.setTableShardingStrategy(new StandardShardingStrategyConfiguration("id", "inline"));
- configuration.getTables().add(nonCacheableTableSharding);
- return new ShardingRule(configuration, Arrays.asList("ds_0", "ds_1"), new InstanceContext(mock(ComputeNodeInstance.class), props -> 0, null, null, null));
+ ruleConfig.getTables().add(nonCacheableTableSharding);
+ return new ShardingRule(ruleConfig, Arrays.asList("ds_0", "ds_1"), new InstanceContext(mock(ComputeNodeInstance.class), props -> 0, null, null, null));
}
private ShardingCacheRule prepareShardingCacheRule(final ShardingRule shardingRule) {
diff --git a/features/sharding/plugin/cache/src/test/java/org/apache/shardingsphere/sharding/cache/rule/builder/ShardingCacheRuleBuilderTest.java b/features/sharding/plugin/cache/src/test/java/org/apache/shardingsphere/sharding/cache/rule/builder/ShardingCacheRuleBuilderTest.java
index 409ab0aa628..7b1ecd77ad3 100644
--- a/features/sharding/plugin/cache/src/test/java/org/apache/shardingsphere/sharding/cache/rule/builder/ShardingCacheRuleBuilderTest.java
+++ b/features/sharding/plugin/cache/src/test/java/org/apache/shardingsphere/sharding/cache/rule/builder/ShardingCacheRuleBuilderTest.java
@@ -37,11 +37,11 @@ public final class ShardingCacheRuleBuilderTest {
@Test
public void assertBuildShardingCacheRule() {
ShardingRule expectedShardingRule = mock(ShardingRule.class);
- ShardingCacheRuleConfiguration expectedConfiguration = new ShardingCacheRuleConfiguration(100, new ShardingCacheOptions(true, 1, 1));
- DatabaseRule actual = new ShardingCacheRuleBuilder().build(expectedConfiguration, "", Collections.emptyMap(), Collections.singletonList(expectedShardingRule), null);
+ ShardingCacheRuleConfiguration expectedConfig = new ShardingCacheRuleConfiguration(100, new ShardingCacheOptions(true, 1, 1));
+ DatabaseRule actual = new ShardingCacheRuleBuilder().build(expectedConfig, "", Collections.emptyMap(), Collections.singletonList(expectedShardingRule), null);
assertThat(actual, instanceOf(ShardingCacheRule.class));
ShardingCacheRule actualShardingCacheRule = (ShardingCacheRule) actual;
- assertThat(actualShardingCacheRule.getConfiguration(), is(expectedConfiguration));
+ assertThat(actualShardingCacheRule.getConfiguration(), is(expectedConfig));
assertThat(actualShardingCacheRule.getShardingRule(), is(expectedShardingRule));
}
diff --git a/features/sharding/plugin/cache/src/test/java/org/apache/shardingsphere/sharding/cache/yaml/swapper/YamlShardingCacheRuleConfigurationSwapperTest.java b/features/sharding/plugin/cache/src/test/java/org/apache/shardingsphere/sharding/cache/yaml/swapper/YamlShardingCacheRuleConfigurationSwapperTest.java
index 7b3a9d5f16f..fa98ed7a35e 100644
--- a/features/sharding/plugin/cache/src/test/java/org/apache/shardingsphere/sharding/cache/yaml/swapper/YamlShardingCacheRuleConfigurationSwapperTest.java
+++ b/features/sharding/plugin/cache/src/test/java/org/apache/shardingsphere/sharding/cache/yaml/swapper/YamlShardingCacheRuleConfigurationSwapperTest.java
@@ -45,11 +45,11 @@ public final class YamlShardingCacheRuleConfigurationSwapperTest {
public void assertSwapToObject() {
YamlShardingCacheRuleConfiguration input = new YamlShardingCacheRuleConfiguration();
input.setAllowedMaxSqlLength(200);
- YamlShardingCacheOptionsConfiguration configuration = new YamlShardingCacheOptionsConfiguration();
- configuration.setSoftValues(true);
- configuration.setInitialCapacity(256);
- configuration.setMaximumSize(4096);
- input.setRouteCache(configuration);
+ YamlShardingCacheOptionsConfiguration yamlConfig = new YamlShardingCacheOptionsConfiguration();
+ yamlConfig.setSoftValues(true);
+ yamlConfig.setInitialCapacity(256);
+ yamlConfig.setMaximumSize(4096);
+ input.setRouteCache(yamlConfig);
ShardingCacheRuleConfiguration actual = new YamlShardingCacheRuleConfigurationSwapper().swapToObject(input);
assertThat(actual.getAllowedMaxSqlLength(), is(200));
ShardingCacheOptions actualOptions = actual.getRouteCache();
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobAPIImpl.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobAPIImpl.java
index d20f547f4c1..322a40f6750 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobAPIImpl.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobAPIImpl.java
@@ -403,9 +403,9 @@ public final class MigrationJobAPIImpl extends AbstractInventoryIncrementalJobAP
YamlMigrationJobConfiguration result = new YamlMigrationJobConfiguration();
Map<String, DataSourceProperties> metaDataDataSource = dataSourcePersistService.load(JobType.MIGRATION);
Map<String, Object> sourceDataSourceProps = swapper.swapToMap(metaDataDataSource.get(parameter.getSourceResourceName()));
- YamlPipelineDataSourceConfiguration sourcePipelineDataSourceConfiguration = createYamlPipelineDataSourceConfiguration(StandardPipelineDataSourceConfiguration.TYPE,
- YamlEngine.marshal(sourceDataSourceProps));
- result.setSource(sourcePipelineDataSourceConfiguration);
+ YamlPipelineDataSourceConfiguration sourcePipelineDataSourceConfig = createYamlPipelineDataSourceConfiguration(
+ StandardPipelineDataSourceConfiguration.TYPE, YamlEngine.marshal(sourceDataSourceProps));
+ result.setSource(sourcePipelineDataSourceConfig);
result.setSourceResourceName(parameter.getSourceResourceName());
StandardPipelineDataSourceConfiguration sourceDataSourceConfig = new StandardPipelineDataSourceConfiguration(sourceDataSourceProps);
DatabaseType sourceDatabaseType = sourceDataSourceConfig.getDatabaseType();
@@ -415,14 +415,14 @@ public final class MigrationJobAPIImpl extends AbstractInventoryIncrementalJobAP
: parameter.getSourceSchemaName();
result.setSourceSchemaName(sourceSchemaName);
result.setSourceTableName(parameter.getSourceTableName());
- Map<String, Map<String, Object>> targetDataSourceProperties = new HashMap<>();
+ Map<String, Map<String, Object>> targetDataSourceProps = new HashMap<>();
ShardingSphereDatabase targetDatabase = PipelineContext.getContextManager().getMetaDataContexts().getMetaData().getDatabase(parameter.getTargetDatabaseName());
for (Entry<String, DataSource> entry : targetDatabase.getResourceMetaData().getDataSources().entrySet()) {
Map<String, Object> dataSourceProps = swapper.swapToMap(DataSourcePropertiesCreator.create(entry.getValue()));
- targetDataSourceProperties.put(entry.getKey(), dataSourceProps);
+ targetDataSourceProps.put(entry.getKey(), dataSourceProps);
}
String targetDatabaseName = parameter.getTargetDatabaseName();
- YamlRootConfiguration targetRootConfig = getYamlRootConfiguration(targetDatabaseName, targetDataSourceProperties, targetDatabase.getRuleMetaData().getConfigurations());
+ YamlRootConfiguration targetRootConfig = getYamlRootConfiguration(targetDatabaseName, targetDataSourceProps, targetDatabase.getRuleMetaData().getConfigurations());
PipelineDataSourceConfiguration targetPipelineDataSource = new ShardingSpherePipelineDataSourceConfiguration(targetRootConfig);
result.setTarget(createYamlPipelineDataSourceConfiguration(targetPipelineDataSource.getType(), YamlEngine.marshal(targetPipelineDataSource.getDataSourceConfiguration())));
result.setTargetDatabaseType(targetPipelineDataSource.getDatabaseType().getType());
diff --git a/kernel/parser/core/src/test/java/org/apache/shardingsphere/parser/rule/builder/SQLParserRuleBuilderTest.java b/kernel/parser/core/src/test/java/org/apache/shardingsphere/parser/rule/builder/SQLParserRuleBuilderTest.java
index f42a06097b1..35d31ed253e 100644
--- a/kernel/parser/core/src/test/java/org/apache/shardingsphere/parser/rule/builder/SQLParserRuleBuilderTest.java
+++ b/kernel/parser/core/src/test/java/org/apache/shardingsphere/parser/rule/builder/SQLParserRuleBuilderTest.java
@@ -17,12 +17,6 @@
package org.apache.shardingsphere.parser.rule.builder;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertTrue;
-
-import java.util.HashMap;
-import java.util.Properties;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.instance.InstanceContext;
import org.apache.shardingsphere.parser.config.SQLParserRuleConfiguration;
@@ -32,6 +26,13 @@ import org.apache.shardingsphere.sql.parser.api.CacheOption;
import org.junit.Test;
import org.mockito.Mock;
+import java.util.HashMap;
+import java.util.Properties;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertTrue;
+
public final class SQLParserRuleBuilderTest {
@Mock
@@ -39,9 +40,9 @@ public final class SQLParserRuleBuilderTest {
@Test
public void assertBuild() {
- SQLParserRuleConfiguration configuration = new SQLParserRuleConfiguration(true, new CacheOption(2, 5), new CacheOption(4, 7));
- SQLParserRule actualResult = new SQLParserRuleBuilder().build(configuration, new HashMap<>(), instanceContext, new ConfigurationProperties(new Properties()));
- assertThat(actualResult.getConfiguration(), is(configuration));
+ SQLParserRuleConfiguration ruleConfig = new SQLParserRuleConfiguration(true, new CacheOption(2, 5), new CacheOption(4, 7));
+ SQLParserRule actualResult = new SQLParserRuleBuilder().build(ruleConfig, new HashMap<>(), instanceContext, new ConfigurationProperties(new Properties()));
+ assertThat(actualResult.getConfiguration(), is(ruleConfig));
assertTrue(actualResult.isSqlCommentParseEnabled());
assertThat(actualResult.getSqlStatementCache().getInitialCapacity(), is(4));
assertThat(actualResult.getSqlStatementCache().getMaximumSize(), is(7L));
diff --git a/kernel/parser/core/src/test/java/org/apache/shardingsphere/parser/yaml/swapper/YamlSQLParserCacheOptionConfigurationSwapperTest.java b/kernel/parser/core/src/test/java/org/apache/shardingsphere/parser/yaml/swapper/YamlSQLParserCacheOptionConfigurationSwapperTest.java
index b58e7ab1225..342adb2a9d1 100644
--- a/kernel/parser/core/src/test/java/org/apache/shardingsphere/parser/yaml/swapper/YamlSQLParserCacheOptionConfigurationSwapperTest.java
+++ b/kernel/parser/core/src/test/java/org/apache/shardingsphere/parser/yaml/swapper/YamlSQLParserCacheOptionConfigurationSwapperTest.java
@@ -19,36 +19,26 @@ package org.apache.shardingsphere.parser.yaml.swapper;
import org.apache.shardingsphere.parser.yaml.config.YamlSQLParserCacheOptionRuleConfiguration;
import org.apache.shardingsphere.sql.parser.api.CacheOption;
-import org.junit.Before;
import org.junit.Test;
-import static org.hamcrest.Matchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
public final class YamlSQLParserCacheOptionConfigurationSwapperTest {
- private final YamlSQLParserCacheOptionConfigurationSwapper cacheOptionConfigurationSwapper = new YamlSQLParserCacheOptionConfigurationSwapper();
-
- private final CacheOption cacheOption = new CacheOption(2, 5);
-
- private final YamlSQLParserCacheOptionRuleConfiguration cacheOptionRuleConfiguration = new YamlSQLParserCacheOptionRuleConfiguration();
-
- @Before
- public void setup() {
- cacheOptionRuleConfiguration.setInitialCapacity(cacheOption.getInitialCapacity());
- cacheOptionRuleConfiguration.setMaximumSize(cacheOption.getMaximumSize());
- }
-
@Test
public void assertSwapToYamlConfiguration() {
- YamlSQLParserCacheOptionRuleConfiguration actual = cacheOptionConfigurationSwapper.swapToYamlConfiguration(cacheOption);
+ YamlSQLParserCacheOptionRuleConfiguration actual = new YamlSQLParserCacheOptionConfigurationSwapper().swapToYamlConfiguration(new CacheOption(2, 5));
assertThat(actual.getInitialCapacity(), is(2));
assertThat(actual.getMaximumSize(), is(5L));
}
@Test
public void assertSwapToObject() {
- CacheOption actual = cacheOptionConfigurationSwapper.swapToObject(cacheOptionRuleConfiguration);
+ YamlSQLParserCacheOptionRuleConfiguration cacheOptionRuleConfig = new YamlSQLParserCacheOptionRuleConfiguration();
+ cacheOptionRuleConfig.setInitialCapacity(2);
+ cacheOptionRuleConfig.setMaximumSize(5L);
+ CacheOption actual = new YamlSQLParserCacheOptionConfigurationSwapper().swapToObject(cacheOptionRuleConfig);
assertThat(actual.getInitialCapacity(), is(2));
assertThat(actual.getMaximumSize(), is(5L));
}
diff --git a/kernel/parser/core/src/test/java/org/apache/shardingsphere/parser/yaml/swapper/YamlSQLParserRuleConfigurationSwapperTest.java b/kernel/parser/core/src/test/java/org/apache/shardingsphere/parser/yaml/swapper/YamlSQLParserRuleConfigurationSwapperTest.java
index b8df431dacc..89b41299275 100644
--- a/kernel/parser/core/src/test/java/org/apache/shardingsphere/parser/yaml/swapper/YamlSQLParserRuleConfigurationSwapperTest.java
+++ b/kernel/parser/core/src/test/java/org/apache/shardingsphere/parser/yaml/swapper/YamlSQLParserRuleConfigurationSwapperTest.java
@@ -18,17 +18,15 @@
package org.apache.shardingsphere.parser.yaml.swapper;
import org.apache.shardingsphere.parser.config.SQLParserRuleConfiguration;
-import org.apache.shardingsphere.parser.constant.SQLParserOrder;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertTrue;
-
import org.apache.shardingsphere.parser.yaml.config.YamlSQLParserCacheOptionRuleConfiguration;
import org.apache.shardingsphere.parser.yaml.config.YamlSQLParserRuleConfiguration;
import org.apache.shardingsphere.sql.parser.api.CacheOption;
import org.junit.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertTrue;
+
public final class YamlSQLParserRuleConfigurationSwapperTest {
@Test
@@ -44,9 +42,9 @@ public final class YamlSQLParserRuleConfigurationSwapperTest {
@Test
public void assertSwapToObjectWithDefaultConfig() {
- YamlSQLParserRuleConfiguration configuration = new YamlSQLParserRuleConfiguration();
- configuration.setSqlCommentParseEnabled(true);
- SQLParserRuleConfiguration actual = new YamlSQLParserRuleConfigurationSwapper().swapToObject(configuration);
+ YamlSQLParserRuleConfiguration yamlConfig = new YamlSQLParserRuleConfiguration();
+ yamlConfig.setSqlCommentParseEnabled(true);
+ SQLParserRuleConfiguration actual = new YamlSQLParserRuleConfigurationSwapper().swapToObject(yamlConfig);
assertThat(actual.getParseTreeCache().getInitialCapacity(), is(128));
assertThat(actual.getParseTreeCache().getMaximumSize(), is(1024L));
assertThat(actual.getSqlStatementCache().getInitialCapacity(), is(2000));
@@ -55,33 +53,18 @@ public final class YamlSQLParserRuleConfigurationSwapperTest {
@Test
public void assertSwapToObject() {
- YamlSQLParserRuleConfiguration configuration = new YamlSQLParserRuleConfiguration();
- configuration.setSqlCommentParseEnabled(true);
- configuration.setParseTreeCache(new YamlSQLParserCacheOptionRuleConfiguration());
- configuration.getParseTreeCache().setInitialCapacity(2);
- configuration.getParseTreeCache().setMaximumSize(5L);
- configuration.setSqlStatementCache(new YamlSQLParserCacheOptionRuleConfiguration());
- configuration.getSqlStatementCache().setInitialCapacity(4);
- configuration.getSqlStatementCache().setMaximumSize(7L);
- SQLParserRuleConfiguration actual = new YamlSQLParserRuleConfigurationSwapper().swapToObject(configuration);
+ YamlSQLParserRuleConfiguration yamlConfig = new YamlSQLParserRuleConfiguration();
+ yamlConfig.setSqlCommentParseEnabled(true);
+ yamlConfig.setParseTreeCache(new YamlSQLParserCacheOptionRuleConfiguration());
+ yamlConfig.getParseTreeCache().setInitialCapacity(2);
+ yamlConfig.getParseTreeCache().setMaximumSize(5L);
+ yamlConfig.setSqlStatementCache(new YamlSQLParserCacheOptionRuleConfiguration());
+ yamlConfig.getSqlStatementCache().setInitialCapacity(4);
+ yamlConfig.getSqlStatementCache().setMaximumSize(7L);
+ SQLParserRuleConfiguration actual = new YamlSQLParserRuleConfigurationSwapper().swapToObject(yamlConfig);
assertThat(actual.getParseTreeCache().getInitialCapacity(), is(2));
assertThat(actual.getParseTreeCache().getMaximumSize(), is(5L));
assertThat(actual.getSqlStatementCache().getInitialCapacity(), is(4));
assertThat(actual.getSqlStatementCache().getMaximumSize(), is(7L));
}
-
- @Test
- public void assertGetTypeClass() {
- assertThat(new YamlSQLParserRuleConfigurationSwapper().getTypeClass().toString(), is(SQLParserRuleConfiguration.class.toString()));
- }
-
- @Test
- public void assertGetRuleTagName() {
- assertThat(new YamlSQLParserRuleConfigurationSwapper().getRuleTagName(), is("SQL_PARSER"));
- }
-
- @Test
- public void assertGetOrder() {
- assertThat(new YamlSQLParserRuleConfigurationSwapper().getOrder(), is(SQLParserOrder.ORDER));
- }
}
diff --git a/kernel/traffic/api/src/test/java/org/apache/shardingsphere/traffic/factory/TrafficLoadBalanceAlgorithmFactoryTest.java b/kernel/traffic/api/src/test/java/org/apache/shardingsphere/traffic/factory/TrafficLoadBalanceAlgorithmFactoryTest.java
index aca12eb3de4..276cab806e4 100644
--- a/kernel/traffic/api/src/test/java/org/apache/shardingsphere/traffic/factory/TrafficLoadBalanceAlgorithmFactoryTest.java
+++ b/kernel/traffic/api/src/test/java/org/apache/shardingsphere/traffic/factory/TrafficLoadBalanceAlgorithmFactoryTest.java
@@ -31,8 +31,7 @@ public final class TrafficLoadBalanceAlgorithmFactoryTest {
@Test
public void assertNewInstance() {
- AlgorithmConfiguration configuration = new AlgorithmConfiguration("FIXTURE", new Properties());
- assertThat(TrafficLoadBalanceAlgorithmFactory.newInstance(configuration), instanceOf(TrafficLoadBalanceAlgorithmFixture.class));
+ assertThat(TrafficLoadBalanceAlgorithmFactory.newInstance(new AlgorithmConfiguration("FIXTURE", new Properties())), instanceOf(TrafficLoadBalanceAlgorithmFixture.class));
}
@Test
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/config/ProxyConfigurationLoaderTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/config/ProxyConfigurationLoaderTest.java
index b90ca73fd0e..6f1d50ac23a 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/config/ProxyConfigurationLoaderTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/config/ProxyConfigurationLoaderTest.java
@@ -45,12 +45,12 @@ public final class ProxyConfigurationLoaderTest {
@Test
public void assertLoadEmptyConfiguration() throws IOException {
YamlProxyConfiguration actual = ProxyConfigurationLoader.load("/conf/empty/");
- YamlProxyServerConfiguration serverConfiguration = actual.getServerConfiguration();
- assertNull(serverConfiguration.getMode());
- assertNull(serverConfiguration.getAuthority());
- assertNull(serverConfiguration.getLabels());
- assertTrue(serverConfiguration.getProps().isEmpty());
- assertTrue(serverConfiguration.getRules().isEmpty());
+ YamlProxyServerConfiguration serverConfig = actual.getServerConfiguration();
+ assertNull(serverConfig.getMode());
+ assertNull(serverConfig.getAuthority());
+ assertNull(serverConfig.getLabels());
+ assertTrue(serverConfig.getProps().isEmpty());
+ assertTrue(serverConfig.getRules().isEmpty());
assertTrue(actual.getDatabaseConfigurations().isEmpty());
}
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactoryTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactoryTest.java
index 3d7e9c7ec5b..21c5ed5c475 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactoryTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactoryTest.java
@@ -63,8 +63,8 @@ import org.mockito.junit.MockitoJUnitRunner;
import java.sql.SQLException;
import java.util.Collections;
+import java.util.HashMap;
import java.util.LinkedHashMap;
-import java.util.Map;
import java.util.Properties;
import static org.hamcrest.CoreMatchers.instanceOf;
@@ -82,32 +82,27 @@ public final class DistSQLBackendHandlerFactoryTest extends ProxyContextRestorer
@Before
public void setUp() {
- MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class),
- new ShardingSphereMetaData(getDatabases(), mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new Properties())));
+ MetaDataContexts metaDataContexts = new MetaDataContexts(mock(MetaDataPersistService.class), new ShardingSphereMetaData(
+ new HashMap<>(Collections.singletonMap("db", mock(ShardingSphereDatabase.class))), mock(ShardingSphereRuleMetaData.class), new ConfigurationProperties(new Properties())));
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
when(connectionSession.getDatabaseName()).thenReturn("db");
+ setContextManager(true);
}
- private Map<String, ShardingSphereDatabase> getDatabases() {
- ShardingSphereDatabase database = mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
- when(database.getProtocolType()).thenReturn(new MySQLDatabaseType());
- Map<String, ShardingSphereDatabase> result = new LinkedHashMap<>(1, 1);
- result.put("db", database);
- return result;
+ @After
+ public void setDown() {
+ setContextManager(false);
}
@Test
public void assertExecuteDataSourcesContext() throws SQLException {
- setContextManager(true);
- ResponseHeader response = RDLBackendHandlerFactory.newInstance(mock(RegisterStorageUnitStatement.class), connectionSession).execute();
- assertThat(response, instanceOf(UpdateResponseHeader.class));
+ assertThat(RDLBackendHandlerFactory.newInstance(mock(RegisterStorageUnitStatement.class), connectionSession).execute(), instanceOf(UpdateResponseHeader.class));
}
@Test
public void assertExecuteShardingTableRuleContext() throws SQLException {
- setContextManager(true);
ShardingSphereDatabase database = ProxyContext.getInstance().getDatabase("db");
when(database.getRuleMetaData()).thenReturn(new ShardingSphereRuleMetaData(Collections.emptyList()));
ResponseHeader response = RDLBackendHandlerFactory.newInstance(mock(CreateShardingTableRuleStatement.class), connectionSession).execute();
@@ -116,7 +111,6 @@ public final class DistSQLBackendHandlerFactoryTest extends ProxyContextRestorer
@Test
public void assertExecuteAddResourceContext() throws SQLException {
- setContextManager(true);
ResponseHeader response = RDLBackendHandlerFactory.newInstance(mock(RegisterStorageUnitStatement.class), connectionSession).execute();
assertThat(response, instanceOf(UpdateResponseHeader.class));
}
@@ -130,7 +124,6 @@ public final class DistSQLBackendHandlerFactoryTest extends ProxyContextRestorer
@Test
public void assertExecuteAlterShadowRuleContext() throws SQLException {
- setContextManager(true);
mockShardingSphereRuleMetaData();
ResponseHeader response = RDLBackendHandlerFactory.newInstance(mock(AlterShadowRuleStatement.class), connectionSession).execute();
assertThat(response, instanceOf(UpdateResponseHeader.class));
@@ -138,7 +131,6 @@ public final class DistSQLBackendHandlerFactoryTest extends ProxyContextRestorer
@Test
public void assertExecuteCreateShadowRuleContext() throws SQLException {
- setContextManager(true);
mockShardingSphereRuleMetaData();
ResponseHeader response = RDLBackendHandlerFactory.newInstance(mock(CreateShadowRuleStatement.class), connectionSession).execute();
assertThat(response, instanceOf(UpdateResponseHeader.class));
@@ -146,7 +138,6 @@ public final class DistSQLBackendHandlerFactoryTest extends ProxyContextRestorer
@Test
public void assertExecuteDropShadowRuleContext() throws SQLException {
- setContextManager(true);
mockShardingSphereRuleMetaData();
ResponseHeader response = RDLBackendHandlerFactory.newInstance(mock(DropShadowRuleStatement.class), connectionSession).execute();
assertThat(response, instanceOf(UpdateResponseHeader.class));
@@ -154,7 +145,6 @@ public final class DistSQLBackendHandlerFactoryTest extends ProxyContextRestorer
@Test
public void assertExecuteAlterDefaultShadowAlgorithm() throws SQLException {
- setContextManager(true);
mockShardingSphereRuleMetaData();
Properties prop = new Properties();
prop.setProperty("type", "value");
@@ -168,7 +158,6 @@ public final class DistSQLBackendHandlerFactoryTest extends ProxyContextRestorer
@Test
public void assertExecuteShowShadowRulesContext() throws SQLException {
- setContextManager(true);
mockShardingSphereRuleMetaData();
ResponseHeader response = RQLBackendHandlerFactory.newInstance(mock(ShowShadowRulesStatement.class), connectionSession).execute();
assertThat(response, instanceOf(QueryResponseHeader.class));
@@ -176,7 +165,6 @@ public final class DistSQLBackendHandlerFactoryTest extends ProxyContextRestorer
@Test
public void assertExecuteShowShadowTableRulesContext() throws SQLException {
- setContextManager(true);
mockShardingSphereRuleMetaData();
ResponseHeader response = RQLBackendHandlerFactory.newInstance(mock(ShowShadowTableRulesStatement.class), connectionSession).execute();
assertThat(response, instanceOf(QueryResponseHeader.class));
@@ -184,7 +172,6 @@ public final class DistSQLBackendHandlerFactoryTest extends ProxyContextRestorer
@Test
public void assertExecuteShowShadowAlgorithmsContext() throws SQLException {
- setContextManager(true);
mockShardingSphereRuleMetaData();
ResponseHeader response = RQLBackendHandlerFactory.newInstance(mock(ShowShadowAlgorithmsStatement.class), connectionSession).execute();
assertThat(response, instanceOf(QueryResponseHeader.class));
@@ -192,7 +179,6 @@ public final class DistSQLBackendHandlerFactoryTest extends ProxyContextRestorer
@Test
public void assertExecuteDropShadowAlgorithmContext() throws SQLException {
- setContextManager(true);
mockShardingSphereRuleMetaData();
ResponseHeader response = RDLBackendHandlerFactory.newInstance(mock(DropShadowAlgorithmStatement.class), connectionSession).execute();
assertThat(response, instanceOf(UpdateResponseHeader.class));
@@ -200,44 +186,37 @@ public final class DistSQLBackendHandlerFactoryTest extends ProxyContextRestorer
@Test
public void assertExecuteDropResourceContext() throws SQLException {
- setContextManager(true);
ResponseHeader response = RDLBackendHandlerFactory.newInstance(mock(UnregisterStorageUnitStatement.class), connectionSession).execute();
assertThat(response, instanceOf(UpdateResponseHeader.class));
}
@Test(expected = MissingRequiredRuleException.class)
public void assertExecuteDropReadwriteSplittingRuleContext() throws SQLException {
- setContextManager(true);
ResponseHeader response = RDLBackendHandlerFactory.newInstance(mock(DropReadwriteSplittingRuleStatement.class), connectionSession).execute();
assertThat(response, instanceOf(UpdateResponseHeader.class));
}
@Test
public void assertExecuteCreateReadwriteSplittingRuleContext() throws SQLException {
- setContextManager(true);
ResponseHeader response = RDLBackendHandlerFactory.newInstance(mock(CreateReadwriteSplittingRuleStatement.class), connectionSession).execute();
assertThat(response, instanceOf(UpdateResponseHeader.class));
}
@Test(expected = MissingRequiredRuleException.class)
public void assertExecuteAlterReadwriteSplittingRuleContext() throws SQLException {
- setContextManager(true);
ResponseHeader response = RDLBackendHandlerFactory.newInstance(mock(AlterReadwriteSplittingRuleStatement.class), connectionSession).execute();
assertThat(response, instanceOf(UpdateResponseHeader.class));
}
@Test
public void assertExecuteShowResourceContext() throws SQLException {
- setContextManager(true);
ResponseHeader response = RQLBackendHandlerFactory.newInstance(mock(ShowStorageUnitsStatement.class), connectionSession).execute();
assertThat(response, instanceOf(QueryResponseHeader.class));
}
private void setContextManager(final boolean isGovernance) {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- MetaDataContexts metaDataContexts = isGovernance
- ? mockMetaDataContexts()
- : new MetaDataContexts(mock(MetaDataPersistService.class), new ShardingSphereMetaData());
+ MetaDataContexts metaDataContexts = isGovernance ? mockMetaDataContexts() : new MetaDataContexts(mock(MetaDataPersistService.class), new ShardingSphereMetaData());
when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
ProxyContext.init(contextManager);
}
@@ -260,21 +239,16 @@ public final class DistSQLBackendHandlerFactoryTest extends ProxyContextRestorer
when(database.getName()).thenReturn("db");
when(database.getResourceMetaData()).thenReturn(mock(ShardingSphereResourceMetaData.class));
ShardingSphereRuleMetaData ruleMetaData = mock(ShardingSphereRuleMetaData.class);
- ShadowRuleConfiguration shadowRuleConfiguration = mockShadowRuleConfiguration();
- when(ruleMetaData.getConfigurations()).thenReturn(Collections.singleton(shadowRuleConfiguration));
+ ShadowRuleConfiguration ruleConfig = mockShadowRuleConfiguration();
+ when(ruleMetaData.getConfigurations()).thenReturn(Collections.singleton(ruleConfig));
when(database.getRuleMetaData()).thenReturn(ruleMetaData);
when(metaDataContexts.getMetaData().getDatabase("db")).thenReturn(database);
}
private ShadowRuleConfiguration mockShadowRuleConfiguration() {
- ShadowRuleConfiguration shadowRuleConfiguration = mock(ShadowRuleConfiguration.class);
- when(shadowRuleConfiguration.getShadowAlgorithms()).thenReturn(mock(LinkedHashMap.class));
- when(shadowRuleConfiguration.getShadowAlgorithms().keySet()).thenReturn(Collections.singleton("default_shadow_algorithm"));
- return shadowRuleConfiguration;
- }
-
- @After
- public void setDown() {
- setContextManager(false);
+ ShadowRuleConfiguration result = mock(ShadowRuleConfiguration.class);
+ when(result.getShadowAlgorithms()).thenReturn(mock(LinkedHashMap.class));
+ when(result.getShadowAlgorithms().keySet()).thenReturn(Collections.singleton("default_shadow_algorithm"));
+ return result;
}
}
diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/RegisterStorageUnitBackendHandlerTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/RegisterStorageUnitBackendHandlerTest.java
index 24208a7ccd6..5000e20635b 100644
--- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/RegisterStorageUnitBackendHandlerTest.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/resource/RegisterStorageUnitBackendHandlerTest.java
@@ -148,8 +148,7 @@ public final class RegisterStorageUnitBackendHandlerTest extends ProxyContextRes
}
private ReadwriteSplittingRuleConfiguration createReadwriteSplittingRuleConfiguration(final String ruleName) {
- ReadwriteSplittingDataSourceRuleConfiguration configuration = new ReadwriteSplittingDataSourceRuleConfiguration(ruleName, null, null, null);
- return new ReadwriteSplittingRuleConfiguration(Collections.singleton(configuration), Collections.emptyMap());
+ return new ReadwriteSplittingRuleConfiguration(Collections.singleton(new ReadwriteSplittingDataSourceRuleConfiguration(ruleName, null, null, null)), Collections.emptyMap());
}
private RegisterStorageUnitStatement createRegisterStorageUnitStatement() {
diff --git a/test/integration-test/env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/impl/MySQLContainer.java b/test/integration-test/env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/impl/MySQLContainer.java
index 60dd7fccf3d..1bda667ece9 100644
--- a/test/integration-test/env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/impl/MySQLContainer.java
+++ b/test/integration-test/env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/impl/MySQLContainer.java
@@ -30,18 +30,18 @@ import java.util.Optional;
*/
public final class MySQLContainer extends DockerStorageContainer {
- private final StorageContainerConfiguration storageContainerConfiguration;
+ private final StorageContainerConfiguration storageContainerConfig;
- public MySQLContainer(final String containerImage, final String scenario, final StorageContainerConfiguration storageContainerConfiguration) {
+ public MySQLContainer(final String containerImage, final String scenario, final StorageContainerConfiguration storageContainerConfig) {
super(DatabaseTypeFactory.getInstance("MySQL"), Strings.isNullOrEmpty(containerImage) ? "mysql/mysql-server:5.7" : containerImage, scenario);
- this.storageContainerConfiguration = storageContainerConfiguration;
+ this.storageContainerConfig = storageContainerConfig;
}
@Override
protected void configure() {
- setCommands(storageContainerConfiguration.getContainerCommand());
- addEnvs(storageContainerConfiguration.getContainerEnvironments());
- mapResources(storageContainerConfiguration.getMountedResources());
+ setCommands(storageContainerConfig.getContainerCommand());
+ addEnvs(storageContainerConfig.getContainerEnvironments());
+ mapResources(storageContainerConfig.getMountedResources());
super.configure();
}
diff --git a/test/integration-test/env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/impl/OpenGaussContainer.java b/test/integration-test/env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/impl/OpenGaussContainer.java
index 205c324d4df..b5114b4ff03 100644
--- a/test/integration-test/env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/impl/OpenGaussContainer.java
+++ b/test/integration-test/env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/impl/OpenGaussContainer.java
@@ -33,18 +33,18 @@ import java.util.Optional;
*/
public final class OpenGaussContainer extends DockerStorageContainer {
- private final StorageContainerConfiguration storageContainerConfiguration;
+ private final StorageContainerConfiguration storageContainerConfig;
- public OpenGaussContainer(final String containerImage, final String scenario, final StorageContainerConfiguration storageContainerConfiguration) {
+ public OpenGaussContainer(final String containerImage, final String scenario, final StorageContainerConfiguration storageContainerConfig) {
super(DatabaseTypeFactory.getInstance("openGauss"), Strings.isNullOrEmpty(containerImage) ? "enmotech/opengauss:3.0.0" : containerImage, scenario);
- this.storageContainerConfiguration = storageContainerConfiguration;
+ this.storageContainerConfig = storageContainerConfig;
}
@Override
protected void configure() {
- setCommands(storageContainerConfiguration.getContainerCommand());
- addEnvs(storageContainerConfiguration.getContainerEnvironments());
- mapResources(storageContainerConfiguration.getMountedResources());
+ setCommands(storageContainerConfig.getContainerCommand());
+ addEnvs(storageContainerConfig.getContainerEnvironments());
+ mapResources(storageContainerConfig.getMountedResources());
withPrivilegedMode(true);
super.configure();
withStartupTimeout(Duration.of(120, ChronoUnit.SECONDS));
diff --git a/test/integration-test/env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/impl/PostgreSQLContainer.java b/test/integration-test/env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/impl/PostgreSQLContainer.java
index 7308807df04..4a0dc01885d 100644
--- a/test/integration-test/env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/impl/PostgreSQLContainer.java
+++ b/test/integration-test/env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/impl/PostgreSQLContainer.java
@@ -30,18 +30,18 @@ import java.util.Optional;
*/
public final class PostgreSQLContainer extends DockerStorageContainer {
- private final StorageContainerConfiguration storageContainerConfiguration;
+ private final StorageContainerConfiguration storageContainerConfig;
- public PostgreSQLContainer(final String containerImage, final String scenario, final StorageContainerConfiguration storageContainerConfiguration) {
+ public PostgreSQLContainer(final String containerImage, final String scenario, final StorageContainerConfiguration storageContainerConfig) {
super(DatabaseTypeFactory.getInstance("PostgreSQL"), Strings.isNullOrEmpty(containerImage) ? "postgres:12-alpine" : containerImage, scenario);
- this.storageContainerConfiguration = storageContainerConfiguration;
+ this.storageContainerConfig = storageContainerConfig;
}
@Override
protected void configure() {
- setCommands(storageContainerConfiguration.getContainerCommand());
- addEnvs(storageContainerConfiguration.getContainerEnvironments());
- mapResources(storageContainerConfiguration.getMountedResources());
+ setCommands(storageContainerConfig.getContainerCommand());
+ addEnvs(storageContainerConfig.getContainerEnvironments());
+ mapResources(storageContainerConfig.getMountedResources());
super.configure();
}