Merge pull request #2357 from janrieke/superBuilderSetterPrefix

setter prefixes for SuperBuilder

9 files changed, 526 insertions, 9 deletions

diff --git a/test/transform/resource/after-delombok/SuperBuilderCustomized.java b/test/transform/resource/after-delombok/SuperBuilderCustomized.java
index e8f95407..bffa72fa 100644
--- a/test/transform/resource/after-delombok/SuperBuilderCustomized.java
+++ b/test/transform/resource/after-delombok/SuperBuilderCustomized.java
@@ -8,15 +8,14 @@ public class SuperBuilderCustomized {
 				field1 = 0;

 				return self();

 			}

+			public B field1(int field1) {

+				this.field1 = field1 + 1;

+				return self();

+			}

 			@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.Override

 			@java.lang.SuppressWarnings("all")

 			public java.lang.String toString() {

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

+public class SuperBuilderCustomizedWithSetterPrefix {

+	public static class Parent {

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

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

+			private int field1;

+			public B setField1(int field1) {

+				this.field1 = field1 + 1;

+				return self();

+			}

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

+			protected abstract B self();

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

+			public abstract C build();

+			@java.lang.Override

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

+			public java.lang.String toString() {

+				return "SuperBuilderCustomizedWithSetterPrefix.Parent.ParentBuilder(field1=" + this.field1 + ")";

+			}

+		}

+		int field1;

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

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

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

+			private ParentBuilderImpl() {

+			}

+			@java.lang.Override

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

+			protected SuperBuilderCustomizedWithSetterPrefix.Parent.ParentBuilderImpl self() {

+				return this;

+			}

+			@java.lang.Override

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

+			public SuperBuilderCustomizedWithSetterPrefix.Parent build() {

+				return new SuperBuilderCustomizedWithSetterPrefix.Parent(this);

+			}

+		}

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

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

+			this.field1 = b.field1;

+		}

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

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

+			return new SuperBuilderCustomizedWithSetterPrefix.Parent.ParentBuilderImpl();

+		}

+	}

+	public static void test() {

+		Parent x = Parent.builder().setField1(5).build();

+	}

+}

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

+public class SuperBuilderWithSetterPrefix {

+	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 SuperBuilderWithSetterPrefix.Parent, B extends SuperBuilderWithSetterPrefix.Parent.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) {

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

+				return self();

+			}

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

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

+				b.withField1(instance.field1);

+				b.withObtainViaField(instance.field1);

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

+				b.withObtainViaStaticMethod(SuperBuilderWithSetterPrefix.Parent.staticMethod(instance));

+				b.withItems(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 withField1(final int field1) {

+				this.field1 = field1;

+				return self();

+			}

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

+			public B withObtainViaField(final int obtainViaField) {

+				this.obtainViaField = obtainViaField;

+				return self();

+			}

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

+			public B withObtainViaMethod(final int obtainViaMethod) {

+				this.obtainViaMethod = obtainViaMethod;

+				return self();

+			}

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

+			public B withObtainViaStaticMethod(final String obtainViaStaticMethod) {

+				this.obtainViaStaticMethod = obtainViaStaticMethod;

+				return self();

+			}

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

+			public B withItem(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 withItems(final java.util.Collection<? extends String> items) {

+				if (items == null) {

+					throw new java.lang.NullPointerException("items cannot be null");

+				}

+				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 "SuperBuilderWithSetterPrefix.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 SuperBuilderWithSetterPrefix.Parent.ParentBuilder<SuperBuilderWithSetterPrefix.Parent, SuperBuilderWithSetterPrefix.Parent.ParentBuilderImpl> {

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

+			private ParentBuilderImpl() {

+			}

+			@java.lang.Override

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

+			protected SuperBuilderWithSetterPrefix.Parent.ParentBuilderImpl self() {

+				return this;

+			}

+			@java.lang.Override

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

+			public SuperBuilderWithSetterPrefix.Parent build() {

+				return new SuperBuilderWithSetterPrefix.Parent(this);

+			}

+		}

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

+		protected Parent(final SuperBuilderWithSetterPrefix.Parent.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 SuperBuilderWithSetterPrefix.Parent.ParentBuilder<?, ?> builder() {

+			return new SuperBuilderWithSetterPrefix.Parent.ParentBuilderImpl();

+		}

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

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

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

+		}

+	}

+	public static class Child extends Parent {

+		private double field3;

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

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

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

+				return self();

+			}

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

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

+				b.setField3(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 setField3(final double field3) {

+				this.field3 = field3;

+				return self();

+			}

+			@java.lang.Override

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

+			public java.lang.String toString() {

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

+			}

+		}

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

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

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

+			private ChildBuilderImpl() {

+			}

+			@java.lang.Override

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

+			protected SuperBuilderWithSetterPrefix.Child.ChildBuilderImpl self() {

+				return this;

+			}

+			@java.lang.Override

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

+			public SuperBuilderWithSetterPrefix.Child build() {

+				return new SuperBuilderWithSetterPrefix.Child(this);

+			}

+		}

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

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

