Fix findbugs violations in aaa-authn-api

[aaa.git] / aaa-authn-api / src / main / java / org / opendaylight / aaa / api / model / Role.java

diff --git a/aaa-authn-api/src/main/java/org/opendaylight/aaa/api/model/Role.java b/aaa-authn-api/src/main/java/org/opendaylight/aaa/api/model/Role.java
index 374c3dcef0c37d22a5920fba61f6e0e4bdf24831..d1bd7d9ad265ddb8b09776b74cd24318a5111e29 100644 (file)
--- a/aaa-authn-api/src/main/java/org/opendaylight/aaa/api/model/Role.java
+++ b/aaa-authn-api/src/main/java/org/opendaylight/aaa/api/model/Role.java
@@ -8,6 +8,8 @@
 
 package org.opendaylight.aaa.api.model;
 
+import java.util.Objects;
+
 /**
  *
  * @author peter.mellquist@hp.com
@@ -49,17 +51,22 @@ public class Role {
 
     @Override
     public int hashCode() {
-        return this.name.hashCode();
+        return name != null ? name.hashCode() : 0;
     }
 
     @Override
     public boolean equals(Object obj) {
-        Role other = (Role) obj;
-        if (other == null) {
+        if (this == obj) {
+            return true;
+        }
+
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
-        if (compareValues(getName(), other.getName()) && compareValues(getRoleid(), other.getRoleid())
-                && compareValues(getDescription(), other.getDescription())) {
+
+        Role other = (Role) obj;
+        if (Objects.equals(getName(), other.getName()) && Objects.equals(getRoleid(), other.getRoleid())
+                && Objects.equals(getDescription(), other.getDescription())) {
             return true;
         }
         return false;
@@ -77,20 +84,4 @@ public class Role {
     public String getDomainid() {
         return this.domainid;
     }
-
-    private boolean compareValues(Object c1, Object c2) {
-        if (c1 == null && c2 != null) {
-            return false;
-        }
-        if (c1 != null && c2 == null) {
-            return false;
-        }
-        if (c1 == null && c2 == null) {
-            return true;
-        }
-        if (c1.equals(c2)) {
-            return true;
-        }
-        return false;
-    }
 }