ecj: copy type parameters to builder class

1 files changed, 98 insertions, 163 deletions

diff --git a/test/transform/resource/after-ecj/SuperBuilderWithGenerics.java b/test/transform/resource/after-ecj/SuperBuilderWithGenerics.java
index 9f71be5a..0ec8efe5 100644
--- a/test/transform/resource/after-ecj/SuperBuilderWithGenerics.java
+++ b/test/transform/resource/after-ecj/SuperBuilderWithGenerics.java
@@ -1,166 +1,101 @@
 import java.util.List;

-

 public class SuperBuilderWithGenerics {

-	public static @lombok.experimental.SuperBuilder class Parent<A> {

-		A field1;

-		List<String> items;

-

-		@java.lang.SuppressWarnings("all")

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

-			this.field1 = b.field1;

-			java.util.List<String> items;

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

-			case 0: 

-				items = java.util.Collections.emptyList();

-				break;

-

-			case 1: 

-				items = java.util.Collections.singletonList(b.items.get(0));

-				break;

-

-			default: 

-				items = java.util.Collections.unmodifiableList(new java.util.ArrayList<String>(b.items));

-			}

-			this.items = items;

-		}

-

-

-		@java.lang.SuppressWarnings("all")

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

-			@java.lang.SuppressWarnings("all")

-			private A field1;

-			@java.lang.SuppressWarnings("all")

-			private java.util.ArrayList<String> items;

-

-			@java.lang.SuppressWarnings("all")

-			protected abstract B self();

-

-			@java.lang.SuppressWarnings("all")

-			public abstract C build();

-

-			@java.lang.SuppressWarnings("all")

-			public B field1(final A field1) {

-				this.field1 = field1;

-				return self();

-			}

-

-			@java.lang.SuppressWarnings("all")

-			public B item(final String item) {

-				if (this.items == null) this.items = new java.util.ArrayList<String>();

-				this.items.add(item);

-				return self();

-			}

-

-			@java.lang.SuppressWarnings("all")

-			public B items(final java.util.Collection<? extends String> items) {

-				if (this.items == null) this.items = new java.util.ArrayList<String>();

-				this.items.addAll(items);

-				return self();

-			}

-

-			@java.lang.SuppressWarnings("all")

-			public B clearItems() {

-				if (this.items != null) this.items.clear();

-				return self();

-			}

-

-			@java.lang.Override

-			@java.lang.SuppressWarnings("all")

-			public java.lang.String toString() {

-				return "SuperBuilderWithGenerics.Parent.ParentBuilder(field1=" + this.field1 + ", items=" + this.items + ")";

-			}

-		}

-

-

-		@java.lang.SuppressWarnings("all")

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

-			@java.lang.SuppressWarnings("all")

-			private ParentBuilderImpl() {

-			}

-

-			@java.lang.Override

-			@java.lang.SuppressWarnings("all")

-			protected ParentBuilderImpl self() {

-				return this;

-			}

-

-			@java.lang.Override

-			@java.lang.SuppressWarnings("all")

-			public Parent<A> build() {

-				return new Parent<A>(this);

-			}

-		}

-

-		@java.lang.SuppressWarnings("all")

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

-			return new ParentBuilderImpl<A>();

-		}

-	}

-

-	@lombok.experimental.SuperBuilder

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

-		double field3;

-

-		@java.lang.SuppressWarnings("all")

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

-			super(b);

-			this.field3 = b.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> {

-			@java.lang.SuppressWarnings("all")

-			private double field3;

-

-			@java.lang.Override

-			@java.lang.SuppressWarnings("all")

-			protected abstract B self();

-

-			@java.lang.Override

-			@java.lang.SuppressWarnings("all")

-			public abstract C build();

-

-			@java.lang.SuppressWarnings("all")

-			public B field3(final double field3) {

-				this.field3 = field3;

-				return self();

-			}

-

-			@java.lang.Override

-			@java.lang.SuppressWarnings("all")

-			public java.lang.String toString() {

-				return "SuperBuilderWithGenerics.Child.ChildBuilder(super=" + super.toString() + ", field3=" + this.field3 + ")";

-			}

-		}

-

-

-		@java.lang.SuppressWarnings("all")

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

-			@java.lang.SuppressWarnings("all")

-			private ChildBuilderImpl() {

-			}

-

-			@java.lang.Override

-			@java.lang.SuppressWarnings("all")

-			protected ChildBuilderImpl self() {

-				return this;

-			}

-

-			@java.lang.Override

-			@java.lang.SuppressWarnings("all")