+			super(b);

+			this.field3 = b.field3;

+		}

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

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

+			return new SuperBuilderWithSetterPrefix.Child.ChildBuilderImpl();

+		}

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

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

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

+		}

+	}

+	public static void test() {

+		Child x = Child.builder().setField3(0.0).withField1(5).withItem("").build().toBuilder().build();

+	}

+}

diff --git a/test/transform/resource/after-ecj/SuperBuilderCustomized.java b/test/transform/resource/after-ecj/SuperBuilderCustomized.java
index 40d1f384..32317f6a 100644
--- a/test/transform/resource/after-ecj/SuperBuilderCustomized.java
+++ b/test/transform/resource/after-ecj/SuperBuilderCustomized.java
@@ -10,12 +10,12 @@ public class SuperBuilderCustomized {
         field1 = 0;

         return self();

       }

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

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

-      public @java.lang.SuppressWarnings("all") B field1(final int field1) {

-        this.field1 = field1;

+      public B field1(int field1) {

+        this.field1 = (field1 + 1);

         return self();

       }

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

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

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

         return (("SuperBuilderCustomized.Parent.ParentBuilder(field1=" + this.field1) + ")");

       }

diff --git a/test/transform/resource/after-ecj/SuperBuilderCustomizedWithSetterPrefix.java b/test/transform/resource/after-ecj/SuperBuilderCustomizedWithSetterPrefix.java
new file mode 100644
index 00000000..283bacd4
--- /dev/null
+++ b/test/transform/resource/after-ecj/SuperBuilderCustomizedWithSetterPrefix.java
@@ -0,0 +1,45 @@
+import java.util.List;

+public class SuperBuilderCustomizedWithSetterPrefix {

+  public static @lombok.experimental.SuperBuilder(setterPrefix = "set") class Parent {

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

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

+      public ParentBuilder() {

+        super();

+      }

+      public B setField1(int field1) {

+        this.field1 = (field1 + 1);

+        return self();

+      }

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

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

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

+        return (("SuperBuilderCustomizedWithSetterPrefix.Parent.ParentBuilder(field1=" + this.field1) + ")");

+      }

+    }

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

+      private ParentBuilderImpl() {

+        super();

+      }

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

+        return this;

+      }

+      public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderCustomizedWithSetterPrefix.Parent build() {

+        return new SuperBuilderCustomizedWithSetterPrefix.Parent(this);

+      }

+    }

+    int field1;

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

+      super();

+      this.field1 = b.field1;

+    }

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

+      return new SuperBuilderCustomizedWithSetterPrefix.Parent.ParentBuilderImpl();

+    }

+  }

+  public SuperBuilderCustomizedWithSetterPrefix() {

+    super();

+  }

+  public static void test() {

+    Parent x = Parent.builder().setField1(5).build();

+  }

+}

