This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 c71caac6840 Rename variable name form configurations to configs
(#28270)
c71caac6840 is described below
commit c71caac6840fc6a7c6883a12b376b649d932227f
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Aug 27 15:38:09 2023 +0800
Rename variable name form configurations to configs (#28270)
---
.../checker/ReadwriteSplittingRuleConfigurationCheckerTest.java | 8 ++++----
.../CreateShardingTableReferenceRuleStatementUpdaterTest.java | 6 +++---
.../shardingsphere/data/pipeline/cdc/api/impl/CDCJobAPI.java | 4 +---
.../pipeline/scenario/migration/api/impl/MigrationJobAPI.java | 4 +---
.../distsql/ral/NewUpdatableGlobalRuleRALBackendHandler.java | 6 +++---
.../handler/distsql/ral/UpdatableGlobalRuleRALBackendHandler.java | 6 +++---
6 files changed, 15 insertions(+), 19 deletions(-)
diff --git
a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/checker/ReadwriteSplittingRuleConfigurationCheckerTest.java
b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/checker/ReadwriteSplittingRuleConfigurationCheckerTest.java
index 6ab88ca748c..5a4c6d4903f 100644
---
a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/checker/ReadwriteSplittingRuleConfigurationCheckerTest.java
+++
b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/checker/ReadwriteSplittingRuleConfigurationCheckerTest.java
@@ -65,9 +65,9 @@ class ReadwriteSplittingRuleConfigurationCheckerTest {
@Test
void assertCheckWhenConfigInvalidWriteDataSource() {
ReadwriteSplittingRuleConfiguration config =
mock(ReadwriteSplittingRuleConfiguration.class);
- List<ReadwriteSplittingDataSourceRuleConfiguration> configurations =
Arrays.asList(createDataSourceRuleConfig(
+ List<ReadwriteSplittingDataSourceRuleConfiguration> configs =
Arrays.asList(createDataSourceRuleConfig(
"write_ds_0", Arrays.asList("read_ds_0", "read_ds_1")),
createDataSourceRuleConfig("write_ds_2", Arrays.asList("read_ds_0",
"read_ds_1")));
- when(config.getDataSources()).thenReturn(configurations);
+ when(config.getDataSources()).thenReturn(configs);
RuleConfigurationChecker checker =
OrderedSPILoader.getServicesByClass(RuleConfigurationChecker.class,
Collections.singleton(config.getClass())).get(config.getClass());
assertThrows(DataSourceNameExistedException.class, () ->
checker.check("test", config, mockDataSources(), Collections.emptyList()));
}
@@ -76,9 +76,9 @@ class ReadwriteSplittingRuleConfigurationCheckerTest {
@Test
void assertCheckWhenConfigInvalidReadDataSource() {
ReadwriteSplittingRuleConfiguration config =
mock(ReadwriteSplittingRuleConfiguration.class);
- List<ReadwriteSplittingDataSourceRuleConfiguration> configurations =
Arrays.asList(createDataSourceRuleConfig(
+ List<ReadwriteSplittingDataSourceRuleConfiguration> configs =
Arrays.asList(createDataSourceRuleConfig(
"write_ds_0", Arrays.asList("read_ds_0", "read_ds_0")),
createDataSourceRuleConfig("write_ds_1", Arrays.asList("read_ds_0",
"read_ds_0")));
- when(config.getDataSources()).thenReturn(configurations);
+ when(config.getDataSources()).thenReturn(configs);
RuleConfigurationChecker checker =
OrderedSPILoader.getServicesByClass(RuleConfigurationChecker.class,
Collections.singleton(config.getClass())).get(config.getClass());
assertThrows(DuplicateDataSourceException.class, () ->
checker.check("test", config, mockDataSources(), Collections.emptyList()));
}
diff --git
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateShardingTableReferenceRuleStatementUpdaterTest.java
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateShardingTableReferenceRuleStatementUpdaterTest.java
index 75fba5fbcc5..3d064c295af 100644
---
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateShardingTableReferenceRuleStatementUpdaterTest.java
+++
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateShardingTableReferenceRuleStatementUpdaterTest.java
@@ -71,9 +71,9 @@ class CreateShardingTableReferenceRuleStatementUpdaterTest {
updater.checkSQLStatement(database, sqlStatement, currentRuleConfig);
ShardingRuleConfiguration toBeCreatedRuleConfig =
updater.buildToBeCreatedRuleConfiguration(currentRuleConfig, sqlStatement);
updater.updateCurrentRuleConfiguration(currentRuleConfig,
toBeCreatedRuleConfig);
- Collection<ShardingTableReferenceRuleConfiguration>
referenceRuleConfigurations = currentRuleConfig.getBindingTableGroups();
- assertThat(referenceRuleConfigurations.size(), is(1));
- Iterator<ShardingTableReferenceRuleConfiguration> iterator =
referenceRuleConfigurations.iterator();
+ Collection<ShardingTableReferenceRuleConfiguration>
referenceRuleConfigs = currentRuleConfig.getBindingTableGroups();
+ assertThat(referenceRuleConfigs.size(), is(1));
+ Iterator<ShardingTableReferenceRuleConfiguration> iterator =
referenceRuleConfigs.iterator();
assertThat(iterator.next().getReference(), is("t_1,t_2"));
}
diff --git
a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/api/impl/CDCJobAPI.java
b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/api/impl/CDCJobAPI.java
index 48bd8cb27fa..3830feca91c 100644
---
a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/api/impl/CDCJobAPI.java
+++
b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/api/impl/CDCJobAPI.java
@@ -81,7 +81,6 @@ import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import
org.apache.shardingsphere.infra.metadata.database.resource.storage.StorageUnit;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.infra.yaml.config.pojo.YamlRootConfiguration;
-import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
import
org.apache.shardingsphere.infra.yaml.config.swapper.resource.YamlDataSourceConfigurationSwapper;
import
org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigurationSwapperEngine;
@@ -167,8 +166,7 @@ public final class CDCJobAPI extends
AbstractInventoryIncrementalJobAPIImpl {
YamlRootConfiguration targetRootConfig = new YamlRootConfiguration();
targetRootConfig.setDatabaseName(database.getName());
targetRootConfig.setDataSources(dataSourcePoolProps);
- Collection<YamlRuleConfiguration> yamlRuleConfigurations =
ruleConfigSwapperEngine.swapToYamlRuleConfigurations(database.getRuleMetaData().getConfigurations());
- targetRootConfig.setRules(yamlRuleConfigurations);
+
targetRootConfig.setRules(ruleConfigSwapperEngine.swapToYamlRuleConfigurations(database.getRuleMetaData().getConfigurations()));
return new
ShardingSpherePipelineDataSourceConfiguration(targetRootConfig);
}
diff --git
a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/api/impl/MigrationJobAPI.java
b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/api/impl/MigrationJobAPI.java
index ef86896f22d..b5b54d4f452 100644
---
a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/api/impl/MigrationJobAPI.java
+++
b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/api/impl/MigrationJobAPI.java
@@ -89,7 +89,6 @@ import
org.apache.shardingsphere.infra.metadata.database.resource.storage.Storag
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.infra.util.json.JsonUtils;
import org.apache.shardingsphere.infra.yaml.config.pojo.YamlRootConfiguration;
-import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
import
org.apache.shardingsphere.infra.yaml.config.swapper.resource.YamlDataSourceConfigurationSwapper;
import
org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigurationSwapperEngine;
import
org.apache.shardingsphere.migration.distsql.statement.MigrateTableStatement;
@@ -206,8 +205,7 @@ public final class MigrationJobAPI extends
AbstractInventoryIncrementalJobAPIImp
YamlRootConfiguration result = new YamlRootConfiguration();
result.setDatabaseName(databaseName);
result.setDataSources(yamlDataSources);
- Collection<YamlRuleConfiguration> yamlRuleConfigurations = new
YamlRuleConfigurationSwapperEngine().swapToYamlRuleConfigurations(rules);
- result.setRules(yamlRuleConfigurations);
+ result.setRules(new
YamlRuleConfigurationSwapperEngine().swapToYamlRuleConfigurations(rules));
return result;
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/NewUpdatableGlobalRuleRALBackendHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/NewUpdatableGlobalRuleRALBackendHandler.java
index 4157f0bf922..1f11b4cfe73 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/NewUpdatableGlobalRuleRALBackendHandler.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/NewUpdatableGlobalRuleRALBackendHandler.java
@@ -46,10 +46,10 @@ public final class NewUpdatableGlobalRuleRALBackendHandler
implements DistSQLBac
GlobalRuleRALUpdater globalRuleUpdater =
TypedSPILoader.getService(GlobalRuleRALUpdater.class, sqlStatement.getClass());
Class<? extends RuleConfiguration> ruleConfigClass =
globalRuleUpdater.getRuleConfigurationClass();
ContextManager contextManager =
ProxyContext.getInstance().getContextManager();
- Collection<RuleConfiguration> ruleConfigurations =
contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getConfigurations();
- RuleConfiguration currentRuleConfig =
findCurrentRuleConfiguration(ruleConfigurations, ruleConfigClass);
+ Collection<RuleConfiguration> ruleConfigs =
contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getConfigurations();
+ RuleConfiguration currentRuleConfig =
findCurrentRuleConfiguration(ruleConfigs, ruleConfigClass);
globalRuleUpdater.checkSQLStatement(currentRuleConfig, sqlStatement);
-
contextManager.getInstanceContext().getModeContextManager().alterGlobalRuleConfiguration(processUpdate(ruleConfigurations,
sqlStatement, globalRuleUpdater, currentRuleConfig));
+
contextManager.getInstanceContext().getModeContextManager().alterGlobalRuleConfiguration(processUpdate(ruleConfigs,
sqlStatement, globalRuleUpdater, currentRuleConfig));
return new UpdateResponseHeader(sqlStatement);
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/UpdatableGlobalRuleRALBackendHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/UpdatableGlobalRuleRALBackendHandler.java
index d483e614ea2..410aa3e9252 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/UpdatableGlobalRuleRALBackendHandler.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/UpdatableGlobalRuleRALBackendHandler.java
@@ -47,10 +47,10 @@ public final class UpdatableGlobalRuleRALBackendHandler
implements DistSQLBacken
GlobalRuleRALUpdater globalRuleUpdater =
TypedSPILoader.getService(GlobalRuleRALUpdater.class, sqlStatement.getClass());
Class<? extends RuleConfiguration> ruleConfigClass =
globalRuleUpdater.getRuleConfigurationClass();
ContextManager contextManager =
ProxyContext.getInstance().getContextManager();
- Collection<RuleConfiguration> ruleConfigurations =
contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getConfigurations();
- RuleConfiguration currentRuleConfig =
findCurrentRuleConfiguration(ruleConfigurations, ruleConfigClass);
+ Collection<RuleConfiguration> ruleConfigs =
contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getConfigurations();
+ RuleConfiguration currentRuleConfig =
findCurrentRuleConfiguration(ruleConfigs, ruleConfigClass);
globalRuleUpdater.checkSQLStatement(currentRuleConfig, sqlStatement);
-
contextManager.getInstanceContext().getModeContextManager().alterGlobalRuleConfiguration(processUpdate(ruleConfigurations,
sqlStatement, globalRuleUpdater, currentRuleConfig));
+
contextManager.getInstanceContext().getModeContextManager().alterGlobalRuleConfiguration(processUpdate(ruleConfigs,
sqlStatement, globalRuleUpdater, currentRuleConfig));
return new UpdateResponseHeader(sqlStatement);
}
