This is an automated email from the ASF dual-hosted git repository.
yx9o 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 ca3edc64849 Refactor DatabaseRuleBuilder (#30979)
ca3edc64849 is described below
commit ca3edc64849cf762cc248b28469bf0bb8f92514b
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Apr 19 23:39:10 2024 +0800
Refactor DatabaseRuleBuilder (#30979)
---
.../shardingsphere/broadcast/rule/builder/BroadcastRuleBuilder.java | 4 ++--
.../shardingsphere/encrypt/rule/builder/EncryptRuleBuilder.java | 4 ++--
.../org/apache/shardingsphere/mask/rule/builder/MaskRuleBuilder.java | 4 ++--
.../rule/builder/ReadwriteSplittingRuleBuilder.java | 4 ++--
.../apache/shardingsphere/shadow/rule/builder/ShadowRuleBuilder.java | 4 ++--
.../shardingsphere/sharding/rule/builder/ShardingRuleBuilder.java | 4 ++--
.../infra/rule/builder/database/DatabaseRuleBuilder.java | 4 ++--
.../infra/rule/builder/database/DatabaseRulesBuilder.java | 4 ++--
.../infra/rule/builder/fixture/FixtureDatabaseRuleBuilder.java | 2 +-
.../apache/shardingsphere/single/rule/builder/SingleRuleBuilder.java | 4 ++--
.../apache/shardingsphere/mode/fixture/ModeRuleBuilderFixture.java | 2 +-
11 files changed, 20 insertions(+), 20 deletions(-)
diff --git
a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/rule/builder/BroadcastRuleBuilder.java
b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/rule/builder/BroadcastRuleBuilder.java
index 5060e6afdc9..a25f5a8ce9b 100644
---
a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/rule/builder/BroadcastRuleBuilder.java
+++
b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/rule/builder/BroadcastRuleBuilder.java
@@ -35,9 +35,9 @@ import java.util.Map;
public final class BroadcastRuleBuilder implements
DatabaseRuleBuilder<BroadcastRuleConfiguration> {
@Override
- public BroadcastRule build(final BroadcastRuleConfiguration config, final
String databaseName, final DatabaseType protocolType,
+ public BroadcastRule build(final BroadcastRuleConfiguration ruleConfig,
final String databaseName, final DatabaseType protocolType,
final Map<String, DataSource> dataSources,
final Collection<ShardingSphereRule> builtRules, final InstanceContext
instanceContext) {
- return new BroadcastRule(config, databaseName, dataSources,
builtRules);
+ return new BroadcastRule(ruleConfig, databaseName, dataSources,
builtRules);
}
@Override
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/builder/EncryptRuleBuilder.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/builder/EncryptRuleBuilder.java
index d65d87539e8..dbb1adc8889 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/builder/EncryptRuleBuilder.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/builder/EncryptRuleBuilder.java
@@ -35,9 +35,9 @@ import java.util.Map;
public final class EncryptRuleBuilder implements
DatabaseRuleBuilder<EncryptRuleConfiguration> {
@Override
- public EncryptRule build(final EncryptRuleConfiguration config, final
String databaseName, final DatabaseType protocolType,
+ public EncryptRule build(final EncryptRuleConfiguration ruleConfig, final
String databaseName, final DatabaseType protocolType,
final Map<String, DataSource> dataSources, final
Collection<ShardingSphereRule> builtRules, final InstanceContext
instanceContext) {
- return new EncryptRule(databaseName, config);
+ return new EncryptRule(databaseName, ruleConfig);
}
@Override
diff --git
a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/rule/builder/MaskRuleBuilder.java
b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/rule/builder/MaskRuleBuilder.java
index 6b5c00d9b28..bc5371b8618 100644
---
a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/rule/builder/MaskRuleBuilder.java
+++
b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/rule/builder/MaskRuleBuilder.java
@@ -35,9 +35,9 @@ import java.util.Map;
public final class MaskRuleBuilder implements
DatabaseRuleBuilder<MaskRuleConfiguration> {
@Override
- public MaskRule build(final MaskRuleConfiguration config, final String
databaseName, final DatabaseType protocolType,
+ public MaskRule build(final MaskRuleConfiguration ruleConfig, final String
databaseName, final DatabaseType protocolType,
final Map<String, DataSource> dataSources, final
Collection<ShardingSphereRule> builtRules, final InstanceContext
instanceContext) {
- return new MaskRule(config);
+ return new MaskRule(ruleConfig);
}
@Override
diff --git
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/builder/ReadwriteSplittingRuleBuilder.java
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/builder/ReadwriteSplittingRuleBuilder.java
index be4c696272f..babeb56d13c 100644
---
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/builder/ReadwriteSplittingRuleBuilder.java
+++
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/builder/ReadwriteSplittingRuleBuilder.java
@@ -35,9 +35,9 @@ import java.util.Map;
public final class ReadwriteSplittingRuleBuilder implements
DatabaseRuleBuilder<ReadwriteSplittingRuleConfiguration> {
@Override
- public ReadwriteSplittingRule build(final
ReadwriteSplittingRuleConfiguration config, final String databaseName, final
DatabaseType protocolType,
+ public ReadwriteSplittingRule build(final
ReadwriteSplittingRuleConfiguration ruleConfig, final String databaseName,
final DatabaseType protocolType,
final Map<String, DataSource>
dataSources, final Collection<ShardingSphereRule> builtRules, final
InstanceContext instanceContext) {
- return new ReadwriteSplittingRule(databaseName, config,
instanceContext);
+ return new ReadwriteSplittingRule(databaseName, ruleConfig,
instanceContext);
}
@Override
diff --git
a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/rule/builder/ShadowRuleBuilder.java
b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/rule/builder/ShadowRuleBuilder.java
index e68462d69ef..a5a72b01d82 100644
---
a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/rule/builder/ShadowRuleBuilder.java
+++
b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/rule/builder/ShadowRuleBuilder.java
@@ -35,9 +35,9 @@ import java.util.Map;
public final class ShadowRuleBuilder implements
DatabaseRuleBuilder<ShadowRuleConfiguration> {
@Override
- public ShadowRule build(final ShadowRuleConfiguration config, final String
databaseName, final DatabaseType protocolType,
+ public ShadowRule build(final ShadowRuleConfiguration ruleConfig, final
String databaseName, final DatabaseType protocolType,
final Map<String, DataSource> dataSources, final
Collection<ShardingSphereRule> builtRules, final InstanceContext
instanceContext) {
- return new ShadowRule(config);
+ return new ShadowRule(ruleConfig);
}
@Override
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/builder/ShardingRuleBuilder.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/builder/ShardingRuleBuilder.java
index 06a20af5bba..2357a49c99b 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/builder/ShardingRuleBuilder.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/builder/ShardingRuleBuilder.java
@@ -37,10 +37,10 @@ import java.util.Map;
public final class ShardingRuleBuilder implements
DatabaseRuleBuilder<ShardingRuleConfiguration> {
@Override
- public ShardingRule build(final ShardingRuleConfiguration config, final
String databaseName, final DatabaseType protocolType,
+ public ShardingRule build(final ShardingRuleConfiguration ruleConfig,
final String databaseName, final DatabaseType protocolType,
final Map<String, DataSource> dataSources, final
Collection<ShardingSphereRule> builtRules, final InstanceContext
instanceContext) {
ShardingSpherePreconditions.checkNotEmpty(dataSources, () -> new
MissingRequiredShardingConfigurationException("Data source", databaseName));
- return new ShardingRule(config, dataSources, instanceContext);
+ return new ShardingRule(ruleConfig, dataSources, instanceContext);
}
@Override
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/rule/builder/database/DatabaseRuleBuilder.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/rule/builder/database/DatabaseRuleBuilder.java
index b5f7274127f..3ad449073a8 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/rule/builder/database/DatabaseRuleBuilder.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/rule/builder/database/DatabaseRuleBuilder.java
@@ -40,7 +40,7 @@ public interface DatabaseRuleBuilder<T extends
RuleConfiguration> extends RuleBu
/**
* Build database rule.
*
- * @param config rule configuration
+ * @param ruleConfig rule configuration
* @param databaseName database name
* @param protocolType protocol type
* @param dataSources data sources
@@ -48,5 +48,5 @@ public interface DatabaseRuleBuilder<T extends
RuleConfiguration> extends RuleBu
* @param instanceContext instance context
* @return built database rule
*/
- DatabaseRule build(T config, String databaseName, DatabaseType
protocolType, Map<String, DataSource> dataSources,
Collection<ShardingSphereRule> builtRules, InstanceContext instanceContext);
+ DatabaseRule build(T ruleConfig, String databaseName, DatabaseType
protocolType, Map<String, DataSource> dataSources,
Collection<ShardingSphereRule> builtRules, InstanceContext instanceContext);
}
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/rule/builder/database/DatabaseRulesBuilder.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/rule/builder/database/DatabaseRulesBuilder.java
index baa1a2109b0..190a31afcd2 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/rule/builder/database/DatabaseRulesBuilder.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/rule/builder/database/DatabaseRulesBuilder.java
@@ -59,10 +59,10 @@ public final class DatabaseRulesBuilder {
public static Collection<ShardingSphereRule> build(final String
databaseName, final DatabaseType protocolType, final DatabaseConfiguration
databaseConfig, final InstanceContext instanceContext) {
Collection<ShardingSphereRule> result = new LinkedList<>();
for (Entry<RuleConfiguration, DatabaseRuleBuilder> entry :
getRuleBuilderMap(databaseConfig).entrySet()) {
- RuleConfigurationChecker configChecker =
OrderedSPILoader.getServicesByClass(
- RuleConfigurationChecker.class,
Collections.singleton(entry.getKey().getClass())).get(entry.getKey().getClass());
Map<String, DataSource> dataSources =
databaseConfig.getStorageUnits().entrySet().stream()
.collect(Collectors.toMap(Entry::getKey, storageUnit ->
storageUnit.getValue().getDataSource(), (oldValue, currentValue) -> oldValue,
LinkedHashMap::new));
+ RuleConfigurationChecker configChecker =
OrderedSPILoader.getServicesByClass(
+ RuleConfigurationChecker.class,
Collections.singleton(entry.getKey().getClass())).get(entry.getKey().getClass());
if (null != configChecker) {
configChecker.check(databaseName, entry.getKey(), dataSources,
result);
}
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/rule/builder/fixture/FixtureDatabaseRuleBuilder.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/rule/builder/fixture/FixtureDatabaseRuleBuilder.java
index c93695deeef..dab4ab21843 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/rule/builder/fixture/FixtureDatabaseRuleBuilder.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/rule/builder/fixture/FixtureDatabaseRuleBuilder.java
@@ -30,7 +30,7 @@ import java.util.Map;
public final class FixtureDatabaseRuleBuilder implements
DatabaseRuleBuilder<FixtureDatabaseRuleConfiguration> {
@Override
- public FixtureRule build(final FixtureDatabaseRuleConfiguration config,
final String databaseName, final DatabaseType protocolType,
+ public FixtureRule build(final FixtureDatabaseRuleConfiguration
ruleConfig, final String databaseName, final DatabaseType protocolType,
final Map<String, DataSource> dataSources, final
Collection<ShardingSphereRule> builtRules, final InstanceContext
instanceContext) {
return new FixtureRule();
}
diff --git
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/rule/builder/SingleRuleBuilder.java
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/rule/builder/SingleRuleBuilder.java
index 60905895217..d2ff1018c3f 100644
---
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/rule/builder/SingleRuleBuilder.java
+++
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/rule/builder/SingleRuleBuilder.java
@@ -35,9 +35,9 @@ import java.util.Map;
public final class SingleRuleBuilder implements
DatabaseRuleBuilder<SingleRuleConfiguration> {
@Override
- public SingleRule build(final SingleRuleConfiguration config, final String
databaseName, final DatabaseType protocolType,
+ public SingleRule build(final SingleRuleConfiguration ruleConfig, final
String databaseName, final DatabaseType protocolType,
final Map<String, DataSource> dataSources, final
Collection<ShardingSphereRule> builtRules, final InstanceContext
instanceContext) {
- return new SingleRule(config, databaseName, protocolType, dataSources,
builtRules);
+ return new SingleRule(ruleConfig, databaseName, protocolType,
dataSources, builtRules);
}
@Override
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/fixture/ModeRuleBuilderFixture.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/fixture/ModeRuleBuilderFixture.java
index 4509f8ff110..354df6b5023 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/fixture/ModeRuleBuilderFixture.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/fixture/ModeRuleBuilderFixture.java
@@ -29,7 +29,7 @@ import java.util.Map;
public final class ModeRuleBuilderFixture implements
DatabaseRuleBuilder<ModeRuleConfigurationFixture> {
@Override
- public ModeRuleFixture build(final ModeRuleConfigurationFixture config,
final String databaseName, final DatabaseType databaseType, final Map<String,
DataSource> dataSources,
+ public ModeRuleFixture build(final ModeRuleConfigurationFixture
ruleConfig, final String databaseName, final DatabaseType databaseType, final
Map<String, DataSource> dataSources,
final Collection<ShardingSphereRule>
builtRules, final InstanceContext instanceContext) {
return new ModeRuleFixture();
}
