This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 3689df85779 Refactor RuleConfigurationChecker (#30621)
3689df85779 is described below
commit 3689df85779df249ce683fb4a5140b92481e41e4
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Mar 24 12:32:24 2024 +0800
Refactor RuleConfigurationChecker (#30621)
---
.../checker/EncryptRuleConfigurationChecker.java | 4 ++--
.../mask/checker/MaskRuleConfigurationChecker.java | 4 ++--
.../ReadwriteSplittingRuleConfigurationChecker.java | 6 +++---
.../shadow/checker/ShadowRuleConfigurationChecker.java | 10 +++++-----
.../checker/ShardingRuleConfigurationChecker.java | 18 +++++++++---------
.../config/rule/checker/RuleConfigurationChecker.java | 4 ++--
.../proxy/fixture/RuleConfigurationFixtureChecker.java | 2 +-
7 files changed, 24 insertions(+), 24 deletions(-)
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/checker/EncryptRuleConfigurationChecker.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/checker/EncryptRuleConfigurationChecker.java
index d8af5f040a9..c66135ebe91 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/checker/EncryptRuleConfigurationChecker.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/checker/EncryptRuleConfigurationChecker.java
@@ -43,8 +43,8 @@ import java.util.Map;
public final class EncryptRuleConfigurationChecker implements
RuleConfigurationChecker<EncryptRuleConfiguration> {
@Override
- public void check(final String databaseName, final
EncryptRuleConfiguration config, final Map<String, DataSource> dataSourceMap,
final Collection<ShardingSphereRule> builtRules) {
- checkTableConfiguration(databaseName, config.getTables(),
config.getEncryptors());
+ public void check(final String databaseName, final
EncryptRuleConfiguration ruleConfig, final Map<String, DataSource>
dataSourceMap, final Collection<ShardingSphereRule> builtRules) {
+ checkTableConfiguration(databaseName, ruleConfig.getTables(),
ruleConfig.getEncryptors());
}
private void checkTableConfiguration(final String databaseName, final
Collection<EncryptTableRuleConfiguration> tableRuleConfigs, final Map<String,
AlgorithmConfiguration> encryptors) {
diff --git
a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/checker/MaskRuleConfigurationChecker.java
b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/checker/MaskRuleConfigurationChecker.java
index 1deb85c7958..39ac6e928de 100644
---
a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/checker/MaskRuleConfigurationChecker.java
+++
b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/checker/MaskRuleConfigurationChecker.java
@@ -37,8 +37,8 @@ import java.util.Map;
public final class MaskRuleConfigurationChecker implements
RuleConfigurationChecker<MaskRuleConfiguration> {
@Override
- public void check(final String databaseName, final MaskRuleConfiguration
config, final Map<String, DataSource> dataSourceMap, final
Collection<ShardingSphereRule> builtRules) {
- checkTables(databaseName, config.getTables(),
config.getMaskAlgorithms());
+ public void check(final String databaseName, final MaskRuleConfiguration
ruleConfig, final Map<String, DataSource> dataSourceMap, final
Collection<ShardingSphereRule> builtRules) {
+ checkTables(databaseName, ruleConfig.getTables(),
ruleConfig.getMaskAlgorithms());
}
private void checkTables(final String databaseName, final
Collection<MaskTableRuleConfiguration> tables, final Map<String,
AlgorithmConfiguration> maskAlgorithms) {
diff --git
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/checker/ReadwriteSplittingRuleConfigurationChecker.java
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/checker/ReadwriteSplittingRuleConfigurationChecker.java
index adfe386e4a4..cbb00f41115 100644
---
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/checker/ReadwriteSplittingRuleConfigurationChecker.java
+++
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/checker/ReadwriteSplittingRuleConfigurationChecker.java
@@ -48,10 +48,10 @@ import java.util.Optional;
public final class ReadwriteSplittingRuleConfigurationChecker implements
RuleConfigurationChecker<ReadwriteSplittingRuleConfiguration> {
@Override
- public void check(final String databaseName, final
ReadwriteSplittingRuleConfiguration config, final Map<String, DataSource>
dataSourceMap, final Collection<ShardingSphereRule> builtRules) {
- Collection<ReadwriteSplittingDataSourceRuleConfiguration> configs =
config.getDataSources();
+ public void check(final String databaseName, final
ReadwriteSplittingRuleConfiguration ruleConfig, final Map<String, DataSource>
dataSourceMap, final Collection<ShardingSphereRule> builtRules) {
+ Collection<ReadwriteSplittingDataSourceRuleConfiguration> configs =
ruleConfig.getDataSources();
checkDataSources(databaseName, configs, dataSourceMap, builtRules);
- checkLoadBalancer(databaseName, configs, getLoadBalancer(config));
+ checkLoadBalancer(databaseName, configs, getLoadBalancer(ruleConfig));
}
private void checkDataSources(final String databaseName, final
Collection<ReadwriteSplittingDataSourceRuleConfiguration> configs,
diff --git
a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/checker/ShadowRuleConfigurationChecker.java
b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/checker/ShadowRuleConfigurationChecker.java
index 66ba08117bc..86bb0103fa6 100644
---
a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/checker/ShadowRuleConfigurationChecker.java
+++
b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/checker/ShadowRuleConfigurationChecker.java
@@ -43,14 +43,14 @@ import java.util.Set;
public final class ShadowRuleConfigurationChecker implements
RuleConfigurationChecker<ShadowRuleConfiguration> {
@Override
- public void check(final String databaseName, final ShadowRuleConfiguration
config, final Map<String, DataSource> dataSourceMap, final
Collection<ShardingSphereRule> builtRules) {
- Map<String, ShadowDataSourceConfiguration> dataSources =
initShadowDataSources(config.getDataSources());
+ public void check(final String databaseName, final ShadowRuleConfiguration
ruleConfig, final Map<String, DataSource> dataSourceMap, final
Collection<ShardingSphereRule> builtRules) {
+ Map<String, ShadowDataSourceConfiguration> dataSources =
initShadowDataSources(ruleConfig.getDataSources());
checkDataSources(dataSources, dataSourceMap, databaseName);
- Map<String, ShadowTableConfiguration> shadowTables =
config.getTables();
+ Map<String, ShadowTableConfiguration> shadowTables =
ruleConfig.getTables();
checkShadowTableDataSourcesAutoReferences(shadowTables, dataSources);
checkShadowTableDataSourcesReferences(shadowTables, dataSources);
- Map<String, AlgorithmConfiguration> shadowAlgorithmConfigs =
config.getShadowAlgorithms();
- String defaultShadowAlgorithmName =
config.getDefaultShadowAlgorithmName();
+ Map<String, AlgorithmConfiguration> shadowAlgorithmConfigs =
ruleConfig.getShadowAlgorithms();
+ String defaultShadowAlgorithmName =
ruleConfig.getDefaultShadowAlgorithmName();
checkDefaultShadowAlgorithmConfiguration(defaultShadowAlgorithmName,
shadowAlgorithmConfigs);
checkShadowTableAlgorithmsAutoReferences(shadowTables,
shadowAlgorithmConfigs.keySet(), defaultShadowAlgorithmName);
checkShadowTableAlgorithmsReferences(shadowTables, databaseName);
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/checker/ShardingRuleConfigurationChecker.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/checker/ShardingRuleConfigurationChecker.java
index 994717b3391..638872cfe4e 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/checker/ShardingRuleConfigurationChecker.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/checker/ShardingRuleConfigurationChecker.java
@@ -44,15 +44,15 @@ import java.util.Map;
public final class ShardingRuleConfigurationChecker implements
RuleConfigurationChecker<ShardingRuleConfiguration> {
@Override
- public void check(final String databaseName, final
ShardingRuleConfiguration config, final Map<String, DataSource> dataSourceMap,
final Collection<ShardingSphereRule> builtRules) {
- Collection<String> keyGenerators = config.getKeyGenerators().keySet();
- Collection<String> auditors = config.getAuditors().keySet();
- Collection<String> shardingAlgorithms =
config.getShardingAlgorithms().keySet();
- checkTableConfiguration(databaseName, config.getTables(),
config.getAutoTables(), keyGenerators, auditors, shardingAlgorithms);
- checkKeyGenerateStrategy(databaseName,
config.getDefaultKeyGenerateStrategy(), keyGenerators);
- checkAuditStrategy(databaseName, config.getDefaultAuditStrategy(),
auditors);
- checkShardingStrategy(databaseName,
config.getDefaultDatabaseShardingStrategy(), shardingAlgorithms);
- checkShardingStrategy(databaseName,
config.getDefaultTableShardingStrategy(), shardingAlgorithms);
+ public void check(final String databaseName, final
ShardingRuleConfiguration ruleConfig, final Map<String, DataSource>
dataSourceMap, final Collection<ShardingSphereRule> builtRules) {
+ Collection<String> keyGenerators =
ruleConfig.getKeyGenerators().keySet();
+ Collection<String> auditors = ruleConfig.getAuditors().keySet();
+ Collection<String> shardingAlgorithms =
ruleConfig.getShardingAlgorithms().keySet();
+ checkTableConfiguration(databaseName, ruleConfig.getTables(),
ruleConfig.getAutoTables(), keyGenerators, auditors, shardingAlgorithms);
+ checkKeyGenerateStrategy(databaseName,
ruleConfig.getDefaultKeyGenerateStrategy(), keyGenerators);
+ checkAuditStrategy(databaseName, ruleConfig.getDefaultAuditStrategy(),
auditors);
+ checkShardingStrategy(databaseName,
ruleConfig.getDefaultDatabaseShardingStrategy(), shardingAlgorithms);
+ checkShardingStrategy(databaseName,
ruleConfig.getDefaultTableShardingStrategy(), shardingAlgorithms);
}
private void checkTableConfiguration(final String databaseName, final
Collection<ShardingTableRuleConfiguration> tables, final
Collection<ShardingAutoTableRuleConfiguration> autoTables,
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/config/rule/checker/RuleConfigurationChecker.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/config/rule/checker/RuleConfigurationChecker.java
index 25ae39b2144..96898b169b2 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/config/rule/checker/RuleConfigurationChecker.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/config/rule/checker/RuleConfigurationChecker.java
@@ -38,9 +38,9 @@ public interface RuleConfigurationChecker<T extends
RuleConfiguration> extends O
* Check rule configuration.
*
* @param databaseName database name to be checked
- * @param config rule configuration to be checked
+ * @param ruleConfig rule configuration to be checked
* @param dataSourceMap data sources to be checked
* @param builtRules built rules
*/
- void check(String databaseName, T config, Map<String, DataSource>
dataSourceMap, Collection<ShardingSphereRule> builtRules);
+ void check(String databaseName, T ruleConfig, Map<String, DataSource>
dataSourceMap, Collection<ShardingSphereRule> builtRules);
}
diff --git
a/proxy/bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/RuleConfigurationFixtureChecker.java
b/proxy/bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/RuleConfigurationFixtureChecker.java
index fb6e2647120..9e2cf433981 100644
---
a/proxy/bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/RuleConfigurationFixtureChecker.java
+++
b/proxy/bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/RuleConfigurationFixtureChecker.java
@@ -28,7 +28,7 @@ import java.util.Map;
public final class RuleConfigurationFixtureChecker implements
RuleConfigurationChecker<MockedRuleConfiguration> {
@Override
- public void check(final String databaseName, final MockedRuleConfiguration
config, final Map<String, DataSource> dataSourceMap, final
Collection<ShardingSphereRule> builtRules) {
+ public void check(final String databaseName, final MockedRuleConfiguration
ruleConfig, final Map<String, DataSource> dataSourceMap, final
Collection<ShardingSphereRule> builtRules) {
}
@Override
