JAVA-1639: VersionNumber does not fullfill equals/hashcode contract (apache#898)

emolsson · tolbertam · commit 69cf23bc5aa2 · 2017-10-27T10:50:26.000-05:00
diff --git a/changelog/README.md b/changelog/README.md
@@ -15,6 +15,7 @@
 - [new feature] JAVA-1377: Add support for TWCS in SchemaBuilder.
 - [improvement] JAVA-1631: Publish a sources jar for driver-core-tests.
 - [improvement] JAVA-1632: Add a withIpPrefix(String) method to CCMBridge.Builder.
+- [bug] JAVA-1639: VersionNumber does not fullfill equals/hashcode contract.
 
 
 ### 3.3.0
diff --git a/driver-core/src/main/java/com/datastax/driver/core/VersionNumber.java b/driver-core/src/main/java/com/datastax/driver/core/VersionNumber.java
@@ -233,7 +233,7 @@ public boolean equals(Object other) {
 
     @Override
     public int hashCode() {
-        return MoreObjects.hashCode(major, minor, patch, dsePatch, preReleases, build);
+        return MoreObjects.hashCode(major, minor, patch, dsePatch, Arrays.hashCode(preReleases), build);
     }
 
     @Override
diff --git a/driver-core/src/test/java/com/datastax/driver/core/VersionNumberTest.java b/driver-core/src/test/java/com/datastax/driver/core/VersionNumberTest.java
@@ -98,6 +98,15 @@ public void should_order_versions() {
         assertOrder("2.0.0+build01", "2.0.0+build02", 0);
     }
 
+    @Test(groups = "unit")
+    public void should_treat_same_prerelease_equal() {
+        VersionNumber version1 = VersionNumber.parse("3.0.15-SNAPSHOT");
+        VersionNumber version2 = VersionNumber.parse("3.0.15-SNAPSHOT");
+
+        assertThat(version1).isEqualTo(version2);
+        assertThat(version1.hashCode()).isEqualTo(version2.hashCode());
+    }
+
     private void assertOrder(String version1, String version2, int expected) {
         assertThat(VersionNumber.parse(version1).compareTo(VersionNumber.parse(version2))).isEqualTo(expected);
     }

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ public boolean equals(Object other) {`
`233`	`233`
`234`	`234`	`@Override`
`235`	`235`	`public int hashCode() {`
`236`		`- return MoreObjects.hashCode(major, minor, patch, dsePatch, preReleases, build);`
	`236`	`+ return MoreObjects.hashCode(major, minor, patch, dsePatch, Arrays.hashCode(preReleases), build);`
`237`	`237`	`}`
`238`	`238`
`239`	`239`	`@Override`