Merge branch 'superToBuilder' of git://github.com/janrieke/lombok into janrieke-superToBuilder

3 files changed, 528 insertions, 0 deletions

diff --git a/test/transform/resource/after-delombok/SuperBuilderAbstractToBuilder.java b/test/transform/resource/after-delombok/SuperBuilderAbstractToBuilder.java
new file mode 100644
index 00000000..096bd533
--- /dev/null
+++ b/test/transform/resource/after-delombok/SuperBuilderAbstractToBuilder.java
@@ -0,0 +1,168 @@
+public class SuperBuilderAbstractToBuilder {

+	public static class Parent {

+		int parentField;

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

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

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

+			private int parentField;

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

+			protected B $fillValuesFrom(final C instance) {

+				ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);

+				return self();

+			}

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

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

+				b.parentField(instance.parentField);

+			}

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

+			protected abstract B self();

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

+			public abstract C build();

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

+			public B parentField(final int parentField) {

+				this.parentField = parentField;

+				return self();

+			}

+			@java.lang.Override

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

+			public java.lang.String toString() {

+				return "SuperBuilderAbstractToBuilder.Parent.ParentBuilder(parentField=" + this.parentField + ")";

+			}

+		}

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

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

+			@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 build() {

+				return new Parent(this);

+			}

+		}

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

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

+			this.parentField = b.parentField;

+		}

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

+		public static ParentBuilder<?, ?> builder() {

+			return new ParentBuilderImpl();

+		}

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

+		public ParentBuilder<?, ?> toBuilder() {

+			return new ParentBuilderImpl().$fillValuesFrom(this);

+		}

+	}

+	public static abstract class Child extends Parent {

+		double childField;

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

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

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

+			private double childField;

+			@java.lang.Override

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

+			protected B $fillValuesFrom(final C instance) {

+				super.$fillValuesFrom(instance);

+				ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);

+				return self();

+			}

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

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

+				b.childField(instance.childField);

+			}

+			@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 childField(final double childField) {

+				this.childField = childField;

+				return self();

+			}

+			@java.lang.Override

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

+			public java.lang.String toString() {

+				return "SuperBuilderAbstractToBuilder.Child.ChildBuilder(super=" + super.toString() + ", childField=" + this.childField + ")";

+			}

+		}

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

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

+			super(b);

+			this.childField = b.childField;

+		}

+	}

+	public static class GrandChild extends Child {

+		String grandChildField;

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

+		public static abstract class GrandChildBuilder<C extends GrandChild, B extends GrandChildBuilder<C, B>> extends Child.ChildBuilder<C, B> {

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

+			private String grandChildField;

+			@java.lang.Override

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

+			protected B $fillValuesFrom(final C instance) {

+				super.$fillValuesFrom(instance);

+				GrandChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);

+				return self();

+			}

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

+			private static void $fillValuesFromInstanceIntoBuilder(final GrandChild instance, final GrandChildBuilder<?, ?> b) {

+				b.grandChildField(instance.grandChildField);

+			}

+			@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 grandChildField(final String grandChildField) {

+				this.grandChildField = grandChildField;

+				return self();

+			}

+			@java.lang.Override

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

+			public java.lang.String toString() {

+				return "SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder(super=" + super.toString() + ", grandChildField=" + this.grandChildField + ")";

+			}

+		}

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

+		private static final class GrandChildBuilderImpl extends GrandChildBuilder<GrandChild, GrandChildBuilderImpl> {

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

+			private GrandChildBuilderImpl() {

+			}

+			@java.lang.Override

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

+			protected GrandChildBuilderImpl self() {

+				return this;

+			}

+			@java.lang.Override

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

+			public GrandChild build() {

+				return new GrandChild(this);

+			}

+		}

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

+		protected GrandChild(final GrandChildBuilder<?, ?> b) {

+			super(b);

+			this.grandChildField = b.grandChildField;

+		}

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

+		public static GrandChildBuilder<?, ?> builder() {

+			return new GrandChildBuilderImpl();

+		}

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

+		public GrandChildBuilder<?, ?> toBuilder() {

+			return new GrandChildBuilderImpl().$fillValuesFrom(this);

+		}

+	}

+	public static void test() {

+		GrandChild x = GrandChild.builder().grandChildField("").parentField(5).childField(2.5).build().toBuilder().build();

+	}

+}

diff --git a/test/transform/resource/after-delombok/SuperBuilderBasicToBuilder.java b/test/transform/resource/after-delombok/SuperBuilderBasicToBuilder.java
new file mode 100644
index 00000000..dc0b4e70
--- /dev/null
+++ b/test/transform/resource/after-delombok/SuperBuilderBasicToBuilder.java
@@ -0,0 +1,198 @@
+import java.util.List;

