fix quality flaws (equals and hashcode methods)

diff --git a/sonar-server/src/main/java/org/sonar/server/search/FacetValue.java b/sonar-server/src/main/java/org/sonar/server/search/FacetValue.java
index cffc5dc9fedec68d613b2957467f807d796b5ff3..ab447a9db5cf95c4e0853d684140d81caedfcd3b 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/search/FacetValue.java
+++ b/sonar-server/src/main/java/org/sonar/server/search/FacetValue.java
@@ -79,4 +79,26 @@ public class FacetValue implements Comparable<FacetValue> {
       return this.getValue().compareTo(other.getValue());
     }
   }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (!(o instanceof FacetValue)) return false;
+
+    FacetValue that = (FacetValue) o;
+
+    if (!key.equals(that.key)) return false;
+    if (subFacets != null ? !subFacets.equals(that.subFacets) : that.subFacets != null) return false;
+    if (!value.equals(that.value)) return false;
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    int result = key.hashCode();
+    result = 31 * result + value.hashCode();
+    result = 31 * result + (subFacets != null ? subFacets.hashCode() : 0);
+    return result;
+  }
 }

diff --git a/sonar-server/src/main/java/org/sonar/server/search/Hit.java b/sonar-server/src/main/java/org/sonar/server/search/Hit.java
index e31ae2904b521a8907d45b5e619546940369a93b..ef04a7ddd6b7c791a3cddbb7e00f0d82cf1014ad 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/search/Hit.java
+++ b/sonar-server/src/main/java/org/sonar/server/search/Hit.java
@@ -73,6 +73,28 @@ public class Hit implements Comparable<Hit> {
     }
   }
 
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (!(o instanceof Hit)) return false;
+
+    Hit hit = (Hit) o;
+
+    if (fields != null ? !fields.equals(hit.fields) : hit.fields != null) return false;
+    if (rank != null ? !rank.equals(hit.rank) : hit.rank != null) return false;
+    if (score != null ? !score.equals(hit.score) : hit.score != null) return false;
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    int result = fields != null ? fields.hashCode() : 0;
+    result = 31 * result + (rank != null ? rank.hashCode() : 0);
+    result = 31 * result + (score != null ? score.hashCode() : 0);
+    return result;
+  }
+
   public static Hit fromMap(Integer rank, Map<String, Object> fieldMap) {
     return fromMap(rank, new TreeMap<String, Object>(fieldMap));
   }