Added support for canEqual in ecj

6 files changed, 61 insertions, 33 deletions

diff --git a/test/transform/resource/after-ecj/DataExtended.java b/test/transform/resource/after-ecj/DataExtended.java
index b7be8bcf..10a66547 100644
--- a/test/transform/resource/after-ecj/DataExtended.java
+++ b/test/transform/resource/after-ecj/DataExtended.java
@@ -12,15 +12,18 @@
   public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
-    if ((o == null))
-        return false;
-    if ((o.getClass() != this.getClass()))
+    if ((! (o instanceof DataExtended)))
         return false;
     final DataExtended other = (DataExtended) o;
+    if ((! other.canEqual(this)))
+        return false;
     if ((this.getX() != other.getX()))
         return false;
     return true;
   }
+  public @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+    return (other instanceof DataExtended);
+  }
   public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 31;
     int result = 1;
diff --git a/test/transform/resource/after-ecj/DataIgnore.java b/test/transform/resource/after-ecj/DataIgnore.java
index df2254c8..13c8e2f7 100644
--- a/test/transform/resource/after-ecj/DataIgnore.java
+++ b/test/transform/resource/after-ecj/DataIgnore.java
@@ -11,15 +11,18 @@
   public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
-    if ((o == null))
-        return false;
-    if ((o.getClass() != this.getClass()))
+    if ((! (o instanceof DataIgnore)))
         return false;
     final DataIgnore other = (DataIgnore) o;
+    if ((! other.canEqual(this)))
+        return false;
     if ((this.getX() != other.getX()))
         return false;
     return true;
   }
+  public @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+    return (other instanceof DataIgnore);
+  }
   public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 31;
     int result = 1;
diff --git a/test/transform/resource/after-ecj/DataOnLocalClass.java b/test/transform/resource/after-ecj/DataOnLocalClass.java
index a17033c2..b987b967 100644
--- a/test/transform/resource/after-ecj/DataOnLocalClass.java
+++ b/test/transform/resource/after-ecj/DataOnLocalClass.java
@@ -23,17 +23,20 @@ class DataOnLocalClass1 {
       public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
         if ((o == this))
             return true;
-        if ((o == null))
-            return false;
-        if ((o.getClass() != this.getClass()))
+        if ((! (o instanceof Local)))
             return false;
         final Local other = (Local) o;
+        if ((! other.canEqual(this)))
+            return false;
         if ((this.getX() != other.getX()))
             return false;
         if (((this.getName() == null) ? (other.getName() != null) : (! this.getName().equals(other.getName()))))
             return false;
         return true;
       }
+      public @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+        return (other instanceof Local);
+      }
       public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
         final int PRIME = 31;
         int result = 1;
@@ -69,15 +72,18 @@ class DataOnLocalClass2 {
         public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
           if ((o == this))
               return true;
-          if ((o == null))
-              return false;
-          if ((o.getClass() != this.getClass()))
+          if ((! (o instanceof InnerLocal)))
               return false;
           final InnerLocal other = (InnerLocal) o;
+          if ((! other.canEqual(this)))
+              return false;
           if (((this.getName() == null) ? (other.getName() != null) : (! this.getName().equals(other.getName()))))
               return false;
           return true;
         }
+        public @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+          return (other instanceof InnerLocal);
+        }
         public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
           final int PRIME = 31;
           int result = 1;
@@ -99,15 +105,18 @@ class DataOnLocalClass2 {
       public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
         if ((o == this))
             return true;
-        if ((o == null))
-            return false;
-        if ((o.getClass() != this.getClass()))
+        if ((! (o instanceof Local)))
             return false;
         final Local other = (Local) o;
+        if ((! other.canEqual(this)))
+            return false;
         if ((this.getX() != other.getX()))
             return false;
         return true;
       }
+      public @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+        return (other instanceof Local);
+      }
       public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
         final int PRIME = 31;
         int result = 1;
diff --git a/test/transform/resource/after-ecj/DataPlain.java b/test/transform/resource/after-ecj/DataPlain.java
index b0af873f..d704a249 100644
--- a/test/transform/resource/after-ecj/DataPlain.java
+++ b/test/transform/resource/after-ecj/DataPlain.java
@@ -18,17 +18,20 @@ import lombok.Data;
   public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
