This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 3bf40ddc18f Refactor AuthorityRuleConfiguration (#24127)
3bf40ddc18f is described below
commit 3bf40ddc18f465ee72661ac13d8e1c608aa8e4da
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Feb 12 20:27:48 2023 +0800
Refactor AuthorityRuleConfiguration (#24127)
* Refactor AuthorityRuleConfiguration
* Refactor AuthorityRuleConfiguration
* Refactor AuthorityRuleConfiguration
---
.../config/AuthorityRuleConfiguration.java | 21 +++++----------------
.../authority/rule/AuthorityRule.java | 2 +-
.../DefaultAuthorityRuleConfigurationBuilder.java | 2 +-
.../YamlAuthorityRuleConfigurationSwapper.java | 4 ++--
.../authority/checker/AuthorityCheckerTest.java | 4 ++--
.../authority/rule/AuthorityRuleTest.java | 2 +-
...efaultAuthorityRuleConfigurationBuilderTest.java | 2 +-
.../YamlAuthorityRuleConfigurationSwapperTest.java | 6 +++---
.../distsql/handler/ShowAuthorityRuleExecutor.java | 2 +-
.../handler/ShowAuthorityRuleExecutorTest.java | 2 +-
.../ConfigurationChangedSubscriberTest.java | 2 +-
.../frontend/mysql/MySQLFrontendEngineTest.java | 2 +-
.../MySQLAuthenticationHandlerTest.java | 2 +-
.../OpenGaussAuthenticationEngineTest.java | 2 +-
.../OpenGaussAuthenticationHandlerTest.java | 2 +-
.../PostgreSQLAuthenticationEngineTest.java | 2 +-
.../PostgreSQLAuthenticationHandlerTest.java | 2 +-
17 files changed, 25 insertions(+), 36 deletions(-)
diff --git
a/kernel/authority/api/src/main/java/org/apache/shardingsphere/authority/config/AuthorityRuleConfiguration.java
b/kernel/authority/api/src/main/java/org/apache/shardingsphere/authority/config/AuthorityRuleConfiguration.java
index 090c91ec63e..7f359b794fd 100644
---
a/kernel/authority/api/src/main/java/org/apache/shardingsphere/authority/config/AuthorityRuleConfiguration.java
+++
b/kernel/authority/api/src/main/java/org/apache/shardingsphere/authority/config/AuthorityRuleConfiguration.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.authority.config;
import lombok.Getter;
-import lombok.Setter;
+import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration;
import
org.apache.shardingsphere.infra.config.rule.scope.GlobalRuleConfiguration;
import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
@@ -30,26 +30,15 @@ import java.util.Map;
/**
* Authority rule configuration.
*/
+@RequiredArgsConstructor
@Getter
-@Setter
public final class AuthorityRuleConfiguration implements
GlobalRuleConfiguration {
private final Collection<ShardingSphereUser> users;
- private final AlgorithmConfiguration provider;
+ private final AlgorithmConfiguration authorityProvider;
- private final Map<String, AlgorithmConfiguration> authenticators = new
LinkedHashMap<>();
-
- private String defaultAuthenticator;
+ private final String defaultAuthenticator;
- public AuthorityRuleConfiguration(final Collection<ShardingSphereUser>
users, final AlgorithmConfiguration provider) {
- this.users = users;
- this.provider = provider;
- }
-
- public AuthorityRuleConfiguration(final Collection<ShardingSphereUser>
users, final AlgorithmConfiguration provider, final String
defaultAuthenticator) {
- this.users = users;
- this.provider = provider;
- this.defaultAuthenticator = defaultAuthenticator;
- }
+ private final Map<String, AlgorithmConfiguration> authenticators = new
LinkedHashMap<>();
}
diff --git
a/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/rule/AuthorityRule.java
b/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/rule/AuthorityRule.java
index 45e6b43d2ca..351af264490 100644
---
a/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/rule/AuthorityRule.java
+++
b/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/rule/AuthorityRule.java
@@ -55,7 +55,7 @@ public final class AuthorityRule implements GlobalRule {
public AuthorityRule(final AuthorityRuleConfiguration ruleConfig, final
Map<String, ShardingSphereDatabase> databases) {
configuration = ruleConfig;
users = ruleConfig.getUsers();
- provider = TypedSPILoader.getService(AuthorityProvider.class,
ruleConfig.getProvider().getType(), ruleConfig.getProvider().getProps());
+ provider = TypedSPILoader.getService(AuthorityProvider.class,
ruleConfig.getAuthorityProvider().getType(),
ruleConfig.getAuthorityProvider().getProps());
authorityRegistry = provider.buildAuthorityRegistry(databases,
ruleConfig.getUsers());
authenticatorConfig.putAll(ruleConfig.getAuthenticators());
defaultAuthenticator = ruleConfig.getDefaultAuthenticator();
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 12f7823332d..0e73e333018 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
@@ -34,7 +34,7 @@ public final class DefaultAuthorityRuleConfigurationBuilder
implements DefaultGl
@Override
public AuthorityRuleConfiguration build() {
- return new AuthorityRuleConfiguration(createDefaultUsers(), new
AlgorithmConfiguration("ALL_PERMITTED", new Properties()));
+ return new AuthorityRuleConfiguration(createDefaultUsers(), new
AlgorithmConfiguration("ALL_PERMITTED", new Properties()), null);
}
private Collection<ShardingSphereUser> createDefaultUsers() {
diff --git
a/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/yaml/swapper/YamlAuthorityRuleConfigurationSwapper.java
b/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/yaml/swapper/YamlAuthorityRuleConfigurationSwapper.java
index beec7892d27..2edb853f3c8 100644
---
a/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/yaml/swapper/YamlAuthorityRuleConfigurationSwapper.java
+++
b/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/yaml/swapper/YamlAuthorityRuleConfigurationSwapper.java
@@ -39,7 +39,7 @@ public final class YamlAuthorityRuleConfigurationSwapper
implements YamlRuleConf
@Override
public YamlAuthorityRuleConfiguration swapToYamlConfiguration(final
AuthorityRuleConfiguration data) {
YamlAuthorityRuleConfiguration result = new
YamlAuthorityRuleConfiguration();
-
result.setPrivilege(algorithmSwapper.swapToYamlConfiguration(data.getProvider()));
+
result.setPrivilege(algorithmSwapper.swapToYamlConfiguration(data.getAuthorityProvider()));
result.setUsers(YamlUsersConfigurationConverter.convertToYamlUserConfiguration(data.getUsers()));
result.setDefaultAuthenticator(data.getDefaultAuthenticator());
if (!data.getAuthenticators().isEmpty()) {
@@ -53,7 +53,7 @@ public final class YamlAuthorityRuleConfigurationSwapper
implements YamlRuleConf
Collection<ShardingSphereUser> users =
YamlUsersConfigurationConverter.convertToShardingSphereUser(yamlConfig.getUsers());
AlgorithmConfiguration provider =
algorithmSwapper.swapToObject(yamlConfig.getPrivilege());
if (null == provider) {
- provider = new
DefaultAuthorityRuleConfigurationBuilder().build().getProvider();
+ provider = new
DefaultAuthorityRuleConfigurationBuilder().build().getAuthorityProvider();
}
AuthorityRuleConfiguration result = new
AuthorityRuleConfiguration(users, provider,
yamlConfig.getDefaultAuthenticator());
yamlConfig.getAuthenticators().forEach((key, value) ->
result.getAuthenticators().put(key, algorithmSwapper.swapToObject(value)));
diff --git
a/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/checker/AuthorityCheckerTest.java
b/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/checker/AuthorityCheckerTest.java
index 30920cce4a1..0d7abb50d4d 100644
---
a/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/checker/AuthorityCheckerTest.java
+++
b/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/checker/AuthorityCheckerTest.java
@@ -39,14 +39,14 @@ public final class AuthorityCheckerTest {
@Test
public void assertCheckIsAuthorizedDatabase() {
Collection<ShardingSphereUser> users = Collections.singleton(new
ShardingSphereUser("root", "", "localhost"));
- AuthorityRuleConfiguration ruleConfig = new
AuthorityRuleConfiguration(users, new AlgorithmConfiguration("ALL_PERMITTED",
new Properties()));
+ AuthorityRuleConfiguration ruleConfig = new
AuthorityRuleConfiguration(users, new AlgorithmConfiguration("ALL_PERMITTED",
new Properties()), null);
assertTrue(new AuthorityChecker(new AuthorityRule(ruleConfig,
Collections.emptyMap()), new Grantee("root", "localhost")).isAuthorized("db0"));
}
@Test
public void assertCheckPrivileges() {
Collection<ShardingSphereUser> users = Collections.singleton(new
ShardingSphereUser("root", "", "localhost"));
- AuthorityRule rule = new AuthorityRule(new
AuthorityRuleConfiguration(users, new AlgorithmConfiguration("ALL_PERMITTED",
new Properties())), Collections.emptyMap());
+ AuthorityRule rule = new AuthorityRule(new
AuthorityRuleConfiguration(users, new AlgorithmConfiguration("ALL_PERMITTED",
new Properties()), null), Collections.emptyMap());
AuthorityChecker authorityChecker = new AuthorityChecker(rule, new
Grantee("root", "localhost"));
authorityChecker.checkPrivileges(null, mock(SelectStatement.class));
authorityChecker.checkPrivileges(null, mock(InsertStatement.class));
diff --git
a/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/rule/AuthorityRuleTest.java
b/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/rule/AuthorityRuleTest.java
index 95bdbfdb0a1..fa14ec8be6f 100644
---
a/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/rule/AuthorityRuleTest.java
+++
b/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/rule/AuthorityRuleTest.java
@@ -70,6 +70,6 @@ public final class AuthorityRuleTest {
Collection<ShardingSphereUser> users = new LinkedList<>();
users.add(new ShardingSphereUser("root", "root", "localhost"));
users.add(new ShardingSphereUser("admin", "123456", "localhost"));
- return new AuthorityRule(new AuthorityRuleConfiguration(users, new
AlgorithmConfiguration("ALL_PERMITTED", new Properties())),
Collections.emptyMap());
+ return new AuthorityRule(new AuthorityRuleConfiguration(users, new
AlgorithmConfiguration("ALL_PERMITTED", new Properties()), null),
Collections.emptyMap());
}
}
diff --git
a/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/rule/builder/DefaultAuthorityRuleConfigurationBuilderTest.java
b/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/rule/builder/DefaultAuthorityRuleConfigurationBuilderTest.java
index 383fc35f9e3..6e7473ecc27 100644
---
a/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/rule/builder/DefaultAuthorityRuleConfigurationBuilderTest.java
+++
b/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/rule/builder/DefaultAuthorityRuleConfigurationBuilderTest.java
@@ -28,7 +28,7 @@ public final class
DefaultAuthorityRuleConfigurationBuilderTest {
@Test
public void assertBuild() {
AuthorityRuleConfiguration actual = new
DefaultAuthorityRuleConfigurationBuilder().build();
- assertThat(actual.getProvider().getType(), is("ALL_PERMITTED"));
+ assertThat(actual.getAuthorityProvider().getType(),
is("ALL_PERMITTED"));
assertThat(actual.getUsers().size(), is(1));
}
}
diff --git
a/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/yaml/swapper/YamlAuthorityRuleConfigurationSwapperTest.java
b/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/yaml/swapper/YamlAuthorityRuleConfigurationSwapperTest.java
index 32a1891a87f..68dbbe7dfa7 100644
---
a/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/yaml/swapper/YamlAuthorityRuleConfigurationSwapperTest.java
+++
b/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/yaml/swapper/YamlAuthorityRuleConfigurationSwapperTest.java
@@ -38,7 +38,7 @@ public final class YamlAuthorityRuleConfigurationSwapperTest {
@Test
public void assertSwapToYamlConfiguration() {
- AuthorityRuleConfiguration authorityRuleConfig = new
AuthorityRuleConfiguration(Collections.emptyList(), new
AlgorithmConfiguration("type", new Properties()));
+ AuthorityRuleConfiguration authorityRuleConfig = new
AuthorityRuleConfiguration(Collections.emptyList(), new
AlgorithmConfiguration("type", new Properties()), null);
YamlAuthorityRuleConfiguration actual =
swapper.swapToYamlConfiguration(authorityRuleConfig);
assertTrue(actual.getUsers().isEmpty());
assertNotNull(actual.getPrivilege());
@@ -51,7 +51,7 @@ public final class YamlAuthorityRuleConfigurationSwapperTest {
authorityRuleConfig.setPrivilege(new
YamlAlgorithmConfiguration("type", new Properties()));
AuthorityRuleConfiguration actual =
swapper.swapToObject(authorityRuleConfig);
assertThat(actual.getUsers().size(), is(1));
- assertNotNull(actual.getProvider());
+ assertNotNull(actual.getAuthorityProvider());
}
@Test
@@ -60,7 +60,7 @@ public final class YamlAuthorityRuleConfigurationSwapperTest {
authorityRuleConfig.setUsers(Collections.singletonList(getYamlUser()));
AuthorityRuleConfiguration actual =
swapper.swapToObject(authorityRuleConfig);
assertThat(actual.getUsers().size(), is(1));
- assertThat(actual.getProvider().getType(), is("ALL_PERMITTED"));
+ assertThat(actual.getAuthorityProvider().getType(),
is("ALL_PERMITTED"));
}
private YamlUserConfiguration getYamlUser() {
diff --git
a/kernel/authority/distsql/handler/src/main/java/org/apache/shardingsphere/authority/distsql/handler/ShowAuthorityRuleExecutor.java
b/kernel/authority/distsql/handler/src/main/java/org/apache/shardingsphere/authority/distsql/handler/ShowAuthorityRuleExecutor.java
index f4de2a643b5..eeb92355676 100644
---
a/kernel/authority/distsql/handler/src/main/java/org/apache/shardingsphere/authority/distsql/handler/ShowAuthorityRuleExecutor.java
+++
b/kernel/authority/distsql/handler/src/main/java/org/apache/shardingsphere/authority/distsql/handler/ShowAuthorityRuleExecutor.java
@@ -39,7 +39,7 @@ public final class ShowAuthorityRuleExecutor implements
MetaDataRequiredQueryabl
AuthorityRule rule =
metaData.getGlobalRuleMetaData().getSingleRule(AuthorityRule.class);
AuthorityRuleConfiguration ruleConfig = rule.getConfiguration();
return Collections.singleton(new
LocalDataQueryResultRow(ruleConfig.getUsers().stream().map(each ->
each.getGrantee().toString()).collect(Collectors.joining("; ")),
- ruleConfig.getProvider().getType(),
ruleConfig.getProvider().getProps().isEmpty() ? "" :
ruleConfig.getProvider().getProps()));
+ ruleConfig.getAuthorityProvider().getType(),
ruleConfig.getAuthorityProvider().getProps().isEmpty() ? "" :
ruleConfig.getAuthorityProvider().getProps()));
}
@Override
diff --git
a/kernel/authority/distsql/handler/src/test/java/org/apache/shardingsphere/authority/distsql/handler/ShowAuthorityRuleExecutorTest.java
b/kernel/authority/distsql/handler/src/test/java/org/apache/shardingsphere/authority/distsql/handler/ShowAuthorityRuleExecutorTest.java
index 060f0b533d4..8f3b94b59fb 100644
---
a/kernel/authority/distsql/handler/src/test/java/org/apache/shardingsphere/authority/distsql/handler/ShowAuthorityRuleExecutorTest.java
+++
b/kernel/authority/distsql/handler/src/test/java/org/apache/shardingsphere/authority/distsql/handler/ShowAuthorityRuleExecutorTest.java
@@ -73,6 +73,6 @@ public final class ShowAuthorityRuleExecutorTest {
private AuthorityRuleConfiguration createAuthorityRuleConfiguration() {
ShardingSphereUser root = new ShardingSphereUser("root", "",
"localhost");
- return new AuthorityRuleConfiguration(Collections.singleton(root), new
AlgorithmConfiguration("ALL_PERMITTED", new Properties()));
+ return new AuthorityRuleConfiguration(Collections.singleton(root), new
AlgorithmConfiguration("ALL_PERMITTED", new Properties()), null);
}
}
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriberTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriberTest.java
index 05498434500..8e01ab07389 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriberTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriberTest.java
@@ -161,7 +161,7 @@ public final class ConfigurationChangedSubscriberTest {
}
private Collection<RuleConfiguration> getChangedGlobalRuleConfigurations()
{
- RuleConfiguration authorityRuleConfig = new
AuthorityRuleConfiguration(getShardingSphereUsers(), new
AlgorithmConfiguration("ALL_PERMITTED", new Properties()));
+ RuleConfiguration authorityRuleConfig = new
AuthorityRuleConfiguration(getShardingSphereUsers(), new
AlgorithmConfiguration("ALL_PERMITTED", new Properties()), null);
return Collections.singleton(authorityRuleConfig);
}
diff --git
a/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/MySQLFrontendEngineTest.java
b/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/MySQLFrontendEngineTest.java
index 635c6d3ae78..efcc8c56aa8 100644
---
a/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/MySQLFrontendEngineTest.java
+++
b/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/MySQLFrontendEngineTest.java
@@ -193,7 +193,7 @@ public final class MySQLFrontendEngineTest extends
ProxyContextRestorer {
}
private ShardingSphereRuleMetaData buildGlobalRuleMetaData(final
ShardingSphereUser user) {
- AuthorityRuleConfiguration ruleConfig = new
AuthorityRuleConfiguration(Collections.singletonList(user), new
AlgorithmConfiguration("ALL_PERMITTED", new Properties()));
+ AuthorityRuleConfiguration ruleConfig = new
AuthorityRuleConfiguration(Collections.singletonList(user), new
AlgorithmConfiguration("ALL_PERMITTED", new Properties()), null);
AuthorityRule rule = new AuthorityRuleBuilder().build(ruleConfig,
Collections.emptyMap(), mock(ConfigurationProperties.class));
return new ShardingSphereRuleMetaData(Collections.singletonList(rule));
}
diff --git
a/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/authentication/MySQLAuthenticationHandlerTest.java
b/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/authentication/MySQLAuthenticationHandlerTest.java
index 982c0746f8c..c75910455db 100644
---
a/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/authentication/MySQLAuthenticationHandlerTest.java
+++
b/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/authentication/MySQLAuthenticationHandlerTest.java
@@ -152,7 +152,7 @@ public final class MySQLAuthenticationHandlerTest extends
ProxyContextRestorer {
}
private ShardingSphereRuleMetaData buildGlobalRuleMetaData(final
ShardingSphereUser user, final boolean isNeedSuper) throws
ReflectiveOperationException {
- AuthorityRuleConfiguration ruleConfig = new
AuthorityRuleConfiguration(Collections.singletonList(user), new
AlgorithmConfiguration("ALL_PERMITTED", new Properties()));
+ AuthorityRuleConfiguration ruleConfig = new
AuthorityRuleConfiguration(Collections.singletonList(user), new
AlgorithmConfiguration("ALL_PERMITTED", new Properties()), null);
AuthorityRule rule = new AuthorityRuleBuilder().build(ruleConfig,
Collections.emptyMap(), mock(ConfigurationProperties.class));
if (!isNeedSuper) {
AuthorityRegistry authorityRegistry =
mock(AuthorityRegistry.class);
diff --git
a/proxy/frontend/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/authentication/OpenGaussAuthenticationEngineTest.java
b/proxy/frontend/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/authentication/OpenGaussAuthenticationEngineTest.java
index b64e475ed7d..e5e4b6bbf9e 100644
---
a/proxy/frontend/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/authentication/OpenGaussAuthenticationEngineTest.java
+++
b/proxy/frontend/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/authentication/OpenGaussAuthenticationEngineTest.java
@@ -169,7 +169,7 @@ public final class OpenGaussAuthenticationEngineTest
extends ProxyContextRestore
}
private ShardingSphereRuleMetaData buildGlobalRuleMetaData(final
ShardingSphereUser user) {
- AuthorityRuleConfiguration ruleConfig = new
AuthorityRuleConfiguration(Collections.singletonList(user), new
AlgorithmConfiguration("ALL_PERMITTED", new Properties()));
+ AuthorityRuleConfiguration ruleConfig = new
AuthorityRuleConfiguration(Collections.singletonList(user), new
AlgorithmConfiguration("ALL_PERMITTED", new Properties()), null);
AuthorityRule rule = new AuthorityRuleBuilder().build(ruleConfig,
Collections.emptyMap(), mock(ConfigurationProperties.class));
return new ShardingSphereRuleMetaData(Collections.singletonList(rule));
}
diff --git
a/proxy/frontend/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/authentication/OpenGaussAuthenticationHandlerTest.java
b/proxy/frontend/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/authentication/OpenGaussAuthenticationHandlerTest.java
index abc6a26a682..22ae6f4804f 100644
---
a/proxy/frontend/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/authentication/OpenGaussAuthenticationHandlerTest.java
+++
b/proxy/frontend/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/authentication/OpenGaussAuthenticationHandlerTest.java
@@ -140,7 +140,7 @@ public final class OpenGaussAuthenticationHandlerTest
extends ProxyContextRestor
}
private ShardingSphereRuleMetaData buildGlobalRuleMetaData(final
ShardingSphereUser user) {
- AuthorityRuleConfiguration ruleConfig = new
AuthorityRuleConfiguration(Collections.singletonList(user), new
AlgorithmConfiguration("ALL_PERMITTED", new Properties()));
+ AuthorityRuleConfiguration ruleConfig = new
AuthorityRuleConfiguration(Collections.singletonList(user), new
AlgorithmConfiguration("ALL_PERMITTED", new Properties()), null);
AuthorityRule rule = new AuthorityRuleBuilder().build(ruleConfig,
Collections.emptyMap(), mock(ConfigurationProperties.class));
return new ShardingSphereRuleMetaData(Collections.singleton(rule));
}
diff --git
a/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/authentication/PostgreSQLAuthenticationEngineTest.java
b/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/authentication/PostgreSQLAuthenticationEngineTest.java
index 4351fb62d9b..1469a296032 100644
---
a/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/authentication/PostgreSQLAuthenticationEngineTest.java
+++
b/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/authentication/PostgreSQLAuthenticationEngineTest.java
@@ -176,7 +176,7 @@ public final class PostgreSQLAuthenticationEngineTest
extends ProxyContextRestor
}
private ShardingSphereRuleMetaData buildGlobalRuleMetaData(final
ShardingSphereUser user) {
- AuthorityRuleConfiguration ruleConfig = new
AuthorityRuleConfiguration(Collections.singletonList(user), new
AlgorithmConfiguration("ALL_PERMITTED", new Properties()));
+ AuthorityRuleConfiguration ruleConfig = new
AuthorityRuleConfiguration(Collections.singletonList(user), new
AlgorithmConfiguration("ALL_PERMITTED", new Properties()), null);
AuthorityRule rule = new AuthorityRuleBuilder().build(ruleConfig,
Collections.emptyMap(), mock(ConfigurationProperties.class));
return new ShardingSphereRuleMetaData(Collections.singleton(rule));
}
diff --git
a/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/authentication/PostgreSQLAuthenticationHandlerTest.java
b/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/authentication/PostgreSQLAuthenticationHandlerTest.java
index f57e125c26a..628a8dcbb0e 100644
---
a/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/authentication/PostgreSQLAuthenticationHandlerTest.java
+++
b/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/authentication/PostgreSQLAuthenticationHandlerTest.java
@@ -150,7 +150,7 @@ public final class PostgreSQLAuthenticationHandlerTest
extends ProxyContextResto
}
private ShardingSphereRuleMetaData buildGlobalRuleMetaData(final
ShardingSphereUser user) {
- AuthorityRuleConfiguration ruleConfig = new
AuthorityRuleConfiguration(Collections.singletonList(user), new
AlgorithmConfiguration("ALL_PERMITTED", new Properties()));
+ AuthorityRuleConfiguration ruleConfig = new
AuthorityRuleConfiguration(Collections.singletonList(user), new
AlgorithmConfiguration("ALL_PERMITTED", new Properties()), null);
AuthorityRule rule = new AuthorityRuleBuilder().build(ruleConfig,
Collections.emptyMap(), mock(ConfigurationProperties.class));
return new ShardingSphereRuleMetaData(Collections.singleton(rule));
}
