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 82835df Use PrivilegeType.SUPER instead of all Privileges (#9704)
82835df is described below
commit 82835dfc3ca93a69b177261eb34cd16c5e37e489
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Mar 17 16:15:56 2021 +0800
Use PrivilegeType.SUPER instead of all Privileges (#9704)
---
.../auth/model/privilege/AdministrationPrivilege.java | 6 +-----
.../auth/model/privilege/data/DataPrivilege.java | 14 +++++---------
.../auth/model/privilege/data/SchemaPrivilege.java | 19 +++++++------------
.../mysql/auth/MySQLAuthenticationHandlerTest.java | 2 +-
4 files changed, 14 insertions(+), 27 deletions(-)
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/model/privilege/AdministrationPrivilege.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/model/privilege/AdministrationPrivilege.java
index fd038f9..7545692 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/model/privilege/AdministrationPrivilege.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/model/privilege/AdministrationPrivilege.java
@@ -44,10 +44,6 @@ public final class AdministrationPrivilege {
* Set super privilege.
*/
public void setSuperPrivilege() {
- for (PrivilegeType each : PrivilegeType.values()) {
- if (each != PrivilegeType.GRANT) {
- privileges.add(each);
- }
- }
+ privileges.add(PrivilegeType.SUPER);
}
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/model/privilege/data/DataPrivilege.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/model/privilege/data/DataPrivilege.java
index f443fb1..7042796 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/model/privilege/data/DataPrivilege.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/model/privilege/data/DataPrivilege.java
@@ -77,22 +77,18 @@ public final class DataPrivilege {
* Set super privilege.
*/
public void setSuperPrivilege() {
- for (PrivilegeType each : PrivilegeType.values()) {
- if (each != PrivilegeType.GRANT) {
- globalPrivileges.add(each);
- }
- }
+ globalPrivileges.add(PrivilegeType.SUPER);
}
@Override
- public boolean equals(final Object o) {
- if (!(o instanceof DataPrivilege)) {
+ public boolean equals(final Object obj) {
+ if (!(obj instanceof DataPrivilege)) {
return false;
}
- if (!globalPrivileges.equals(((DataPrivilege)
o).getGlobalPrivileges())) {
+ if (!globalPrivileges.equals(((DataPrivilege)
obj).getGlobalPrivileges())) {
return false;
}
- if (!specificPrivileges.equals(((DataPrivilege)
o).specificPrivileges)) {
+ if (!specificPrivileges.equals(((DataPrivilege)
obj).specificPrivileges)) {
return false;
}
return true;
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/model/privilege/data/SchemaPrivilege.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/model/privilege/data/SchemaPrivilege.java
index 0ea4ba6..4ec1d07 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/model/privilege/data/SchemaPrivilege.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/model/privilege/data/SchemaPrivilege.java
@@ -72,28 +72,23 @@ public final class SchemaPrivilege {
/**
* Set super privilege.
- *
*/
- public void setSuper() {
- for (PrivilegeType each : PrivilegeType.values()) {
- if (!each.equals(PrivilegeType.GRANT)) {
- globalPrivileges.add(each);
- }
- }
+ public void setSuperPrivilege() {
+ globalPrivileges.add(PrivilegeType.SUPER);
}
@Override
- public boolean equals(final Object o) {
- if (!(o instanceof SchemaPrivilege)) {
+ public boolean equals(final Object obj) {
+ if (!(obj instanceof SchemaPrivilege)) {
return false;
}
- if (name != ((SchemaPrivilege) o).name) {
+ if (!name.equals(((SchemaPrivilege) obj).name)) {
return false;
}
- if (!globalPrivileges.equals(((SchemaPrivilege)
o).getGlobalPrivileges())) {
+ if (!globalPrivileges.equals(((SchemaPrivilege)
obj).globalPrivileges)) {
return false;
}
- if (!specificPrivileges.equals(((SchemaPrivilege)
o).getSpecificPrivileges())) {
+ if (!specificPrivileges.equals(((SchemaPrivilege)
obj).specificPrivileges)) {
return false;
}
return true;
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/auth/MySQLAuthenticationHandlerTest.java
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/auth/MySQLAuthenticationHandlerTest.java
index 074116e..f5ce8bc 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/auth/MySQLAuthenticationHandlerTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/auth/MySQLAuthenticationHandlerTest.java
@@ -124,7 +124,7 @@ public final class MySQLAuthenticationHandlerTest {
DefaultAuthentication authentication = new DefaultAuthentication();
ShardingSpherePrivilege privilege = new ShardingSpherePrivilege();
SchemaPrivilege schema = new SchemaPrivilege("db1");
- schema.setSuper();
+ schema.setSuperPrivilege();
privilege.getDataPrivilege().getSpecificPrivileges().put("db1",
schema);
authentication.getAuthentication().put(user, privilege);
initProxyContext(authentication);
