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 ddd5b607e85 Fix pmd warning for ReadwriteSplittingRule (#25365)
ddd5b607e85 is described below
commit ddd5b607e853b3331d649562f76a6cc082e1833b
Author: zhaojinchao <[email protected]>
AuthorDate: Thu Apr 27 18:28:41 2023 +0800
Fix pmd warning for ReadwriteSplittingRule (#25365)
* Fix pmd warning for ReadwriteSplittingRule
* Fix checkstyle
---
.../readwritesplitting/rule/ReadwriteSplittingRule.java | 12 +++++-------
.../rule/builder/ReadwriteSplittingRuleBuilder.java | 2 +-
.../route/ReadwriteSplittingSQLRouterTest.java | 3 +--
.../readwritesplitting/rule/ReadwriteSplittingRuleTest.java | 2 +-
.../util/YamlDatabaseConfigurationImportExecutor.java | 2 +-
5 files changed, 9 insertions(+), 12 deletions(-)
diff --git
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRule.java
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRule.java
index 51723684111..b045d14eeb7 100644
---
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRule.java
+++
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRule.java
@@ -25,7 +25,6 @@ import
org.apache.shardingsphere.infra.datasource.mapper.DataSourceRoleInfo;
import org.apache.shardingsphere.infra.datasource.state.DataSourceState;
import org.apache.shardingsphere.infra.instance.InstanceContext;
import
org.apache.shardingsphere.infra.metadata.database.schema.QualifiedDatabase;
-import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.infra.rule.event.DataSourceStatusChangedEvent;
import org.apache.shardingsphere.infra.rule.identifier.scope.DatabaseRule;
import
org.apache.shardingsphere.infra.rule.identifier.type.DataSourceContainedRule;
@@ -70,13 +69,12 @@ public final class ReadwriteSplittingRule implements
DatabaseRule, DataSourceCon
private final InstanceContext instanceContext;
- public ReadwriteSplittingRule(final String databaseName, final
ReadwriteSplittingRuleConfiguration ruleConfig,
- final Collection<ShardingSphereRule>
builtRules, final InstanceContext instanceContext) {
+ public ReadwriteSplittingRule(final String databaseName, final
ReadwriteSplittingRuleConfiguration ruleConfig, final InstanceContext
instanceContext) {
this.databaseName = databaseName;
this.instanceContext = instanceContext;
configuration = ruleConfig;
loadBalancers = createLoadBalancers(ruleConfig);
- dataSourceRules = createDataSourceRules(ruleConfig, builtRules);
+ dataSourceRules = createDataSourceRules(ruleConfig);
}
private Map<String, ReadQueryLoadBalanceAlgorithm>
createLoadBalancers(final ReadwriteSplittingRuleConfiguration ruleConfig) {
@@ -90,15 +88,15 @@ public final class ReadwriteSplittingRule implements
DatabaseRule, DataSourceCon
return result;
}
- private Map<String, ReadwriteSplittingDataSourceRule>
createDataSourceRules(final ReadwriteSplittingRuleConfiguration ruleConfig,
final Collection<ShardingSphereRule> builtRules) {
+ private Map<String, ReadwriteSplittingDataSourceRule>
createDataSourceRules(final ReadwriteSplittingRuleConfiguration ruleConfig) {
Map<String, ReadwriteSplittingDataSourceRule> result = new
HashMap<>(ruleConfig.getDataSources().size(), 1);
for (ReadwriteSplittingDataSourceRuleConfiguration each :
ruleConfig.getDataSources()) {
- result.putAll(createDataSourceRules(each, builtRules));
+ result.putAll(createDataSourceRules(each));
}
return result;
}
- private Map<String, ReadwriteSplittingDataSourceRule>
createDataSourceRules(final ReadwriteSplittingDataSourceRuleConfiguration
config, final Collection<ShardingSphereRule> builtRules) {
+ private Map<String, ReadwriteSplittingDataSourceRule>
createDataSourceRules(final ReadwriteSplittingDataSourceRuleConfiguration
config) {
ReadQueryLoadBalanceAlgorithm loadBalanceAlgorithm =
loadBalancers.getOrDefault(
config.getName() + "." + config.getLoadBalancerName(),
TypedSPILoader.getService(ReadQueryLoadBalanceAlgorithm.class, null));
return createStaticDataSourceRules(config, loadBalanceAlgorithm);
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 84181a011d1..ba9ebde6989 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
@@ -36,7 +36,7 @@ public final class ReadwriteSplittingRuleBuilder implements
DatabaseRuleBuilder<
@Override
public ReadwriteSplittingRule build(final
ReadwriteSplittingRuleConfiguration config, final String databaseName,
final Map<String, DataSource>
dataSources, final Collection<ShardingSphereRule> builtRules, final
InstanceContext instanceContext) {
- return new ReadwriteSplittingRule(databaseName, config, builtRules,
instanceContext);
+ return new ReadwriteSplittingRule(databaseName, config,
instanceContext);
}
@Override
diff --git
a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/route/ReadwriteSplittingSQLRouterTest.java
b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/route/ReadwriteSplittingSQLRouterTest.java
index 2eb08687781..42a69dfc55d 100644
---
a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/route/ReadwriteSplittingSQLRouterTest.java
+++
b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/route/ReadwriteSplittingSQLRouterTest.java
@@ -81,8 +81,7 @@ class ReadwriteSplittingSQLRouterTest {
@BeforeEach
void setUp() {
staticRule = new ReadwriteSplittingRule("logic_db", new
ReadwriteSplittingRuleConfiguration(Collections.singleton(new
ReadwriteSplittingDataSourceRuleConfiguration(DATASOURCE_NAME,
- WRITE_DATASOURCE, Collections.singletonList(READ_DATASOURCE),
"")),
- Collections.emptyMap()), Collections.emptyList(),
mock(InstanceContext.class));
+ WRITE_DATASOURCE, Collections.singletonList(READ_DATASOURCE),
"")), Collections.emptyMap()), mock(InstanceContext.class));
sqlRouter = (ReadwriteSplittingSQLRouter)
OrderedSPILoader.getServices(SQLRouter.class,
Collections.singleton(staticRule)).get(staticRule);
}
diff --git
a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRuleTest.java
b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRuleTest.java
index 746dae26cb8..7375d130c87 100644
---
a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRuleTest.java
+++
b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRuleTest.java
@@ -60,7 +60,7 @@ class ReadwriteSplittingRuleTest {
ReadwriteSplittingDataSourceRuleConfiguration config =
new ReadwriteSplittingDataSourceRuleConfiguration("readwrite",
"write_ds", Arrays.asList("read_ds_0", "read_ds_1"), "random");
return new ReadwriteSplittingRule("logic_db", new
ReadwriteSplittingRuleConfiguration(
- Collections.singleton(config),
Collections.singletonMap("random", new AlgorithmConfiguration("RANDOM", new
Properties()))), Collections.emptyList(), mock(InstanceContext.class));
+ Collections.singleton(config),
Collections.singletonMap("random", new AlgorithmConfiguration("RANDOM", new
Properties()))), mock(InstanceContext.class));
}
private void assertDataSourceRule(final ReadwriteSplittingDataSourceRule
actual) {
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/YamlDatabaseConfigurationImportExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/YamlDatabaseConfigurationImportExecutor.java
index 9b2fb7529e5..869984dab4c 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/YamlDatabaseConfigurationImportExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/YamlDatabaseConfigurationImportExecutor.java
@@ -224,7 +224,7 @@ public final class YamlDatabaseConfigurationImportExecutor {
Collection<ShardingSphereRule> rules =
database.getRuleMetaData().getRules();
readwriteSplittingRuleConfigImportChecker.check(database,
readwriteSplittingRuleConfig);
allRuleConfigs.add(readwriteSplittingRuleConfig);
- rules.add(new ReadwriteSplittingRule(database.getName(),
readwriteSplittingRuleConfig, rules, instanceContext));
+ rules.add(new ReadwriteSplittingRule(database.getName(),
readwriteSplittingRuleConfig, instanceContext));
}
private void addEncryptRuleConfiguration(final EncryptRuleConfiguration
encryptRuleConfig, final Collection<RuleConfiguration> allRuleConfigs, final
ShardingSphereDatabase database) {
