Merge branch 'master' into annoGetSet

37 files changed, 482 insertions, 158 deletions

diff --git a/test/transform/resource/after-ecj/ClassNamedAfterGetter.java b/test/transform/resource/after-ecj/ClassNamedAfterGetter.java
index fdb6f122..fb9df0ea 100644
--- a/test/transform/resource/after-ecj/ClassNamedAfterGetter.java
+++ b/test/transform/resource/after-ecj/ClassNamedAfterGetter.java
@@ -1,9 +1,9 @@
 class GetFoo {
   private @lombok.Getter int foo;
-  GetFoo() {
-    super();
-  }
   public @java.lang.SuppressWarnings("all") int getFoo() {
     return this.foo;
   }
+  GetFoo() {
+    super();
+  }
 }
diff --git a/test/transform/resource/after-ecj/CleanupName.java b/test/transform/resource/after-ecj/CleanupName.java
index 944a81e1..4011721b 100644
--- a/test/transform/resource/after-ecj/CleanupName.java
+++ b/test/transform/resource/after-ecj/CleanupName.java
@@ -10,7 +10,10 @@ class CleanupName {
       }
     finally
       {
-        o.toString();
+        if ((o != null))
+            {
+              o.toString();
+            }
       }
   }
   void test2() {
@@ -21,7 +24,10 @@ class CleanupName {
       }
     finally
       {
-        o.toString();
+        if ((o != null))
+            {
+              o.toString();
+            }
       }
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/CleanupPlain.java b/test/transform/resource/after-ecj/CleanupPlain.java
index 6754b4f6..fe8d7571 100644
--- a/test/transform/resource/after-ecj/CleanupPlain.java
+++ b/test/transform/resource/after-ecj/CleanupPlain.java
@@ -18,12 +18,18 @@ class CleanupPlain {
           }
         finally
           {
-            out.close();
+            if ((out != null))
+                {
+                  out.close();
+                }
           }
       }
     finally
       {
-        in.close();
+        if ((in != null))
+            {
+              in.close();
+            }
       }
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/CommentsInterspersed.java b/test/transform/resource/after-ecj/CommentsInterspersed.java
index d708ad72..60c69aed 100644
--- a/test/transform/resource/after-ecj/CommentsInterspersed.java
+++ b/test/transform/resource/after-ecj/CommentsInterspersed.java
@@ -2,11 +2,11 @@ import lombok.Getter;
 public class CommentsInterspersed {
   private int x;
   private @Getter String test = "foo";
+  public @java.lang.SuppressWarnings("all") String getTest() {
+    return this.test;
+  }
   public CommentsInterspersed() {
     super();
   }
   public native void gwtTest();
-  public @java.lang.SuppressWarnings("all") String getTest() {
-    return this.test;
-  }
 }
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 b6e385f3..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;
@@ -81,3 +87,78 @@ import lombok.Data;
     return (((("Data2(x=" + this.getX()) + ", name=") + this.getName()) + ")");
   }
 }
