Issue 625: use (even) better primes for hashcodes

13 files changed, 26 insertions, 23 deletions

diff --git a/test/transform/resource/after-delombok/Accessors.java b/test/transform/resource/after-delombok/Accessors.java
index 33f31825..8b984236 100644
--- a/test/transform/resource/after-delombok/Accessors.java
+++ b/test/transform/resource/after-delombok/Accessors.java
@@ -84,7 +84,7 @@ class AccessorsPrefix3 {
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
 	public int hashCode() {
-		final int PRIME = 277;
+		final int PRIME = 59;
 		int result = 1;
 		final java.lang.Object $fName = this.getName();
 		result = result * PRIME + ($fName == null ? 0 : $fName.hashCode());
diff --git a/test/transform/resource/after-delombok/DataExtended.java b/test/transform/resource/after-delombok/DataExtended.java
index 76967bdc..07aa1f7e 100644
--- a/test/transform/resource/after-delombok/DataExtended.java
+++ b/test/transform/resource/after-delombok/DataExtended.java
@@ -28,7 +28,7 @@ class DataExtended {
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
 	public int hashCode() {
-		final int PRIME = 277;
+		final int PRIME = 59;
 		int result = 1;
 		result = result * PRIME + this.getX();
 		return result;
diff --git a/test/transform/resource/after-delombok/DataIgnore.java b/test/transform/resource/after-delombok/DataIgnore.java
index caf97974..fa729ada 100644
--- a/test/transform/resource/after-delombok/DataIgnore.java
+++ b/test/transform/resource/after-delombok/DataIgnore.java
@@ -27,7 +27,7 @@ class DataIgnore {
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
 	public int hashCode() {
-		final int PRIME = 277;
+		final int PRIME = 59;
 		int result = 1;
 		result = result * PRIME + this.getX();
 		return result;
diff --git a/test/transform/resource/after-delombok/DataOnLocalClass.java b/test/transform/resource/after-delombok/DataOnLocalClass.java
index fae0e4a5..bbd9ae4b 100644
--- a/test/transform/resource/after-delombok/DataOnLocalClass.java
+++ b/test/transform/resource/after-delombok/DataOnLocalClass.java
@@ -39,7 +39,7 @@ class DataOnLocalClass1 {
 			@java.lang.Override
 			@java.lang.SuppressWarnings("all")
 			public int hashCode() {
-				final int PRIME = 277;
+				final int PRIME = 59;
 				int result = 1;
 				result = result * PRIME + this.getX();
 				final java.lang.Object $name = this.getName();
@@ -99,7 +99,7 @@ class DataOnLocalClass2 {
 				@java.lang.Override
 				@java.lang.SuppressWarnings("all")
 				public int hashCode() {
-					final int PRIME = 277;
+					final int PRIME = 59;
 					int result = 1;
 					final java.lang.Object $name = this.getName();
 					result = result * PRIME + ($name == null ? 0 : $name.hashCode());
@@ -136,7 +136,7 @@ class DataOnLocalClass2 {
 			@java.lang.Override
 			@java.lang.SuppressWarnings("all")
 			public int hashCode() {
-				final int PRIME = 277;
+				final int PRIME = 59;
 				int result = 1;
 				result = result * PRIME + this.getX();
 				return result;
diff --git a/test/transform/resource/after-delombok/DataPlain.java b/test/transform/resource/after-delombok/DataPlain.java
index 99df699d..6d536c8a 100644
--- a/test/transform/resource/after-delombok/DataPlain.java
+++ b/test/transform/resource/after-delombok/DataPlain.java
@@ -38,7 +38,7 @@ class Data1 {
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
 	public int hashCode() {
-		final int PRIME = 277;
+		final int PRIME = 59;
 		int result = 1;
 		result = result * PRIME + this.getX();
 		final java.lang.Object $name = this.getName();
@@ -91,7 +91,7 @@ class Data2 {
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
 	public int hashCode() {
-		final int PRIME = 277;
+		final int PRIME = 59;
 		int result = 1;
 		result = result * PRIME + this.getX();
 		final java.lang.Object $name = this.getName();
@@ -139,7 +139,7 @@ final class Data3 {
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
 	public int hashCode() {
-		final int PRIME = 277;
+		final int PRIME = 59;
 		int result = 1;
 		result = result * PRIME + this.getX();
 		final java.lang.Object $name = this.getName();
@@ -187,7 +187,7 @@ final class Data4 extends java.util.Timer {
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
 	public int hashCode() {
-		final int PRIME = 277;
+		final int PRIME = 59;
 		int result = 1;
 		result = result * PRIME + super.hashCode();
 		result = result * PRIME + this.getX();
diff --git a/test/transform/resource/after-delombok/DataWithGetter.java b/test/transform/resource/after-delombok/DataWithGetter.java
index 0aed0e12..b429fe53 100644
--- a/test/transform/resource/after-delombok/DataWithGetter.java
+++ b/test/transform/resource/after-delombok/DataWithGetter.java
@@ -36,7 +36,7 @@ class DataWithGetter {
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
 	public int hashCode() {
-		final int PRIME = 277;
+		final int PRIME = 59;
 		int result = 1;
 		result = result * PRIME + this.getX();
 		result = result * PRIME + this.getY();
diff --git a/test/transform/resource/after-delombok/DataWithGetterNone.java b/test/transform/resource/after-delombok/DataWithGetterNone.java
index 8b5ecc01..b063b4ff 100644
--- a/test/transform/resource/after-delombok/DataWithGetterNone.java
+++ b/test/transform/resource/after-delombok/DataWithGetterNone.java
@@ -36,7 +36,7 @@ class DataWithGetterNone {
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
 	public int hashCode() {
-		final int PRIME = 277;
+		final int PRIME = 59;
 		int result = 1;
 		result = result * PRIME + this.x;
 		result = result * PRIME + this.y;
diff --git a/test/transform/resource/after-delombok/EqualsAndHashCode.java b/test/transform/resource/after-delombok/EqualsAndHashCode.java
index 73256edb..afe03dea 100644
--- a/test/transform/resource/after-delombok/EqualsAndHashCode.java
+++ b/test/transform/resource/after-delombok/EqualsAndHashCode.java
@@ -29,7 +29,7 @@ class EqualsAndHashCode {
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
 	public int hashCode() {
-		final int PRIME = 277;
+		final int PRIME = 59;
 		int result = 1;
 		result = result * PRIME + this.x;
 		result = result * PRIME + java.util.Arrays.hashCode(this.y);
@@ -46,6 +46,7 @@ final class EqualsAndHashCode2 {
 	long y;
 	float f;
 	double d;
+	boolean b;
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
 	public boolean equals(final java.lang.Object o) {
@@ -56,12 +57,13 @@ final class EqualsAndHashCode2 {
 		if (this.y != other.y) return false;
 		if (java.lang.Float.compare(this.f, other.f) != 0) return false;
 		if (java.lang.Double.compare(this.d, other.d) != 0) return false;
+		if (this.b != other.b) return false;
 		return true;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
 	public int hashCode() {
-		final int PRIME = 277;
+		final int PRIME = 59;
 		int result = 1;
 		result = result * PRIME + this.x;
 		final long $y = this.y;
@@ -69,6 +71,7 @@ final class EqualsAndHashCode2 {
 		result = result * PRIME + java.lang.Float.floatToIntBits(this.f);
 		final long $d = java.lang.Double.doubleToLongBits(this.d);
 		result = result * PRIME + (int)($d >>> 32 ^ $d);
+		result = result * PRIME + (this.b ? 79 : 97);
 		return result;
 	}
 }
@@ -111,7 +114,7 @@ class EqualsAndHashCode4 extends EqualsAndHashCode {
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
 	public int hashCode() {
-		final int PRIME = 277;
+		final int PRIME = 59;
 		int result = 1;
 		result = result * PRIME + super.hashCode();
 		return result;
diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeWithSomeExistingMethods.java b/test/transform/resource/after-delombok/EqualsAndHashCodeWithSomeExistingMethods.java
index e1bdc7f7..aa9b984f 100644
--- a/test/transform/resource/after-delombok/EqualsAndHashCodeWithSomeExistingMethods.java
+++ b/test/transform/resource/after-delombok/EqualsAndHashCodeWithSomeExistingMethods.java
@@ -69,7 +69,7 @@ class EqualsAndHashCodeWithNoExistingMethods {
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
 	public int hashCode() {
-		final int PRIME = 277;
+		final int PRIME = 59;
 		int result = 1;
 		result = result * PRIME + this.x;
 		return result;
diff --git a/test/transform/resource/after-delombok/GetterLazyBoolean.java b/test/transform/resource/after-delombok/GetterLazyBoolean.java
index ba26e7b7..eb6662e2 100644
--- a/test/transform/resource/after-delombok/GetterLazyBoolean.java
+++ b/test/transform/resource/after-delombok/GetterLazyBoolean.java
@@ -21,9 +21,9 @@ class GetterLazyBoolean {
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
 	public int hashCode() {
-		final int PRIME = 277;
+		final int PRIME = 59;
 		int result = 1;
-		result = result * PRIME + (this.isBooleanValue() ? 2609 : 2591);
+		result = result * PRIME + (this.isBooleanValue() ? 79 : 97);
 		return result;
 	}
 	@java.lang.Override
diff --git a/test/transform/resource/after-delombok/GetterLazyEahcToString.java b/test/transform/resource/after-delombok/GetterLazyEahcToString.java
index 29e2f51c..3e98a25e 100644
--- a/test/transform/resource/after-delombok/GetterLazyEahcToString.java
+++ b/test/transform/resource/after-delombok/GetterLazyEahcToString.java
@@ -27,7 +27,7 @@ class GetterLazyEahcToString {
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
 	public int hashCode() {
-		final int PRIME = 277;
+		final int PRIME = 59;
 		int result = 1;
 		final java.lang.Object $value = this.getValue();
 		result = result * PRIME + ($value == null ? 0 : $value.hashCode());
diff --git a/test/transform/resource/after-delombok/GetterSetterJavadoc.java b/test/transform/resource/after-delombok/GetterSetterJavadoc.java
index 5b12a395..743a3aac 100644
--- a/test/transform/resource/after-delombok/GetterSetterJavadoc.java
+++ b/test/transform/resource/after-delombok/GetterSetterJavadoc.java
@@ -41,7 +41,7 @@ class GetterSetterJavadoc1 {
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
 	public int hashCode() {
-		final int PRIME = 277;
+		final int PRIME = 59;
 		int result = 1;
 		result = result * PRIME + this.getFieldName();
 		return result;
diff --git a/test/transform/resource/after-delombok/ValuePlain.java b/test/transform/resource/after-delombok/ValuePlain.java
index af87d1ba..e880454b 100644
--- a/test/transform/resource/after-delombok/ValuePlain.java
+++ b/test/transform/resource/after-delombok/ValuePlain.java
@@ -30,7 +30,7 @@ final class Value1 {
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
 	public int hashCode() {
-		final int PRIME = 277;
+		final int PRIME = 59;
 		int result = 1;
 		result = result * PRIME + this.getX();
 		final java.lang.Object $name = this.getName();
@@ -80,7 +80,7 @@ class Value2 {
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
 	public int hashCode() {
-		final int PRIME = 277;
+		final int PRIME = 59;
 		int result = 1;
 		result = result * PRIME + this.getX();
 		final java.lang.Object $name = this.getName();
@@ -123,7 +123,7 @@ final class Value3 {
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
 	public int hashCode() {
-		final int PRIME = 277;
+		final int PRIME = 59;
 		int result = 1;
 		result = result * PRIME + this.getX();
 		result = result * PRIME + this.getY();