This is an automated email from the ASF dual-hosted git repository.
chengzhang 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 d5df0d00fc8 Refactor feature rule changed processor (#30181)
d5df0d00fc8 is described below
commit d5df0d00fc80bcd79b1505630942341cc8962af9
Author: zhaojinchao <[email protected]>
AuthorDate: Sun Feb 18 22:09:17 2024 +0800
Refactor feature rule changed processor (#30181)
---
.../shardingsphere/mask/rule/changed/MaskAlgorithmChangedProcessor.java | 2 +-
.../shardingsphere/mask/rule/changed/MaskTableChangedProcessor.java | 2 +-
.../rule/changed/ReadwriteSplittingDataSourceChangedProcessor.java | 2 +-
.../rule/changed/ReadwriteSplittingLoadBalancerChangedProcessor.java | 2 +-
.../shadow/rule/changed/DefaultShadowAlgorithmNameChangedProcessor.java | 2 +-
.../shadow/rule/changed/ShadowAlgorithmChangedProcessor.java | 2 +-
.../shadow/rule/changed/ShadowDataSourceChangedProcessor.java | 2 +-
.../shardingsphere/shadow/rule/changed/ShadowTableChangedProcessor.java | 2 +-
.../rule/changed/DefaultDatabaseShardingStrategyChangedProcessor.java | 2 +-
.../sharding/rule/changed/DefaultShardingColumnChangedProcessor.java | 2 +-
.../sharding/rule/changed/KeyGeneratorChangedProcessor.java | 2 +-
.../sharding/rule/changed/ShardingAlgorithmChangedProcessor.java | 2 +-
.../sharding/rule/changed/ShardingTableReferenceChangedProcessor.java | 2 +-
13 files changed, 13 insertions(+), 13 deletions(-)
diff --git
a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/rule/changed/MaskAlgorithmChangedProcessor.java
b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/rule/changed/MaskAlgorithmChangedProcessor.java
index 84e3b2e2270..71cc6f27715 100644
---
a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/rule/changed/MaskAlgorithmChangedProcessor.java
+++
b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/rule/changed/MaskAlgorithmChangedProcessor.java
@@ -47,7 +47,7 @@ public final class MaskAlgorithmChangedProcessor implements
RuleItemConfiguratio
@Override
public MaskRuleConfiguration findRuleConfiguration(final
ShardingSphereDatabase database) {
return database.getRuleMetaData().findSingleRule(MaskRule.class)
- .map(maskRule -> getConfiguration((MaskRuleConfiguration)
maskRule.getConfiguration())).orElseGet(() -> new MaskRuleConfiguration(new
LinkedList<>(), new LinkedHashMap<>()));
+ .map(maskRule ->
getConfiguration(maskRule.getConfiguration())).orElseGet(() -> new
MaskRuleConfiguration(new LinkedList<>(), new LinkedHashMap<>()));
}
private MaskRuleConfiguration getConfiguration(final MaskRuleConfiguration
config) {
diff --git
a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/rule/changed/MaskTableChangedProcessor.java
b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/rule/changed/MaskTableChangedProcessor.java
index 1b2bb563bdd..1c83f7aaab5 100644
---
a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/rule/changed/MaskTableChangedProcessor.java
+++
b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/rule/changed/MaskTableChangedProcessor.java
@@ -46,7 +46,7 @@ public final class MaskTableChangedProcessor implements
RuleItemConfigurationCha
@Override
public MaskRuleConfiguration findRuleConfiguration(final
ShardingSphereDatabase database) {
return database.getRuleMetaData().findSingleRule(MaskRule.class)
- .map(optional -> getConfiguration((MaskRuleConfiguration)
optional.getConfiguration())).orElseGet(() -> new MaskRuleConfiguration(new
LinkedList<>(), new LinkedHashMap<>()));
+ .map(optional ->
getConfiguration(optional.getConfiguration())).orElseGet(() -> new
MaskRuleConfiguration(new LinkedList<>(), new LinkedHashMap<>()));
}
private MaskRuleConfiguration getConfiguration(final MaskRuleConfiguration
config) {
diff --git
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/changed/ReadwriteSplittingDataSourceChangedProcessor.java
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/changed/ReadwriteSplittingDataSourceChangedProcessor.java
index 89b636c0b65..fbf250a388c 100644
---
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/changed/ReadwriteSplittingDataSourceChangedProcessor.java
+++
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/changed/ReadwriteSplittingDataSourceChangedProcessor.java
@@ -57,7 +57,7 @@ public final class
ReadwriteSplittingDataSourceChangedProcessor implements RuleI
@Override
public ReadwriteSplittingRuleConfiguration findRuleConfiguration(final
ShardingSphereDatabase database) {
Optional<ReadwriteSplittingRule> rule =
database.getRuleMetaData().findSingleRule(ReadwriteSplittingRule.class);
- return rule.map(optional -> (ReadwriteSplittingRuleConfiguration)
optional.getConfiguration())
+ return rule.map(ReadwriteSplittingRule::getConfiguration)
.orElseGet(() -> new ReadwriteSplittingRuleConfiguration(new
LinkedList<>(), new LinkedHashMap<>()));
}
diff --git
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/changed/ReadwriteSplittingLoadBalancerChangedProcessor.java
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/changed/ReadwriteSplittingLoadBalancerChangedProcessor.java
index 0e6a763d9bd..80a9f119a74 100644
---
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/changed/ReadwriteSplittingLoadBalancerChangedProcessor.java
+++
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/changed/ReadwriteSplittingLoadBalancerChangedProcessor.java
@@ -46,7 +46,7 @@ public final class
ReadwriteSplittingLoadBalancerChangedProcessor implements Rul
@Override
public ReadwriteSplittingRuleConfiguration findRuleConfiguration(final
ShardingSphereDatabase database) {
- return
database.getRuleMetaData().findSingleRule(ReadwriteSplittingRule.class).map(optional
-> (ReadwriteSplittingRuleConfiguration) optional.getConfiguration())
+ return
database.getRuleMetaData().findSingleRule(ReadwriteSplittingRule.class).map(ReadwriteSplittingRule::getConfiguration)
.orElseGet(() -> new ReadwriteSplittingRuleConfiguration(new
LinkedList<>(), new LinkedHashMap<>()));
}
diff --git
a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/rule/changed/DefaultShadowAlgorithmNameChangedProcessor.java
b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/rule/changed/DefaultShadowAlgorithmNameChangedProcessor.java
index ce9534cbbc2..8af6195de5e 100644
---
a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/rule/changed/DefaultShadowAlgorithmNameChangedProcessor.java
+++
b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/rule/changed/DefaultShadowAlgorithmNameChangedProcessor.java
@@ -39,7 +39,7 @@ public final class DefaultShadowAlgorithmNameChangedProcessor
implements RuleIte
@Override
public ShadowRuleConfiguration findRuleConfiguration(final
ShardingSphereDatabase database) {
- return
database.getRuleMetaData().findSingleRule(ShadowRule.class).map(optional ->
(ShadowRuleConfiguration)
optional.getConfiguration()).orElseGet(ShadowRuleConfiguration::new);
+ return
database.getRuleMetaData().findSingleRule(ShadowRule.class).map(ShadowRule::getConfiguration).orElseGet(ShadowRuleConfiguration::new);
}
@Override
diff --git
a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/rule/changed/ShadowAlgorithmChangedProcessor.java
b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/rule/changed/ShadowAlgorithmChangedProcessor.java
index 3b633e018b0..dc88ac05222 100644
---
a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/rule/changed/ShadowAlgorithmChangedProcessor.java
+++
b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/rule/changed/ShadowAlgorithmChangedProcessor.java
@@ -45,7 +45,7 @@ public final class ShadowAlgorithmChangedProcessor implements
RuleItemConfigurat
@Override
public ShadowRuleConfiguration findRuleConfiguration(final
ShardingSphereDatabase database) {
- return
database.getRuleMetaData().findSingleRule(ShadowRule.class).map(optional ->
(ShadowRuleConfiguration)
optional.getConfiguration()).orElseGet(ShadowRuleConfiguration::new);
+ return
database.getRuleMetaData().findSingleRule(ShadowRule.class).map(ShadowRule::getConfiguration).orElseGet(ShadowRuleConfiguration::new);
}
@Override
diff --git
a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/rule/changed/ShadowDataSourceChangedProcessor.java
b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/rule/changed/ShadowDataSourceChangedProcessor.java
index fbf5fd8cc84..1bc5e33f1d0 100644
---
a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/rule/changed/ShadowDataSourceChangedProcessor.java
+++
b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/rule/changed/ShadowDataSourceChangedProcessor.java
@@ -43,7 +43,7 @@ public final class ShadowDataSourceChangedProcessor
implements RuleItemConfigura
@Override
public ShadowRuleConfiguration findRuleConfiguration(final
ShardingSphereDatabase database) {
- return
database.getRuleMetaData().findSingleRule(ShadowRule.class).map(optional ->
(ShadowRuleConfiguration)
optional.getConfiguration()).orElseGet(ShadowRuleConfiguration::new);
+ return
database.getRuleMetaData().findSingleRule(ShadowRule.class).map(ShadowRule::getConfiguration).orElseGet(ShadowRuleConfiguration::new);
}
@Override
diff --git
a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/rule/changed/ShadowTableChangedProcessor.java
b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/rule/changed/ShadowTableChangedProcessor.java
index 1cb5e398f7d..fc3418ea358 100644
---
a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/rule/changed/ShadowTableChangedProcessor.java
+++
b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/rule/changed/ShadowTableChangedProcessor.java
@@ -43,7 +43,7 @@ public final class ShadowTableChangedProcessor implements
RuleItemConfigurationC
@Override
public ShadowRuleConfiguration findRuleConfiguration(final
ShardingSphereDatabase database) {
- return
database.getRuleMetaData().findSingleRule(ShadowRule.class).map(optional ->
(ShadowRuleConfiguration)
optional.getConfiguration()).orElseGet(ShadowRuleConfiguration::new);
+ return
database.getRuleMetaData().findSingleRule(ShadowRule.class).map(ShadowRule::getConfiguration).orElseGet(ShadowRuleConfiguration::new);
}
@Override
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/DefaultDatabaseShardingStrategyChangedProcessor.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/DefaultDatabaseShardingStrategyChangedProcessor.java
index d68726ae38f..ef774001b0d 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/DefaultDatabaseShardingStrategyChangedProcessor.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/DefaultDatabaseShardingStrategyChangedProcessor.java
@@ -41,7 +41,7 @@ public final class
DefaultDatabaseShardingStrategyChangedProcessor implements Ru
@Override
public ShardingRuleConfiguration findRuleConfiguration(final
ShardingSphereDatabase database) {
- return
database.getRuleMetaData().findSingleRule(ShardingRule.class).map(optional ->
(ShardingRuleConfiguration)
optional.getConfiguration()).orElseGet(ShardingRuleConfiguration::new);
+ return
database.getRuleMetaData().findSingleRule(ShardingRule.class).map(ShardingRule::getConfiguration).orElseGet(ShardingRuleConfiguration::new);
}
@Override
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/DefaultShardingColumnChangedProcessor.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/DefaultShardingColumnChangedProcessor.java
index 5d6479bf28e..ad4546b0449 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/DefaultShardingColumnChangedProcessor.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/DefaultShardingColumnChangedProcessor.java
@@ -37,7 +37,7 @@ public final class DefaultShardingColumnChangedProcessor
implements RuleItemConf
@Override
public ShardingRuleConfiguration findRuleConfiguration(final
ShardingSphereDatabase database) {
- return
database.getRuleMetaData().findSingleRule(ShardingRule.class).map(optional ->
(ShardingRuleConfiguration)
optional.getConfiguration()).orElseGet(ShardingRuleConfiguration::new);
+ return
database.getRuleMetaData().findSingleRule(ShardingRule.class).map(ShardingRule::getConfiguration).orElseGet(ShardingRuleConfiguration::new);
}
@Override
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/KeyGeneratorChangedProcessor.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/KeyGeneratorChangedProcessor.java
index 269ac44d42f..d77fa61ba1c 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/KeyGeneratorChangedProcessor.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/KeyGeneratorChangedProcessor.java
@@ -43,7 +43,7 @@ public final class KeyGeneratorChangedProcessor implements
RuleItemConfiguration
@Override
public ShardingRuleConfiguration findRuleConfiguration(final
ShardingSphereDatabase database) {
- return
database.getRuleMetaData().findSingleRule(ShardingRule.class).map(optional ->
(ShardingRuleConfiguration)
optional.getConfiguration()).orElseGet(ShardingRuleConfiguration::new);
+ return
database.getRuleMetaData().findSingleRule(ShardingRule.class).map(ShardingRule::getConfiguration).orElseGet(ShardingRuleConfiguration::new);
}
@Override
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/ShardingAlgorithmChangedProcessor.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/ShardingAlgorithmChangedProcessor.java
index 676d91de945..93596c285d6 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/ShardingAlgorithmChangedProcessor.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/ShardingAlgorithmChangedProcessor.java
@@ -43,7 +43,7 @@ public final class ShardingAlgorithmChangedProcessor
implements RuleItemConfigur
@Override
public ShardingRuleConfiguration findRuleConfiguration(final
ShardingSphereDatabase database) {
- return
database.getRuleMetaData().findSingleRule(ShardingRule.class).map(optional ->
(ShardingRuleConfiguration)
optional.getConfiguration()).orElseGet(ShardingRuleConfiguration::new);
+ return
database.getRuleMetaData().findSingleRule(ShardingRule.class).map(ShardingRule::getConfiguration).orElseGet(ShardingRuleConfiguration::new);
}
@Override
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/ShardingTableReferenceChangedProcessor.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/ShardingTableReferenceChangedProcessor.java
index c3ffd5911d7..52b19bc0351 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/ShardingTableReferenceChangedProcessor.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/changed/ShardingTableReferenceChangedProcessor.java
@@ -41,7 +41,7 @@ public final class ShardingTableReferenceChangedProcessor
implements RuleItemCon
@Override
public ShardingRuleConfiguration findRuleConfiguration(final
ShardingSphereDatabase database) {
- return
database.getRuleMetaData().findSingleRule(ShardingRule.class).map(optional ->
(ShardingRuleConfiguration)
optional.getConfiguration()).orElseGet(ShardingRuleConfiguration::new);
+ return
database.getRuleMetaData().findSingleRule(ShardingRule.class).map(ShardingRule::getConfiguration).orElseGet(ShardingRuleConfiguration::new);
}
@Override