+final @Data class Data3 {
+  final int x;
+  String name;
+  public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") Data3(final int x) {
+    super();
+    this.x = x;
+  }
+  public @java.lang.SuppressWarnings("all") int getX() {
+    return this.x;
+  }
+  public @java.lang.SuppressWarnings("all") String getName() {
+    return this.name;
+  }
+  public @java.lang.SuppressWarnings("all") void setName(final String name) {
+    this.name = name;
+  }
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+    if ((o == this))
+        return true;
+    if ((! (o instanceof Data3)))
+        return false;
+    final Data3 other = (Data3) o;
+    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.Override @java.lang.SuppressWarnings("all") int hashCode() {
+    final int PRIME = 31;
+    int result = 1;
+    result = ((result * PRIME) + this.getX());
+    result = ((result * PRIME) + ((this.getName() == null) ? 0 : this.getName().hashCode()));
+    return result;
+  }
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+    return (((("Data3(x=" + this.getX()) + ", name=") + this.getName()) + ")");
+  }
+}
+final @Data @lombok.EqualsAndHashCode(callSuper = true) class Data4 extends java.util.Timer {
+  final int x;
+  public @java.lang.SuppressWarnings("all") int getX() {
+    return this.x;
+  }
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+    return (("Data4(x=" + this.getX()) + ")");
+  }
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+    if ((o == this))
+        return true;
+    if ((! (o instanceof Data4)))
+        return false;
+    final Data4 other = (Data4) o;
+    if ((! other.canEqual(this)))
+        return false;
+    if ((! super.equals(o)))
+        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 Data4);
+  }
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+    final int PRIME = 31;
+    int result = 1;
+    result = ((result * PRIME) + super.hashCode());
+    result = ((result * PRIME) + this.getX());
+    return result;
+  }
+  Data4() {
+    super();
+  }
+}
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;
diff --git a/test/transform/resource/after-ecj/GetterAccessLevel.java b/test/transform/resource/after-ecj/GetterAccessLevel.java
index 14edfb56..f0de95e7 100644
--- a/test/transform/resource/after-ecj/GetterAccessLevel.java
+++ b/test/transform/resource/after-ecj/GetterAccessLevel.java
@@ -10,9 +10,6 @@ class GetterAccessLevel {
   @lombok.Getter(lombok.AccessLevel.PROTECTED) String protectedString;
   @lombok.Getter(lombok.AccessLevel.PUBLIC) String publicString;
   @lombok.Getter(value = lombok.AccessLevel.PUBLIC) String value;
-  GetterAccessLevel() {
-    super();
-  }
   private @java.lang.SuppressWarnings("all") boolean isPrivate() {
     return this.isPrivate;
   }
@@ -40,4 +37,7 @@ class GetterAccessLevel {
   public @java.lang.SuppressWarnings("all") String getValue() {
     return this.value;
   }
+  GetterAccessLevel() {
+    super();
+  }
 }
diff --git a/test/transform/resource/after-ecj/GetterAlreadyExists.java b/test/transform/resource/after-ecj/GetterAlreadyExists.java
index 959b6a64..f491f147 100644
--- a/test/transform/resource/after-ecj/GetterAlreadyExists.java
+++ b/test/transform/resource/after-ecj/GetterAlreadyExists.java
@@ -27,27 +27,27 @@ class Getter3 {
 }
 class Getter4 {
   @lombok.Getter String foo;
+  public @java.lang.SuppressWarnings("all") String getFoo() {
+    return this.foo;
+  }
   Getter4() {
     super();
   }
   String hasFoo() {
     return null;
   }
-  public @java.lang.SuppressWarnings("all") String getFoo() {
-    return this.foo;
-  }
 }
 class Getter5 {
   @lombok.Getter String foo;
+  public @java.lang.SuppressWarnings("all") String getFoo() {
+    return this.foo;
+  }
   Getter5() {
     super();
   }
   String isFoo() {
     return null;
   }
-  public @java.lang.SuppressWarnings("all") String getFoo() {
-    return this.foo;
-  }
 }
 class Getter6 {
   @lombok.Getter String foo;
@@ -60,27 +60,27 @@ class Getter6 {
 }
 class Getter7 {
   @lombok.Getter String foo;
+  public @java.lang.SuppressWarnings("all") String getFoo() {
+    return this.foo;
+  }
   Getter7() {
     super();
   }
   boolean hasFoo() {
     return false;
   }
-  public @java.lang.SuppressWarnings("all") String getFoo() {
-    return this.foo;
-  }
 }
 class Getter8 {
   @lombok.Getter String foo;
+  public @java.lang.SuppressWarnings("all") String getFoo() {
+    return this.foo;
+  }
   Getter8() {
     super();
   }
   boolean isFoo() {
     return false;
   }
-  public @java.lang.SuppressWarnings("all") String getFoo() {
-    return this.foo;
-  }
 }
 class Getter9 {
   @lombok.Getter String foo;
@@ -120,27 +120,27 @@ class Getter12 {
 }
 class Getter13 {
   @lombok.Getter String foo;
+  public @java.lang.SuppressWarnings("all") String getFoo() {
+    return this.foo;
+  }
   Getter13() {
     super();
   }
   static boolean hasFoo() {
     return false;
   }
-  public @java.lang.SuppressWarnings("all") String getFoo() {
-    return this.foo;
-  }
 }
 class Getter14 {
   @lombok.Getter String foo;
+  public @java.lang.SuppressWarnings("all") String getFoo() {
+    return this.foo;
+  }
   Getter14() {
     super();
   }
   static boolean isFoo() {
     return false;
   }
-  public @java.lang.SuppressWarnings("all") String getFoo() {
-    return this.foo;
-  }
 }
 class Getter15 {
   @lombok.Getter String foo;
@@ -153,27 +153,27 @@ class Getter15 {
 }
 class Getter16 {
   @lombok.Getter String foo;
+  public @java.lang.SuppressWarnings("all") String getFoo() {
+    return this.foo;
+  }
   Getter16() {
     super();
   }
   static String hasFoo() {
     return false;
   }
-  public @java.lang.SuppressWarnings("all") String getFoo() {
-    return this.foo;
-  }
 }
 class Getter17 {
   @lombok.Getter String foo;
+  public @java.lang.SuppressWarnings("all") String getFoo() {
+    return this.foo;
+  }
   Getter17() {
     super();
   }
   static String isFoo() {
     return false;
   }
-  public @java.lang.SuppressWarnings("all") String getFoo() {
-    return this.foo;
-  }
 }
 class Getter18 {
   @lombok.Getter String foo;
diff --git a/test/transform/resource/after-ecj/GetterBoolean.java b/test/transform/resource/after-ecj/GetterBoolean.java
index caf758c1..e9e4f370 100644
--- a/test/transform/resource/after-ecj/GetterBoolean.java
+++ b/test/transform/resource/after-ecj/GetterBoolean.java
@@ -2,9 +2,6 @@ class Getter {
   @lombok.Getter boolean foo;
   @lombok.Getter boolean isBar;
   @lombok.Getter boolean hasBaz;
-  Getter() {
-    super();
-  }
   public @java.lang.SuppressWarnings("all") boolean isFoo() {
     return this.foo;
   }
@@ -14,6 +11,9 @@ class Getter {
   public @java.lang.SuppressWarnings("all") boolean hasBaz() {
     return this.hasBaz;
   }
+  Getter() {
+    super();
+  }
 }
 class MoreGetter {
   @lombok.Getter boolean foo;
diff --git a/test/transform/resource/after-ecj/GetterOnClass.java b/test/transform/resource/after-ecj/GetterOnClass.java
index 7668c9d3..421aa150 100644
--- a/test/transform/resource/after-ecj/GetterOnClass.java
+++ b/test/transform/resource/after-ecj/GetterOnClass.java
@@ -1,67 +1,68 @@
 @lombok.Getter class GetterOnClass1 {
   @lombok.Getter(lombok.AccessLevel.NONE) boolean isNone;
   boolean isPublic;
-  GetterOnClass1() {
-    super();
-  }
   public @java.lang.SuppressWarnings("all") boolean isPublic() {
     return this.isPublic;
   }
+  GetterOnClass1() {
+    super();
+  }
+
 }
 @lombok.Getter(lombok.AccessLevel.PROTECTED) class GetterOnClass2 {
   @lombok.Getter(lombok.AccessLevel.NONE) boolean isNone;
   boolean isProtected;
   @lombok.Getter(lombok.AccessLevel.PACKAGE) boolean isPackage;
-  GetterOnClass2() {
-    super();
-  }
   @java.lang.SuppressWarnings("all") boolean isPackage() {
     return this.isPackage;
   }
   protected @java.lang.SuppressWarnings("all") boolean isProtected() {
     return this.isProtected;
   }
+  GetterOnClass2() {
+    super();
+  }
 }
 @lombok.Getter(lombok.AccessLevel.PACKAGE) class GetterOnClass3 {
   @lombok.Getter(lombok.AccessLevel.NONE) boolean isNone;
   boolean isPackage;
-  GetterOnClass3() {
-    super();
-  }
   @java.lang.SuppressWarnings("all") boolean isPackage() {
     return this.isPackage;
   }
+  GetterOnClass3() {
+    super();
+  }
 }
 @lombok.Getter(lombok.AccessLevel.PRIVATE) class GetterOnClass4 {
   @lombok.Getter(lombok.AccessLevel.NONE) boolean isNone;
   boolean isPrivate;
-  GetterOnClass4() {
-    super();
-  }
   private @java.lang.SuppressWarnings("all") boolean isPrivate() {
     return this.isPrivate;
   }
+  GetterOnClass4() {
+    super();
+  }
 }
 @lombok.Getter(lombok.AccessLevel.PUBLIC) class GetterOnClass5 {
   @lombok.Getter(lombok.AccessLevel.NONE) boolean isNone;
   boolean isPublic;
-  GetterOnClass5() {
-    super();
-  }
   public @java.lang.SuppressWarnings("all") boolean isPublic() {
     return this.isPublic;
   }
+  GetterOnClass5() {
+    super();
+  }
 }
 @lombok.Getter class GetterOnClass6 {
   String couldBeNull;
   @lombok.NonNull String nonNull;
-  GetterOnClass6() {
-    super();
-  }
   public @java.lang.SuppressWarnings("all") String getCouldBeNull() {
     return this.couldBeNull;
   }
   public @lombok.NonNull @java.lang.SuppressWarnings("all") String getNonNull() {
     return this.nonNull;
   }
-}
+  GetterOnClass6() {
+    super();
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/GetterOnStatic.java b/test/transform/resource/after-ecj/GetterOnStatic.java
index ee90b897..538f25cb 100644
--- a/test/transform/resource/after-ecj/GetterOnStatic.java
+++ b/test/transform/resource/after-ecj/GetterOnStatic.java
@@ -3,13 +3,13 @@ class Getter {
   static @lombok.Getter int bar;
   <clinit>() {
   }
-  Getter() {
-    super();
-  }
   public static @java.lang.SuppressWarnings("all") boolean isFoo() {
     return Getter.foo;
   }
   public static @java.lang.SuppressWarnings("all") int getBar() {
     return Getter.bar;
   }
+  Getter() {
+    super();
+  }
 }
diff --git a/test/transform/resource/after-ecj/GetterPlain.java b/test/transform/resource/after-ecj/GetterPlain.java
index 19e24c77..cd096ca3 100644
--- a/test/transform/resource/after-ecj/GetterPlain.java
+++ b/test/transform/resource/after-ecj/GetterPlain.java
@@ -2,13 +2,13 @@ import lombok.Getter;
 class GetterPlain {
   @lombok.Getter int i;
   @Getter int foo;
-  GetterPlain() {
-    super();
-  }
   public @java.lang.SuppressWarnings("all") int getI() {
     return this.i;
   }
   public @java.lang.SuppressWarnings("all") int getFoo() {
     return this.foo;
   }
+  GetterPlain() {
+    super();
+  }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/GetterWithDollar.java b/test/transform/resource/after-ecj/GetterWithDollar.java
index f4bc799c..b102ba66 100644
--- a/test/transform/resource/after-ecj/GetterWithDollar.java
+++ b/test/transform/resource/after-ecj/GetterWithDollar.java
@@ -1,22 +1,22 @@
 class GetterWithDollar1 {
   @lombok.Getter int $i;
-  GetterWithDollar1() {
-    super();
-  }
   public @java.lang.SuppressWarnings("all") int get$i() {
     return this.$i;
   }
+  GetterWithDollar1() {
+    super();
+  }
 }
 class GetterWithDollar2 {
   @lombok.Getter int $i;
   @lombok.Getter int i;
-  GetterWithDollar2() {
-    super();
-  }
   public @java.lang.SuppressWarnings("all") int get$i() {
     return this.$i;
   }
   public @java.lang.SuppressWarnings("all") int getI() {
     return this.i;
   }
+  GetterWithDollar2() {
+    super();
+  }
 }
diff --git a/test/transform/resource/after-ecj/LoggerCommons.java b/test/transform/resource/after-ecj/LoggerCommons.java
new file mode 100644
index 00000000..bb38983f
--- /dev/null
+++ b/test/transform/resource/after-ecj/LoggerCommons.java
@@ -0,0 +1,24 @@
+@lombok.extern.apachecommons.Log class LoggerCommons {
+  private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommons.class);
+  <clinit>() {
+  }
+  LoggerCommons() {
+    super();
+  }
+}
+@lombok.extern.apachecommons.Log(String.class) class LoggerCommonsString {
+  private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(String.class);
+  <clinit>() {
+  }
+  LoggerCommonsString() {
+    super();
+  }
+}
+@lombok.extern.apachecommons.Log(java.lang.String.class) class LoggerCommonsJavaLangString {
+  private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(java.lang.String.class);
+  <clinit>() {
+  }
+  LoggerCommonsJavaLangString() {
+    super();
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/LoggerJul.java b/test/transform/resource/after-ecj/LoggerJul.java
new file mode 100644
index 00000000..3d09cb71
--- /dev/null
+++ b/test/transform/resource/after-ecj/LoggerJul.java
@@ -0,0 +1,24 @@
+@lombok.extern.jul.Log class LoggerJul {
+  private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJul.class.getName());
+  <clinit>() {
+  }
+  LoggerJul() {
+    super();
+  }
+}
+@lombok.extern.jul.Log(String.class) class LoggerJulString {
+  private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(String.class.getName());
+  <clinit>() {
+  }
+  LoggerJulString() {
+    super();
+  }
+}
+@lombok.extern.jul.Log(java.lang.String.class) class LoggerJulJavaLangString {
+  private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(java.lang.String.class.getName());
+  <clinit>() {
+  }
+  LoggerJulJavaLangString() {
+    super();
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/LoggerLog4j.java b/test/transform/resource/after-ecj/LoggerLog4j.java
new file mode 100644
index 00000000..45898a57
--- /dev/null
+++ b/test/transform/resource/after-ecj/LoggerLog4j.java
@@ -0,0 +1,24 @@
+@lombok.extern.log4j.Log class LoggerLog4j {
+  private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4j.class);
+  <clinit>() {
+  }
+  LoggerLog4j() {
+    super();
+  }
+}
+@lombok.extern.log4j.Log(String.class) class LoggerLog4jString {
+  private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(String.class);
+  <clinit>() {
+  }
+  LoggerLog4jString() {
+    super();
+  }
+}
+@lombok.extern.log4j.Log(java.lang.String.class) class LoggerLog4jJavaLangString {
+  private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(java.lang.String.class);
+  <clinit>() {
+  }
+  LoggerLog4jJavaLangString() {
+    super();
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/LoggerSlf4j.java b/test/transform/resource/after-ecj/LoggerSlf4j.java
new file mode 100644
index 00000000..e635ece8
--- /dev/null
+++ b/test/transform/resource/after-ecj/LoggerSlf4j.java
@@ -0,0 +1,21 @@
+@lombok.extern.slf4j.Log class LoggerSlf4j {
+  private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4j.class);
+  <clinit>() {
+  }
+  LoggerSlf4j() {
+    super();
+  }
+}
+class LoggerSlf4jOuter {
+  static @lombok.extern.slf4j.Log class Inner {
+    private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class);
+    <clinit>() {
+    }
+    Inner() {
+      super();
+    }
+  }
+  LoggerSlf4jOuter() {
+    super();
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/LoggerSlf4jAlreadyExists.java b/test/transform/resource/after-ecj/LoggerSlf4jAlreadyExists.java
new file mode 100644
index 00000000..22fa0eeb
--- /dev/null
+++ b/test/transform/resource/after-ecj/LoggerSlf4jAlreadyExists.java
@@ -0,0 +1,6 @@
+@lombok.extern.slf4j.Log class LoggerSlf4jAlreadyExists {
+  int log;
+  LoggerSlf4jAlreadyExists() {
+    super();
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/LoggerSlf4jClassOfArray.java b/test/transform/resource/after-ecj/LoggerSlf4jClassOfArray.java
new file mode 100644
index 00000000..20fe0fde
--- /dev/null
+++ b/test/transform/resource/after-ecj/LoggerSlf4jClassOfArray.java
@@ -0,0 +1,16 @@
+@lombok.extern.slf4j.Log(String[].class) class LoggerSlf4jClassOfArray {
+  private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(String[].class);
+  <clinit>() {
+  }
+  LoggerSlf4jClassOfArray() {
+    super();
+  }
+}
+@lombok.extern.slf4j.Log(java.lang.String[].class) class LoggerSlf4jClassOfArrayJLS {
+  private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(java.lang.String[].class);
+  <clinit>() {
+  }
+  LoggerSlf4jClassOfArrayJLS() {
+    super();
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/LoggerSlf4jOnNonType.java b/test/transform/resource/after-ecj/LoggerSlf4jOnNonType.java
new file mode 100644
index 00000000..a45612ae
--- /dev/null
+++ b/test/transform/resource/after-ecj/LoggerSlf4jOnNonType.java
@@ -0,0 +1,7 @@
+class LoggerSlf4jOnNonType {
+  LoggerSlf4jOnNonType() {
+    super();
+  }
+  @lombok.extern.slf4j.Log void foo() {
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/LoggerSlf4jTypes.java b/test/transform/resource/after-ecj/LoggerSlf4jTypes.java
new file mode 100644
index 00000000..25b3fd86
--- /dev/null
+++ b/test/transform/resource/after-ecj/LoggerSlf4jTypes.java
@@ -0,0 +1,31 @@
+@lombok.extern.slf4j.Log interface LoggerSlf4jTypesInterface {
+}
+@lombok.extern.slf4j.Log @interface LoggerSlf4jTypesAnnotation {
+}
+@lombok.extern.slf4j.Log enum LoggerSlf4jTypesEnum {
+  private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesEnum.class);
+  <clinit>() {
+  }
+  LoggerSlf4jTypesEnum() {
+    super();
+  }
+}
+@lombok.extern.slf4j.Log enum LoggerSlf4jTypesEnumWithElement {
+  FOO(),
+  private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesEnumWithElement.class);
+  <clinit>() {
+  }
+  LoggerSlf4jTypesEnumWithElement() {
+    super();
+  }
+}
+interface LoggerSlf4jTypesInterfaceOuter {
+  @lombok.extern.slf4j.Log class Inner {
+    private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class);
+    <clinit>() {
+    }
+    Inner() {
+      super();
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/LoggerSlf4jWithClass.java b/test/transform/resource/after-ecj/LoggerSlf4jWithClass.java
new file mode 100644
index 00000000..9f4846aa
--- /dev/null
+++ b/test/transform/resource/after-ecj/LoggerSlf4jWithClass.java
@@ -0,0 +1,32 @@
+@lombok.extern.slf4j.Log(String.class) class LoggerSlf4jWithClass {
+  private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(String.class);
+  <clinit>() {
+  }
+  LoggerSlf4jWithClass() {
+    super();
+  }
+}
+@lombok.extern.slf4j.Log(java.util.List.class) class LoggerSlf4jWithClassList {
+  private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(java.util.List.class);
+  <clinit>() {
+  }
+  LoggerSlf4jWithClassList() {
+    super();
+  }
+}
+@lombok.extern.slf4j.Log(value = java.lang.String.class) class LoggerSlf4jWithClassValue {
+  private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(java.lang.String.class);
+  <clinit>() {
+  }
+  LoggerSlf4jWithClassValue() {
+    super();
+  }
+}
+@lombok.extern.slf4j.Log(void.class) class LoggerSlf4jWithClassVoid {
+  private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(void.class);
+  <clinit>() {
+  }
+  LoggerSlf4jWithClassVoid() {
+    super();
+  }
+}
diff --git a/test/transform/resource/after-ecj/LoggerSlf4jWithPackage.java b/test/transform/resource/after-ecj/LoggerSlf4jWithPackage.java
new file mode 100644
index 00000000..655d14f8
--- /dev/null
+++ b/test/transform/resource/after-ecj/LoggerSlf4jWithPackage.java
@@ -0,0 +1,22 @@
+package before;
+@lombok.extern.slf4j.Log class LoggerSlf4jWithPackage {
+  private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithPackage.class);
+  <clinit>() {
+  }
+  LoggerSlf4jWithPackage() {
+    super();
+  }
+}
+class LoggerSlf4jWithPackageOuter {
+  static @lombok.extern.slf4j.Log class Inner {
+    private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class);
+    <clinit>() {
+    }
+    Inner() {
+      super();
+    }
+  }
+  LoggerSlf4jWithPackageOuter() {
+    super();
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/MultiFieldGetter.java b/test/transform/resource/after-ecj/MultiFieldGetter.java
index 4ed6038d..16368f25 100644
--- a/test/transform/resource/after-ecj/MultiFieldGetter.java
+++ b/test/transform/resource/after-ecj/MultiFieldGetter.java
@@ -3,26 +3,26 @@ import lombok.AccessLevel;
 class MultiFieldGetter {
   @Getter(AccessLevel.PROTECTED) int x;
   @Getter(AccessLevel.PROTECTED) int y;
-  MultiFieldGetter() {
-    super();
-  }
   protected @java.lang.SuppressWarnings("all") int getX() {
     return this.x;
   }
   protected @java.lang.SuppressWarnings("all") int getY() {
     return this.y;
   }
+  MultiFieldGetter() {
+    super();
+  }
 }
 @Getter class MultiFieldGetter2 {
   @Getter(AccessLevel.PACKAGE) int x;
   @Getter(AccessLevel.PACKAGE) int y;
-  MultiFieldGetter2() {
-    super();
-  }
   @java.lang.SuppressWarnings("all") int getX() {
     return this.x;
   }
   @java.lang.SuppressWarnings("all") int getY() {
     return this.y;
   }
+  MultiFieldGetter2() {
+    super();
+  }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/NonNullPlain.java b/test/transform/resource/after-ecj/NonNullPlain.java
index 877f97ae..6f552436 100644
--- a/test/transform/resource/after-ecj/NonNullPlain.java
+++ b/test/transform/resource/after-ecj/NonNullPlain.java
@@ -1,9 +1,6 @@
 class NonNullPlain {
   @lombok.Setter @lombok.NonNull @lombok.Getter int i;
   @lombok.Getter @lombok.Setter @lombok.NonNull String s;
-  NonNullPlain() {
-    super();
-  }
   public @java.lang.SuppressWarnings("all") void setI(final @lombok.NonNull int i) {
     this.i = i;
   }
@@ -18,4 +15,7 @@ class NonNullPlain {
         throw new java.lang.NullPointerException("s");
     this.s = s;
   }
+  NonNullPlain() {
+    super();
+  }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/SetterAccessLevel.java b/test/transform/resource/after-ecj/SetterAccessLevel.java
index 20eb9d2c..deee8213 100644
--- a/test/transform/resource/after-ecj/SetterAccessLevel.java
+++ b/test/transform/resource/after-ecj/SetterAccessLevel.java
@@ -5,9 +5,6 @@ class SetterAccessLevel {
   @lombok.Setter(lombok.AccessLevel.PROTECTED) boolean isProtected;
   @lombok.Setter(lombok.AccessLevel.PUBLIC) boolean isPublic;
   @lombok.Setter(value = lombok.AccessLevel.PUBLIC) boolean value;
-  SetterAccessLevel() {
-    super();
-  }
   private @java.lang.SuppressWarnings("all") void setIsPrivate(final boolean isPrivate) {
     this.isPrivate = isPrivate;
   }
@@ -23,4 +20,7 @@ class SetterAccessLevel {
   public @java.lang.SuppressWarnings("all") void setValue(final boolean value) {
     this.value = value;
   }
+  SetterAccessLevel() {
+    super();
+  }
 }
diff --git a/test/transform/resource/after-ecj/SetterOnClass.java b/test/transform/resource/after-ecj/SetterOnClass.java
index e92e217c..084323c4 100644
--- a/test/transform/resource/after-ecj/SetterOnClass.java
+++ b/test/transform/resource/after-ecj/SetterOnClass.java
@@ -1,63 +1,60 @@
 @lombok.Setter class SetterOnClass1 {
   @lombok.Setter(lombok.AccessLevel.NONE) boolean isNone;
   boolean isPublic;
-  SetterOnClass1() {
-    super();
-  }
   public @java.lang.SuppressWarnings("all") void setIsPublic(final boolean isPublic) {
     this.isPublic = isPublic;
   }
+  SetterOnClass1() {
+    super();
+  }
 }
 @lombok.Setter(lombok.AccessLevel.PROTECTED) class SetterOnClass2 {
   @lombok.Setter(lombok.AccessLevel.NONE) boolean isNone;
   boolean isProtected;
   @lombok.Setter(lombok.AccessLevel.PACKAGE) boolean isPackage;
-  SetterOnClass2() {
-    super();
-  }
   @java.lang.SuppressWarnings("all") void setIsPackage(final boolean isPackage) {
     this.isPackage = isPackage;
   }
   protected @java.lang.SuppressWarnings("all") void setIsProtected(final boolean isProtected) {
     this.isProtected = isProtected;
   }
+  SetterOnClass2() {
+    super();
+  }
 }
 @lombok.Setter(lombok.AccessLevel.PACKAGE) class SetterOnClass3 {
   @lombok.Setter(lombok.AccessLevel.NONE) boolean isNone;
   boolean isPackage;
-  SetterOnClass3() {
-    super();
-  }
   @java.lang.SuppressWarnings("all") void setIsPackage(final boolean isPackage) {
     this.isPackage = isPackage;
   }
+  SetterOnClass3() {
+    super();
+  }
 }
 @lombok.Setter(lombok.AccessLevel.PRIVATE) class SetterOnClass4 {
   @lombok.Setter(lombok.AccessLevel.NONE) boolean isNone;
   boolean isPrivate;
-  SetterOnClass4() {
-    super();
-  }
   private @java.lang.SuppressWarnings("all") void setIsPrivate(final boolean isPrivate) {
     this.isPrivate = isPrivate;
   }
+  SetterOnClass4() {
+    super();
+  }
 }
 @lombok.Setter(lombok.AccessLevel.PUBLIC) class SetterOnClass5 {
   @lombok.Setter(lombok.AccessLevel.NONE) boolean isNone;
   boolean isPublic;
-  SetterOnClass5() {
-    super();
-  }
   public @java.lang.SuppressWarnings("all") void setIsPublic(final boolean isPublic) {
     this.isPublic = isPublic;
   }
+  SetterOnClass5() {
+    super();
+  }
 }
 @lombok.Setter class SetterOnClass6 {
   String couldBeNull;
   @lombok.NonNull String nonNull;
-  SetterOnClass6() {
-    super();
-  }
   public @java.lang.SuppressWarnings("all") void setCouldBeNull(final String couldBeNull) {
     this.couldBeNull = couldBeNull;
   }
@@ -66,4 +63,7 @@
         throw new java.lang.NullPointerException("nonNull");
     this.nonNull = nonNull;
   }
+  SetterOnClass6() {
+    super();
+  }
 }
diff --git a/test/transform/resource/after-ecj/SetterOnStatic.java b/test/transform/resource/after-ecj/SetterOnStatic.java
index 8a5abdd8..c1e4d3d1 100644
--- a/test/transform/resource/after-ecj/SetterOnStatic.java
+++ b/test/transform/resource/after-ecj/SetterOnStatic.java
@@ -3,13 +3,13 @@ class Setter {
   static @lombok.Setter int bar;
   <clinit>() {
   }
-  Setter() {
-    super();
-  }
   public static @java.lang.SuppressWarnings("all") void setFoo(final boolean foo) {
     Setter.foo = foo;
   }
   public static @java.lang.SuppressWarnings("all") void setBar(final int bar) {
     Setter.bar = bar;
   }
+  Setter() {
+    super();
+  }
 }
diff --git a/test/transform/resource/after-ecj/SetterPlain.java b/test/transform/resource/after-ecj/SetterPlain.java
index 7f0a4a81..08154244 100644
--- a/test/transform/resource/after-ecj/SetterPlain.java
+++ b/test/transform/resource/after-ecj/SetterPlain.java
@@ -2,13 +2,13 @@ import lombok.Setter;
 class SetterPlain {
   @lombok.Setter int i;
   @Setter int foo;
-  SetterPlain() {
-    super();
-  }
   public @java.lang.SuppressWarnings("all") void setI(final int i) {
     this.i = i;
   }
   public @java.lang.SuppressWarnings("all") void setFoo(final int foo) {
     this.foo = foo;
   }
+  SetterPlain() {
+    super();
+  }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/SetterWithDollar.java b/test/transform/resource/after-ecj/SetterWithDollar.java
index c5bc14f1..bf27536b 100644
--- a/test/transform/resource/after-ecj/SetterWithDollar.java
+++ b/test/transform/resource/after-ecj/SetterWithDollar.java
@@ -1,22 +1,22 @@
 class SetterWithDollar1 {
   @lombok.Setter int $i;
-  SetterWithDollar1() {
-    super();
-  }
   public @java.lang.SuppressWarnings("all") void set$i(final int $i) {
     this.$i = $i;
   }
+  SetterWithDollar1() {
+    super();
+  }
 }
 class SetterWithDollar2 {
   @lombok.Setter int $i;
   @lombok.Setter int i;
-  SetterWithDollar2() {
-    super();
-  }
   public @java.lang.SuppressWarnings("all") void set$i(final int $i) {
     this.$i = $i;
   }
   public @java.lang.SuppressWarnings("all") void setI(final int i) {
     this.i = i;
   }
+  SetterWithDollar2() {
+    super();
+  }
 }
diff --git a/test/transform/resource/after-ecj/SynchronizedPlain.java b/test/transform/resource/after-ecj/SynchronizedPlain.java
index b9f032c5..8e5b6297 100644
--- a/test/transform/resource/after-ecj/SynchronizedPlain.java
+++ b/test/transform/resource/after-ecj/SynchronizedPlain.java
@@ -19,6 +19,8 @@ class SynchronizedPlain1 {
 }
 class SynchronizedPlain2 {
   private static final @java.lang.SuppressWarnings("all") java.lang.Object $LOCK = new java.lang.Object[0];
+  <clinit>() {
+  }
   SynchronizedPlain2() {
     super();
   }
diff --git a/test/transform/resource/after-ecj/ToStringInner.java b/test/transform/resource/after-ecj/ToStringInner.java
index 2f14407e..963299db 100644
--- a/test/transform/resource/after-ecj/ToStringInner.java
+++ b/test/transform/resource/after-ecj/ToStringInner.java
@@ -2,31 +2,31 @@ import lombok.ToString;
 @ToString class ToStringOuter {
   @ToString class ToStringInner {
     final int y;
-    ToStringInner() {
-      super();
-    }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (("ToStringOuter.ToStringInner(y=" + this.y) + ")");
     }
+    ToStringInner() {
+      super();
+    }
   }
   static @ToString class ToStringStaticInner {
     final int y;
-    ToStringStaticInner() {
-      super();
-    }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
       return (("ToStringOuter.ToStringStaticInner(y=" + this.y) + ")");
     }
+    ToStringStaticInner() {
+      super();
+    }
   }
   class ToStringMiddle {
     @ToString class ToStringMoreInner {
       final String name;
-      ToStringMoreInner() {
-        super();
-      }
       public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
         return (("ToStringOuter.ToStringMiddle.ToStringMoreInner(name=" + this.name) + ")");
       }
+      ToStringMoreInner() {
+        super();
+      }
     }
     ToStringMiddle() {
       super();
@@ -34,10 +34,10 @@ import lombok.ToString;
   }
   final int x;
   String name;
-  ToStringOuter() {
-    super();
-  }
   public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return (((("ToStringOuter(x=" + this.x) + ", name=") + this.name) + ")");
   }
+  ToStringOuter() {
+    super();
+  }
 }
diff --git a/test/transform/resource/after-ecj/ToStringPlain.java b/test/transform/resource/after-ecj/ToStringPlain.java
index 7196abb9..458f78d0 100644
--- a/test/transform/resource/after-ecj/ToStringPlain.java
+++ b/test/transform/resource/after-ecj/ToStringPlain.java
@@ -2,20 +2,20 @@ import lombok.ToString;
 @lombok.ToString class ToString1 {
   final int x;
   String name;
-  ToString1() {
-    super();
-  }
   public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return (((("ToString1(x=" + this.x) + ", name=") + this.name) + ")");
   }
+  ToString1() {
+    super();
+  }
 }
 @ToString class ToString2 {
   final int x;
   String name;
-  ToString2() {
-    super();
-  }
   public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return (((("ToString2(x=" + this.x) + ", name=") + this.name) + ")");
   }
+  ToString2() {
+    super();
+  }
 }