Fixes #1543: in equals, by default first compare the primitives

4 files changed, 21 insertions, 21 deletions

diff --git a/test/transform/resource/after-delombok/BuilderDefaults.java b/test/transform/resource/after-delombok/BuilderDefaults.java
index 5a563024..42b751ce 100644
--- a/test/transform/resource/after-delombok/BuilderDefaults.java
+++ b/test/transform/resource/after-delombok/BuilderDefaults.java
@@ -85,10 +85,10 @@ public final class BuilderDefaults {
 		if (!(o instanceof BuilderDefaults)) return false;
 		final BuilderDefaults other = (BuilderDefaults) o;
 		if (this.getX() != other.getX()) return false;
+		if (this.getZ() != other.getZ()) return false;
 		final java.lang.Object this$name = this.getName();
 		final java.lang.Object other$name = other.getName();
 		if (this$name == null ? other$name != null : !this$name.equals(other$name)) return false;
-		if (this.getZ() != other.getZ()) return false;
 		return true;
 	}
 	@java.lang.Override
@@ -97,10 +97,10 @@ public final class BuilderDefaults {
 		final int PRIME = 59;
 		int result = 1;
 		result = result * PRIME + this.getX();
-		final java.lang.Object $name = this.getName();
-		result = result * PRIME + ($name == null ? 43 : $name.hashCode());
 		final long $z = this.getZ();
 		result = result * PRIME + (int) ($z >>> 32 ^ $z);
+		final java.lang.Object $name = this.getName();
+		result = result * PRIME + ($name == null ? 43 : $name.hashCode());
 		return result;
 	}
 	@java.lang.Override
@@ -108,4 +108,4 @@ public final class BuilderDefaults {
 	public java.lang.String toString() {
 		return "BuilderDefaults(x=" + this.getX() + ", name=" + this.getName() + ", z=" + this.getZ() + ")";
 	}
-}
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeRank.java b/test/transform/resource/after-delombok/EqualsAndHashCodeRank.java
index ad2ddbb1..fcf371b6 100644
--- a/test/transform/resource/after-delombok/EqualsAndHashCodeRank.java
+++ b/test/transform/resource/after-delombok/EqualsAndHashCodeRank.java
@@ -9,9 +9,9 @@ public class EqualsAndHashCodeRank {
 		if (!(o instanceof EqualsAndHashCodeRank)) return false;
 		final EqualsAndHashCodeRank other = (EqualsAndHashCodeRank) o;
 		if (!other.canEqual((java.lang.Object) this)) return false;
-		if (this.b != other.b) return false;
 		if (this.a != other.a) return false;
 		if (this.c != other.c) return false;
+		if (this.b != other.b) return false;
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
@@ -23,9 +23,9 @@ public class EqualsAndHashCodeRank {
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
-		result = result * PRIME + this.b;
 		result = result * PRIME + this.a;
 		result = result * PRIME + this.c;
+		result = result * PRIME + this.b;
 		return result;
 	}
-}
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/BuilderDefaults.java b/test/transform/resource/after-ecj/BuilderDefaults.java
index 46f55bef..c9be219d 100644
--- a/test/transform/resource/after-ecj/BuilderDefaults.java
+++ b/test/transform/resource/after-ecj/BuilderDefaults.java
@@ -72,25 +72,25 @@ public final @Value @Builder class BuilderDefaults {
     final BuilderDefaults other = (BuilderDefaults) o;
     if ((this.getX() != other.getX()))
         return false;
+    if ((this.getZ() != other.getZ()))
+        return false;
     final java.lang.Object this$name = this.getName();
     final java.lang.Object other$name = other.getName();
     if (((this$name == null) ? (other$name != null) : (! this$name.equals(other$name))))
         return false;
-    if ((this.getZ() != other.getZ()))
-        return false;
     return true;
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.getX());
-    final java.lang.Object $name = this.getName();
-    result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode()));
     final long $z = this.getZ();
     result = ((result * PRIME) + (int) ($z ^ ($z >>> 32)));
+    final java.lang.Object $name = this.getName();
+    result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode()));
     return result;
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return (((((("BuilderDefaults(x=" + this.getX()) + ", name=") + this.getName()) + ", z=") + this.getZ()) + ")");
   }
-}
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeRank.java b/test/transform/resource/after-ecj/EqualsAndHashCodeRank.java
index 1ea899a8..ef221261 100644
--- a/test/transform/resource/after-ecj/EqualsAndHashCodeRank.java
+++ b/test/transform/resource/after-ecj/EqualsAndHashCodeRank.java
@@ -7,18 +7,18 @@ public @EqualsAndHashCode class EqualsAndHashCodeRank {
     super();
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
-    if (o == this)
+    if ((o == this))
         return true;
-    if (!(o instanceof EqualsAndHashCodeRank))
+    if ((! (o instanceof EqualsAndHashCodeRank)))
         return false;
     final EqualsAndHashCodeRank other = (EqualsAndHashCodeRank) o;
-    if (!other.canEqual((java.lang.Object) this))
+    if ((! other.canEqual((java.lang.Object) this)))
         return false;
-    if (this.b != other.b)
+    if ((this.a != other.a))
         return false;
-    if (this.a != other.a)
+    if ((this.c != other.c))
         return false;
-    if (this.c != other.c)
+    if ((this.b != other.b))
         return false;
     return true;
   }
@@ -28,9 +28,9 @@ public @EqualsAndHashCode class EqualsAndHashCodeRank {
   public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 59;
     int result = 1;
-    result = result * PRIME + this.b;
-    result = result * PRIME + this.a;
-    result = result * PRIME + this.c;
+    result = ((result * PRIME) + this.a);
+    result = ((result * PRIME) + this.c);
+    result = ((result * PRIME) + this.b);
     return result;
   }
 }