-    if ((o == null))
-        return false;
-    if ((o.getClass() != this.getClass()))
+    if ((! (o instanceof Data1)))
         return false;
     final Data1 other = (Data1) o;
+    if ((! other.canEqual(this)))
+        return false;
     if ((this.getX() != other.getX()))
         return false;
     if (((this.getName() == null) ? (other.getName() != null) : (! this.getName().equals(other.getName()))))
         return false;
     return true;
   }
+  public @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+    return (other instanceof Data1);
+  }
   public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 31;
     int result = 1;
@@ -59,17 +62,20 @@ import lombok.Data;
   public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
-    if ((o == null))
-        return false;
-    if ((o.getClass() != this.getClass()))
+    if ((! (o instanceof Data2)))
         return false;
     final Data2 other = (Data2) o;
+    if ((! other.canEqual(this)))
+        return false;
     if ((this.getX() != other.getX()))
         return false;
     if (((this.getName() == null) ? (other.getName() != null) : (! this.getName().equals(other.getName()))))
         return false;
     return true;
   }
+  public @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+    return (other instanceof Data2);
+  }
   public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 31;
     int result = 1;
@@ -100,9 +106,7 @@ final @Data class Data3 {
   public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
-    if ((o == null))
-        return false;
-    if ((o.getClass() != this.getClass()))
+    if ((! (o instanceof Data3)))
         return false;
     final Data3 other = (Data3) o;
     if ((this.getX() != other.getX()))
@@ -133,17 +137,20 @@ final @Data @lombok.EqualsAndHashCode(callSuper = true) class Data4 extends java
   public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
-    if ((o == null))
+    if ((! (o instanceof Data4)))
         return false;
-    if ((o.getClass() != this.getClass()))
+    final Data4 other = (Data4) o;
+    if ((! other.canEqual(this)))
         return false;
     if ((! super.equals(o)))
         return false;
-    final Data4 other = (Data4) o;
     if ((this.getX() != other.getX()))
         return false;
     return true;
   }
+  public @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+    return (other instanceof Data4);
+  }
   public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 31;
     int result = 1;
diff --git a/test/transform/resource/after-ecj/DataWithGetter.java b/test/transform/resource/after-ecj/DataWithGetter.java
index abf1dc64..904ae0fa 100644
--- a/test/transform/resource/after-ecj/DataWithGetter.java
+++ b/test/transform/resource/after-ecj/DataWithGetter.java
@@ -15,11 +15,11 @@
   public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
-    if ((o == null))
-        return false;
-    if ((o.getClass() != this.getClass()))
+    if ((! (o instanceof DataWithGetter)))
         return false;
     final DataWithGetter other = (DataWithGetter) o;
+    if ((! other.canEqual(this)))
+        return false;
     if ((this.getX() != other.getX()))
         return false;
     if ((this.getY() != other.getY()))
@@ -28,6 +28,9 @@
         return false;
     return true;
   }
+  public @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+    return (other instanceof DataWithGetter);
+  }
   public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 31;
     int result = 1;
diff --git a/test/transform/resource/after-ecj/DataWithGetterNone.java b/test/transform/resource/after-ecj/DataWithGetterNone.java
index 97509c07..0172f4f3 100644
--- a/test/transform/resource/after-ecj/DataWithGetterNone.java
+++ b/test/transform/resource/after-ecj/DataWithGetterNone.java
@@ -15,11 +15,11 @@
   public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
-    if ((o == null))
-        return false;
-    if ((o.getClass() != this.getClass()))
+    if ((! (o instanceof DataWithGetterNone)))
         return false;
     final DataWithGetterNone other = (DataWithGetterNone) o;
+    if ((! other.canEqual(this)))
+        return false;
     if ((this.x != other.x))
         return false;
     if ((this.y != other.y))
@@ -28,6 +28,9 @@
         return false;
     return true;
   }
+  public @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+    return (other instanceof DataWithGetterNone);
+  }
   public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 31;
     int result = 1;