+public class SuperBuilderBasicToBuilder {

+	public static class Parent {

+		private int field1;

+		int obtainViaField;

+		int obtainViaMethod;

+		String obtainViaStaticMethod;

+		List<String> items;

+		private int method() {

+			return 2;

+		}

+		private static String staticMethod(Parent instance) {

+			return "staticMethod";

+		}

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

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

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

+			private int field1;

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

+			private int obtainViaField;

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

+			private int obtainViaMethod;

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

+			private String obtainViaStaticMethod;

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

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

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

+			protected B $fillValuesFrom(final C instance) {

+				ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);

+				return self();

+			}

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

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

+				b.field1(instance.field1);

+				b.obtainViaField(instance.field1);

+				b.obtainViaMethod(instance.method());

+				b.obtainViaStaticMethod(Parent.staticMethod(instance));

+				b.items(instance.items == null ? java.util.Collections.emptyList() : instance.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 int field1) {

+				this.field1 = field1;

+				return self();

+			}

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

+			public B obtainViaField(final int obtainViaField) {

+				this.obtainViaField = obtainViaField;

+				return self();

+			}

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

+			public B obtainViaMethod(final int obtainViaMethod) {

+				this.obtainViaMethod = obtainViaMethod;

+				return self();

+			}

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

+			public B obtainViaStaticMethod(final String obtainViaStaticMethod) {

+				this.obtainViaStaticMethod = obtainViaStaticMethod;

+				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 "SuperBuilderBasicToBuilder.Parent.ParentBuilder(field1=" + this.field1 + ", obtainViaField=" + this.obtainViaField + ", obtainViaMethod=" + this.obtainViaMethod + ", obtainViaStaticMethod=" + this.obtainViaStaticMethod + ", items=" + this.items + ")";

+			}

+		}

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

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

+			@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 build() {

+				return new Parent(this);

+			}

+		}

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

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

+			this.field1 = b.field1;

+			this.obtainViaField = b.obtainViaField;

+			this.obtainViaMethod = b.obtainViaMethod;

+			this.obtainViaStaticMethod = b.obtainViaStaticMethod;

+			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 ParentBuilder<?, ?> builder() {

+			return new ParentBuilderImpl();

+		}

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

+		public ParentBuilder<?, ?> toBuilder() {

+			return new ParentBuilderImpl().$fillValuesFrom(this);

+		}

+	}

+	public static class Child extends Parent {

+		private double field3;

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

+		public static abstract class ChildBuilder<C extends Child, B extends ChildBuilder<C, B>> extends Parent.ParentBuilder<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);

+				return self();

+			}

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

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

+				b.field3(instance.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 "SuperBuilderBasicToBuilder.Child.ChildBuilder(super=" + super.toString() + ", field3=" + this.field3 + ")";

+			}

+		}

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

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

+			@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 build() {

+				return new Child(this);

+			}

+		}

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

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

+			super(b);

+			this.field3 = b.field3;

+		}

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

+		public static ChildBuilder<?, ?> builder() {

+			return new ChildBuilderImpl();

+		}

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

+		public ChildBuilder<?, ?> toBuilder() {

+			return new ChildBuilderImpl().$fillValuesFrom(this);

+		}

+	}

+	public static void test() {

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

+	}

+}

diff --git a/test/transform/resource/after-delombok/SuperBuilderWithGenericsAndToBuilder.java b/test/transform/resource/after-delombok/SuperBuilderWithGenericsAndToBuilder.java
new file mode 100644
index 00000000..deb5a223
--- /dev/null
+++ b/test/transform/resource/after-delombok/SuperBuilderWithGenericsAndToBuilder.java
@@ -0,0 +1,162 @@
+import java.util.List;

+public class SuperBuilderWithGenericsAndToBuilder {

+	public static class Parent<A> {

+		A field1;

+		List<String> 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 B $fillValuesFrom(final C instance) {

+				ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);

+				return self();

+			}

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

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

+				b.field1(instance.field1);

+				b.items(instance.items == null ? java.util.Collections.emptyList() : instance.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 "SuperBuilderWithGenericsAndToBuilder.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<A> self() {

+				return this;

+			}

+			@java.lang.Override

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

+			public Parent<A> build() {

+				return new Parent<A>(this);

+			}

+		}

+		@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 <A> ParentBuilder<A, ?, ?> builder() {

+			return new ParentBuilderImpl<A>();

+		}

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

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

+			return new 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> {

+			@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);

+				return self();

+			}

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

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

+				b.field3(instance.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 "SuperBuilderWithGenericsAndToBuilder.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<A> self() {

+				return this;

+			}

+			@java.lang.Override

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

+			public Child<A> build() {

+				return new Child<A>(this);

+			}

+		}

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

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

+			super(b);

+			this.field3 = b.field3;

+		}

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

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

+			return new ChildBuilderImpl<A>();

+		}

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

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

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

+		}

+	}

+	public static void test() {

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

+	}

+}