-			public Child<A> build() {

-				return new Child<A>(this);

-			}

-		}

-

-		@java.lang.SuppressWarnings("all")

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

-			return new ChildBuilderImpl<A>();

-		}

-	}

-

-	public static void test() {

-		Child<Integer> x = Child.<Integer>builder().field3(0.0).field1(5).item("").build();

-	}

+  public static @lombok.experimental.SuperBuilder class Parent<A> {

+    public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder<A, C extends Parent<A>, B extends ParentBuilder<A, C, B>> {

+      private @java.lang.SuppressWarnings("all") A field1;

+      private @java.lang.SuppressWarnings("all") java.util.ArrayList<String> items;

+      protected abstract @java.lang.SuppressWarnings("all") B self();

+      public abstract @java.lang.SuppressWarnings("all") C build();

+      public @java.lang.SuppressWarnings("all") B field1(final A field1) {

+        this.field1 = field1;

+        return self();

+      }

+      public @java.lang.SuppressWarnings("all") B item(String item) {

+        if ((this.items == null))

+            this.items = new java.util.ArrayList<String>();

+        this.items.add(item);

+        return self();

+      }

+      public @java.lang.SuppressWarnings("all") B items(java.util.Collection<? extends String> items) {

+        if ((this.items == null))

+            this.items = new java.util.ArrayList<String>();

+        this.items.addAll(items);

+        return self();

+      }

+      public @java.lang.SuppressWarnings("all") B clearItems() {

+        if ((this.items != null))

+            this.items.clear();

+        return self();

+      }

+      public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {

+        return (((("SuperBuilderWithGenerics.Parent.ParentBuilder(field1=" + this.field1) + ", items=") + this.items) + ")");

+      }

+    }

+    private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl<A> extends ParentBuilder<A, Parent<A>, ParentBuilderImpl<A>> {

+      private @java.lang.SuppressWarnings("all") ParentBuilderImpl() {

+      }

+      protected @java.lang.Override @java.lang.SuppressWarnings("all") ParentBuilderImpl self() {

+        return this;

+      }

+      public @java.lang.Override @java.lang.SuppressWarnings("all") Parent<A> build() {

+        return new Parent<A>(this);

+      }

+    }

+    A field1;

+    @lombok.Singular List<String> items;

+    protected @java.lang.SuppressWarnings("all") Parent(final ParentBuilder<A, ?, ?> b) {

+      this.field1 = b.field1;

+      java.util.List<String> items;

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

+      case 0: 

+        items = java.util.Collections.emptyList();

+        break;

+      case 1: 

+        items = java.util.Collections.singletonList(b.items.get(0));

+        break;

+      default: 

+        items = java.util.Collections.unmodifiableList(new java.util.ArrayList<String>(b.items));

+      }

+      this.items = items;

+    }

+    public static @java.lang.SuppressWarnings("all") <A> ParentBuilder<A, ?, ?> builder() {

+      return new ParentBuilderImpl<A>();

+    }

+  }

+  @lombok.experimental.SuperBuilder

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

+    double field3;

+    protected @java.lang.SuppressWarnings("all") Child(final ChildBuilder<A, ?, ?> b) {

+      super(b);

+      this.field3 = b.field3;

+    }

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

+      private @java.lang.SuppressWarnings("all") double field3;

+      protected @java.lang.Override @java.lang.SuppressWarnings("all") abstract B self();

+      public @java.lang.Override @java.lang.SuppressWarnings("all") abstract C build();

+      public @java.lang.SuppressWarnings("all") B field3(final double field3) {

+        this.field3 = field3;

+        return self();

+      }

+      public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {

+        return "SuperBuilderWithGenerics.Child.ChildBuilder(super=" + super.toString() + ", field3=" + this.field3 + ")";

+      }

+    }

+    private static final @java.lang.SuppressWarnings("all") class ChildBuilderImpl<A> extends ChildBuilder<A, Child<A>, ChildBuilderImpl<A>> {

+      private ChildBuilderImpl() {

+      }

+      protected @java.lang.Override @java.lang.SuppressWarnings("all") ChildBuilderImpl self() {

+        return this;

+      }

+      public @java.lang.Override @java.lang.SuppressWarnings("all") Child<A> build() {

+        return new Child<A>(this);

+      }

+    }

+    public static @java.lang.SuppressWarnings("all") <A> ChildBuilder<A, ?, ?> builder() {

+      return new ChildBuilderImpl<A>();

+    }

+  }

+  public static void test() {

+    Child<Integer> x = Child.<Integer>builder().field3(0.0).field1(5).item("").build();

+  }

 }