Ensure both equals and hashCode are always present

fbacchella · Jul 5, 2016 · a3bf3b8 · a3bf3b8
1 parent e6be34a
commit a3bf3b8
Show file tree

Hide file tree

Showing 4 changed files with 95 additions and 16 deletions.
diff --git a/src/jrds/GraphNode.java b/src/jrds/GraphNode.java
@@ -48,13 +48,6 @@ public GraphNode(Probe<?, ?> theStore, GraphDesc gd) {
     protected GraphNode() {
     }
 
-    /**
-     * @see java.lang.Object#hashCode()
-     */
-    public int hashCode() {
-        return getQualifiedName().hashCode();
-    }
-
     /**
      * @return Returns the theStore.
      */
@@ -217,4 +210,27 @@ public void setBeans(Map<String, String> beans) {
         this.beans = beans;
     }
 
+    /**
+     * @see java.lang.Object#hashCode()
+     */
+    @Override
+    public int hashCode() {
+        return getQualifiedName().hashCode();
+    }
+
+    /**
+     * Two nodes are equals if qualified names matches
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        } else if (obj == null || getClass() != obj.getClass()) {
+            return false;
+        } else {
+            return getQualifiedName().equals(obj);
+        }
+    }
+
 }
diff --git a/src/jrds/Probe.java b/src/jrds/Probe.java
@@ -418,10 +418,29 @@ public String getQualifiedName() {
         return getHost().getName() + "/" + getName();
     }
 
+    /**
+     * @see java.lang.Object#hashCode()
+     */
+    @Override
     public int hashCode() {
         return getQualifiedName().hashCode();
     }
 
+    /**
+     * Two probes are equals if qualified names matches
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        } else if (obj == null || getClass() != obj.getClass()) {
+            return false;
+        } else {
+            return getQualifiedName().equals(obj);
+        }
+    }
+
     public Set<String> getTags() {
         return getHost().getTags();
     }

diff --git a/src/jrds/starter/ConnectionInfo.java b/src/jrds/starter/ConnectionInfo.java
@@ -81,14 +81,44 @@ public String toString() {
         return type.getCanonicalName() + (name == null ? "" : ("/" + name));
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see java.lang.Object#hashCode()
      */
     @Override
     public int hashCode() {
-        return name == null ? type.hashCode() : name.hashCode();
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((name == null) ? 0 : name.hashCode());
+        result = prime * result + ((type == null) ? 0 : type.hashCode());
+        return result;
+    }
+
+    /**
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        } else if (obj == null || getClass() != obj.getClass()) {
+            return false;
+        } else {
+            ConnectionInfo other = (ConnectionInfo) obj;
+            if (name == null) {
+                if(other.name != null)
+                    return false;
+            } else if (!name.equals(other.name)) {
+                return false;
+            }
+            if (type == null) {
+                if (other.type != null) {
+                    return false;
+                }
+            } else if (!type.equals(other.type)) {
+                return false;
+            }
+        }
+        return true;
     }
 
 }
diff --git a/src/jrds/starter/HostStarter.java b/src/jrds/starter/HostStarter.java
@@ -92,21 +92,35 @@ public boolean isHidden() {
         return host.isHidden();
     }
 
-    /*
-     * (non-Javadoc)
+    /**
+     * @see java.lang.Object#hashCode()
+     */
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + super.hashCode();
+        result = prime * result + (getParent() == null ? 0 : getParent().hashCode());
+        return result;
+    }
+
+    /**
+     * Two hosts are equals if they are equals and their parents too
      * 
      * @see java.lang.Object#equals(java.lang.Object)
      */
     @Override
     public boolean equals(Object obj) {
-        if(!(obj instanceof HostStarter))
+        if (!(obj instanceof HostStarter)) {
             return false;
+        }
         HostStarter other = (HostStarter) obj;
         boolean parentEquals;
-        if(getParent() != null)
+        if (getParent() != null) {
             parentEquals = getParent().equals(other.getParent());
-        else
+        } else {
             parentEquals = other.getParent() == null;
+        }
         return host.equals(other.getHost()) && parentEquals;
     }