Code Review
/
aaa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix findbugs violations in aaa-authn-api
[aaa.git]
/
aaa-authn-api
/
src
/
main
/
java
/
org
/
opendaylight
/
aaa
/
api
/
model
/
Grant.java
diff --git
a/aaa-authn-api/src/main/java/org/opendaylight/aaa/api/model/Grant.java
b/aaa-authn-api/src/main/java/org/opendaylight/aaa/api/model/Grant.java
index 41f4688f1efd85d6dcd07413ade9b83318215f0e..9df8c854fcd196fd20aa849927e723421b5ae4aa 100644
(file)
--- a/
aaa-authn-api/src/main/java/org/opendaylight/aaa/api/model/Grant.java
+++ b/
aaa-authn-api/src/main/java/org/opendaylight/aaa/api/model/Grant.java
@@
-8,6
+8,8
@@
package org.opendaylight.aaa.api.model;
package org.opendaylight.aaa.api.model;
+import java.util.Objects;
+
/**
*
* @author peter.mellquist@hp.com
/**
*
* @author peter.mellquist@hp.com
@@
-62,28
+64,17
@@
public class Grant {
@Override
public boolean equals(Object obj) {
@Override
public boolean equals(Object obj) {
- Grant other = (Grant) obj;
- if (other == null) {
- return false;
- }
- if (compareValues(getDomainid(), other.getDomainid()) && compareValues(getRoleid(), other.getRoleid())
- && compareValues(getUserid(), other.getUserid())) {
+ if (this == obj) {
return true;
}
return true;
}
- return false;
- }
- private boolean compareValues(Object c1, Object c2) {
- if (c1 == null && c2 != null) {
+ if (obj == null || getClass() != obj.getClass()) {
return false;
}
return false;
}
- if (c1 != null && c2 == null) {
- return false;
- }
- if (c1 == null && c2 == null) {
- return true;
- }
- if (c1.equals(c2)) {
+
+ Grant other = (Grant) obj;
+ if (Objects.equals(getDomainid(), other.getDomainid()) && Objects.equals(getRoleid(), other.getRoleid())
+ && Objects.equals(getUserid(), other.getUserid())) {
return true;
}
return false;
return true;
}
return false;