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 591ff8949c1 Rename param name from rules to builtRules in
RuleConfigurationChecker.check() (#26042)
591ff8949c1 is described below
commit 591ff8949c1117646100d0eb5be8ff61b19e2117
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Jun 4 19:00:30 2023 +0800
Rename param name from rules to builtRules in
RuleConfigurationChecker.check() (#26042)
---
.../encrypt/checker/CompatibleEncryptRuleConfigurationChecker.java | 4 ++--
.../encrypt/checker/EncryptRuleConfigurationChecker.java | 2 +-
.../checker/ReadwriteSplittingRuleConfigurationChecker.java | 4 ++--
.../shardingsphere/shadow/checker/ShadowRuleConfigurationChecker.java | 2 +-
.../sharding/checker/ShardingRuleConfigurationChecker.java | 2 +-
.../infra/config/rule/checker/RuleConfigurationChecker.java | 4 ++--
.../shardingsphere/proxy/fixture/RuleConfigurationFixtureChecker.java | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/checker/CompatibleEncryptRuleConfigurationChecker.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/checker/CompatibleEncryptRuleConfigurationChecker.java
index ae31292024d..43e7dba2c4d 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/checker/CompatibleEncryptRuleConfigurationChecker.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/checker/CompatibleEncryptRuleConfigurationChecker.java
@@ -37,8 +37,8 @@ public final class CompatibleEncryptRuleConfigurationChecker
implements RuleConf
private final EncryptRuleConfigurationChecker delegate = new
EncryptRuleConfigurationChecker();
@Override
- public void check(final String databaseName, final
CompatibleEncryptRuleConfiguration config, final Map<String, DataSource>
dataSourceMap, final Collection<ShardingSphereRule> rules) {
- delegate.check(databaseName,
config.convertToEncryptRuleConfiguration(), dataSourceMap, rules);
+ public void check(final String databaseName, final
CompatibleEncryptRuleConfiguration config, final Map<String, DataSource>
dataSourceMap, final Collection<ShardingSphereRule> builtRules) {
+ delegate.check(databaseName,
config.convertToEncryptRuleConfiguration(), dataSourceMap, builtRules);
}
@Override
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 75f4ea02d76..2f0e720d9b0 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
@@ -45,7 +45,7 @@ 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> rules) {
+ public void check(final String databaseName, final
EncryptRuleConfiguration config, final Map<String, DataSource> dataSourceMap,
final Collection<ShardingSphereRule> builtRules) {
checkTableConfiguration(databaseName, config.getTables(),
config.getEncryptors());
}
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 4243d09148c..6ce4f172be6 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
@@ -51,10 +51,10 @@ import java.util.Map;
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> rules) {
+ public void check(final String databaseName, final
ReadwriteSplittingRuleConfiguration config, final Map<String, DataSource>
dataSourceMap, final Collection<ShardingSphereRule> builtRules) {
Collection<ReadwriteSplittingDataSourceRuleConfiguration> configs =
config.getDataSources();
Preconditions.checkArgument(!configs.isEmpty(), "Readwrite-splitting
data source rules can not be empty.");
- checkDataSources(databaseName, configs, dataSourceMap, rules);
+ checkDataSources(databaseName, configs, dataSourceMap, builtRules);
checkLoadBalancerDataSourceName(databaseName, configs,
getLoadBalancer(config));
}
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 556ebe79090..6acb86baaf5 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,7 +43,7 @@ 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> rules) {
+ 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());
checkDataSources(dataSources, dataSourceMap, databaseName);
Map<String, ShadowTableConfiguration> shadowTables =
config.getTables();
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 a4eed7ed75c..685acbe211d 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,7 +44,7 @@ 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> rules) {
+ 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();
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 611f8640c9f..62291b0918c 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
@@ -40,7 +40,7 @@ public interface RuleConfigurationChecker<T extends
RuleConfiguration> extends O
* @param databaseName database name to be checked
* @param config rule configuration to be checked
* @param dataSourceMap data sources to be checked
- * @param rules rules to be checked
+ * @param builtRules built rules
*/
- void check(String databaseName, T config, Map<String, DataSource>
dataSourceMap, Collection<ShardingSphereRule> rules);
+ void check(String databaseName, T config, 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 dc858cd757d..fb6e2647120 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> rules) {
+ public void check(final String databaseName, final MockedRuleConfiguration
config, final Map<String, DataSource> dataSourceMap, final
Collection<ShardingSphereRule> builtRules) {
}
@Override
