[fixes #2268] make lombok generate qualified types in order to avoid name clashes.

73 files changed, 584 insertions, 1513 deletions

diff --git a/test/transform/resource/after-ecj/BuilderComplex.java b/test/transform/resource/after-ecj/BuilderComplex.java
index 23dbf058..b8265415 100644
--- a/test/transform/resource/after-ecj/BuilderComplex.java
+++ b/test/transform/resource/after-ecj/BuilderComplex.java
@@ -9,19 +9,19 @@ class BuilderComplex {
     @java.lang.SuppressWarnings("all") TestVoidName() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") TestVoidName<T> number(final T number) {
+    public @java.lang.SuppressWarnings("all") BuilderComplex.TestVoidName<T> number(final T number) {
       this.number = number;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") TestVoidName<T> arg2(final int arg2) {
+    public @java.lang.SuppressWarnings("all") BuilderComplex.TestVoidName<T> arg2(final int arg2) {
       this.arg2 = arg2;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") TestVoidName<T> arg3(final String arg3) {
+    public @java.lang.SuppressWarnings("all") BuilderComplex.TestVoidName<T> arg3(final String arg3) {
       this.arg3 = arg3;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") TestVoidName<T> selfRef(final BuilderComplex selfRef) {
+    public @java.lang.SuppressWarnings("all") BuilderComplex.TestVoidName<T> selfRef(final BuilderComplex selfRef) {
       this.selfRef = selfRef;
       return this;
     }
@@ -37,7 +37,7 @@ class BuilderComplex {
   }
   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>TestVoidName<T> builder() {
-    return new TestVoidName<T>();
+  public static @java.lang.SuppressWarnings("all") <T extends Number>BuilderComplex.TestVoidName<T> builder() {
+    return new BuilderComplex.TestVoidName<T>();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderCustomName.java b/test/transform/resource/after-ecj/BuilderCustomName.java
index 1067a9d1..ee44cc75 100644
--- a/test/transform/resource/after-ecj/BuilderCustomName.java
+++ b/test/transform/resource/after-ecj/BuilderCustomName.java
@@ -1,6 +1,6 @@
 import java.util.List;
 @lombok.experimental.SuperBuilder class BuilderCustomName<T> {
-  public static abstract @java.lang.SuppressWarnings("all") class SimpleTestBuilder<T, C extends BuilderCustomName<T>, B extends SimpleTestBuilder<T, C, B>> {
+  public static abstract @java.lang.SuppressWarnings("all") class SimpleTestBuilder<T, C extends BuilderCustomName<T>, B extends BuilderCustomName.SimpleTestBuilder<T, C, B>> {
     private @java.lang.SuppressWarnings("all") int field;
     public SimpleTestBuilder() {
       super();
@@ -15,11 +15,11 @@ import java.util.List;
       return (("BuilderCustomName.SimpleTestBuilder(field=" + this.field) + ")");
     }
   }
-  private static final @java.lang.SuppressWarnings("all") class SimpleTestBuilderImpl<T> extends SimpleTestBuilder<T, BuilderCustomName<T>, SimpleTestBuilderImpl<T>> {
+  private static final @java.lang.SuppressWarnings("all") class SimpleTestBuilderImpl<T> extends BuilderCustomName.SimpleTestBuilder<T, BuilderCustomName<T>, BuilderCustomName.SimpleTestBuilderImpl<T>> {
     private SimpleTestBuilderImpl() {
       super();
     }
-    protected @java.lang.Override @java.lang.SuppressWarnings("all") SimpleTestBuilderImpl<T> self() {
+    protected @java.lang.Override @java.lang.SuppressWarnings("all") BuilderCustomName.SimpleTestBuilderImpl<T> self() {
       return this;
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") BuilderCustomName<T> build() {
@@ -27,11 +27,11 @@ import java.util.List;
     }
   }
   private final int field;
-  protected @java.lang.SuppressWarnings("all") BuilderCustomName(final SimpleTestBuilder<T, ?, ?> b) {
+  protected @java.lang.SuppressWarnings("all") BuilderCustomName(final BuilderCustomName.SimpleTestBuilder<T, ?, ?> b) {
     super();
     this.field = b.field;
   }
-  public static @java.lang.SuppressWarnings("all") <T>SimpleTestBuilder<T, ?, ?> builder() {
-    return new SimpleTestBuilderImpl<T>();
+  public static @java.lang.SuppressWarnings("all") <T>BuilderCustomName.SimpleTestBuilder<T, ?, ?> builder() {
+    return new BuilderCustomName.SimpleTestBuilderImpl<T>();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderDefaults.java b/test/transform/resource/after-ecj/BuilderDefaults.java
index b9588386..6226022e 100644
--- a/test/transform/resource/after-ecj/BuilderDefaults.java
+++ b/test/transform/resource/after-ecj/BuilderDefaults.java
@@ -10,16 +10,16 @@ public final @Value @Builder class BuilderDefaults {
     @java.lang.SuppressWarnings("all") BuilderDefaultsBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderDefaultsBuilder x(final int x) {
+    public @java.lang.SuppressWarnings("all") BuilderDefaults.BuilderDefaultsBuilder x(final int x) {
       this.x$value = x;
       x$set = true;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderDefaultsBuilder name(final String name) {
+    public @java.lang.SuppressWarnings("all") BuilderDefaults.BuilderDefaultsBuilder name(final String name) {
       this.name = name;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderDefaultsBuilder z(final long z) {
+    public @java.lang.SuppressWarnings("all") BuilderDefaults.BuilderDefaultsBuilder z(final long z) {
       this.z$value = z;
       z$set = true;
       return this;
@@ -46,8 +46,8 @@ public final @Value @Builder class BuilderDefaults {
     this.name = name;
     this.z = z;
   }
-  public static @java.lang.SuppressWarnings("all") BuilderDefaultsBuilder builder() {
-    return new BuilderDefaultsBuilder();
+  public static @java.lang.SuppressWarnings("all") BuilderDefaults.BuilderDefaultsBuilder builder() {
+    return new BuilderDefaults.BuilderDefaultsBuilder();
   }
   public @java.lang.SuppressWarnings("all") int getX() {
     return this.x;
diff --git a/test/transform/resource/after-ecj/BuilderDefaultsGenerics.java b/test/transform/resource/after-ecj/BuilderDefaultsGenerics.java
index 8f9da4b3..4e32de42 100644
--- a/test/transform/resource/after-ecj/BuilderDefaultsGenerics.java
+++ b/test/transform/resource/after-ecj/BuilderDefaultsGenerics.java
@@ -11,17 +11,17 @@ public @Builder class BuilderDefaultsGenerics<N extends Number, T, R extends Lis
     @java.lang.SuppressWarnings("all") BuilderDefaultsGenericsBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderDefaultsGenericsBuilder<N, T, R> callable(final java.util.concurrent.Callable<N> callable) {
+    public @java.lang.SuppressWarnings("all") BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder<N, T, R> callable(final java.util.concurrent.Callable<N> callable) {
       this.callable$value = callable;
       callable$set = true;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderDefaultsGenericsBuilder<N, T, R> tee(final T tee) {
+    public @java.lang.SuppressWarnings("all") BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder<N, T, R> tee(final T tee) {
       this.tee$value = tee;
       tee$set = true;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderDefaultsGenericsBuilder<N, T, R> arrr(final R arrr) {
+    public @java.lang.SuppressWarnings("all") BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder<N, T, R> arrr(final R arrr) {
       this.arrr$value = arrr;
       arrr$set = true;
       return this;
@@ -51,7 +51,7 @@ public @Builder class BuilderDefaultsGenerics<N extends Number, T, R extends Lis
     this.tee = tee;
     this.arrr = arrr;
   }
-  public static @java.lang.SuppressWarnings("all") <N extends Number, T, R extends List<T>>BuilderDefaultsGenericsBuilder<N, T, R> builder() {
-    return new BuilderDefaultsGenericsBuilder<N, T, R>();
+  public static @java.lang.SuppressWarnings("all") <N extends Number, T, R extends List<T>>BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder<N, T, R> builder() {
+    return new BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder<N, T, R>();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderDefaultsWarnings.java b/test/transform/resource/after-ecj/BuilderDefaultsWarnings.java
index 1078f452..296f72dc 100644
--- a/test/transform/resource/after-ecj/BuilderDefaultsWarnings.java
+++ b/test/transform/resource/after-ecj/BuilderDefaultsWarnings.java
@@ -8,27 +8,27 @@ public @Builder class BuilderDefaultsWarnings {
     @java.lang.SuppressWarnings("all") BuilderDefaultsWarningsBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderDefaultsWarningsBuilder x(final long x) {
+    public @java.lang.SuppressWarnings("all") BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder x(final long x) {
       this.x = x;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderDefaultsWarningsBuilder z(final int z) {
+    public @java.lang.SuppressWarnings("all") BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder z(final int z) {
       this.z = z;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderDefaultsWarningsBuilder item(final String item) {
+    public @java.lang.SuppressWarnings("all") BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder item(final String item) {
       if ((this.items == null))
           this.items = new java.util.ArrayList<String>();
       this.items.add(item);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderDefaultsWarningsBuilder items(final java.util.Collection<? extends String> items) {
+    public @java.lang.SuppressWarnings("all") BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder items(final java.util.Collection<? extends String> items) {
       if ((this.items == null))
           this.items = new java.util.ArrayList<String>();
       this.items.addAll(items);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderDefaultsWarningsBuilder clearItems() {
+    public @java.lang.SuppressWarnings("all") BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder clearItems() {
       if ((this.items != null))
           this.items.clear();
       return this;
@@ -61,8 +61,8 @@ public @Builder class BuilderDefaultsWarnings {
     this.z = z;
     this.items = items;
   }
-  public static @java.lang.SuppressWarnings("all") BuilderDefaultsWarningsBuilder builder() {
-    return new BuilderDefaultsWarningsBuilder();
+  public static @java.lang.SuppressWarnings("all") BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder builder() {
+    return new BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder();
   }
 }
 class NoBuilderButHasDefaults {
@@ -81,7 +81,7 @@ class NoBuilderButHasDefaults {
   public @Builder NoBuilderButHasDefaults() {
     super();
   }
-  public static @java.lang.SuppressWarnings("all") NoBuilderButHasDefaultsBuilder builder() {
-    return new NoBuilderButHasDefaultsBuilder();
+  public static @java.lang.SuppressWarnings("all") NoBuilderButHasDefaults.NoBuilderButHasDefaultsBuilder builder() {
+    return new NoBuilderButHasDefaults.NoBuilderButHasDefaultsBuilder();
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/BuilderGenericMethod.java b/test/transform/resource/after-ecj/BuilderGenericMethod.java
index 1b770654..7965599d 100644
--- a/test/transform/resource/after-ecj/BuilderGenericMethod.java
+++ b/test/transform/resource/after-ecj/BuilderGenericMethod.java
@@ -8,11 +8,11 @@ class BuilderGenericMethod<T> {
     @java.lang.SuppressWarnings("all") MapBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") MapBuilder<N> a(final int a) {
+    public @java.lang.SuppressWarnings("all") BuilderGenericMethod<T>.MapBuilder<N> a(final int a) {
       this.a = a;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") MapBuilder<N> b(final long b) {
+    public @java.lang.SuppressWarnings("all") BuilderGenericMethod<T>.MapBuilder<N> b(final long b) {
       this.b = b;
       return this;
     }
@@ -29,7 +29,7 @@ class BuilderGenericMethod<T> {
   public @Builder <N extends Number>Map<N, T> foo(int a, long b) {
     return null;
   }
-  public @java.lang.SuppressWarnings("all") <N extends Number>MapBuilder<N> builder() {
-    return new MapBuilder<N>();
+  public @java.lang.SuppressWarnings("all") <N extends Number>BuilderGenericMethod<T>.MapBuilder<N> builder() {
+    return this.new MapBuilder<N>();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderInstanceMethod.java b/test/transform/resource/after-ecj/BuilderInstanceMethod.java
index 5f57aef7..397ba113 100644
--- a/test/transform/resource/after-ecj/BuilderInstanceMethod.java
+++ b/test/transform/resource/after-ecj/BuilderInstanceMethod.java
@@ -8,19 +8,19 @@ class BuilderInstanceMethod<T> {
     @java.lang.SuppressWarnings("all") StringBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") StringBuilder show(final int show) {
+    public @java.lang.SuppressWarnings("all") BuilderInstanceMethod<T>.StringBuilder show(final int show) {
       this.show = show;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") StringBuilder yes(final int yes) {
+    public @java.lang.SuppressWarnings("all") BuilderInstanceMethod<T>.StringBuilder yes(final int yes) {
       this.yes = yes;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") StringBuilder also(final List<T> also) {
+    public @java.lang.SuppressWarnings("all") BuilderInstanceMethod<T>.StringBuilder also(final List<T> also) {