From c19455542c7d5b0d480546e541dc7d2ee904688d Mon Sep 17 00:00:00 2001 From: miferreiro Date: Thu, 21 Feb 2019 17:47:52 +0100 Subject: [PATCH] The functions of the pet entity, hashCode and equals, have been improved --- .../java/es/uvigo/esei/daa/entities/Pet.java | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/src/main/java/es/uvigo/esei/daa/entities/Pet.java b/src/main/java/es/uvigo/esei/daa/entities/Pet.java index 7d27902..84bc538 100644 --- a/src/main/java/es/uvigo/esei/daa/entities/Pet.java +++ b/src/main/java/es/uvigo/esei/daa/entities/Pet.java @@ -96,10 +96,7 @@ public class Pet { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((specie == null) ? 0 : specie.hashCode()); result = prime * result + id; - result = prime * result + idOwner; - result = prime * result + ((name == null) ? 0 : name.hashCode()); return result; } @@ -109,22 +106,10 @@ public class Pet { return true; if (obj == null) return false; - if (getClass() != obj.getClass()) + if (!(obj instanceof Pet)) return false; Pet other = (Pet) obj; - if (specie == null) { - if (other.specie != null) - return false; - } else if (!specie.equals(other.specie)) - return false; - if (id != other.id) - return false; - if (idOwner != other.idOwner) - return false; - if (name == null) { - if (other.name != null) - return false; - } else if (!name.equals(other.name)) + if(id != other.id) return false; return true; } -- 2.18.1