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 abf141e174e Rename AuthorityProviderAlgorithm to AuthorityProvider
(#23984)
abf141e174e is described below
commit abf141e174efc40e4f3cad0423deb15d59b79457
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Feb 3 23:33:54 2023 +0800
Rename AuthorityProviderAlgorithm to AuthorityProvider (#23984)
---
docs/document/content/dev-manual/proxy.cn.md | 8 ++++----
docs/document/content/dev-manual/proxy.en.md | 8 ++++----
...{AuthorityProviderAlgorithm.java => AuthorityProvider.java} | 4 ++--
...Algorithm.java => DatabasePermittedPrivilegesProvider.java} | 6 +++---
.../provider/database/builder/DatabasePrivilegeBuilder.java | 4 ++--
...viderAlgorithm.java => AllPermittedPrivilegesProvider.java} | 6 +++---
.../apache/shardingsphere/authority/rule/AuthorityRule.java | 6 +++---
... org.apache.shardingsphere.authority.spi.AuthorityProvider} | 4 ++--
.../DatabasePermittedPrivilegesProviderAlgorithmTest.java | 10 +++++-----
9 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/docs/document/content/dev-manual/proxy.cn.md
b/docs/document/content/dev-manual/proxy.cn.md
index e85f2b7aa3a..c94854ffccb 100644
--- a/docs/document/content/dev-manual/proxy.cn.md
+++ b/docs/document/content/dev-manual/proxy.cn.md
@@ -23,11 +23,11 @@ chapter = true
| PostgreSQL | PostgreSQL 协议实现 |
[`org.apache.shardingsphere.proxy.frontend.postgresql.PostgreSQLFrontendEngine`](https://github.com/apache/shardingsphere/blob/master/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/PostgreSQLFrontendEngine.java)
|
| openGauss | openGauss 协议实现 |
[`org.apache.shardingsphere.proxy.frontend.opengauss.OpenGaussFrontendEngine`](https://github.com/apache/shardingsphere/blob/master/proxy/frontend/opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/OpenGaussFrontendEngine.java)
|
-## AuthorityProvideAlgorithm
+## AuthorityProvide
### 全限定类名
-[`org.apache.shardingsphere.authority.spi.AuthorityProviderAlgorithm`](https://github.com/apache/shardingsphere/blob/master/kernel/authority/api/src/main/java/org/apache/shardingsphere/authority/spi/AuthorityProviderAlgorithm.java)
+[`org.apache.shardingsphere.authority.spi.AuthorityProvider`](https://github.com/apache/shardingsphere/blob/master/kernel/authority/api/src/main/java/org/apache/shardingsphere/authority/spi/AuthorityProvider.java)
### 定义
@@ -37,5 +37,5 @@ chapter = true
| *配置标识* | *详细说明* | *全限定类名* |
| ------------------ | --------------------------------------- | ---------- |
-| ALL_PERMITTED | 默认授予所有权限（不鉴权） |
[`org.apache.shardingsphere.authority.provider.simple.AllPermittedPrivilegesProviderAlgorithm`](https://github.com/apache/shardingsphere/blob/master/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/simple/AllPermittedPrivilegesProviderAlgorithm.java)
|
-| DATABASE_PERMITTED | 通过属性 user-database-mappings 配置的权限 |
[`org.apache.shardingsphere.authority.provider.database.DatabasePermittedPrivilegesProviderAlgorithm`](https://github.com/apache/shardingsphere/blob/master/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/database/DatabasePermittedPrivilegesProviderAlgorithm.java)
|
+| ALL_PERMITTED | 默认授予所有权限（不鉴权） |
[`org.apache.shardingsphere.authority.provider.simple.AllPermittedPrivilegesProvider`](https://github.com/apache/shardingsphere/blob/master/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/simple/AllPermittedPrivilegesProvider.java)
|
+| DATABASE_PERMITTED | 通过属性 user-database-mappings 配置的权限 |
[`org.apache.shardingsphere.authority.provider.database.DatabasePermittedPrivilegesProvider`](https://github.com/apache/shardingsphere/blob/master/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/database/DatabasePermittedPrivilegesProvider.java)
|
diff --git a/docs/document/content/dev-manual/proxy.en.md
b/docs/document/content/dev-manual/proxy.en.md
index 1b9fc65a456..be7b909d948 100644
--- a/docs/document/content/dev-manual/proxy.en.md
+++ b/docs/document/content/dev-manual/proxy.en.md
@@ -23,11 +23,11 @@ Protocols for ShardingSphere-Proxy to parse and adapt for
accessing databases.
| PostgreSQL | Protocol implementation for PostgreSQL |
[`org.apache.shardingsphere.proxy.frontend.postgresql.PostgreSQLFrontendEngine`](https://github.com/apache/shardingsphere/blob/master/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/PostgreSQLFrontendEngine.java)
|
| openGauss | Protocol implementation for openGauss |
[`org.apache.shardingsphere.proxy.frontend.opengauss.OpenGaussFrontendEngine`](https://github.com/apache/shardingsphere/blob/master/proxy/frontend/opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/OpenGaussFrontendEngine.java)
|
-## AuthorityProvideAlgorithm
+## AuthorityProvide
### Fully-qualified class name
-[`org.apache.shardingsphere.authority.spi.AuthorityProviderAlgorithm`](https://github.com/apache/shardingsphere/blob/master/kernel/authority/api/src/main/java/org/apache/shardingsphere/authority/spi/AuthorityProviderAlgorithm.java)
+[`org.apache.shardingsphere.authority.spi.AuthorityProvider`](https://github.com/apache/shardingsphere/blob/master/kernel/authority/api/src/main/java/org/apache/shardingsphere/authority/spi/AuthorityProvider.java)
### Definition
@@ -37,5 +37,5 @@ Loading logic for user permission.
| *Configuration Type* | *Description* |
*Fully-qualified class name* |
| -------------------- | ------------------------------------------------ |
---------------------------- |
-| ALL_PERMITTED | Grant all permissions by default (no forensics) |
[`org.apache.shardingsphere.authority.provider.simple.AllPermittedPrivilegesProviderAlgorithm`](https://github.com/apache/shardingsphere/blob/master/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/simple/AllPermittedPrivilegesProviderAlgorithm.java)
|
-| DATABASE_PERMITTED | Permissions configured by user-database-mappings |
[`org.apache.shardingsphere.authority.provider.database.DatabasePermittedPrivilegesProviderAlgorithm`](https://github.com/apache/shardingsphere/blob/master/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/database/DatabasePermittedPrivilegesProviderAlgorithm.java)
|
+| ALL_PERMITTED | Grant all permissions by default (no forensics) |
[`org.apache.shardingsphere.authority.provider.simple.AllPermittedPrivilegesProvider`](https://github.com/apache/shardingsphere/blob/master/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/simple/AllPermittedPrivilegesProvider.java)
|
+| DATABASE_PERMITTED | Permissions configured by user-database-mappings |
[`org.apache.shardingsphere.authority.provider.database.DatabasePermittedPrivilegesProvider`](https://github.com/apache/shardingsphere/blob/master/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/database/DatabasePermittedPrivilegesProvider.java)
|
diff --git
a/kernel/authority/api/src/main/java/org/apache/shardingsphere/authority/spi/AuthorityProviderAlgorithm.java
b/kernel/authority/api/src/main/java/org/apache/shardingsphere/authority/spi/AuthorityProvider.java
similarity index 93%
rename from
kernel/authority/api/src/main/java/org/apache/shardingsphere/authority/spi/AuthorityProviderAlgorithm.java
rename to
kernel/authority/api/src/main/java/org/apache/shardingsphere/authority/spi/AuthorityProvider.java
index 5c84f0a177b..eb89bbc1f8b 100644
---
a/kernel/authority/api/src/main/java/org/apache/shardingsphere/authority/spi/AuthorityProviderAlgorithm.java
+++
b/kernel/authority/api/src/main/java/org/apache/shardingsphere/authority/spi/AuthorityProvider.java
@@ -26,9 +26,9 @@ import java.util.Collection;
import java.util.Map;
/**
- * Authority provider algorithm.
+ * Authority provider.
*/
-public interface AuthorityProviderAlgorithm extends TypedSPI {
+public interface AuthorityProvider extends TypedSPI {
/**
* Build authority registry.
diff --git
a/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/database/DatabasePermittedPrivilegesProviderAlgorithm.java
b/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/database/DatabasePermittedPrivilegesProvider.java
similarity index 92%
rename from
kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/database/DatabasePermittedPrivilegesProviderAlgorithm.java
rename to
kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/database/DatabasePermittedPrivilegesProvider.java
index 6286c0cf1dd..1ae3a719be9 100644
---
a/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/database/DatabasePermittedPrivilegesProviderAlgorithm.java
+++
b/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/database/DatabasePermittedPrivilegesProvider.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.authority.provider.database;
import org.apache.shardingsphere.authority.model.AuthorityRegistry;
import
org.apache.shardingsphere.authority.provider.database.builder.DatabasePrivilegeBuilder;
import
org.apache.shardingsphere.authority.registry.UserPrivilegeMapAuthorityRegistry;
-import org.apache.shardingsphere.authority.spi.AuthorityProviderAlgorithm;
+import org.apache.shardingsphere.authority.spi.AuthorityProvider;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
@@ -30,9 +30,9 @@ import java.util.Map;
import java.util.Properties;
/**
- * Database permitted privileges provider algorithm.
+ * Database permitted privileges provider.
*/
-public final class DatabasePermittedPrivilegesProviderAlgorithm implements
AuthorityProviderAlgorithm {
+public final class DatabasePermittedPrivilegesProvider implements
AuthorityProvider {
public static final String PROP_USER_DATABASE_MAPPINGS =
"user-database-mappings";
diff --git
a/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/database/builder/DatabasePrivilegeBuilder.java
b/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/database/builder/DatabasePrivilegeBuilder.java
index 129f6f95e63..773d97d6f5f 100644
---
a/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/database/builder/DatabasePrivilegeBuilder.java
+++
b/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/database/builder/DatabasePrivilegeBuilder.java
@@ -21,7 +21,7 @@ import com.google.common.base.Preconditions;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.authority.model.ShardingSpherePrivileges;
-import
org.apache.shardingsphere.authority.provider.database.DatabasePermittedPrivilegesProviderAlgorithm;
+import
org.apache.shardingsphere.authority.provider.database.DatabasePermittedPrivilegesProvider;
import
org.apache.shardingsphere.authority.provider.database.model.privilege.DatabasePermittedPrivileges;
import org.apache.shardingsphere.infra.metadata.user.Grantee;
import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
@@ -49,7 +49,7 @@ public final class DatabasePrivilegeBuilder {
* @return privileges
*/
public static Map<ShardingSphereUser, ShardingSpherePrivileges>
build(final Collection<ShardingSphereUser> users, final Properties props) {
- String mappingProp =
props.getProperty(DatabasePermittedPrivilegesProviderAlgorithm.PROP_USER_DATABASE_MAPPINGS,
"");
+ String mappingProp =
props.getProperty(DatabasePermittedPrivilegesProvider.PROP_USER_DATABASE_MAPPINGS,
"");
checkDatabases(mappingProp);
return buildPrivileges(users, mappingProp);
}
diff --git
a/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/simple/AllPermittedPrivilegesProviderAlgorithm.java
b/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/simple/AllPermittedPrivilegesProvider.java
similarity index 91%
rename from
kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/simple/AllPermittedPrivilegesProviderAlgorithm.java
rename to
kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/simple/AllPermittedPrivilegesProvider.java
index 1aceeda6cc2..df2c478541c 100644
---
a/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/simple/AllPermittedPrivilegesProviderAlgorithm.java
+++
b/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/provider/simple/AllPermittedPrivilegesProvider.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.authority.provider.simple;
import org.apache.shardingsphere.authority.model.AuthorityRegistry;
import
org.apache.shardingsphere.authority.registry.AllPermittedAuthorityRegistry;
-import org.apache.shardingsphere.authority.spi.AuthorityProviderAlgorithm;
+import org.apache.shardingsphere.authority.spi.AuthorityProvider;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
@@ -28,9 +28,9 @@ import java.util.Collections;
import java.util.Map;
/**
- * All permitted privileges provider algorithm.
+ * All permitted privileges provider.
*/
-public final class AllPermittedPrivilegesProviderAlgorithm implements
AuthorityProviderAlgorithm {
+public final class AllPermittedPrivilegesProvider implements AuthorityProvider
{
@Override
public AuthorityRegistry buildAuthorityRegistry(final Map<String,
ShardingSphereDatabase> databases, final Collection<ShardingSphereUser> users) {
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 3886c42adcd..45c3a4ddd9b 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
@@ -21,7 +21,7 @@ import lombok.Getter;
import org.apache.shardingsphere.authority.config.AuthorityRuleConfiguration;
import org.apache.shardingsphere.authority.model.AuthorityRegistry;
import org.apache.shardingsphere.authority.model.ShardingSpherePrivileges;
-import org.apache.shardingsphere.authority.spi.AuthorityProviderAlgorithm;
+import org.apache.shardingsphere.authority.spi.AuthorityProvider;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.user.Grantee;
import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
@@ -42,14 +42,14 @@ public final class AuthorityRule implements GlobalRule {
private final Collection<ShardingSphereUser> users;
- private final AuthorityProviderAlgorithm provider;
+ private final AuthorityProvider provider;
private volatile AuthorityRegistry authorityRegistry;
public AuthorityRule(final AuthorityRuleConfiguration ruleConfig, final
Map<String, ShardingSphereDatabase> databases) {
configuration = ruleConfig;
users = ruleConfig.getUsers();
- provider = TypedSPILoader.getService(AuthorityProviderAlgorithm.class,
ruleConfig.getProvider().getType(), ruleConfig.getProvider().getProps());
+ provider = TypedSPILoader.getService(AuthorityProvider.class,
ruleConfig.getProvider().getType(), ruleConfig.getProvider().getProps());
authorityRegistry = provider.buildAuthorityRegistry(databases,
ruleConfig.getUsers());
}
diff --git
a/kernel/authority/core/src/main/resources/META-INF/services/org.apache.shardingsphere.authority.spi.AuthorityProviderAlgorithm
b/kernel/authority/core/src/main/resources/META-INF/services/org.apache.shardingsphere.authority.spi.AuthorityProvider
similarity index 93%
rename from
kernel/authority/core/src/main/resources/META-INF/services/org.apache.shardingsphere.authority.spi.AuthorityProviderAlgorithm
rename to
kernel/authority/core/src/main/resources/META-INF/services/org.apache.shardingsphere.authority.spi.AuthorityProvider
index 4c763f63866..b51eb952c8f 100644
---
a/kernel/authority/core/src/main/resources/META-INF/services/org.apache.shardingsphere.authority.spi.AuthorityProviderAlgorithm
+++
b/kernel/authority/core/src/main/resources/META-INF/services/org.apache.shardingsphere.authority.spi.AuthorityProvider
@@ -15,5 +15,5 @@
# limitations under the License.
#
-org.apache.shardingsphere.authority.provider.simple.AllPermittedPrivilegesProviderAlgorithm
-org.apache.shardingsphere.authority.provider.database.DatabasePermittedPrivilegesProviderAlgorithm
+org.apache.shardingsphere.authority.provider.simple.AllPermittedPrivilegesProvider
+org.apache.shardingsphere.authority.provider.database.DatabasePermittedPrivilegesProvider
diff --git
a/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/provider/schema/DatabasePermittedPrivilegesProviderAlgorithmTest.java
b/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/provider/schema/DatabasePermittedPrivilegesProviderAlgorithmTest.java
index 81f9ab346e2..4d7d5a76d02 100644
---
a/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/provider/schema/DatabasePermittedPrivilegesProviderAlgorithmTest.java
+++
b/kernel/authority/core/src/test/java/org/apache/shardingsphere/authority/provider/schema/DatabasePermittedPrivilegesProviderAlgorithmTest.java
@@ -19,8 +19,8 @@ package org.apache.shardingsphere.authority.provider.schema;
import org.apache.shardingsphere.authority.model.AuthorityRegistry;
import org.apache.shardingsphere.authority.model.ShardingSpherePrivileges;
-import
org.apache.shardingsphere.authority.provider.database.DatabasePermittedPrivilegesProviderAlgorithm;
-import org.apache.shardingsphere.authority.spi.AuthorityProviderAlgorithm;
+import
org.apache.shardingsphere.authority.provider.database.DatabasePermittedPrivilegesProvider;
+import org.apache.shardingsphere.authority.spi.AuthorityProvider;
import org.apache.shardingsphere.infra.metadata.user.Grantee;
import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
@@ -39,9 +39,9 @@ public final class
DatabasePermittedPrivilegesProviderAlgorithmTest {
@Test
public void assertBuildAuthorityRegistry() {
Properties props = PropertiesBuilder.build(
- new
Property(DatabasePermittedPrivilegesProviderAlgorithm.PROP_USER_DATABASE_MAPPINGS,
"root@localhost=test, [email protected]=db_dal_admin, user1@=test, user1@=test1,
user1@=*"));
- AuthorityProviderAlgorithm algorithm =
TypedSPILoader.getService(AuthorityProviderAlgorithm.class,
"DATABASE_PERMITTED", props);
- AuthorityRegistry actual =
algorithm.buildAuthorityRegistry(Collections.emptyMap(),
Collections.singletonList(new ShardingSphereUser("user1", "", "127.0.0.2")));
+ new
Property(DatabasePermittedPrivilegesProvider.PROP_USER_DATABASE_MAPPINGS,
"root@localhost=test, [email protected]=db_dal_admin, user1@=test, user1@=test1,
user1@=*"));
+ AuthorityProvider provider =
TypedSPILoader.getService(AuthorityProvider.class, "DATABASE_PERMITTED", props);
+ AuthorityRegistry actual =
provider.buildAuthorityRegistry(Collections.emptyMap(),
Collections.singletonList(new ShardingSphereUser("user1", "", "127.0.0.2")));
Optional<ShardingSpherePrivileges> privileges =
actual.findPrivileges(new Grantee("user1", "127.0.0.2"));
assertTrue(privileges.isPresent());
assertTrue(privileges.get().hasPrivileges("test"));
