This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 2f7b51a69d8 Refactor for code format (#26644)
2f7b51a69d8 is described below
commit 2f7b51a69d8af1699a9985f0a6add62c2019a9cb
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Jun 28 00:31:10 2023 +0800
Refactor for code format (#26644)
---
.../encrypt/event/EncryptRuleConfigurationEventBuilder.java | 2 +-
.../shardingsphere/mask/event/MaskRuleConfigurationEventBuilder.java | 2 +-
.../event/ReadwriteSplittingRuleConfigurationEventBuilder.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/EncryptRuleConfigurationEventBuilder.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/EncryptRuleConfigurationEventBuilder.java
index 3fbcd828d66..c7dda1aa7b0 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/EncryptRuleConfigurationEventBuilder.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/EncryptRuleConfigurationEventBuilder.java
@@ -49,7 +49,7 @@ public final class EncryptRuleConfigurationEventBuilder
implements RuleConfigura
return Optional.of(createEncryptConfigEvent(databaseName,
tableName.get(), event));
}
Optional<String> encryptorName =
encryptRuleNodePath.getNamedItem(EncryptNodePath.ENCRYPTORS).getNameByActiveVersion(event.getKey());
- return encryptorName.flatMap(optional ->
Optional.of(createEncryptorEvent(databaseName, optional, event)));
+ return encryptorName.map(optional ->
createEncryptorEvent(databaseName, optional, event));
}
private GovernanceEvent createEncryptConfigEvent(final String
databaseName, final String groupName, final DataChangedEvent event) {
diff --git
a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/event/MaskRuleConfigurationEventBuilder.java
b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/event/MaskRuleConfigurationEventBuilder.java
index 63b54778097..5714aa2919e 100644
---
a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/event/MaskRuleConfigurationEventBuilder.java
+++
b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/event/MaskRuleConfigurationEventBuilder.java
@@ -49,7 +49,7 @@ public final class MaskRuleConfigurationEventBuilder
implements RuleConfiguratio
return Optional.of(createMaskConfigEvent(databaseName,
tableName.get(), event));
}
Optional<String> algorithmName =
maskRuleNodePath.getNamedItem(MaskNodePath.ALGORITHMS).getNameByActiveVersion(event.getKey());
- return algorithmName.flatMap(optional ->
Optional.of(createMaskAlgorithmEvent(databaseName, optional, event)));
+ return algorithmName.map(optional ->
createMaskAlgorithmEvent(databaseName, optional, event));
}
private GovernanceEvent createMaskConfigEvent(final String databaseName,
final String tableName, final DataChangedEvent event) {
diff --git
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/event/ReadwriteSplittingRuleConfigurationEventBuilder.java
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/event/ReadwriteSplittingRuleConfigurationEventBuilder.java
index a8e2a7416a4..bab887934df 100644
---
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/event/ReadwriteSplittingRuleConfigurationEventBuilder.java
+++
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/event/ReadwriteSplittingRuleConfigurationEventBuilder.java
@@ -49,7 +49,7 @@ public final class
ReadwriteSplittingRuleConfigurationEventBuilder implements Ru
return
Optional.of(createReadwriteSplittingConfigEvent(databaseName, groupName.get(),
event));
}
Optional<String> loadBalancerName =
readwriteSplittingRuleNodePath.getNamedItem(ReadwriteSplittingNodePath.LOAD_BALANCERS).getNameByActiveVersion(event.getKey());
- return loadBalancerName.flatMap(optional ->
Optional.of(createLoadBalanceEvent(databaseName, optional, event)));
+ return loadBalancerName.map(optional ->
createLoadBalanceEvent(databaseName, optional, event));
}
private GovernanceEvent createReadwriteSplittingConfigEvent(final String
databaseName, final String groupName, final DataChangedEvent event) {