This is an automated email from the ASF dual-hosted git repository.
panjuan 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 d7f6df65f92 Rename DatabasePermittedAuthorityRegistry (#29562)
d7f6df65f92 is described below
commit d7f6df65f9225872951fd3df53d7adc082f8b919
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Dec 27 12:56:10 2023 +0800
Rename DatabasePermittedAuthorityRegistry (#29562)
---
.../database/DatabasePermittedAuthorityRegistryProvider.java | 11 +++++------
.../DatabasePermittedAuthorityRegistry.java} | 10 +++++-----
.../{model => }/privilege/DatabasePermittedPrivileges.java | 4 ++--
.../database/{model => }/subject/DatabaseAccessSubject.java | 2 +-
.../simple/AllPermittedAuthorityRegistryProvider.java | 2 +-
.../AllPermittedAuthorityRegistry.java | 3 +--
.../admin/executor/DefaultDatabaseMetaDataExecutorTest.java | 2 +-
.../information/SelectInformationSchemataExecutorTest.java | 2 +-
8 files changed, 17 insertions(+), 19 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 010545f4900..67dc78ab380 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
@@ -19,9 +19,8 @@ package org.apache.shardingsphere.authority.provider.database;
import com.google.common.base.Preconditions;
import org.apache.shardingsphere.authority.model.AuthorityRegistry;
-import org.apache.shardingsphere.authority.model.ShardingSpherePrivileges;
-import
org.apache.shardingsphere.authority.provider.database.model.privilege.DatabasePermittedPrivileges;
-import
org.apache.shardingsphere.authority.provider.database.registry.UserPrivilegeMapAuthorityRegistry;
+import
org.apache.shardingsphere.authority.provider.database.privilege.DatabasePermittedPrivileges;
+import
org.apache.shardingsphere.authority.provider.database.privilege.DatabasePermittedAuthorityRegistry;
import org.apache.shardingsphere.authority.spi.AuthorityRegistryProvider;
import org.apache.shardingsphere.infra.metadata.user.Grantee;
import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
@@ -54,7 +53,7 @@ public final class DatabasePermittedAuthorityRegistryProvider
implements Authori
public AuthorityRegistry build(final Collection<ShardingSphereUser> users)
{
String userDatabaseMappings =
props.getProperty(DatabasePermittedAuthorityRegistryProvider.PROP_USER_DATABASE_MAPPINGS,
"");
checkDatabases(userDatabaseMappings);
- return new UserPrivilegeMapAuthorityRegistry(buildPrivileges(users,
convertUserDatabases(userDatabaseMappings)));
+ return new DatabasePermittedAuthorityRegistry(buildPrivileges(users,
convertUserDatabases(userDatabaseMappings)));
}
private void checkDatabases(final String userDatabaseMappings) {
@@ -63,8 +62,8 @@ public final class DatabasePermittedAuthorityRegistryProvider
implements Authori
"user-database-mappings configuration `%s` is invalid, the
configuration format should be like `username@hostname=database`", each));
}
- private Map<ShardingSphereUser, ShardingSpherePrivileges>
buildPrivileges(final Collection<ShardingSphereUser> users,
-
final Map<ShardingSphereUser, Collection<String>> userDatabaseMappings) {
+ private Map<ShardingSphereUser, DatabasePermittedPrivileges>
buildPrivileges(final Collection<ShardingSphereUser> users,
+
final Map<ShardingSphereUser, Collection<String>> userDatabaseMappings) {
return users.stream().collect(Collectors.toMap(each -> each, each ->
new DatabasePermittedPrivileges(getUserDatabases(each, userDatabaseMappings))));
}
diff --git
a/kernel/authority/provider/database/src/main/java/org/apache/shardingsphere/authority/provider/database/registry/UserPrivilegeMapAuthorityRegistry.java
b/kernel/authority/provider/database/src/main/java/org/apache/shardingsphere/authority/provider/database/privilege/DatabasePermittedAuthorityRegistry.java
similarity index 75%
rename from
kernel/authority/provider/database/src/main/java/org/apache/shardingsphere/authority/provider/database/registry/UserPrivilegeMapAuthorityRegistry.java
rename to
kernel/authority/provider/database/src/main/java/org/apache/shardingsphere/authority/provider/database/privilege/DatabasePermittedAuthorityRegistry.java
index 55db290936f..c202894d38e 100644
---
a/kernel/authority/provider/database/src/main/java/org/apache/shardingsphere/authority/provider/database/registry/UserPrivilegeMapAuthorityRegistry.java
+++
b/kernel/authority/provider/database/src/main/java/org/apache/shardingsphere/authority/provider/database/privilege/DatabasePermittedAuthorityRegistry.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.authority.provider.database.registry;
+package org.apache.shardingsphere.authority.provider.database.privilege;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.authority.model.AuthorityRegistry;
@@ -27,15 +27,15 @@ import java.util.Map;
import java.util.Optional;
/**
- * User privilege map authority registry.
+ * Database permitted authority registry.
*/
@RequiredArgsConstructor
-public final class UserPrivilegeMapAuthorityRegistry implements
AuthorityRegistry {
+public final class DatabasePermittedAuthorityRegistry implements
AuthorityRegistry {
- private final Map<ShardingSphereUser, ? extends ShardingSpherePrivileges>
userPrivilegeMap;
+ private final Map<ShardingSphereUser, DatabasePermittedPrivileges>
userPrivileges;
@Override
public Optional<ShardingSpherePrivileges> findPrivileges(final Grantee
grantee) {
- return userPrivilegeMap.keySet().stream().filter(each ->
each.getGrantee().equals(grantee)).findFirst().map(userPrivilegeMap::get);
+ return userPrivileges.keySet().stream().filter(each ->
each.getGrantee().equals(grantee)).findFirst().map(userPrivileges::get);
}
}
diff --git
a/kernel/authority/provider/database/src/main/java/org/apache/shardingsphere/authority/provider/database/model/privilege/DatabasePermittedPrivileges.java
b/kernel/authority/provider/database/src/main/java/org/apache/shardingsphere/authority/provider/database/privilege/DatabasePermittedPrivileges.java
similarity index 91%
rename from
kernel/authority/provider/database/src/main/java/org/apache/shardingsphere/authority/provider/database/model/privilege/DatabasePermittedPrivileges.java
rename to
kernel/authority/provider/database/src/main/java/org/apache/shardingsphere/authority/provider/database/privilege/DatabasePermittedPrivileges.java
index f8e97eb9662..959dde49034 100644
---
a/kernel/authority/provider/database/src/main/java/org/apache/shardingsphere/authority/provider/database/model/privilege/DatabasePermittedPrivileges.java
+++
b/kernel/authority/provider/database/src/main/java/org/apache/shardingsphere/authority/provider/database/privilege/DatabasePermittedPrivileges.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.authority.provider.database.model.privilege;
+package org.apache.shardingsphere.authority.provider.database.privilege;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.authority.model.AccessSubject;
import org.apache.shardingsphere.authority.model.PrivilegeType;
import org.apache.shardingsphere.authority.model.ShardingSpherePrivileges;
-import
org.apache.shardingsphere.authority.provider.database.model.subject.DatabaseAccessSubject;
+import
org.apache.shardingsphere.authority.provider.database.subject.DatabaseAccessSubject;
import java.util.Collection;
diff --git
a/kernel/authority/provider/database/src/main/java/org/apache/shardingsphere/authority/provider/database/model/subject/DatabaseAccessSubject.java
b/kernel/authority/provider/database/src/main/java/org/apache/shardingsphere/authority/provider/database/subject/DatabaseAccessSubject.java
similarity index 93%
rename from
kernel/authority/provider/database/src/main/java/org/apache/shardingsphere/authority/provider/database/model/subject/DatabaseAccessSubject.java
rename to
kernel/authority/provider/database/src/main/java/org/apache/shardingsphere/authority/provider/database/subject/DatabaseAccessSubject.java
index 737a68cb1ac..e69a87ccfc4 100644
---
a/kernel/authority/provider/database/src/main/java/org/apache/shardingsphere/authority/provider/database/model/subject/DatabaseAccessSubject.java
+++
b/kernel/authority/provider/database/src/main/java/org/apache/shardingsphere/authority/provider/database/subject/DatabaseAccessSubject.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.authority.provider.database.model.subject;
+package org.apache.shardingsphere.authority.provider.database.subject;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/kernel/authority/provider/simple/src/main/java/org/apache/shardingsphere/authority/provider/simple/AllPermittedAuthorityRegistryProvider.java
b/kernel/authority/provider/simple/src/main/java/org/apache/shardingsphere/authority/provider/simple/AllPermittedAuthorityRegistryProvider.java
index 87906df3e14..f32b69ddd07 100644
---
a/kernel/authority/provider/simple/src/main/java/org/apache/shardingsphere/authority/provider/simple/AllPermittedAuthorityRegistryProvider.java
+++
b/kernel/authority/provider/simple/src/main/java/org/apache/shardingsphere/authority/provider/simple/AllPermittedAuthorityRegistryProvider.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.authority.provider.simple;
import org.apache.shardingsphere.authority.model.AuthorityRegistry;
-import
org.apache.shardingsphere.authority.provider.simple.registry.AllPermittedAuthorityRegistry;
+import
org.apache.shardingsphere.authority.provider.simple.privilege.AllPermittedAuthorityRegistry;
import org.apache.shardingsphere.authority.spi.AuthorityRegistryProvider;
import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
diff --git
a/kernel/authority/provider/simple/src/main/java/org/apache/shardingsphere/authority/provider/simple/registry/AllPermittedAuthorityRegistry.java
b/kernel/authority/provider/simple/src/main/java/org/apache/shardingsphere/authority/provider/simple/privilege/AllPermittedAuthorityRegistry.java
similarity index 89%
rename from
kernel/authority/provider/simple/src/main/java/org/apache/shardingsphere/authority/provider/simple/registry/AllPermittedAuthorityRegistry.java
rename to
kernel/authority/provider/simple/src/main/java/org/apache/shardingsphere/authority/provider/simple/privilege/AllPermittedAuthorityRegistry.java
index 544985aa59e..7fd9b51c42a 100644
---
a/kernel/authority/provider/simple/src/main/java/org/apache/shardingsphere/authority/provider/simple/registry/AllPermittedAuthorityRegistry.java
+++
b/kernel/authority/provider/simple/src/main/java/org/apache/shardingsphere/authority/provider/simple/privilege/AllPermittedAuthorityRegistry.java
@@ -15,11 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.authority.provider.simple.registry;
+package org.apache.shardingsphere.authority.provider.simple.privilege;
import org.apache.shardingsphere.authority.model.AuthorityRegistry;
import org.apache.shardingsphere.authority.model.ShardingSpherePrivileges;
-import
org.apache.shardingsphere.authority.provider.simple.privilege.AllPermittedPrivileges;
import org.apache.shardingsphere.infra.metadata.user.Grantee;
import java.util.Optional;
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/DefaultDatabaseMetaDataExecutorTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/DefaultDatabaseMetaDataExecutorTest.java
index af7a432d0c1..adc2a9ead23 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/DefaultDatabaseMetaDataExecutorTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/DefaultDatabaseMetaDataExecutorTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.proxy.backend.handler.admin.executor;
-import
org.apache.shardingsphere.authority.provider.database.model.privilege.DatabasePermittedPrivileges;
+import
org.apache.shardingsphere.authority.provider.database.privilege.DatabasePermittedPrivileges;
import org.apache.shardingsphere.authority.rule.AuthorityRule;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
diff --git
a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/information/SelectInformationSchemataExecutorTest.java
b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/information/SelectInformationSchemataExecutorTest.java
index cdbb1ee04d4..a615194359f 100644
---
a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/information/SelectInformationSchemataExecutorTest.java
+++
b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/information/SelectInformationSchemataExecutorTest.java
@@ -17,7 +17,7 @@
package
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.information;
-import
org.apache.shardingsphere.authority.provider.database.model.privilege.DatabasePermittedPrivileges;
+import
org.apache.shardingsphere.authority.provider.database.privilege.DatabasePermittedPrivileges;
import org.apache.shardingsphere.authority.rule.AuthorityRule;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import
org.apache.shardingsphere.infra.database.core.metadata.database.DialectDatabaseMetaData;
