From 5ae24f5d2348317bc45f3ae1903093c4e658914f Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Wed, 9 Mar 2016 18:43:02 -0800 Subject: [PATCH] ChangeBundle: Don't implement hashCode/equals Due to timestamp rounding, equals is no longer transitive, since ReviewDb bundles must match exactly but different ones might round to different NoteDb values. We never put these in collections or compare them except by using differencesFrom directly, so just delete these methods. Change-Id: I4aacb404dc73f64fdd31061710629cbe6009d7fa --- .../gerrit/server/notedb/ChangeBundle.java | 18 ------------------ .../gerrit/server/notedb/ChangeBundleTest.java | 3 --- 2 files changed, 21 deletions(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeBundle.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeBundle.java index 4abe8d6cc6..8a2d27f365 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeBundle.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeBundle.java @@ -476,24 +476,6 @@ public class ChangeBundle { return normalized; } - @Override - public boolean equals(Object o) { - if (!(o instanceof ChangeBundle)) { - return false; - } - return differencesFrom((ChangeBundle) o).isEmpty(); - } - - @Override - public int hashCode() { - return Objects.hash( - change.getId(), - normalizeChangeMessages(), - patchSets.keySet(), - patchSetApprovals.keySet(), - patchLineComments.keySet()); - } - @Override public String toString() { return getClass().getSimpleName() + "{id=" + change.getId() diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeBundleTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeBundleTest.java index 546a29120c..0bcc94e22c 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeBundleTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeBundleTest.java @@ -518,9 +518,6 @@ public class ChangeBundleTest { private static void assertNoDiffs(ChangeBundle a, ChangeBundle b) { assertThat(a.differencesFrom(b)).isEmpty(); assertThat(b.differencesFrom(a)).isEmpty(); - assertThat(a).isEqualTo(b); - assertThat(b).isEqualTo(a); - assertThat(a.hashCode()).isEqualTo(b.hashCode()); } private static void assertDiffs(ChangeBundle a, ChangeBundle b, String first,