Merge branch 'master' into jdk8. Also added some major fixes whilst merging.

Conflicts:
	src/core/lombok/javac/handlers/JavacHandlerUtil.java
	src/utils/lombok/javac/CommentCatcher.java
	src/utils/lombok/javac/Javac.java

21 files changed, 495 insertions, 64 deletions

diff --git a/test/transform/resource/after-ecj/BuilderChainAndFluent.java b/test/transform/resource/after-ecj/BuilderChainAndFluent.java
new file mode 100644
index 00000000..6a307105
--- /dev/null
+++ b/test/transform/resource/after-ecj/BuilderChainAndFluent.java
@@ -0,0 +1,25 @@
+@lombok.experimental.Builder(fluent = false,chain = false) class BuilderChainAndFluent {
+  public static @java.lang.SuppressWarnings("all") class BuilderChainAndFluentBuilder {
+    private int yes;
+    @java.lang.SuppressWarnings("all") BuilderChainAndFluentBuilder() {
+      super();
+    }
+    public @java.lang.SuppressWarnings("all") void setYes(final int yes) {
+      this.yes = yes;
+    }
+    public @java.lang.SuppressWarnings("all") BuilderChainAndFluent build() {
+      return new BuilderChainAndFluent(yes);
+    }
+    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+      return (("BuilderChainAndFluent.BuilderChainAndFluentBuilder(yes=" + this.yes) + ")");
+    }
+  }
+  private final int yes;
+  @java.lang.SuppressWarnings("all") BuilderChainAndFluent(final int yes) {
+    super();
+    this.yes = yes;
+  }
+  public static @java.lang.SuppressWarnings("all") BuilderChainAndFluentBuilder builder() {
+    return new BuilderChainAndFluentBuilder();
+  }
+}
diff --git a/test/transform/resource/after-ecj/BuilderComplex.java b/test/transform/resource/after-ecj/BuilderComplex.java
new file mode 100644
index 00000000..19aeb043
--- /dev/null
+++ b/test/transform/resource/after-ecj/BuilderComplex.java
@@ -0,0 +1,43 @@
+import java.util.List;
+import lombok.experimental.Builder;
+class BuilderComplex {
+  public static @java.lang.SuppressWarnings("all") class VoidBuilder<T extends Number> {
+    private T number;
+    private int arg2;
+    private String arg3;
+    private BuilderComplex selfRef;
+    @java.lang.SuppressWarnings("all") VoidBuilder() {
+      super();
+    }
+    public @java.lang.SuppressWarnings("all") VoidBuilder<T> number(final T number) {
+      this.number = number;
+      return this;
+    }
+    public @java.lang.SuppressWarnings("all") VoidBuilder<T> arg2(final int arg2) {
+      this.arg2 = arg2;
+      return this;
+    }
+    public @java.lang.SuppressWarnings("all") VoidBuilder<T> arg3(final String arg3) {
+      this.arg3 = arg3;
+      return this;
+    }
+    public @java.lang.SuppressWarnings("all") VoidBuilder<T> selfRef(final BuilderComplex selfRef) {
+      this.selfRef = selfRef;
+      return this;
+    }
+    public @java.lang.SuppressWarnings("all") void execute() {
+      BuilderComplex.<T>testVoidWithGenerics(number, arg2, arg3, selfRef);
+    }
+    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+      return (((((((("BuilderComplex.VoidBuilder(number=" + this.number) + ", arg2=") + this.arg2) + ", arg3=") + this.arg3) + ", selfRef=") + this.selfRef) + ")");
+    }
+  }
+  BuilderComplex() {
+    super();
+  }
+  private static @Builder(buildMethodName = "execute") <T extends Number>void testVoidWithGenerics(T number, int arg2, String arg3, BuilderComplex selfRef) {
+  }
+  public static @java.lang.SuppressWarnings("all") <T extends Number>VoidBuilder<T> builder() {
+    return new VoidBuilder<T>();
+  }
+}
diff --git a/test/transform/resource/after-ecj/BuilderSimple.java b/test/transform/resource/after-ecj/BuilderSimple.java
new file mode 100644
index 00000000..85db360d
--- /dev/null
+++ b/test/transform/resource/after-ecj/BuilderSimple.java
@@ -0,0 +1,36 @@
+import java.util.List;
+@lombok.experimental.Builder class BuilderSimple<T> {
+  public static @java.lang.SuppressWarnings("all") class BuilderSimpleBuilder<T> {
+    private int yes;
+    private List<T> also;
+    @java.lang.SuppressWarnings("all") BuilderSimpleBuilder() {
+      super();
+    }
+    public @java.lang.SuppressWarnings("all") BuilderSimpleBuilder<T> yes(final int yes) {
+      this.yes = yes;
+      return this;
+    }
+    public @java.lang.SuppressWarnings("all") BuilderSimpleBuilder<T> also(final List<T> also) {
+      this.also = also;
+      return this;
+    }
+    public @java.lang.SuppressWarnings("all") BuilderSimple<T> build() {
+      return new BuilderSimple<T>(yes, also);
+    }
+    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+      return (((("BuilderSimple.BuilderSimpleBuilder(yes=" + this.yes) + ", also=") + this.also) + ")");
+    }
+  }
+  private final int noshow = 0;
+  private final int yes;
+  private List<T> also;
+  private int $butNotMe;
+  @java.lang.SuppressWarnings("all") BuilderSimple(final int yes, final List<T> also) {
+    super();
+    this.yes = yes;
+    this.also = also;
+  }
+  public static @java.lang.SuppressWarnings("all") <T>BuilderSimpleBuilder<T> builder() {
+    return new BuilderSimpleBuilder<T>();
+  }
+}
diff --git a/test/transform/resource/after-ecj/BuilderWithExistingBuilderClass.java b/test/transform/resource/after-ecj/BuilderWithExistingBuilderClass.java
new file mode 100644
index 00000000..38cb0038
--- /dev/null
+++ b/test/transform/resource/after-ecj/BuilderWithExistingBuilderClass.java
@@ -0,0 +1,36 @@
+import lombok.experimental.Builder;
+class BuilderWithExistingBuilderClass<T, K extends Number> {
+  public static class BuilderWithExistingBuilderClassBuilder<Z extends Number> {
+    private boolean arg2;
+    private String arg3;
+    private Z arg1;
+    public void arg2(boolean arg) {
+    }
+    @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClassBuilder() {
+      super();
+    }
+    public @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClassBuilder<Z> arg1(final Z arg1) {
+      this.arg1 = arg1;
+      return this;
+    }
+    public @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClassBuilder<Z> arg3(final String arg3) {
+      this.arg3 = arg3;
+      return this;
+    }
+    public @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClass<String, Z> build() {
+      return BuilderWithExistingBuilderClass.<Z>staticMethod(arg1, arg2, arg3);
+    }
+    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+      return (((((("BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder(arg1=" + this.arg1) + ", arg2=") + this.arg2) + ", arg3=") + this.arg3) + ")");
+    }
+  }
+  BuilderWithExistingBuilderClass() {
+    super();
+  }
+  public static @Builder <Z extends Number>BuilderWithExistingBuilderClass<String, Z> staticMethod(Z arg1, boolean arg2, String arg3) {
+    return null;
+  }
+  public static @java.lang.SuppressWarnings("all") <Z extends Number>BuilderWithExistingBuilderClassBuilder<Z> builder() {
+    return new BuilderWithExistingBuilderClassBuilder<Z>();
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/DataOnLocalClass.java b/test/transform/resource/after-ecj/DataOnLocalClass.java
index 137edf50..2f8dcca1 100644
--- a/test/transform/resource/after-ecj/DataOnLocalClass.java
+++ b/test/transform/resource/after-ecj/DataOnLocalClass.java
@@ -63,7 +63,9 @@ class DataOnLocalClass2 {
         }
         public @java.lang.SuppressWarnings("all") void setName(final @lombok.NonNull String name) {
           if ((name == null))
-              throw new java.lang.NullPointerException("name");
+              {
+                throw new java.lang.NullPointerException("name");
+              }
           this.name = name;
         }
         public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
@@ -96,7 +98,9 @@ class DataOnLocalClass2 {
         public @java.lang.SuppressWarnings("all") InnerLocal(final @lombok.NonNull String name) {
           super();
           if ((name == null))
-              throw new java.lang.NullPointerException("name");
+              {
+                throw new java.lang.NullPointerException("name");
+              }
           this.name = name;
         }
       }
diff --git a/test/transform/resource/after-ecj/DelegateOnGetter.java b/test/transform/resource/after-ecj/DelegateOnGetter.java
index 4eab3791..59f6a3b8 100644
--- a/test/transform/resource/after-ecj/DelegateOnGetter.java
+++ b/test/transform/resource/after-ecj/DelegateOnGetter.java
@@ -5,12 +5,12 @@ class DelegateOnGetter {
     void setList(java.util.ArrayList<java.lang.String> list);
     int getInt();
   }
-  private final @Delegate @Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<Bar>> bar = new java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<Bar>>();
+  private final @Delegate @Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.lang.Object> bar = new java.util.concurrent.atomic.AtomicReference<java.lang.Object>();
   DelegateOnGetter() {
     super();
   }
   public @Delegate @java.lang.SuppressWarnings("all") Bar getBar() {
-    java.util.concurrent.atomic.AtomicReference<Bar> value = this.bar.get();
+    java.lang.Object value = this.bar.get();
     if ((value == null))
         {
           synchronized (this.bar)
@@ -28,12 +28,12 @@ class DelegateOnGetter {
                         return 42;
                       }
                     };
-                    value = new java.util.concurrent.atomic.AtomicReference<Bar>(actualValue);
+                    value = ((actualValue == null) ? this.bar : actualValue);
                     this.bar.set(value);
                   }
             }
         }
