You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2022/05/07 02:58:50 UTC
[shardingsphere] branch master updated: Add java doc of Privilege (#17404)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 a2605cdf468 Add java doc of Privilege (#17404)
a2605cdf468 is described below
commit a2605cdf4680db08137c4b888d8b26de7eeaf4e2
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat May 7 10:58:43 2022 +0800
Add java doc of Privilege (#17404)
---
...ivilegesPermittedAuthorityProviderAlgorithm.java | 21 +++++++++------------
.../schema/builder/SchemaPrivilegeBuilder.java | 6 ++++--
...PrivilegesPermittedShardingSpherePrivileges.java | 14 +++++++-------
3 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/schema/SchemaPrivilegesPermittedAuthorityProviderAlgorithm.java b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/schema/SchemaPrivilegesPermittedAuthorityProviderAlgorithm.java
index 6c11e3fb252..1f9e8673f7f 100644
--- a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/schema/SchemaPrivilegesPermittedAuthorityProviderAlgorithm.java
+++ b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/schema/SchemaPrivilegesPermittedAuthorityProviderAlgorithm.java
@@ -17,6 +17,8 @@
package org.apache.shardingsphere.authority.provider.schema;
+import lombok.Getter;
+import lombok.Setter;
import org.apache.shardingsphere.authority.model.ShardingSpherePrivileges;
import org.apache.shardingsphere.authority.provider.schema.builder.SchemaPrivilegeBuilder;
import org.apache.shardingsphere.authority.spi.AuthorityProviderAlgorithm;
@@ -30,32 +32,27 @@ import java.util.Optional;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
+/**
+ * Schema privileges permitted authority provider algorithm.
+ */
public final class SchemaPrivilegesPermittedAuthorityProviderAlgorithm implements AuthorityProviderAlgorithm {
public static final String PROP_USER_SCHEMA_MAPPINGS = "user-schema-mappings";
private final Map<ShardingSphereUser, ShardingSpherePrivileges> userPrivilegeMap = new ConcurrentHashMap<>();
+ @Getter
+ @Setter
private Properties props;
- @Override
- public void setProps(final Properties props) {
- this.props = props;
- }
-
- @Override
- public Properties getProps() {
- return this.props;
- }
-
@Override
public void init(final Map<String, ShardingSphereMetaData> metaDataMap, final Collection<ShardingSphereUser> users) {
- this.userPrivilegeMap.putAll(SchemaPrivilegeBuilder.build(users, props));
+ userPrivilegeMap.putAll(SchemaPrivilegeBuilder.build(users, props));
}
@Override
public void refresh(final Map<String, ShardingSphereMetaData> metaDataMap, final Collection<ShardingSphereUser> users) {
- this.userPrivilegeMap.putAll(SchemaPrivilegeBuilder.build(users, props));
+ userPrivilegeMap.putAll(SchemaPrivilegeBuilder.build(users, props));
}
@Override
diff --git a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/schema/builder/SchemaPrivilegeBuilder.java b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/schema/builder/SchemaPrivilegeBuilder.java
index 6014200133c..f330babd52e 100644
--- a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/schema/builder/SchemaPrivilegeBuilder.java
+++ b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/schema/builder/SchemaPrivilegeBuilder.java
@@ -35,6 +35,9 @@ import java.util.Map.Entry;
import java.util.Properties;
import java.util.Set;
+/**
+ * Schema privilege builder.
+ */
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class SchemaPrivilegeBuilder {
@@ -104,7 +107,6 @@ public final class SchemaPrivilegeBuilder {
private static boolean checkAnyOtherHost(final Grantee grantee, final ShardingSphereUser shardingSphereUser) {
return ("%".equalsIgnoreCase(grantee.getHostname())
- || grantee.getHostname().equals(shardingSphereUser.getGrantee().getHostname()))
- && grantee.getUsername().equals(shardingSphereUser.getGrantee().getUsername());
+ || grantee.getHostname().equals(shardingSphereUser.getGrantee().getHostname())) && grantee.getUsername().equals(shardingSphereUser.getGrantee().getUsername());
}
}
diff --git a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/schema/model/privilege/SchemaPrivilegesPermittedShardingSpherePrivileges.java b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/schema/model/privilege/SchemaPrivilegesPermittedShardingSpherePrivileges.java
index c05dcc7f625..004262513ef 100644
--- a/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/schema/model/privilege/SchemaPrivilegesPermittedShardingSpherePrivileges.java
+++ b/shardingsphere-kernel/shardingsphere-authority/shardingsphere-authority-core/src/main/java/org/apache/shardingsphere/authority/provider/schema/model/privilege/SchemaPrivilegesPermittedShardingSpherePrivileges.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.authority.provider.schema.model.privilege;
-import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.authority.model.AccessSubject;
import org.apache.shardingsphere.authority.model.PrivilegeType;
import org.apache.shardingsphere.authority.model.ShardingSpherePrivileges;
@@ -26,8 +26,11 @@ import org.apache.shardingsphere.authority.provider.natived.model.subject.Schema
import java.util.Collection;
import java.util.Set;
-@AllArgsConstructor
-public class SchemaPrivilegesPermittedShardingSpherePrivileges implements ShardingSpherePrivileges {
+/**
+ * Schema privilegesPermittedShardingSpherePrivileges.
+ */
+@RequiredArgsConstructor
+public final class SchemaPrivilegesPermittedShardingSpherePrivileges implements ShardingSpherePrivileges {
private final Set<String> schemas;
@@ -47,9 +50,6 @@ public class SchemaPrivilegesPermittedShardingSpherePrivileges implements Shardi
@Override
public boolean hasPrivileges(final AccessSubject accessSubject, final Collection<PrivilegeType> privileges) {
- if (accessSubject instanceof SchemaAccessSubject) {
- return hasPrivileges(((SchemaAccessSubject) accessSubject).getSchema());
- }
- return false;
+ return accessSubject instanceof SchemaAccessSubject && hasPrivileges(((SchemaAccessSubject) accessSubject).getSchema());
}
}