Issue 625: use (even) better primes for hashcodes

13 files changed, 27 insertions, 23 deletions

diff --git a/test/transform/resource/after-ecj/Accessors.java b/test/transform/resource/after-ecj/Accessors.java
index 52a72d52..c8fdc3bf 100644
--- a/test/transform/resource/after-ecj/Accessors.java
+++ b/test/transform/resource/after-ecj/Accessors.java
@@ -90,7 +90,7 @@ class AccessorsChain {
     return (other instanceof AccessorsPrefix3);
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") 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-ecj/DataExtended.java b/test/transform/resource/after-ecj/DataExtended.java
index 35a7ca34..bcfd26e3 100644
--- a/test/transform/resource/after-ecj/DataExtended.java
+++ b/test/transform/resource/after-ecj/DataExtended.java
@@ -22,7 +22,7 @@
     return (other instanceof DataExtended);
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") 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-ecj/DataIgnore.java b/test/transform/resource/after-ecj/DataIgnore.java
index 4a3c051b..d0e72e15 100644
--- a/test/transform/resource/after-ecj/DataIgnore.java
+++ b/test/transform/resource/after-ecj/DataIgnore.java
@@ -20,7 +20,7 @@
     return (other instanceof DataIgnore);
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") 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-ecj/DataOnLocalClass.java b/test/transform/resource/after-ecj/DataOnLocalClass.java
index 4a247542..511291c2 100644
--- a/test/transform/resource/after-ecj/DataOnLocalClass.java
+++ b/test/transform/resource/after-ecj/DataOnLocalClass.java
@@ -36,7 +36,7 @@ class DataOnLocalClass1 {
         return (other instanceof Local);
       }
       public @java.lang.Override @java.lang.SuppressWarnings("all") 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();
@@ -86,7 +86,7 @@ class DataOnLocalClass2 {
           return (other instanceof Local.InnerLocal);
         }
         public @java.lang.Override @java.lang.SuppressWarnings("all") 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()));
@@ -124,7 +124,7 @@ class DataOnLocalClass2 {
         return (other instanceof Local);
       }
       public @java.lang.Override @java.lang.SuppressWarnings("all") 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-ecj/DataPlain.java b/test/transform/resource/after-ecj/DataPlain.java
index 2105c6f2..aa47fdaa 100644
--- a/test/transform/resource/after-ecj/DataPlain.java
+++ b/test/transform/resource/after-ecj/DataPlain.java
@@ -31,7 +31,7 @@ import lombok.Data;
     return (other instanceof Data1);
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") 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();
@@ -78,7 +78,7 @@ import lombok.Data;
     return (other instanceof Data2);
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") 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();
@@ -120,7 +120,7 @@ final @Data class Data3 {
     return true;
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") 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();
@@ -167,7 +167,7 @@ final @Data @lombok.EqualsAndHashCode(callSuper = true) class Data4 extends java
     return (other instanceof Data4);
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") 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-ecj/DataWithGetter.java b/test/transform/resource/after-ecj/DataWithGetter.java
index 9676e851..2ce74ceb 100644
--- a/test/transform/resource/after-ecj/DataWithGetter.java
+++ b/test/transform/resource/after-ecj/DataWithGetter.java
@@ -30,7 +30,7 @@
     return (other instanceof DataWithGetter);
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") 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-ecj/DataWithGetterNone.java b/test/transform/resource/after-ecj/DataWithGetterNone.java
index d5e190d8..087d0762 100644
--- a/test/transform/resource/after-ecj/DataWithGetterNone.java
+++ b/test/transform/resource/after-ecj/DataWithGetterNone.java
@@ -30,7 +30,7 @@
     return (other instanceof DataWithGetterNone);
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") 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-ecj/EqualsAndHashCode.java b/test/transform/resource/after-ecj/EqualsAndHashCode.java
index 492f9344..625a0f87 100644
--- a/test/transform/resource/after-ecj/EqualsAndHashCode.java
+++ b/test/transform/resource/after-ecj/EqualsAndHashCode.java
@@ -35,7 +35,7 @@
     return (other instanceof EqualsAndHashCode);
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") 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));
@@ -52,6 +52,7 @@ final @lombok.EqualsAndHashCode class EqualsAndHashCode2 {
   long y;
   float f;
   double d;
+  boolean b;
   EqualsAndHashCode2() {
     super();
   }
@@ -69,10 +70,12 @@ final @lombok.EqualsAndHashCode class EqualsAndHashCode2 {
         return false;
     if ((java.lang.Double.compare(this.d, other.d) != 0))
         return false;
+    if ((this.b != other.b))
+        return false;
     return true;
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
-    final int PRIME = 277;
+    final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.x);
     final long $y = this.y;
@@ -80,6 +83,7 @@ final @lombok.EqualsAndHashCode 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 ^ ($d >>> 32)));
+    result = ((result * PRIME) + (this.b ? 79 : 97));
     return result;
   }
 }