-    return value.get();
+    return (Bar) ((value == this.bar) ? null : value);
   }
   public @java.lang.SuppressWarnings("all") int getInt() {
     return this.getBar().getInt();
diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeWithSomeExistingMethods.java b/test/transform/resource/after-ecj/EqualsAndHashCodeWithSomeExistingMethods.java
new file mode 100644
index 00000000..cdd771a4
--- /dev/null
+++ b/test/transform/resource/after-ecj/EqualsAndHashCodeWithSomeExistingMethods.java
@@ -0,0 +1,71 @@
+import lombok.*;
+import static lombok.AccessLevel.NONE;
+@Data @Getter(NONE) @Setter(NONE) class EqualsAndHashCodeWithSomeExistingMethods {
+  int x;
+  public int hashCode() {
+    return 42;
+  }
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+    return (("EqualsAndHashCodeWithSomeExistingMethods(x=" + this.x) + ")");
+  }
+  public @java.lang.SuppressWarnings("all") EqualsAndHashCodeWithSomeExistingMethods() {
+    super();
+  }
+}
+@Data @Getter(NONE) @Setter(NONE) class EqualsAndHashCodeWithSomeExistingMethods2 {
+  int x;
+  public boolean canEqual(Object other) {
+    return false;
+  }
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+    return (("EqualsAndHashCodeWithSomeExistingMethods2(x=" + this.x) + ")");
+  }
+  public @java.lang.SuppressWarnings("all") EqualsAndHashCodeWithSomeExistingMethods2() {
+    super();
+  }
+}
+@Data @Getter(NONE) @Setter(NONE) class EqualsAndHashCodeWithAllExistingMethods {
+  int x;
+  public int hashCode() {
+    return 42;
+  }
+  public boolean equals(Object other) {
+    return false;
+  }
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+    return (("EqualsAndHashCodeWithAllExistingMethods(x=" + this.x) + ")");
+  }
+  public @java.lang.SuppressWarnings("all") EqualsAndHashCodeWithAllExistingMethods() {
+    super();
+  }
+}
+@Data @Getter(AccessLevel.NONE) @Setter(lombok.AccessLevel.NONE) class EqualsAndHashCodeWithNoExistingMethods {
+  int x;
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+    if ((o == this))
+        return true;
+    if ((! (o instanceof EqualsAndHashCodeWithNoExistingMethods)))
+        return false;
+    final @java.lang.SuppressWarnings("all") EqualsAndHashCodeWithNoExistingMethods other = (EqualsAndHashCodeWithNoExistingMethods) o;
+    if ((! other.canEqual((java.lang.Object) this)))
+        return false;
+    if ((this.x != other.x))
+        return false;
+    return true;
+  }
+  public @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+    return (other instanceof EqualsAndHashCodeWithNoExistingMethods);
+  }
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+    final int PRIME = 31;
+    int result = 1;
+    result = ((result * PRIME) + this.x);
+    return result;
+  }
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+    return (("EqualsAndHashCodeWithNoExistingMethods(x=" + this.x) + ")");
+  }
+  public @java.lang.SuppressWarnings("all") EqualsAndHashCodeWithNoExistingMethods() {
+    super();
+  }
+}
diff --git a/test/transform/resource/after-ecj/GetterLazy.java b/test/transform/resource/after-ecj/GetterLazy.java
index 0f5027b9..8394f58d 100644
--- a/test/transform/resource/after-ecj/GetterLazy.java
+++ b/test/transform/resource/after-ecj/GetterLazy.java
@@ -4,12 +4,12 @@ class GetterLazy {
       super();
     }
   }
