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 e9d0ecc22a3 Refactor DatabasePermittedAuthorityRegistryProvider
(#29598)
e9d0ecc22a3 is described below
commit e9d0ecc22a3aade49ea0fa112d9aeaeb02129144
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Dec 29 20:08:54 2023 +0800
Refactor DatabasePermittedAuthorityRegistryProvider (#29598)
---
.../provider/database/DatabasePermittedAuthorityRegistryProvider.java | 2 +-
.../database/DatabasePermittedAuthorityRegistryProviderTest.java | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git
a/kernel/authority/provider/database/src/main/java/org/apache/shardingsphere/authority/provider/database/DatabasePermittedAuthorityRegistryProvider.java
b/kernel/authority/provider/database/src/main/java/org/apache/shardingsphere/authority/provider/database/DatabasePermittedAuthorityRegistryProvider.java
index 60ddae0e8a7..ea20a82baa5 100644
---
a/kernel/authority/provider/database/src/main/java/org/apache/shardingsphere/authority/provider/database/DatabasePermittedAuthorityRegistryProvider.java
+++
b/kernel/authority/provider/database/src/main/java/org/apache/shardingsphere/authority/provider/database/DatabasePermittedAuthorityRegistryProvider.java
@@ -40,7 +40,7 @@ import java.util.stream.Collectors;
*/
public final class DatabasePermittedAuthorityRegistryProvider implements
AuthorityRegistryProvider {
- public static final String USER_DATABASE_MAPPINGS_KEY =
"user-database-mappings";
+ private static final String USER_DATABASE_MAPPINGS_KEY =
"user-database-mappings";
private String userDatabaseMappings;
diff --git
a/kernel/authority/provider/database/src/test/java/org/apache/shardingsphere/authority/provider/database/DatabasePermittedAuthorityRegistryProviderTest.java
b/kernel/authority/provider/database/src/test/java/org/apache/shardingsphere/authority/provider/database/DatabasePermittedAuthorityRegistryProviderTest.java
index 5ee0d4267da..74e3369974a 100644
---
a/kernel/authority/provider/database/src/test/java/org/apache/shardingsphere/authority/provider/database/DatabasePermittedAuthorityRegistryProviderTest.java
+++
b/kernel/authority/provider/database/src/test/java/org/apache/shardingsphere/authority/provider/database/DatabasePermittedAuthorityRegistryProviderTest.java
@@ -38,8 +38,7 @@ class DatabasePermittedAuthorityRegistryProviderTest {
@Test
void assertBuild() {
- Properties props = PropertiesBuilder.build(
- new
Property(DatabasePermittedAuthorityRegistryProvider.USER_DATABASE_MAPPINGS_KEY,
"root@localhost=test, [email protected]=db_dal_admin, user1@=test, user1@=test1,
user1@=*"));
+ Properties props = PropertiesBuilder.build(new
Property("user-database-mappings", "root@localhost=test,
[email protected]=db_dal_admin, user1@=test, user1@=test1, user1@=*"));
AuthorityRegistryProvider provider =
TypedSPILoader.getService(AuthorityRegistryProvider.class,
"DATABASE_PERMITTED", props);
AuthorityRegistry actual =
provider.build(Collections.singletonList(new ShardingSphereUser("user1", "",
"127.0.0.2")));
Optional<ShardingSpherePrivileges> privileges =
actual.findPrivileges(new Grantee("user1", "127.0.0.2"));