@@ -125,7 +129,7 @@ final @lombok.EqualsAndHashCode(callSuper = false) class EqualsAndHashCode3 exte
     return (other instanceof EqualsAndHashCode4);
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") 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-ecj/EqualsAndHashCodeWithSomeExistingMethods.java b/test/transform/resource/after-ecj/EqualsAndHashCodeWithSomeExistingMethods.java
index 83878675..05f7ad97 100644
--- a/test/transform/resource/after-ecj/EqualsAndHashCodeWithSomeExistingMethods.java
+++ b/test/transform/resource/after-ecj/EqualsAndHashCodeWithSomeExistingMethods.java
@@ -57,7 +57,7 @@ import static lombok.AccessLevel.NONE;
     return (other instanceof EqualsAndHashCodeWithNoExistingMethods);
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") 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-ecj/GetterLazyBoolean.java b/test/transform/resource/after-ecj/GetterLazyBoolean.java
index d3b257a7..c37eece2 100644
--- a/test/transform/resource/after-ecj/GetterLazyBoolean.java
+++ b/test/transform/resource/after-ecj/GetterLazyBoolean.java
@@ -57,9 +57,9 @@
     return (other instanceof GetterLazyBoolean);
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") 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;
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
diff --git a/test/transform/resource/after-ecj/GetterLazyEahcToString.java b/test/transform/resource/after-ecj/GetterLazyEahcToString.java
index d8a90350..da9f6a83 100644
--- a/test/transform/resource/after-ecj/GetterLazyEahcToString.java
+++ b/test/transform/resource/after-ecj/GetterLazyEahcToString.java
@@ -46,7 +46,7 @@
     return (other instanceof GetterLazyEahcToString);
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") 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-ecj/GetterSetterJavadoc.java b/test/transform/resource/after-ecj/GetterSetterJavadoc.java
index 10d9a0be..b7fc15b8 100644
--- a/test/transform/resource/after-ecj/GetterSetterJavadoc.java
+++ b/test/transform/resource/after-ecj/GetterSetterJavadoc.java
@@ -22,7 +22,7 @@
     return (other instanceof GetterSetterJavadoc1);
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") 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-ecj/ValuePlain.java b/test/transform/resource/after-ecj/ValuePlain.java
index a23944de..5ca32af8 100644
--- a/test/transform/resource/after-ecj/ValuePlain.java
+++ b/test/transform/resource/after-ecj/ValuePlain.java
@@ -23,7 +23,7 @@ final @lombok.Value class Value1 {
     return true;
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") 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();
@@ -68,7 +68,7 @@ final @lombok.Value class Value1 {
     return (other instanceof Value2);
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") 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();
@@ -106,7 +106,7 @@ final @Value class Value3 {
     return true;
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
-    final int PRIME = 277;
+    final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.getX());
     result = ((result * PRIME) + this.getY());