-  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<ValueType>> fieldName = new java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<ValueType>>();
+  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.lang.Object> fieldName = new java.util.concurrent.atomic.AtomicReference<java.lang.Object>();
   GetterLazy() {
     super();
   }
   public @java.lang.SuppressWarnings("all") ValueType getFieldName() {
-    java.util.concurrent.atomic.AtomicReference<ValueType> value = this.fieldName.get();
+    java.lang.Object value = this.fieldName.get();
     if ((value == null))
         {
           synchronized (this.fieldName)
@@ -18,11 +18,11 @@ class GetterLazy {
               if ((value == null))
                   {
                     final ValueType actualValue = new ValueType();
-                    value = new java.util.concurrent.atomic.AtomicReference<ValueType>(actualValue);
+                    value = ((actualValue == null) ? this.fieldName : actualValue);
                     this.fieldName.set(value);
                   }
             }
         }
-    return value.get();
+    return (ValueType) ((value == this.fieldName) ? null : value);
   }
 }
diff --git a/test/transform/resource/after-ecj/GetterLazyBoolean.java b/test/transform/resource/after-ecj/GetterLazyBoolean.java
index 8c890827..a51b164f 100644
--- a/test/transform/resource/after-ecj/GetterLazyBoolean.java
+++ b/test/transform/resource/after-ecj/GetterLazyBoolean.java
@@ -1,6 +1,6 @@
 @lombok.EqualsAndHashCode(of = "booleanValue") @lombok.ToString(of = "booleanValue") class GetterLazyBoolean {
-  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Boolean>> booleanValue = new java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Boolean>>();
-  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Boolean>> otherBooleanValue = new java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Boolean>>();
+  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.lang.Object> booleanValue = new java.util.concurrent.atomic.AtomicReference<java.lang.Object>();
+  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.lang.Object> otherBooleanValue = new java.util.concurrent.atomic.AtomicReference<java.lang.Object>();
   GetterLazyBoolean() {
     super();
   }
@@ -8,7 +8,7 @@
     return true;
   }
   public @java.lang.SuppressWarnings("all") boolean isBooleanValue() {
-    java.util.concurrent.atomic.AtomicReference<java.lang.Boolean> value = this.booleanValue.get();
+    java.lang.Object value = this.booleanValue.get();
     if ((value == null))
         {
           synchronized (this.booleanValue)
@@ -17,15 +17,15 @@
               if ((value == null))
                   {
                     final boolean actualValue = calculateBoolean();
-                    value = new java.util.concurrent.atomic.AtomicReference<java.lang.Boolean>(actualValue);
+                    value = actualValue;
                     this.booleanValue.set(value);
                   }
             }
         }
