You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2023/06/30 01:01:24 UTC
[shardingsphere] branch master updated: Keep code style (#26712)
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 62054e89c5e Keep code style (#26712)
62054e89c5e is described below
commit 62054e89c5e3fb3cc32b840add51cba0d1b2220c
Author: zhaojinchao <zh...@apache.org>
AuthorDate: Fri Jun 30 09:01:18 2023 +0800
Keep code style (#26712)
---
.../encrypt/subscriber/EncryptTableSubscriber.java | 16 ++++++++--------
.../encrypt/subscriber/EncryptorSubscriber.java | 14 +++++++-------
.../compatible/CompatibleEncryptTableSubscriber.java | 16 ++++++++--------
.../compatible/CompatibleEncryptorSubscriber.java | 14 +++++++-------
.../mask/subscriber/MaskAlgorithmSubscriber.java | 14 +++++++-------
.../mask/subscriber/MaskTableSubscriber.java | 16 ++++++++--------
.../sharding/subscriber/ShardingAlgorithmSubscriber.java | 8 ++++----
.../ShardingStrategyConfigurationSubscriber.java | 8 ++++----
.../subscriber/ShardingTableConfigurationSubscriber.java | 8 ++++----
9 files changed, 57 insertions(+), 57 deletions(-)
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/EncryptTableSubscriber.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/EncryptTableSubscriber.java
index 7fbd7de7af4..5d4c5c66216 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/EncryptTableSubscriber.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/EncryptTableSubscriber.java
@@ -103,18 +103,18 @@ public final class EncryptTableSubscriber implements RuleChangedSubscriber {
private EncryptRuleConfiguration getEncryptRuleConfiguration(final ShardingSphereDatabase database, final EncryptTableRuleConfiguration needToAddedConfig) {
Optional<EncryptRule> rule = database.getRuleMetaData().findSingleRule(EncryptRule.class);
- EncryptRuleConfiguration config = rule.map(encryptRule -> getEncryptRuleConfiguration((EncryptRuleConfiguration) encryptRule.getConfiguration()))
+ EncryptRuleConfiguration result = rule.map(encryptRule -> getEncryptRuleConfiguration((EncryptRuleConfiguration) encryptRule.getConfiguration()))
.orElseGet(() -> new EncryptRuleConfiguration(new LinkedList<>(), new LinkedHashMap<>()));
// TODO refactor DistSQL to only persist config
- config.getTables().removeIf(each -> each.getName().equals(needToAddedConfig.getName()));
- config.getTables().add(needToAddedConfig);
- return config;
+ result.getTables().removeIf(each -> each.getName().equals(needToAddedConfig.getName()));
+ result.getTables().add(needToAddedConfig);
+ return result;
}
- private EncryptRuleConfiguration getEncryptRuleConfiguration(final EncryptRuleConfiguration config) {
- if (null == config.getTables()) {
- return new EncryptRuleConfiguration(new LinkedList<>(), config.getEncryptors());
+ private EncryptRuleConfiguration getEncryptRuleConfiguration(final EncryptRuleConfiguration result) {
+ if (null == result.getTables()) {
+ return new EncryptRuleConfiguration(new LinkedList<>(), result.getEncryptors());
}
- return config;
+ return result;
}
}
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/EncryptorSubscriber.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/EncryptorSubscriber.java
index a276e30768c..6c8b0e12c05 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/EncryptorSubscriber.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/EncryptorSubscriber.java
@@ -77,18 +77,18 @@ public final class EncryptorSubscriber implements RuleChangedSubscriber {
private EncryptRuleConfiguration getEncryptRuleConfiguration(final ShardingSphereDatabase database, final AlterEncryptorEvent event) {
Optional<EncryptRule> rule = database.getRuleMetaData().findSingleRule(EncryptRule.class);
- EncryptRuleConfiguration config = rule.map(encryptRule -> getEncryptRuleConfiguration((EncryptRuleConfiguration) encryptRule.getConfiguration()))
+ EncryptRuleConfiguration result = rule.map(encryptRule -> getEncryptRuleConfiguration((EncryptRuleConfiguration) encryptRule.getConfiguration()))
.orElseGet(() -> new EncryptRuleConfiguration(new LinkedList<>(), new LinkedHashMap<>()));
- config.getEncryptors().put(event.getEncryptorName(), swapToAlgorithmConfig(
+ result.getEncryptors().put(event.getEncryptorName(), swapToAlgorithmConfig(
contextManager.getInstanceContext().getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion())));
- return config;
+ return result;
}
- private EncryptRuleConfiguration getEncryptRuleConfiguration(final EncryptRuleConfiguration config) {
- if (null == config.getEncryptors()) {
- return new EncryptRuleConfiguration(config.getTables(), new LinkedHashMap<>());
+ private EncryptRuleConfiguration getEncryptRuleConfiguration(final EncryptRuleConfiguration result) {
+ if (null == result.getEncryptors()) {
+ return new EncryptRuleConfiguration(result.getTables(), new LinkedHashMap<>());
}
- return config;
+ return result;
}
private AlgorithmConfiguration swapToAlgorithmConfig(final String yamlContext) {
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/compatible/CompatibleEncryptTableSubscriber.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/compatible/CompatibleEncryptTableSubscriber.java
index ec77d75f972..a16f720821f 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/compatible/CompatibleEncryptTableSubscriber.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/compatible/CompatibleEncryptTableSubscriber.java
@@ -106,18 +106,18 @@ public final class CompatibleEncryptTableSubscriber implements RuleChangedSubscr
private CompatibleEncryptRuleConfiguration getCompatibleEncryptRuleConfiguration(final ShardingSphereDatabase database, final EncryptTableRuleConfiguration needToAddedConfig) {
Optional<EncryptRule> rule = database.getRuleMetaData().findSingleRule(EncryptRule.class);
- CompatibleEncryptRuleConfiguration config = rule.map(encryptRule -> getCompatibleEncryptRuleConfiguration((CompatibleEncryptRuleConfiguration) encryptRule.getConfiguration()))
+ CompatibleEncryptRuleConfiguration result = rule.map(encryptRule -> getCompatibleEncryptRuleConfiguration((CompatibleEncryptRuleConfiguration) encryptRule.getConfiguration()))
.orElseGet(() -> new CompatibleEncryptRuleConfiguration(new LinkedList<>(), new LinkedHashMap<>()));
// TODO refactor DistSQL to only persist config
- config.getTables().removeIf(each -> each.getName().equals(needToAddedConfig.getName()));
- config.getTables().add(needToAddedConfig);
- return config;
+ result.getTables().removeIf(each -> each.getName().equals(needToAddedConfig.getName()));
+ result.getTables().add(needToAddedConfig);
+ return result;
}
- private CompatibleEncryptRuleConfiguration getCompatibleEncryptRuleConfiguration(final CompatibleEncryptRuleConfiguration config) {
- if (null == config.getTables()) {
- return new CompatibleEncryptRuleConfiguration(new LinkedList<>(), config.getEncryptors());
+ private CompatibleEncryptRuleConfiguration getCompatibleEncryptRuleConfiguration(final CompatibleEncryptRuleConfiguration result) {
+ if (null == result.getTables()) {
+ return new CompatibleEncryptRuleConfiguration(new LinkedList<>(), result.getEncryptors());
}
- return config;
+ return result;
}
}
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/compatible/CompatibleEncryptorSubscriber.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/compatible/CompatibleEncryptorSubscriber.java
index 3200aecd53b..3000e6e7af6 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/compatible/CompatibleEncryptorSubscriber.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/subscriber/compatible/CompatibleEncryptorSubscriber.java
@@ -79,18 +79,18 @@ public final class CompatibleEncryptorSubscriber implements RuleChangedSubscribe
private CompatibleEncryptRuleConfiguration getCompatibleEncryptRuleConfiguration(final ShardingSphereDatabase database, final AlterCompatibleEncryptorEvent event) {
Optional<EncryptRule> rule = database.getRuleMetaData().findSingleRule(EncryptRule.class);
- CompatibleEncryptRuleConfiguration config = rule.map(encryptRule -> getEncryptRuleConfiguration((CompatibleEncryptRuleConfiguration) encryptRule.getConfiguration()))
+ CompatibleEncryptRuleConfiguration result = rule.map(encryptRule -> getEncryptRuleConfiguration((CompatibleEncryptRuleConfiguration) encryptRule.getConfiguration()))
.orElseGet(() -> new CompatibleEncryptRuleConfiguration(new LinkedList<>(), new LinkedHashMap<>()));
- config.getEncryptors().put(event.getEncryptorName(), swapToAlgorithmConfig(
+ result.getEncryptors().put(event.getEncryptorName(), swapToAlgorithmConfig(
contextManager.getInstanceContext().getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion())));
- return config;
+ return result;
}
- private CompatibleEncryptRuleConfiguration getEncryptRuleConfiguration(final CompatibleEncryptRuleConfiguration config) {
- if (null == config.getEncryptors()) {
- return new CompatibleEncryptRuleConfiguration(config.getTables(), new LinkedHashMap<>());
+ private CompatibleEncryptRuleConfiguration getEncryptRuleConfiguration(final CompatibleEncryptRuleConfiguration result) {
+ if (null == result.getEncryptors()) {
+ return new CompatibleEncryptRuleConfiguration(result.getTables(), new LinkedHashMap<>());
}
- return config;
+ return result;
}
private AlgorithmConfiguration swapToAlgorithmConfig(final String yamlContext) {
diff --git a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/subscriber/MaskAlgorithmSubscriber.java b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/subscriber/MaskAlgorithmSubscriber.java
index 7e7c8972aa1..7cdff98597a 100644
--- a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/subscriber/MaskAlgorithmSubscriber.java
+++ b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/subscriber/MaskAlgorithmSubscriber.java
@@ -77,18 +77,18 @@ public final class MaskAlgorithmSubscriber implements RuleChangedSubscriber {
private MaskRuleConfiguration getMaskRuleConfiguration(final ShardingSphereDatabase database, final AlterMaskAlgorithmEvent event) {
Optional<MaskRule> rule = database.getRuleMetaData().findSingleRule(MaskRule.class);
- MaskRuleConfiguration config = rule.map(maskRule -> getMaskRuleConfiguration((MaskRuleConfiguration) maskRule.getConfiguration()))
+ MaskRuleConfiguration result = rule.map(maskRule -> getMaskRuleConfiguration((MaskRuleConfiguration) maskRule.getConfiguration()))
.orElseGet(() -> new MaskRuleConfiguration(new LinkedList<>(), new LinkedHashMap<>()));
- config.getMaskAlgorithms().put(event.getAlgorithmName(), swapToAlgorithmConfig(
+ result.getMaskAlgorithms().put(event.getAlgorithmName(), swapToAlgorithmConfig(
contextManager.getInstanceContext().getModeContextManager().getVersionPathByActiveVersionKey(event.getActiveVersionKey(), event.getActiveVersion())));
- return config;
+ return result;
}
- private MaskRuleConfiguration getMaskRuleConfiguration(final MaskRuleConfiguration config) {
- if (null == config.getMaskAlgorithms()) {
- return new MaskRuleConfiguration(config.getTables(), new LinkedHashMap<>());
+ private MaskRuleConfiguration getMaskRuleConfiguration(final MaskRuleConfiguration result) {
+ if (null == result.getMaskAlgorithms()) {
+ return new MaskRuleConfiguration(result.getTables(), new LinkedHashMap<>());
}
- return config;
+ return result;
}
private AlgorithmConfiguration swapToAlgorithmConfig(final String yamlContext) {
diff --git a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/subscriber/MaskTableSubscriber.java b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/subscriber/MaskTableSubscriber.java
index ea860c5aa44..dd28d563ded 100644
--- a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/subscriber/MaskTableSubscriber.java
+++ b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/subscriber/MaskTableSubscriber.java
@@ -103,18 +103,18 @@ public final class MaskTableSubscriber implements RuleChangedSubscriber {
private MaskRuleConfiguration getMaskRuleConfiguration(final ShardingSphereDatabase database, final MaskTableRuleConfiguration needToAddedConfig) {
Optional<MaskRule> rule = database.getRuleMetaData().findSingleRule(MaskRule.class);
- MaskRuleConfiguration config = rule.map(maskRule -> getMaskRuleConfiguration((MaskRuleConfiguration) maskRule.getConfiguration()))
+ MaskRuleConfiguration result = rule.map(maskRule -> getMaskRuleConfiguration((MaskRuleConfiguration) maskRule.getConfiguration()))
.orElseGet(() -> new MaskRuleConfiguration(new LinkedList<>(), new LinkedHashMap<>()));
// TODO refactor DistSQL to only persist config
- config.getTables().removeIf(each -> each.getName().equals(needToAddedConfig.getName()));
- config.getTables().add(needToAddedConfig);
- return config;
+ result.getTables().removeIf(each -> each.getName().equals(needToAddedConfig.getName()));
+ result.getTables().add(needToAddedConfig);
+ return result;
}
- private MaskRuleConfiguration getMaskRuleConfiguration(final MaskRuleConfiguration config) {
- if (null == config.getTables()) {
- return new MaskRuleConfiguration(new LinkedList<>(), config.getMaskAlgorithms());
+ private MaskRuleConfiguration getMaskRuleConfiguration(final MaskRuleConfiguration result) {
+ if (null == result.getTables()) {
+ return new MaskRuleConfiguration(new LinkedList<>(), result.getMaskAlgorithms());
}
- return config;
+ return result;
}
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingAlgorithmSubscriber.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingAlgorithmSubscriber.java
index 711831bbe3c..15ac6b6b2d1 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingAlgorithmSubscriber.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingAlgorithmSubscriber.java
@@ -148,13 +148,13 @@ public final class ShardingAlgorithmSubscriber implements RuleChangedSubscriber
private ShardingRuleConfiguration getShardingRuleConfiguration(final ShardingSphereDatabase database) {
Optional<ShardingRule> rule = database.getRuleMetaData().findSingleRule(ShardingRule.class);
- ShardingRuleConfiguration config;
+ ShardingRuleConfiguration result;
if (rule.isPresent()) {
- config = (ShardingRuleConfiguration) rule.get().getConfiguration();
+ result = (ShardingRuleConfiguration) rule.get().getConfiguration();
} else {
- config = new ShardingRuleConfiguration();
+ result = new ShardingRuleConfiguration();
}
- return config;
+ return result;
}
private AlgorithmConfiguration swapToAlgorithmConfig(final String yamlContext) {
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingStrategyConfigurationSubscriber.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingStrategyConfigurationSubscriber.java
index b78faf203bb..55e6efdd85a 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingStrategyConfigurationSubscriber.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingStrategyConfigurationSubscriber.java
@@ -322,13 +322,13 @@ public final class ShardingStrategyConfigurationSubscriber implements RuleChange
private ShardingRuleConfiguration getShardingRuleConfiguration(final ShardingSphereDatabase database) {
Optional<ShardingRule> rule = database.getRuleMetaData().findSingleRule(ShardingRule.class);
- ShardingRuleConfiguration config;
+ ShardingRuleConfiguration result;
if (rule.isPresent()) {
- config = (ShardingRuleConfiguration) rule.get().getConfiguration();
+ result = (ShardingRuleConfiguration) rule.get().getConfiguration();
} else {
- config = new ShardingRuleConfiguration();
+ result = new ShardingRuleConfiguration();
}
- return config;
+ return result;
}
private ShardingStrategyConfiguration swapShardingStrategyConfig(final String yamlContext) {
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingTableConfigurationSubscriber.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingTableConfigurationSubscriber.java
index 8ba07b46bc8..f3baab00b52 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingTableConfigurationSubscriber.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/subscriber/ShardingTableConfigurationSubscriber.java
@@ -222,13 +222,13 @@ public final class ShardingTableConfigurationSubscriber implements RuleChangedSu
private ShardingRuleConfiguration getShardingRuleConfiguration(final ShardingSphereDatabase database) {
Optional<ShardingRule> rule = database.getRuleMetaData().findSingleRule(ShardingRule.class);
- ShardingRuleConfiguration config;
+ ShardingRuleConfiguration result;
if (rule.isPresent()) {
- config = (ShardingRuleConfiguration) rule.get().getConfiguration();
+ result = (ShardingRuleConfiguration) rule.get().getConfiguration();
} else {
- config = new ShardingRuleConfiguration();
+ result = new ShardingRuleConfiguration();
}
- return config;
+ return result;
}
private ShardingTableRuleConfiguration swapShardingTableRuleConfig(final String yamlContext) {