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

1 files changed, 24 insertions, 24 deletions

diff --git a/test/transform/resource/after-delombok/SuperBuilderWithGenericsAndToBuilder.java b/test/transform/resource/after-delombok/SuperBuilderWithGenericsAndToBuilder.java
index af67e900..a6c44c7f 100644
--- a/test/transform/resource/after-delombok/SuperBuilderWithGenericsAndToBuilder.java
+++ b/test/transform/resource/after-delombok/SuperBuilderWithGenericsAndToBuilder.java
@@ -4,7 +4,7 @@ public class SuperBuilderWithGenericsAndToBuilder {
 		A field1;

 		Map<Integer, String> items;

 		@java.lang.SuppressWarnings("all")

-		public static abstract class ParentBuilder<A, C extends Parent<A>, B extends ParentBuilder<A, C, B>> {

+		public static abstract class ParentBuilder<A, C extends SuperBuilderWithGenericsAndToBuilder.Parent<A>, B extends SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder<A, C, B>> {

 			@java.lang.SuppressWarnings("all")

 			private A field1;

 			@java.lang.SuppressWarnings("all")

@@ -13,11 +13,11 @@ public class SuperBuilderWithGenericsAndToBuilder {
 			private java.util.ArrayList<String> items$value;

 			@java.lang.SuppressWarnings("all")

 			protected B $fillValuesFrom(final C instance) {

-				ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);

+				SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);

 				return self();

 			}

 			@java.lang.SuppressWarnings("all")

-			private static <A> void $fillValuesFromInstanceIntoBuilder(final Parent<A> instance, final ParentBuilder<A, ?, ?> b) {

+			private static <A> void $fillValuesFromInstanceIntoBuilder(final SuperBuilderWithGenericsAndToBuilder.Parent<A> instance, final SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder<A, ?, ?> b) {

 				b.field1(instance.field1);

 				b.items(instance.items == null ? java.util.Collections.emptyMap() : instance.items);

 			}

@@ -67,23 +67,23 @@ public class SuperBuilderWithGenericsAndToBuilder {
 			}

 		}

 		@java.lang.SuppressWarnings("all")

-		private static final class ParentBuilderImpl<A> extends ParentBuilder<A, Parent<A>, ParentBuilderImpl<A>> {

+		private static final class ParentBuilderImpl<A> extends SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder<A, SuperBuilderWithGenericsAndToBuilder.Parent<A>, SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilderImpl<A>> {

 			@java.lang.SuppressWarnings("all")

 			private ParentBuilderImpl() {

 			}

 			@java.lang.Override

 			@java.lang.SuppressWarnings("all")

-			protected ParentBuilderImpl<A> self() {

+			protected SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilderImpl<A> self() {

 				return this;

 			}

 			@java.lang.Override

 			@java.lang.SuppressWarnings("all")

-			public Parent<A> build() {

-				return new Parent<A>(this);

+			public SuperBuilderWithGenericsAndToBuilder.Parent<A> build() {

+				return new SuperBuilderWithGenericsAndToBuilder.Parent<A>(this);

 			}

 		}

 		@java.lang.SuppressWarnings("all")

-		protected Parent(final ParentBuilder<A, ?, ?> b) {

+		protected Parent(final SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder<A, ?, ?> b) {

 			this.field1 = b.field1;

 			java.util.Map<Integer, String> items;

 			switch (b.items$key == null ? 0 : b.items$key.size()) {

@@ -101,29 +101,29 @@ public class SuperBuilderWithGenericsAndToBuilder {
 			this.items = items;

 		}

 		@java.lang.SuppressWarnings("all")

-		public static <A> ParentBuilder<A, ?, ?> builder() {

-			return new ParentBuilderImpl<A>();

+		public static <A> SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder<A, ?, ?> builder() {

+			return new SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilderImpl<A>();

 		}

 		@java.lang.SuppressWarnings("all")

-		public ParentBuilder<A, ?, ?> toBuilder() {

-			return new ParentBuilderImpl<A>().$fillValuesFrom(this);

+		public SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder<A, ?, ?> toBuilder() {

+			return new SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilderImpl<A>().$fillValuesFrom(this);

 		}

 	}

 	public static class Child<A> extends Parent<A> {

 		double field3;

 		@java.lang.SuppressWarnings("all")

-		public static abstract class ChildBuilder<A, C extends Child<A>, B extends ChildBuilder<A, C, B>> extends Parent.ParentBuilder<A, C, B> {

+		public static abstract class ChildBuilder<A, C extends SuperBuilderWithGenericsAndToBuilder.Child<A>, B extends SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder<A, C, B>> extends Parent.ParentBuilder<A, C, B> {

 			@java.lang.SuppressWarnings("all")

 			private double field3;

 			@java.lang.Override

 			@java.lang.SuppressWarnings("all")

 			protected B $fillValuesFrom(final C instance) {

 				super.$fillValuesFrom(instance);

-				ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);

+				SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);

 				return self();

 			}

 			@java.lang.SuppressWarnings("all")

-			private static <A> void $fillValuesFromInstanceIntoBuilder(final Child<A> instance, final ChildBuilder<A, ?, ?> b) {

+			private static <A> void $fillValuesFromInstanceIntoBuilder(final SuperBuilderWithGenericsAndToBuilder.Child<A> instance, final SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder<A, ?, ?> b) {

 				b.field3(instance.field3);

 			}

 			@java.lang.Override

@@ -144,33 +144,33 @@ public class SuperBuilderWithGenericsAndToBuilder {
 			}

 		}

 		@java.lang.SuppressWarnings("all")

-		private static final class ChildBuilderImpl<A> extends ChildBuilder<A, Child<A>, ChildBuilderImpl<A>> {

+		private static final class ChildBuilderImpl<A> extends SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder<A, SuperBuilderWithGenericsAndToBuilder.Child<A>, SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilderImpl<A>> {

 			@java.lang.SuppressWarnings("all")

 			private ChildBuilderImpl() {

 			}

 			@java.lang.Override

 			@java.lang.SuppressWarnings("all")

-			protected ChildBuilderImpl<A> self() {

+			protected SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilderImpl<A> self() {

 				return this;

 			}

 			@java.lang.Override

 			@java.lang.SuppressWarnings("all")

-			public Child<A> build() {

-				return new Child<A>(this);

+			public SuperBuilderWithGenericsAndToBuilder.Child<A> build() {

+				return new SuperBuilderWithGenericsAndToBuilder.Child<A>(this);

 			}

 		}

 		@java.lang.SuppressWarnings("all")

-		protected Child(final ChildBuilder<A, ?, ?> b) {

+		protected Child(final SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder<A, ?, ?> b) {

 			super(b);

 			this.field3 = b.field3;

 		}

 		@java.lang.SuppressWarnings("all")

-		public static <A> ChildBuilder<A, ?, ?> builder() {

-			return new ChildBuilderImpl<A>();

+		public static <A> SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder<A, ?, ?> builder() {

+			return new SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilderImpl<A>();

 		}

 		@java.lang.SuppressWarnings("all")

-		public ChildBuilder<A, ?, ?> toBuilder() {

-			return new ChildBuilderImpl<A>().$fillValuesFrom(this);

+		public SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder<A, ?, ?> toBuilder() {

+			return new SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilderImpl<A>().$fillValuesFrom(this);

 		}

 	}

 	public static void test() {