[fixes #2647] consider lombok.builder.className for builder extends

3 files changed, 151 insertions, 0 deletions

diff --git a/test/transform/resource/after-delombok/SuperBuilderWithCustomBuilderClassName.java b/test/transform/resource/after-delombok/SuperBuilderWithCustomBuilderClassName.java
new file mode 100644
index 00000000..2d9498db
--- /dev/null
+++ b/test/transform/resource/after-delombok/SuperBuilderWithCustomBuilderClassName.java
@@ -0,0 +1,79 @@
+class SuperBuilderWithCustomBuilderClassName {
+	static class SuperClass {
+		@java.lang.SuppressWarnings("all")
+		public static abstract class Builder<C extends SuperBuilderWithCustomBuilderClassName.SuperClass, B extends SuperBuilderWithCustomBuilderClassName.SuperClass.Builder<C, B>> {
+			@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 "SuperBuilderWithCustomBuilderClassName.SuperClass.Builder()";
+			}
+		}
+		@java.lang.SuppressWarnings("all")
+		private static final class BuilderImpl extends SuperBuilderWithCustomBuilderClassName.SuperClass.Builder<SuperBuilderWithCustomBuilderClassName.SuperClass, SuperBuilderWithCustomBuilderClassName.SuperClass.BuilderImpl> {
+			@java.lang.SuppressWarnings("all")
+			private BuilderImpl() {
+			}
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			protected SuperBuilderWithCustomBuilderClassName.SuperClass.BuilderImpl self() {
+				return this;
+			}
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			public SuperBuilderWithCustomBuilderClassName.SuperClass build() {
+				return new SuperBuilderWithCustomBuilderClassName.SuperClass(this);
+			}
+		}
+		@java.lang.SuppressWarnings("all")
+		protected SuperClass(final SuperBuilderWithCustomBuilderClassName.SuperClass.Builder<?, ?> b) {
+		}
+		@java.lang.SuppressWarnings("all")
+		public static SuperBuilderWithCustomBuilderClassName.SuperClass.Builder<?, ?> builder() {
+			return new SuperBuilderWithCustomBuilderClassName.SuperClass.BuilderImpl();
+		}
+	}
+	static class SubClass extends SuperClass {
+		@java.lang.SuppressWarnings("all")
+		public static abstract class Builder<C extends SuperBuilderWithCustomBuilderClassName.SubClass, B extends SuperBuilderWithCustomBuilderClassName.SubClass.Builder<C, B>> extends SuperClass.Builder<C, B> {
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			protected abstract B self();
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			public abstract C build();
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			public java.lang.String toString() {
+				return "SuperBuilderWithCustomBuilderClassName.SubClass.Builder(super=" + super.toString() + ")";
+			}
+		}
+		@java.lang.SuppressWarnings("all")
+		private static final class BuilderImpl extends SuperBuilderWithCustomBuilderClassName.SubClass.Builder<SuperBuilderWithCustomBuilderClassName.SubClass, SuperBuilderWithCustomBuilderClassName.SubClass.BuilderImpl> {
+			@java.lang.SuppressWarnings("all")
+			private BuilderImpl() {
+			}
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			protected SuperBuilderWithCustomBuilderClassName.SubClass.BuilderImpl self() {
+				return this;
+			}
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			public SuperBuilderWithCustomBuilderClassName.SubClass build() {
+				return new SuperBuilderWithCustomBuilderClassName.SubClass(this);
+			}
+		}
+		@java.lang.SuppressWarnings("all")
+		protected SubClass(final SuperBuilderWithCustomBuilderClassName.SubClass.Builder<?, ?> b) {
+			super(b);
+		}
+		@java.lang.SuppressWarnings("all")
+		public static SuperBuilderWithCustomBuilderClassName.SubClass.Builder<?, ?> builder() {
+			return new SuperBuilderWithCustomBuilderClassName.SubClass.BuilderImpl();
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/SuperBuilderWithCustomBuilderClassName.java b/test/transform/resource/after-ecj/SuperBuilderWithCustomBuilderClassName.java
new file mode 100644
index 00000000..08acadfc
--- /dev/null
+++ b/test/transform/resource/after-ecj/SuperBuilderWithCustomBuilderClassName.java
@@ -0,0 +1,63 @@
+class SuperBuilderWithCustomBuilderClassName {
+  static @lombok.experimental.SuperBuilder class SuperClass {
+    public static abstract @java.lang.SuppressWarnings("all") class Builder<C extends SuperBuilderWithCustomBuilderClassName.SuperClass, B extends SuperBuilderWithCustomBuilderClassName.SuperClass.Builder<C, B>> {
+      public Builder() {
+        super();
+      }
+      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 "SuperBuilderWithCustomBuilderClassName.SuperClass.Builder()";
+      }
+    }
+    private static final @java.lang.SuppressWarnings("all") class BuilderImpl extends SuperBuilderWithCustomBuilderClassName.SuperClass.Builder<SuperBuilderWithCustomBuilderClassName.SuperClass, SuperBuilderWithCustomBuilderClassName.SuperClass.BuilderImpl> {
+      private BuilderImpl() {
+        super();
+      }
+      protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithCustomBuilderClassName.SuperClass.BuilderImpl self() {
+        return this;
+      }
+      public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithCustomBuilderClassName.SuperClass build() {
+        return new SuperBuilderWithCustomBuilderClassName.SuperClass(this);
+      }
+    }
+    protected @java.lang.SuppressWarnings("all") SuperClass(final SuperBuilderWithCustomBuilderClassName.SuperClass.Builder<?, ?> b) {
+      super();
+    }
+    public static @java.lang.SuppressWarnings("all") SuperBuilderWithCustomBuilderClassName.SuperClass.Builder<?, ?> builder() {
+      return new SuperBuilderWithCustomBuilderClassName.SuperClass.BuilderImpl();
+    }
+  }
+  static @lombok.experimental.SuperBuilder class SubClass extends SuperClass {
+    public static abstract @java.lang.SuppressWarnings("all") class Builder<C extends SuperBuilderWithCustomBuilderClassName.SubClass, B extends SuperBuilderWithCustomBuilderClassName.SubClass.Builder<C, B>> extends SuperClass.Builder<C, B> {
+      public Builder() {
+        super();
+      }
+      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.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+        return (("SuperBuilderWithCustomBuilderClassName.SubClass.Builder(super=" + super.toString()) + ")");
+      }
+    }
+    private static final @java.lang.SuppressWarnings("all") class BuilderImpl extends SuperBuilderWithCustomBuilderClassName.SubClass.Builder<SuperBuilderWithCustomBuilderClassName.SubClass, SuperBuilderWithCustomBuilderClassName.SubClass.BuilderImpl> {
+      private BuilderImpl() {
+        super();
+      }
+      protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithCustomBuilderClassName.SubClass.BuilderImpl self() {
+        return this;
+      }
+      public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithCustomBuilderClassName.SubClass build() {
+        return new SuperBuilderWithCustomBuilderClassName.SubClass(this);
+      }
+    }
+    protected @java.lang.SuppressWarnings("all") SubClass(final SuperBuilderWithCustomBuilderClassName.SubClass.Builder<?, ?> b) {
+      super(b);
+    }
+    public static @java.lang.SuppressWarnings("all") SuperBuilderWithCustomBuilderClassName.SubClass.Builder<?, ?> builder() {
+      return new SuperBuilderWithCustomBuilderClassName.SubClass.BuilderImpl();
+    }
+  }
+  SuperBuilderWithCustomBuilderClassName() {
+    super();
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/SuperBuilderWithCustomBuilderClassName.java b/test/transform/resource/before/SuperBuilderWithCustomBuilderClassName.java
new file mode 100644
index 00000000..23590045
--- /dev/null
+++ b/test/transform/resource/before/SuperBuilderWithCustomBuilderClassName.java
@@ -0,0 +1,9 @@
+//CONF: lombok.builder.className=Builder
+class SuperBuilderWithCustomBuilderClassName {
+	@lombok.experimental.SuperBuilder
+	static class SuperClass {
+	}
+	@lombok.experimental.SuperBuilder
+	static class SubClass extends SuperClass {
+	}
+}