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 881d0e4 Add @EqualsAndHashCode for all Privilege classes (#9705)
881d0e4 is described below
commit 881d0e4ac460f26a6304c41724eb4327508c23c0
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Mar 17 16:22:02 2021 +0800
Add @EqualsAndHashCode for all Privilege classes (#9705)
---
.../auth/model/privilege/AdministrationPrivilege.java | 2 ++
.../auth/model/privilege/ShardingSpherePrivilege.java | 16 ++--------------
.../auth/model/privilege/data/DataPrivilege.java | 16 ++--------------
.../auth/model/privilege/data/SchemaPrivilege.java | 19 ++-----------------
.../auth/model/privilege/data/TablePrivilege.java | 2 ++
5 files changed, 10 insertions(+), 45 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 7545692..f4ceeee 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
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.infra.metadata.auth.model.privilege;
+import lombok.EqualsAndHashCode;
import lombok.Getter;
import java.util.Collection;
@@ -26,6 +27,7 @@ import java.util.LinkedHashSet;
* Administration privilege.
*/
@Getter
+@EqualsAndHashCode
public final class AdministrationPrivilege {
private final Collection<PrivilegeType> privileges = new LinkedHashSet<>();
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/model/privilege/ShardingSpherePrivilege.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/model/privilege/ShardingSpherePrivilege.java
index 9562952..cdee5d3 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/model/privilege/ShardingSpherePrivilege.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/model/privilege/ShardingSpherePrivilege.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.infra.metadata.auth.model.privilege;
+import lombok.EqualsAndHashCode;
import lombok.Getter;
import
org.apache.shardingsphere.infra.metadata.auth.model.privilege.data.DataPrivilege;
@@ -24,6 +25,7 @@ import
org.apache.shardingsphere.infra.metadata.auth.model.privilege.data.DataPr
* ShardingSphere privilege.
*/
@Getter
+@EqualsAndHashCode
public final class ShardingSpherePrivilege {
private final AdministrationPrivilege administrationPrivilege = new
AdministrationPrivilege();
@@ -37,18 +39,4 @@ public final class ShardingSpherePrivilege {
administrationPrivilege.setSuperPrivilege();
dataPrivilege.setSuperPrivilege();
}
-
- @Override
- public boolean equals(final Object obj) {
- if (!(obj instanceof ShardingSpherePrivilege)) {
- return false;
- }
- if
(!administrationPrivilege.getPrivileges().equals(((ShardingSpherePrivilege)
obj).administrationPrivilege.getPrivileges())) {
- return false;
- }
- if (!dataPrivilege.equals(((ShardingSpherePrivilege)
obj).dataPrivilege)) {
- return false;
- }
- return true;
- }
}
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 7042796..2273d2c 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
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.infra.metadata.auth.model.privilege.data;
+import lombok.EqualsAndHashCode;
import lombok.Getter;
import
org.apache.shardingsphere.infra.metadata.auth.model.privilege.PrivilegeType;
@@ -30,6 +31,7 @@ import java.util.stream.Collectors;
* Data privilege.
*/
@Getter
+@EqualsAndHashCode
public final class DataPrivilege {
private final Collection<PrivilegeType> globalPrivileges = new
LinkedHashSet<>();
@@ -79,18 +81,4 @@ public final class DataPrivilege {
public void setSuperPrivilege() {
globalPrivileges.add(PrivilegeType.SUPER);
}
-
- @Override
- public boolean equals(final Object obj) {
- if (!(obj instanceof DataPrivilege)) {
- return false;
- }
- if (!globalPrivileges.equals(((DataPrivilege)
obj).getGlobalPrivileges())) {
- return false;
- }
- 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 4ec1d07..ee5e5da 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
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.infra.metadata.auth.model.privilege.data;
+import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.infra.metadata.auth.model.privilege.PrivilegeType;
@@ -32,6 +33,7 @@ import java.util.stream.Collectors;
*/
@RequiredArgsConstructor
@Getter
+@EqualsAndHashCode
public final class SchemaPrivilege {
private final String name;
@@ -76,21 +78,4 @@ public final class SchemaPrivilege {
public void setSuperPrivilege() {
globalPrivileges.add(PrivilegeType.SUPER);
}
-
- @Override
- public boolean equals(final Object obj) {
- if (!(obj instanceof SchemaPrivilege)) {
- return false;
- }
- if (!name.equals(((SchemaPrivilege) obj).name)) {
- return false;
- }
- if (!globalPrivileges.equals(((SchemaPrivilege)
obj).globalPrivileges)) {
- return false;
- }
- if (!specificPrivileges.equals(((SchemaPrivilege)
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/TablePrivilege.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/model/privilege/data/TablePrivilege.java
index e152d74..74436db 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/model/privilege/data/TablePrivilege.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/model/privilege/data/TablePrivilege.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.infra.metadata.auth.model.privilege.data;
+import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.infra.metadata.auth.model.privilege.PrivilegeType;
@@ -29,6 +30,7 @@ import java.util.LinkedHashSet;
*/
@RequiredArgsConstructor
@Getter
+@EqualsAndHashCode
public final class TablePrivilege {
private final String tableName;
