Consistent equals() and hashCode() implementations

Author: darxriggs

src/main/java/com/github/fabienrenaud/jjb/model/Clients.java

@@ -27,17 +27,21 @@ public class Clients {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof Clients)) return false;
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof Clients)) {
+            return false;
+        }
 
         Clients that = (Clients) o;
 
-        return clients != null ? clients.equals(that.clients) : that.clients == null;
+        return Objects.equals(clients, that.clients);
     }
 
     @Override
     public int hashCode() {
-        return clients != null ? clients.hashCode() : 0;
+        return Objects.hashCode(clients);
     }
 
     @Override
@@ -104,7 +108,9 @@ public boolean equals(Object o) {
             if (!(o instanceof Client)) {
                 return false;
             }
+
             Client client = (Client) o;
+
             return index == client.index &&
                     isActive == client.isActive &&
                     age == client.age &&
@@ -129,7 +135,8 @@ public boolean equals(Object o) {
 
         @Override
         public int hashCode() {
-            return Objects.hash(_id, index, guid, isActive, balance, picture, age, eyeColor, name, gender, company, emails, phones, address, about, registered, tags, partners);
+            return Objects.hash(_id, index, guid, isActive, balance, picture, age, eyeColor, name, gender, company,
+                    Arrays.hashCode(emails), Arrays.hashCode(phones), address, about, registered, tags, partners);
         }
 
         private String toStr(long[] nums) {
@@ -243,22 +250,23 @@ public static Partner create(long id, String name, OffsetDateTime since) {
 
         @Override
         public boolean equals(Object o) {
-            if (this == o) return true;
-            if (!(o instanceof Partner)) return false;
+            if (this == o) {
+                return true;
+            }
+            if (!(o instanceof Partner)) {
+                return false;
+            }
 
             Partner partner = (Partner) o;
 
-            if (id != partner.id) return false;
-            if (since == null && partner.since != null || since != null && !since.isEqual(partner.since)) return false;
-            return name != null ? name.equals(partner.name) : partner.name == null;
+            return id == partner.id &&
+                    Objects.equals(since, partner.since) &&
+                    Objects.equals(name, partner.name);
         }
 
         @Override
         public int hashCode() {
-            int result = (int)id;
-            result = 31 * result + (since != null ? since.hashCode() : 0);
-            result = 31 * result + (name != null ? name.hashCode() : 0);
-            return result;
+            return Objects.hash(id, since, name);
         }
 
         @Override

src/main/java/com/github/fabienrenaud/jjb/model/Users.java

@@ -20,17 +20,21 @@ public class Users {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof Users)) return false;
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof Users)) {
+            return false;
+        }
 
         Users that = (Users) o;
 
-        return users != null ? users.equals(that.users) : that.users == null;
+        return Objects.equals(users, that.users);
     }
 
     @Override
     public int hashCode() {
-        return users != null ? users.hashCode() : 0;
+        return Objects.hashCode(users);
     }
 
     @Override
@@ -100,7 +104,9 @@ public boolean equals(Object o) {
             if (!(o instanceof User)) {
                 return false;
             }
+
             User user = (User) o;
+
             return index == user.index &&
                     isActive == user.isActive &&
                     age == user.age &&
@@ -158,20 +164,22 @@ public static Friend create(String id, String name) {
 
         @Override
         public boolean equals(Object o) {
-            if (this == o) return true;
-            if (!(o instanceof Friend)) return false;
+            if (this == o) {
+                return true;
+            }
+            if (!(o instanceof Friend)) {
+                return false;
+            }
 
             Friend friend = (Friend) o;
 
-            if (id != null ? !id.equals(friend.id) : friend.id != null) return false;
-            return name != null ? name.equals(friend.name) : friend.name == null;
+            return Objects.equals(id, friend.id) &&
+                    Objects.equals(name, friend.name);
         }
 
         @Override
         public int hashCode() {
-            int result = id != null ? id.hashCode() : 0;
-            result = 31 * result + (name != null ? name.hashCode() : 0);
-            return result;
+            return Objects.hash(id, name);
         }
 
         @Override

src/main/java/com/github/fabienrenaud/jjb/support/Libapi.java

@@ -2,6 +2,7 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 public class Libapi {
 
@@ -33,20 +34,22 @@ public List<Api> api() {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof Libapi)) return false;
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof Libapi)) {
+            return false;
+        }
 
         Libapi libapi = (Libapi) o;
 
-        if (lib != libapi.lib) return false;
-        return api == libapi.api;
-
+        return active == libapi.active &&
+                lib == libapi.lib &&
+                Objects.equals(api, libapi.api);
     }
 
     @Override
     public int hashCode() {
-        int result = lib != null ? lib.hashCode() : 0;
-        result = 31 * result + (api != null ? api.hashCode() : 0);
-        return result;
+        return Objects.hash(active, lib, api);
     }
 }