diff --git a/test/transform/resource/after-ecj/SuperBuilderWithSetterPrefix.java b/test/transform/resource/after-ecj/SuperBuilderWithSetterPrefix.java
new file mode 100644
index 00000000..6d24f613
--- /dev/null
+++ b/test/transform/resource/after-ecj/SuperBuilderWithSetterPrefix.java
@@ -0,0 +1,168 @@
+import java.util.List;

+public class SuperBuilderWithSetterPrefix {

+  public static @lombok.experimental.SuperBuilder(toBuilder = true,setterPrefix = "with") class Parent {

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

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

+      private @java.lang.SuppressWarnings("all") int obtainViaField;

+      private @java.lang.SuppressWarnings("all") int obtainViaMethod;

+      private @java.lang.SuppressWarnings("all") String obtainViaStaticMethod;

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

+      public ParentBuilder() {

+        super();

+      }

+      protected @java.lang.SuppressWarnings("all") B $fillValuesFrom(final C instance) {

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

+        return self();

+      }

+      private static @java.lang.SuppressWarnings("all") void $fillValuesFromInstanceIntoBuilder(final SuperBuilderWithSetterPrefix.Parent instance, final SuperBuilderWithSetterPrefix.Parent.ParentBuilder<?, ?> b) {

+        b.withField1(instance.field1);

+        b.withObtainViaField(instance.field1);

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

+        b.withObtainViaStaticMethod(SuperBuilderWithSetterPrefix.Parent.staticMethod(instance));

+        b.withItems(((instance.items == null) ? java.util.Collections.emptyList() : instance.items));

+      }

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

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

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

+        this.field1 = field1;

+        return self();

+      }

+      public @java.lang.SuppressWarnings("all") B withObtainViaField(final int obtainViaField) {

+        this.obtainViaField = obtainViaField;

+        return self();

+      }

+      public @java.lang.SuppressWarnings("all") B withObtainViaMethod(final int obtainViaMethod) {

+        this.obtainViaMethod = obtainViaMethod;

+        return self();

+      }

+      public @java.lang.SuppressWarnings("all") B withObtainViaStaticMethod(final String obtainViaStaticMethod) {

+        this.obtainViaStaticMethod = obtainViaStaticMethod;

+        return self();

+      }

+      public @java.lang.SuppressWarnings("all") B withItem(final 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 withItems(final java.util.Collection<? extends String> items) {

+        if ((items == null))

+            {

+              throw new java.lang.NullPointerException("items cannot be null");

+            }

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

+      }

+    }

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

+      private ParentBuilderImpl() {

+        super();

+      }

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

+        return this;

+      }

+      public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithSetterPrefix.Parent build() {

+        return new SuperBuilderWithSetterPrefix.Parent(this);

+      }

+    }

+    private int field1;

+    @lombok.Builder.ObtainVia(field = "field1") int obtainViaField;

+    @lombok.Builder.ObtainVia(method = "method") int obtainViaMethod;

+    @lombok.Builder.ObtainVia(method = "staticMethod",isStatic = true) String obtainViaStaticMethod;

+    @lombok.Singular List<String> items;

+    private int method() {

+      return 2;

+    }

+    private static String staticMethod(Parent instance) {

+      return "staticMethod";

+    }

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

+      super();

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

+    }

+    public @java.lang.SuppressWarnings("all") SuperBuilderWithSetterPrefix.Parent.ParentBuilder<?, ?> toBuilder() {

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

+    }

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

+      return new SuperBuilderWithSetterPrefix.Parent.ParentBuilderImpl();

+    }

+  }

+  public static @lombok.experimental.SuperBuilder(toBuilder = true,setterPrefix = "set") class Child extends Parent {

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

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

+      public ChildBuilder() {

+        super();

+      }

+      protected @java.lang.Override @java.lang.SuppressWarnings("all") B $fillValuesFrom(final C instance) {

+        super.$fillValuesFrom(instance);

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

+        return self();

+      }

+      private static @java.lang.SuppressWarnings("all") void $fillValuesFromInstanceIntoBuilder(final SuperBuilderWithSetterPrefix.Child instance, final SuperBuilderWithSetterPrefix.Child.ChildBuilder<?, ?> b) {

+        b.setField3(instance.field3);

+      }

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

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

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

+        this.field3 = field3;

+        return self();

+      }

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

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

