(shardingsphere) branch master updated: Refactor DefaultAuthorityRuleConfigurationBuilder (#29585)

[jianglongtao]

This is an automated email from the ASF dual-hosted git repository.

jianglongtao 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 a04d35eaef9 Refactor DefaultAuthorityRuleConfigurationBuilder (#29585)
a04d35eaef9 is described below

commit a04d35eaef99e93a537a3b2436efc5aa660175d3
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Thu Dec 28 20:53:13 2023 +0800

    Refactor DefaultAuthorityRuleConfigurationBuilder (#29585)
---
 .../builder/DefaultAuthorityRuleConfigurationBuilder.java     | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git 
a/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/rule/builder/DefaultAuthorityRuleConfigurationBuilder.java
 
b/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/rule/builder/DefaultAuthorityRuleConfigurationBuilder.java
index 5d2cb239e85..9b1991209ca 100644
--- 
a/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/rule/builder/DefaultAuthorityRuleConfigurationBuilder.java
+++ 
b/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/rule/builder/DefaultAuthorityRuleConfigurationBuilder.java
@@ -24,6 +24,7 @@ import 
org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
 import 
org.apache.shardingsphere.infra.rule.builder.global.DefaultGlobalRuleConfigurationBuilder;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.Properties;
@@ -35,13 +36,9 @@ public final class DefaultAuthorityRuleConfigurationBuilder 
implements DefaultGl
     
     @Override
     public AuthorityRuleConfiguration build() {
-        return new AuthorityRuleConfiguration(createDefaultUsers(), new 
AlgorithmConfiguration("ALL_PERMITTED", new Properties()), new 
LinkedHashMap<>(), null);
-    }
-    
-    private Collection<ShardingSphereUser> createDefaultUsers() {
-        Collection<ShardingSphereUser> result = new LinkedHashSet<>();
-        result.add(new ShardingSphereUser(DefaultUser.USER_NAME, 
DefaultUser.USER_PASSWORD, DefaultUser.USER_HOSTNAME));
-        return result;
+        Collection<ShardingSphereUser> defaultUsers = new 
LinkedHashSet<>(Collections.singleton(new 
ShardingSphereUser(DefaultUser.USER_NAME, DefaultUser.USER_PASSWORD, 
DefaultUser.USER_HOSTNAME)));
+        AlgorithmConfiguration authorityProviderConfig = new 
AlgorithmConfiguration("ALL_PERMITTED", new Properties());
+        return new AuthorityRuleConfiguration(defaultUsers, 
authorityProviderConfig, new LinkedHashMap<>(), null);
     }
     
     @Override