diff options
Diffstat (limited to 'vdslib')
| -rw-r--r-- | vdslib/src/main/java/com/yahoo/vdslib/state/ClusterState.java | 7 | ||||
| -rw-r--r-- | vdslib/src/test/java/com/yahoo/vdslib/distribution/DistributionTestFactory.java | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/vdslib/src/main/java/com/yahoo/vdslib/state/ClusterState.java b/vdslib/src/main/java/com/yahoo/vdslib/state/ClusterState.java index a1c468a1372..0b8a7457e51 100644 --- a/vdslib/src/main/java/com/yahoo/vdslib/state/ClusterState.java +++ b/vdslib/src/main/java/com/yahoo/vdslib/state/ClusterState.java @@ -83,12 +83,7 @@ public class ClusterState implements Cloneable { @Override public int hashCode() { - int hc = version * 211; - hc += state.hashCode() * 97; - hc += distributionBits * 31; - hc += nodeCount.hashCode() * 7; - hc += nodeStates.hashCode(); - return hc; + return java.util.Objects.hash(version, state, distributionBits, nodeCount, nodeStates); } @FunctionalInterface diff --git a/vdslib/src/test/java/com/yahoo/vdslib/distribution/DistributionTestFactory.java b/vdslib/src/test/java/com/yahoo/vdslib/distribution/DistributionTestFactory.java index c3a8647d95b..804480569d6 100644 --- a/vdslib/src/test/java/com/yahoo/vdslib/distribution/DistributionTestFactory.java +++ b/vdslib/src/test/java/com/yahoo/vdslib/distribution/DistributionTestFactory.java @@ -43,6 +43,7 @@ public class DistributionTestFactory extends CrossPlatformTestFactory { failure = Failure.NONE; } + @Override public boolean equals(Object other) { if (!(other instanceof Test)) return false; Test t = (Test) other; @@ -51,8 +52,9 @@ public class DistributionTestFactory extends CrossPlatformTestFactory { && failure.equals(t.failure)); } + @Override public int hashCode() { - return bucket.hashCode() + nodes.hashCode() + disks.hashCode(); + return java.util.Objects.hash(bucket, nodes, disks); } public String toString() { |