+      }

+    }

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

+      private ChildBuilderImpl() {

+        super();

+      }

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

+        return this;

+      }

+      public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithSetterPrefix.Child build() {

+        return new SuperBuilderWithSetterPrefix.Child(this);

+      }

+    }

+    private double field3;

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

+      super(b);

+      this.field3 = b.field3;

+    }

+    public @java.lang.SuppressWarnings("all") SuperBuilderWithSetterPrefix.Child.ChildBuilder<?, ?> toBuilder() {

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

+    }

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

+      return new SuperBuilderWithSetterPrefix.Child.ChildBuilderImpl();

+    }

+  }

+  public SuperBuilderWithSetterPrefix() {

+    super();

+  }

+  public static void test() {

+    Child x = Child.builder().setField3(0.0).withField1(5).withItem("").build().toBuilder().build();

+  }

+}

diff --git a/test/transform/resource/before/SuperBuilderCustomized.java b/test/transform/resource/before/SuperBuilderCustomized.java
index 58f2797c..77830587 100644
--- a/test/transform/resource/before/SuperBuilderCustomized.java
+++ b/test/transform/resource/before/SuperBuilderCustomized.java
@@ -8,6 +8,10 @@ public class SuperBuilderCustomized {
 				field1 = 0;
 				return self();
 			}
+			public B field1(int field1) {
+				this.field1 = field1 + 1;
+				return self();
+			}
 		}
 		int field1;
 	}
diff --git a/test/transform/resource/before/SuperBuilderCustomizedWithSetterPrefix.java b/test/transform/resource/before/SuperBuilderCustomizedWithSetterPrefix.java
new file mode 100644
index 00000000..be2cfc4a
--- /dev/null
+++ b/test/transform/resource/before/SuperBuilderCustomizedWithSetterPrefix.java
@@ -0,0 +1,18 @@
+import java.util.List;
+
+public class SuperBuilderCustomizedWithSetterPrefix {
+	@lombok.experimental.SuperBuilder(setterPrefix = "set")
+	public static class Parent {
+		public static abstract class ParentBuilder<C extends Parent, B extends ParentBuilder<C, B>> {
+			public B setField1(int field1) {
+				this.field1 = field1 + 1;
+				return self();
+			}
+		}
+		int field1;
+	}
+	
+	public static void test() {
+		Parent x = Parent.builder().setField1(5).build();
+	}
+}
diff --git a/test/transform/resource/before/SuperBuilderWithSetterPrefix.java b/test/transform/resource/before/SuperBuilderWithSetterPrefix.java
new file mode 100644
index 00000000..5eaef360
--- /dev/null
+++ b/test/transform/resource/before/SuperBuilderWithSetterPrefix.java
@@ -0,0 +1,32 @@
+import java.util.List;
+
+public class SuperBuilderWithSetterPrefix {
+	@lombok.experimental.SuperBuilder(toBuilder=true, setterPrefix = "with")
+	public static class Parent {
+		private int field1;
+		@lombok.Builder.ObtainVia(field="field1")
+		int obtainViaField;
+		@lombok.Builder.ObtainVia(method="method")
+		int obtainViaMethod;
+		@lombok.Builder.ObtainVia(method = "staticMethod", isStatic = true)
+		String obtainViaStaticMethod;
+		@lombok.Singular List<String> items;
+		
+		private int method() {
+			return 2;
+		}
+
+		private static String staticMethod(Parent instance) {
+			return "staticMethod";
+		}
+	}
+	
+	@lombok.experimental.SuperBuilder(toBuilder=true, setterPrefix = "set")
+	public static class Child extends Parent {
+		private double field3;
+	}
+	
+	public static void test() {
+		Child x = Child.builder().setField3(0.0).withField1(5).withItem("").build().toBuilder().build();
+	}
+}