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

73 files changed, 584 insertions, 1651 deletions

diff --git a/test/transform/resource/after-delombok/BuilderComplex.java b/test/transform/resource/after-delombok/BuilderComplex.java
index c63d7b59..a82a0497 100644
--- a/test/transform/resource/after-delombok/BuilderComplex.java
+++ b/test/transform/resource/after-delombok/BuilderComplex.java
@@ -16,22 +16,22 @@ class BuilderComplex {
 		TestVoidName() {
 		}
 		@java.lang.SuppressWarnings("all")
-		public TestVoidName<T> number(final T number) {
+		public BuilderComplex.TestVoidName<T> number(final T number) {
 			this.number = number;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public TestVoidName<T> arg2(final int arg2) {
+		public BuilderComplex.TestVoidName<T> arg2(final int arg2) {
 			this.arg2 = arg2;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public TestVoidName<T> arg3(final String arg3) {
+		public BuilderComplex.TestVoidName<T> arg3(final String arg3) {
 			this.arg3 = arg3;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public TestVoidName<T> selfRef(final BuilderComplex selfRef) {
+		public BuilderComplex.TestVoidName<T> selfRef(final BuilderComplex selfRef) {
 			this.selfRef = selfRef;
 			return this;
 		}
@@ -46,7 +46,7 @@ class BuilderComplex {
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	public static <T extends Number> TestVoidName<T> builder() {
-		return new TestVoidName<T>();
+	public static <T extends Number> BuilderComplex.TestVoidName<T> builder() {
+		return new BuilderComplex.TestVoidName<T>();
 	}
 }
diff --git a/test/transform/resource/after-delombok/BuilderCustomName.java b/test/transform/resource/after-delombok/BuilderCustomName.java
index 4db08220..4b423ee0 100644
--- a/test/transform/resource/after-delombok/BuilderCustomName.java
+++ b/test/transform/resource/after-delombok/BuilderCustomName.java
@@ -2,7 +2,7 @@ import java.util.List;
 class BuilderCustomName<T> {
 	private final int field;
 	@java.lang.SuppressWarnings("all")
-	public static abstract class SimpleTestBuilder<T, C extends BuilderCustomName<T>, B extends SimpleTestBuilder<T, C, B>> {
+	public static abstract class SimpleTestBuilder<T, C extends BuilderCustomName<T>, B extends BuilderCustomName.SimpleTestBuilder<T, C, B>> {
 		@java.lang.SuppressWarnings("all")
 		private int field;
 		@java.lang.SuppressWarnings("all")
@@ -21,13 +21,13 @@ class BuilderCustomName<T> {
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	private static final class SimpleTestBuilderImpl<T> extends SimpleTestBuilder<T, BuilderCustomName<T>, SimpleTestBuilderImpl<T>> {
+	private static final class SimpleTestBuilderImpl<T> extends BuilderCustomName.SimpleTestBuilder<T, BuilderCustomName<T>, BuilderCustomName.SimpleTestBuilderImpl<T>> {
 		@java.lang.SuppressWarnings("all")
 		private SimpleTestBuilderImpl() {
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
-		protected SimpleTestBuilderImpl<T> self() {
+		protected BuilderCustomName.SimpleTestBuilderImpl<T> self() {
 			return this;
 		}
 		@java.lang.Override
@@ -37,11 +37,11 @@ class BuilderCustomName<T> {
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	protected BuilderCustomName(final SimpleTestBuilder<T, ?, ?> b) {
+	protected BuilderCustomName(final BuilderCustomName.SimpleTestBuilder<T, ?, ?> b) {
 		this.field = b.field;
 	}
 	@java.lang.SuppressWarnings("all")
-	public static <T> SimpleTestBuilder<T, ?, ?> builder() {
-		return new SimpleTestBuilderImpl<T>();
+	public static <T> BuilderCustomName.SimpleTestBuilder<T, ?, ?> builder() {
+		return new BuilderCustomName.SimpleTestBuilderImpl<T>();
 	}
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/BuilderDefaults.java b/test/transform/resource/after-delombok/BuilderDefaults.java
index 475b3f3c..eb692267 100644
--- a/test/transform/resource/after-delombok/BuilderDefaults.java
+++ b/test/transform/resource/after-delombok/BuilderDefaults.java
@@ -32,18 +32,18 @@ public final class BuilderDefaults {
 		BuilderDefaultsBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderDefaultsBuilder x(final int x) {
+		public BuilderDefaults.BuilderDefaultsBuilder x(final int x) {
 			this.x$value = x;
 			x$set = true;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderDefaultsBuilder name(final String name) {
+		public BuilderDefaults.BuilderDefaultsBuilder name(final String name) {
 			this.name = name;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderDefaultsBuilder z(final long z) {
+		public BuilderDefaults.BuilderDefaultsBuilder z(final long z) {
 			this.z$value = z;
 			z$set = true;
 			return this;
@@ -63,8 +63,8 @@ public final class BuilderDefaults {
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	public static BuilderDefaultsBuilder builder() {
-		return new BuilderDefaultsBuilder();
+	public static BuilderDefaults.BuilderDefaultsBuilder builder() {
+		return new BuilderDefaults.BuilderDefaultsBuilder();
 	}
 	@java.lang.SuppressWarnings("all")
 	public int getX() {
diff --git a/test/transform/resource/after-delombok/BuilderDefaultsGenerics.java b/test/transform/resource/after-delombok/BuilderDefaultsGenerics.java
index 46fcd6b4..fb187e27 100644
--- a/test/transform/resource/after-delombok/BuilderDefaultsGenerics.java
+++ b/test/transform/resource/after-delombok/BuilderDefaultsGenerics.java
@@ -39,19 +39,19 @@ public class BuilderDefaultsGenerics<N extends Number, T, R extends List<T>> {
 		BuilderDefaultsGenericsBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderDefaultsGenericsBuilder<N, T, R> callable(final java.util.concurrent.Callable<N> callable) {
+		public BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder<N, T, R> callable(final java.util.concurrent.Callable<N> callable) {
 			this.callable$value = callable;
 			callable$set = true;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderDefaultsGenericsBuilder<N, T, R> tee(final T tee) {
+		public BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder<N, T, R> tee(final T tee) {
 			this.tee$value = tee;
 			tee$set = true;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderDefaultsGenericsBuilder<N, T, R> arrr(final R arrr) {
+		public BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder<N, T, R> arrr(final R arrr) {
 			this.arrr$value = arrr;
 			arrr$set = true;
 			return this;
@@ -73,7 +73,7 @@ public class BuilderDefaultsGenerics<N extends Number, T, R extends List<T>> {
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	public static <N extends Number, T, R extends List<T>> BuilderDefaultsGenericsBuilder<N, T, R> builder() {
-		return new BuilderDefaultsGenericsBuilder<N, T, R>();
+	public static <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-delombok/BuilderDefaultsWarnings.java b/test/transform/resource/after-delombok/BuilderDefaultsWarnings.java
index 7e645dc1..f00d42af 100644
--- a/test/transform/resource/after-delombok/BuilderDefaultsWarnings.java
+++ b/test/transform/resource/after-delombok/BuilderDefaultsWarnings.java
@@ -21,29 +21,29 @@ public class BuilderDefaultsWarnings {
 		BuilderDefaultsWarningsBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderDefaultsWarningsBuilder x(final long x) {
+		public BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder x(final long x) {
 			this.x = x;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderDefaultsWarningsBuilder z(final int z) {
+		public BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder z(final int z) {
 			this.z = z;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderDefaultsWarningsBuilder item(final String item) {
+		public BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder item(final String item) {
 			if (this.items == null) this.items = new java.util.ArrayList<String>();
 			this.items.add(item);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderDefaultsWarningsBuilder items(final java.util.Collection<? extends String> items) {
+		public 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;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderDefaultsWarningsBuilder clearItems() {
+		public BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder clearItems() {
 			if (this.items != null) this.items.clear();
 			return this;
 		}
@@ -69,8 +69,8 @@ public class BuilderDefaultsWarnings {
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	public static BuilderDefaultsWarningsBuilder builder() {
-		return new BuilderDefaultsWarningsBuilder();
+	public static BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder builder() {
+		return new BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder();
 	}
 }
 class NoBuilderButHasDefaults {
@@ -93,7 +93,7 @@ class NoBuilderButHasDefaults {
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	public static NoBuilderButHasDefaultsBuilder builder() {
-		return new NoBuilderButHasDefaultsBuilder();
+	public static NoBuilderButHasDefaults.NoBuilderButHasDefaultsBuilder builder() {
+		return new NoBuilderButHasDefaults.NoBuilderButHasDefaultsBuilder();
 	}
 }
diff --git a/test/transform/resource/after-delombok/BuilderGenericMethod.java b/test/transform/resource/after-delombok/BuilderGenericMethod.java
index f70ae871..053e8ce4 100644
--- a/test/transform/resource/after-delombok/BuilderGenericMethod.java
+++ b/test/transform/resource/after-delombok/BuilderGenericMethod.java
@@ -14,12 +14,12 @@ class BuilderGenericMethod<T> {
 		MapBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		public MapBuilder<N> a(final int a) {
+		public BuilderGenericMethod<T>.MapBuilder<N> a(final int a) {
 			this.a = a;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public MapBuilder<N> b(final long b) {
+		public BuilderGenericMethod<T>.MapBuilder<N> b(final long b) {
 			this.b = b;
 			return this;
 		}
@@ -34,7 +34,7 @@ class BuilderGenericMethod<T> {
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	public <N extends Number> MapBuilder<N> builder() {
-		return new MapBuilder<N>();
+	public <N extends Number> BuilderGenericMethod<T>.MapBuilder<N> builder() {
+		return this.new MapBuilder<N>();
 	}
 }
diff --git a/test/transform/resource/after-delombok/BuilderInstanceMethod.java b/test/transform/resource/after-delombok/BuilderInstanceMethod.java
index 12b76a8f..9389d871 100644
--- a/test/transform/resource/after-delombok/BuilderInstanceMethod.java
+++ b/test/transform/resource/after-delombok/BuilderInstanceMethod.java
@@ -17,22 +17,22 @@ class BuilderInstanceMethod<T> {
 		StringBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
-		public StringBuilder show(final int show) {
+		public BuilderInstanceMethod<T>.StringBuilder show(final int show) {
 			this.show = show;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public StringBuilder yes(final int yes) {
+		public BuilderInstanceMethod<T>.StringBuilder yes(final int yes) {
 			this.yes = yes;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public StringBuilder also(final List<T> also) {
+		public BuilderInstanceMethod<T>.StringBuilder also(final List<T> also) {
 			this.also = also;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public StringBuilder $andMe(final int $andMe) {
+		public BuilderInstanceMethod<T>.StringBuilder $andMe(final int $andMe) {
 			this.$andMe = $andMe;
 			return this;
 		}
@@ -47,7 +47,7 @@ class BuilderInstanceMethod<T> {
 		}
 	}
 	@java.lang.SuppressWarnings("all")
-	public StringBuilder builder() {
-		return new StringBuilder();
+	public BuilderInstanceMethod<T>.StringBuilder builder() {
+		return this.new StringBuilder();
 	}
 }
diff --git a/test/transform/resource/after-delomb