diff options
4 files changed, 9 insertions, 16 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java b/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java index e9b17721b63..2f671d3483c 100644 --- a/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java +++ b/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java @@ -221,14 +221,10 @@ public class Execution extends com.yahoo.processing.execution.Execution { } public int hashCode() { - int hc = indexFacts.hashCode(); - hc += rendererRegistry.hashCode(); - hc += tokenRegistry.hashCode(); - hc += searchChainRegistry.hashCode(); - hc += detailedDiagnostics ? 9907 : 0; - hc += breakdown ? 9949 : 0; - hc += linguistics.hashCode(); - return hc; + return java.util.Objects.hash(indexFacts, + rendererRegistry, tokenRegistry, searchChainRegistry, + detailedDiagnostics, breakdown, + linguistics); } @Override diff --git a/document/src/main/java/com/yahoo/document/select/OrderingSpecification.java b/document/src/main/java/com/yahoo/document/select/OrderingSpecification.java index 774aa0e4e27..9e0c5b87c4b 100644 --- a/document/src/main/java/com/yahoo/document/select/OrderingSpecification.java +++ b/document/src/main/java/com/yahoo/document/select/OrderingSpecification.java @@ -38,7 +38,7 @@ public class OrderingSpecification { } public int hashCode() { - return order + widthBits*9901 + divisionBits*9973 + 2*(int)orderingStart; + return java.util.Objects.hash(order, orderingStart, widthBits, divisionBits); } public String toString() { 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() { |