-    return value.get();
+    return (java.lang.Boolean) value;
   }
   public @java.lang.SuppressWarnings("all") boolean isOtherBooleanValue() {
-    java.util.concurrent.atomic.AtomicReference<java.lang.Boolean> value = this.otherBooleanValue.get();
+    java.lang.Object value = this.otherBooleanValue.get();
     if ((value == null))
         {
           synchronized (this.otherBooleanValue)
@@ -34,12 +34,12 @@
               if ((value == null))
                   {
                     final boolean actualValue = (! calculateBoolean());
-                    value = new java.util.concurrent.atomic.AtomicReference<java.lang.Boolean>(actualValue);
+                    value = actualValue;
                     this.otherBooleanValue.set(value);
                   }
             }
         }
-    return value.get();
+    return (java.lang.Boolean) value;
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
diff --git a/test/transform/resource/after-ecj/GetterLazyEahcToString.java b/test/transform/resource/after-ecj/GetterLazyEahcToString.java
index 1ca848af..db2d4fcf 100644
--- a/test/transform/resource/after-ecj/GetterLazyEahcToString.java
+++ b/test/transform/resource/after-ecj/GetterLazyEahcToString.java
@@ -1,11 +1,11 @@
 @lombok.EqualsAndHashCode(doNotUseGetters = true) @lombok.ToString(doNotUseGetters = true) class GetterLazyEahcToString {
-  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<String>> value = new java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<String>>();
+  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.lang.Object> value = new java.util.concurrent.atomic.AtomicReference<java.lang.Object>();
   private final @lombok.Getter String value2 = "";
   GetterLazyEahcToString() {
     super();
   }
   public @java.lang.SuppressWarnings("all") String getValue() {
-    java.util.concurrent.atomic.AtomicReference<String> value = this.value.get();
+    java.lang.Object value = this.value.get();
     if ((value == null))
         {
           synchronized (this.value)
@@ -14,12 +14,12 @@
               if ((value == null))
                   {
                     final String actualValue = "";
-                    value = new java.util.concurrent.atomic.AtomicReference<String>(actualValue);
+                    value = ((actualValue == null) ? this.value : actualValue);
                     this.value.set(value);
                   }
             }
         }
-    return value.get();
+    return (String) ((value == this.value) ? null : value);
   }
   public @java.lang.SuppressWarnings("all") String getValue2() {
     return this.value2;
diff --git a/test/transform/resource/after-ecj/GetterLazyNative.java b/test/transform/resource/after-ecj/GetterLazyNative.java
index b67abfc9..db70f2f4 100644
--- a/test/transform/resource/after-ecj/GetterLazyNative.java
+++ b/test/transform/resource/after-ecj/GetterLazyNative.java
@@ -1,18 +1,18 @@
 class GetterLazyNative {
-  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Boolean>> booleanField = new java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Boolean>>();
-  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Byte>> byteField = new java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Byte>>();
-  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Short>> shortField = new java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Short>>();
-  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Integer>> intField = new java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Integer>>();
-  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Long>> longField = new java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Long>>();
-  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Float>> floatField = new java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Float>>();
-  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Double>> doubleField = new java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Double>>();
-  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Character>> charField = new java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Character>>();
-  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<int[]>> intArrayField = new java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<int[]>>();
+  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.lang.Object> booleanField = new java.util.concurrent.atomic.AtomicReference<java.lang.Object>();
+  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.lang.Object> byteField = new java.util.concurrent.atomic.AtomicReference<java.lang.Object>();
+  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.lang.Object> shortField = new java.util.concurrent.atomic.AtomicReference<java.lang.Object>();
+  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.lang.Object> intField = new java.util.concurrent.atomic.AtomicReference<java.lang.Object>();
+  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.lang.Object> longField = new java.util.concurrent.atomic.AtomicReference<java.lang.Object>();
+  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.lang.Object> floatField = new java.util.concurrent.atomic.AtomicReference<java.lang.Object>();
+  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.lang.Object> doubleField = new java.util.concurrent.atomic.AtomicReference<java.lang.Object>();
+  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.lang.Object> charField = new java.util.concurrent.atomic.AtomicReference<java.lang.Object>();
+  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.lang.Object> intArrayField = new java.util.concurrent.atomic.AtomicReference<java.lang.Object>();
   GetterLazyNative() {
     super();
   }
   public @java.lang.SuppressWarnings("all") boolean isBooleanField() {
-    java.util.concurrent.atomic.AtomicReference<java.lang.Boolean> value = this.booleanField.get();
+    java.lang.Object value = this.booleanField.get();
     if ((value == null))
         {
           synchronized (this.booleanField)
@@ -21,15 +21,15 @@ class GetterLazyNative {
               if ((value == null))
                   {
                     final boolean actualValue = true;
-                    value = new java.util.concurrent.atomic.AtomicReference<java.lang.Boolean>(actualValue);
+                    value = actualValue;
                     this.booleanField.set(value);
                   }
             }
         }
-    return value.get();
+    return (java.lang.Boolean) value;
   }
   public @java.lang.SuppressWarnings("all") byte getByteField() {
-    java.util.concurrent.atomic.AtomicReference<java.lang.Byte> value = this.byteField.get();
+    java.lang.Object value = this.byteField.get();
     if ((value == null))
         {
           synchronized (this.byteField)
@@ -38,15 +38,15 @@ class GetterLazyNative {
               if ((value == null))
                   {
                     final byte actualValue = 1;
-                    value = new java.util.concurrent.atomic.AtomicReference<java.lang.Byte>(actualValue);
+                    value = actualValue;
                     this.byteField.set(value);
                   }
             }
         }
-    return value.get();
+    return (java.lang.Byte) value;
   }
   public @java.lang.SuppressWarnings("all") short getShortField() {
-    java.util.concurrent.atomic.AtomicReference<java.lang.Short> value = this.shortField.get();
+    java.lang.Object value = this.shortField.get();
     if ((value == null))
         {
           synchronized (this.shortField)
@@ -55,15 +55,15 @@ class GetterLazyNative {
               if ((value == null))
                   {
                     final short actualValue = 1;
-                    value = new java.util.concurrent.atomic.AtomicReference<java.lang.Short>(actualValue);
+                    value = actualValue;
                     this.shortField.set(value);
                   }
             }
         }
-    return value.get();
+    return (java.lang.Short) value;
   }
   public @java.lang.SuppressWarnings("all") int getIntField() {
-    java.util.concurrent.atomic.AtomicReference<java.lang.Integer> value = this.intField.get();
+    java.lang.Object value = this.intField.get();
     if ((value == null))
         {
           synchronized (this.intField)
@@ -72,15 +72,15 @@ class GetterLazyNative {
               if ((value == null))
                   {
                     final int actualValue = 1;
-                    value = new java.util.concurrent.atomic.AtomicReference<java.lang.Integer>(actualValue);
+                    value = actualValue;
                     this.intField.set(value);
                   }
             }
         }
-    return value.get();
+    return (java.lang.Integer) value;
   }
   public @java.lang.SuppressWarnings("all") long getLongField() {
-    java.util.concurrent.atomic.AtomicReference<java.lang.Long> value = this.longField.get();
+    java.lang.Object value = this.longField.get();
     if ((value == null))
         {
           synchronized (this.longField)
@@ -89,15 +89,15 @@ class GetterLazyNative {
               if ((value == null))
                   {
                     final long actualValue = 1;
-                    value = new java.util.concurrent.atomic.AtomicReference<java.lang.Long>(actualValue);
+                    value = actualValue;
                     this.longField.set(value);
                   }
             }
         }
-    return value.get();
+    return (java.lang.Long) value;
   }
   public @java.lang.SuppressWarnings("all") float getFloatField() {
-    java.util.concurrent.atomic.AtomicReference<java.lang.Float> value = this.floatField.get();
+    java.lang.Object value = this.floatField.get();
     if ((value == null))
         {
           synchronized (this.floatField)
@@ -106,15 +106,15 @@ class GetterLazyNative {
               if ((value == null))
                   {
                     final float actualValue = 1.0f;
-                    value = new java.util.concurrent.atomic.AtomicReference<java.lang.Float>(actualValue);
+                    value = actualValue;
                     this.floatField.set(value);
                   }
             }
         }
-    return value.get();
+    return (java.lang.Float) value;
   }
   public @java.lang.SuppressWarnings("all") double getDoubleField() {
-    java.util.concurrent.atomic.AtomicReference<java.lang.Double> value = this.doubleField.get();
+    java.lang.Object value = this.doubleField.get();
     if ((value == null))
         {
           synchronized (this.doubleField)
@@ -123,15 +123,15 @@ class GetterLazyNative {
               if ((value == null))
                   {
                     final double actualValue = 1.0;
-                    value = new java.util.concurrent.atomic.AtomicReference<java.lang.Double>(actualValue);
+                    value = actualValue;
                     this.doubleField.set(value);
                   }
             }
         }
-    return value.get();
+    return (java.lang.Double) value;
   }
   public @java.lang.SuppressWarnings("all") char getCharField() {
-    java.util.concurrent.atomic.AtomicReference<java.lang.Character> value = this.charField.get();
+    java.lang.Object value = this.charField.get();
     if ((value == null))
         {
           synchronized (this.charField)
@@ -140,15 +140,15 @@ class GetterLazyNative {
               if ((value == null))
                   {
                     final char actualValue = '1';
-                    value = new java.util.concurrent.atomic.AtomicReference<java.lang.Character>(actualValue);
+                    value = actualValue;
                     this.charField.set(value);
                   }
             }
         }
-    return value.get();
+    return (java.lang.Character) value;
   }
   public @java.lang.SuppressWarnings("all") int[] getIntArrayField() {
-    java.util.concurrent.atomic.AtomicReference<int[]> value = this.intArrayField.get();
+    java.lang.Object value = this.intArrayField.get();
     if ((value == null))
         {
           synchronized (this.intArrayField)
@@ -157,11 +157,11 @@ class GetterLazyNative {
               if ((value == null))
                   {
                     final int[] actualValue = new int[]{1};
-                    value = new java.util.concurrent.atomic.AtomicReference<int[]>(actualValue);
+                    value = ((actualValue == null) ? this.intArrayField : actualValue);
                     this.intArrayField.set(value);
                   }
             }
         }
-    return value.get();
+    return (int[]) ((value == this.intArrayField) ? null : value);
   }
 }
diff --git a/test/transform/resource/after-ecj/GetterSetterJavadoc.java b/test/transform/resource/after-ecj/GetterSetterJavadoc.java
new file mode 100644
index 00000000..73f26180
--- /dev/null
+++ b/test/transform/resource/after-ecj/GetterSetterJavadoc.java
@@ -0,0 +1,60 @@
+@lombok.Data class GetterSetterJavadoc1 {
+  private int fieldName;
+  public @java.lang.SuppressWarnings("all") int getFieldName() {
+    return this.fieldName;
+  }
+  public @java.lang.SuppressWarnings("all") void setFieldName(final int fieldName) {
+    this.fieldName = fieldName;
+  }
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+    if ((o == this))
+        return true;
+    if ((! (o instanceof GetterSetterJavadoc1)))
+        return false;
+    final @java.lang.SuppressWarnings("all") GetterSetterJavadoc1 other = (GetterSetterJavadoc1) o;
+    if ((! other.canEqual((java.lang.Object) this)))
+        return false;
+    if ((this.getFieldName() != other.getFieldName()))
+        return false;
+    return true;
+  }
+  public @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+    return (other instanceof GetterSetterJavadoc1);
+  }
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+    final int PRIME = 31;
+    int result = 1;
+    result = ((result * PRIME) + this.getFieldName());
+    return result;
+  }
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+    return (("GetterSetterJavadoc1(fieldName=" + this.getFieldName()) + ")");
+  }
+  public @java.lang.SuppressWarnings("all") GetterSetterJavadoc1() {
+    super();
+  }
+}
+class GetterSetterJavadoc2 {
+  private @lombok.Getter @lombok.Setter int fieldName;
+  GetterSetterJavadoc2() {
+    super();
+  }
+  public @java.lang.SuppressWarnings("all") int getFieldName() {
+    return this.fieldName;
+  }
+  public @java.lang.SuppressWarnings("all") void setFieldName(final int fieldName) {
+    this.fieldName = fieldName;
+  }
+}
+class GetterSetterJavadoc3 {
+  private @lombok.Getter @lombok.Setter int fieldName;
+  GetterSetterJavadoc3() {
+    super();
+  }
+  public @java.lang.SuppressWarnings("all") int getFieldName() {
+    return this.fieldName;
+  }
+  public @java.lang.SuppressWarnings("all") void setFieldName(final int fieldName) {
+    this.fieldName = fieldName;
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/JavadocGenerally.java b/test/transform/resource/after-ecj/JavadocGenerally.java
new file mode 100644
index 00000000..be9ed756
--- /dev/null
+++ b/test/transform/resource/after-ecj/JavadocGenerally.java
@@ -0,0 +1,11 @@
+package testPackage;
+class JavadocGenerally {
+  public interface TestingInner {
+  }
+  private int someField;
+  JavadocGenerally() {
+    super();
+  }
+  public void test() {
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/LoggerLog4j2.java b/test/transform/resource/after-ecj/LoggerLog4j2.java
new file mode 100644
index 00000000..c1368e5d
--- /dev/null
+++ b/test/transform/resource/after-ecj/LoggerLog4j2.java
@@ -0,0 +1,17 @@
+import lombok.extern.log4j.Log4j2;
+@lombok.extern.log4j.Log4j2 class LoggerLog4j2 {
+  private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(LoggerLog4j2.class);
+  <clinit>() {
+  }
+  LoggerLog4j2() {
+    super();
+  }
+}
+@Log4j2 class LoggerLog4j2WithImport {
+  private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(LoggerLog4j2WithImport.class);
+  <clinit>() {
+  }
+  LoggerLog4j2WithImport() {
+    super();
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/NonNullOnParameter.java b/test/transform/resource/after-ecj/NonNullOnParameter.java
new file mode 100644
index 00000000..bbceb153
--- /dev/null
+++ b/test/transform/resource/after-ecj/NonNullOnParameter.java
@@ -0,0 +1,61 @@
+class NonNullOnParameter extends Thread {
+  NonNullOnParameter(@lombok.NonNull String arg) {
+    this(arg, "");
+    if ((arg == null))
+        {
+          throw new java.lang.NullPointerException("arg");
+        }
+  }
+  NonNullOnParameter(@lombok.NonNull String arg, @lombok.NonNull String arg2) {
+    super(arg);
+    if ((arg2 == null))
+        {
+          throw new java.lang.NullPointerException("arg2");
+        }
+    if ((arg == null))
+        throw new NullPointerException();
+  }
+  public void test2(@lombok.NonNull String arg, @lombok.NonNull String arg2, @lombok.NonNull String arg3) {
+    if ((arg == null))
+        {
+          throw new java.lang.NullPointerException("arg");
+        }
+    if ((arg3 == null))
+        {
+          throw new java.lang.NullPointerException("arg3");
+        }
+    if ((arg2 == null))
+        {
+          throw new NullPointerException("arg2");
+        }
+    if ((arg == null))
+        System.out.println("Hello");
+  }
+  public void test3(@lombok.NonNull String arg) {
+    if ((arg == null))
+        {
+          throw new java.lang.NullPointerException("arg");
+        }
+    if ((arg != null))
+        throw new IllegalStateException();
+  }
+  public void test(@lombok.NonNull String stringArg, @lombok.NonNull String arg2, @lombok.NonNull int primitiveArg) {
+    if ((stringArg == null))
+        {
+          throw new java.lang.NullPointerException("stringArg");
+        }
+    if ((arg2 == null))
+        {
+          throw new java.lang.NullPointerException("arg2");
+        }
+  }
+  public void test(@lombok.NonNull String arg) {
+    if ((arg == null))
+        {
+          throw new java.lang.NullPointerException("arg");
+        }
+    System.out.println("Hey");
+    if ((arg == null))
+        throw new NullPointerException();
+  }
+}
\ 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 c9c96d0a..6e937f6a 100644
--- a/test/transform/resource/after-ecj/NonNullPlain.java
+++ b/test/transform/resource/after-ecj/NonNullPlain.java
@@ -8,7 +8,9 @@ import java.lang.annotation.*;
   public @java.beans.ConstructorProperties({"i", "s"}) @java.lang.SuppressWarnings("all") NonNullPlain(final @lombok.NonNull int i, final @lombok.NonNull String s) {
     super();
     if ((s == null))
-        throw new java.lang.NullPointerException("s");
+        {
+          throw new java.lang.NullPointerException("s");
+        }
     this.i = i;
     this.s = s;
   }
@@ -26,7 +28,9 @@ import java.lang.annotation.*;
   }
   public @java.lang.SuppressWarnings("all") void setS(final @lombok.NonNull String s) {
     if ((s == null))
-        throw new java.lang.NullPointerException("s");
+        {
+          throw new java.lang.NullPointerException("s");
+        }
     this.s = s;
   }
   public @java.lang.SuppressWarnings("all") void setO(final Object o) {
diff --git a/test/transform/resource/after-ecj/SetterOnClass.java b/test/transform/resource/after-ecj/SetterOnClass.java
index da928f24..aa3459bb 100644
--- a/test/transform/resource/after-ecj/SetterOnClass.java
+++ b/test/transform/resource/after-ecj/SetterOnClass.java
@@ -63,7 +63,9 @@
   }
   public @java.lang.SuppressWarnings("all") void setNonNull(final @lombok.NonNull String nonNull) {
     if ((nonNull == null))
-        throw new java.lang.NullPointerException("nonNull");
+        {
+          throw new java.lang.NullPointerException("nonNull");
+        }
     this.nonNull = nonNull;
   }
 }
diff --git a/test/transform/resource/after-ecj/ValueExperimental.java b/test/transform/resource/after-ecj/ValueExperimental.java
new file mode 100644
index 00000000..dd13574a
--- /dev/null
+++ b/test/transform/resource/after-ecj/ValueExperimental.java
@@ -0,0 +1,39 @@
+import lombok.experimental.Value;
+final @Value class ValueExperimental1 {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+    if ((o == this))
+        return true;
+    if ((! (o instanceof ValueExperimental1)))
+        return false;
+    return true;
+  }
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+    int result = 1;
+    return result;
+  }
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+    return "ValueExperimental1()";
+  }
+  public @java.lang.SuppressWarnings("all") ValueExperimental1() {
+    super();
+  }
+}
+final @lombok.experimental.Value class ValueExperimental2 {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+    if ((o == this))
+        return true;
+    if ((! (o instanceof ValueExperimental2)))
+        return false;
+    return true;
+  }
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+    int result = 1;
+    return result;
+  }
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+    return "ValueExperimental2()";
+  }
+  public @java.lang.SuppressWarnings("all") ValueExperimental2() {
+    super();
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/ValueExperimentalStarImport.java b/test/transform/resource/after-ecj/ValueExperimentalStarImport.java
new file mode 100644
index 00000000..b69e85d9
--- /dev/null
+++ b/test/transform/resource/after-ecj/ValueExperimentalStarImport.java
@@ -0,0 +1,20 @@
+import lombok.experimental.*;
+final @Value class ValueExperimentalStarImport {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+    if ((o == this))
+        return true;
+    if ((! (o instanceof ValueExperimentalStarImport)))
+        return false;
+    return true;
+  }
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+    int result = 1;
+    return result;
+  }
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+    return "ValueExperimentalStarImport()";
+  }
+  public @java.lang.SuppressWarnings("all") ValueExperimentalStarImport() {
+    super();
+  }
+}
diff --git a/test/transform/resource/after-ecj/ValuePlain.java b/test/transform/resource/after-ecj/ValuePlain.java
index b798b308..d095913f 100644
--- a/test/transform/resource/after-ecj/ValuePlain.java
+++ b/test/transform/resource/after-ecj/ValuePlain.java
@@ -1,5 +1,5 @@
-import lombok.experimental.Value;
-final @lombok.experimental.Value class Value1 {
+import lombok.Value;
+final @lombok.Value class Value1 {
   private final int x;
   private final String name;
   public @java.lang.SuppressWarnings("all") int getX() {
diff --git a/test/transform/resource/after-ecj/WitherOnClass.java b/test/transform/resource/after-ecj/WitherOnClass.java
index ff4566e5..82132e87 100644
--- a/test/transform/resource/after-ecj/WitherOnClass.java
+++ b/test/transform/resource/after-ecj/WitherOnClass.java
@@ -33,7 +33,9 @@
   }
   public @java.lang.SuppressWarnings("all") WitherOnClass3 withNonNull(final @lombok.NonNull String nonNull) {
     if ((nonNull == null))
-        throw new java.lang.NullPointerException("nonNull");
+        {
+          throw new java.lang.NullPointerException("nonNull");
+        }
     return ((this.nonNull == nonNull) ? this : new WitherOnClass3(this.couldBeNull, nonNull));
   }
 }