feat: allow generics with SuperBuilder customization

Nathaniel Troutman · Nathaniel Troutman · commit 074f23621b03 · 2024-04-01T11:19:23.000-07:00
diff --git a/src/core/lombok/javac/handlers/HandleSuperBuilder.java b/src/core/lombok/javac/handlers/HandleSuperBuilder.java
@@ -1160,7 +1160,7 @@ private boolean constructorExists(JavacNode type, String builderClassName) {
 						if (lastIndexOfDot >= 0) {
 							typeName = typeName.substring(lastIndexOfDot+1);
 						}
-						if ((builderClassName+"<?, ?>").equals(typeName))
+						if (typeName.startsWith(builderClassName) && typeName.endsWith("?, ?>"))
 							return true;
 					}
 				}
diff --git a/test/transform/resource/after-delombok/SuperBuilderCustomized.java b/test/transform/resource/after-delombok/SuperBuilderCustomized.java
@@ -1,7 +1,7 @@
 import java.util.List;
 public class SuperBuilderCustomized {
-	public static class Parent {
-		public static abstract class ParentBuilder<C extends Parent, B extends ParentBuilder<C, B>> {
+	public static class Parent<T> {
+		public static abstract class ParentBuilder<T, C extends Parent<T>, B extends ParentBuilder<T, C, B>> {
 			@java.lang.SuppressWarnings("all")
 			private int field1;
 			public B resetToDefault() {
@@ -23,31 +23,31 @@ public java.lang.String toString() {
 			}
 		}
 		int field1;
-		protected Parent(ParentBuilder<?, ?> b) {
+		protected Parent(ParentBuilder<?, ?, ?> b) {
 			if (b.field1 == 0) throw new IllegalArgumentException("field1 must be != 0");
 			this.field1 = b.field1;
 		}
-		public static SuperBuilderCustomized.Parent.ParentBuilder<?, ?> builder(int field1) {
+		public static SuperBuilderCustomized.Parent.ParentBuilder<?, ?, ?> builder(int field1) {
 			return new SuperBuilderCustomized.Parent.ParentBuilderImpl().field1(field1);
 		}
 		@java.lang.SuppressWarnings("all")
-		private static final class ParentBuilderImpl extends SuperBuilderCustomized.Parent.ParentBuilder<SuperBuilderCustomized.Parent, SuperBuilderCustomized.Parent.ParentBuilderImpl> {
+		private static final class ParentBuilderImpl<T> extends SuperBuilderCustomized.Parent.ParentBuilder<T, SuperBuilderCustomized.Parent<T>, SuperBuilderCustomized.Parent.ParentBuilderImpl<T>> {
 			@java.lang.SuppressWarnings("all")
 			private ParentBuilderImpl() {
 			}
 			@java.lang.Override
 			@java.lang.SuppressWarnings("all")
-			protected SuperBuilderCustomized.Parent.ParentBuilderImpl self() {
+			protected SuperBuilderCustomized.Parent.ParentBuilderImpl<T> self() {
 				return this;
 			}
 			@java.lang.Override
 			@java.lang.SuppressWarnings("all")
-			public SuperBuilderCustomized.Parent build() {
-				return new SuperBuilderCustomized.Parent(this);
+			public SuperBuilderCustomized.Parent<T> build() {
+				return new SuperBuilderCustomized.Parent<T>(this);
 			}
 		}
 	}
-	public static class Child extends Parent {
+	public static class Child extends Parent<String> {
 		private static final class ChildBuilderImpl extends ChildBuilder<Child, ChildBuilderImpl> {
 			@Override
 			public Child build() {
@@ -68,7 +68,7 @@ protected SuperBuilderCustomized.Child.ChildBuilderImpl self() {
 			return new ChildBuilderImpl().field2(10.0);
 		}
 		@java.lang.SuppressWarnings("all")
-		public static abstract class ChildBuilder<C extends SuperBuilderCustomized.Child, B extends SuperBuilderCustomized.Child.ChildBuilder<C, B>> extends Parent.ParentBuilder<C, B> {
+		public static abstract class ChildBuilder<C extends SuperBuilderCustomized.Child, B extends SuperBuilderCustomized.Child.ChildBuilder<C, B>> extends Parent.ParentBuilder<String, C, B> {
 			@java.lang.SuppressWarnings("all")
 			private double field2;
 			/**
diff --git a/test/transform/resource/after-ecj/SuperBuilderCustomized.java b/test/transform/resource/after-ecj/SuperBuilderCustomized.java
@@ -1,7 +1,7 @@
 import java.util.List;
 public class SuperBuilderCustomized {
-  public static @lombok.experimental.SuperBuilder class Parent {
-    public static abstract class ParentBuilder<C extends Parent, B extends ParentBuilder<C, B>> {
+  public static @lombok.experimental.SuperBuilder class Parent<T> {
+    public static abstract class ParentBuilder<T, C extends Parent<T>, B extends ParentBuilder<T, C, B>> {
       private @java.lang.SuppressWarnings("all") int field1;
       public ParentBuilder() {
         super();
@@ -20,25 +20,25 @@ public B field1(int field1) {
         return (("SuperBuilderCustomized.Parent.ParentBuilder(field1=" + this.field1) + ")");
       }
     }
-    private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends SuperBuilderCustomized.Parent.ParentBuilder<SuperBuilderCustomized.Parent, SuperBuilderCustomized.Parent.ParentBuilderImpl> {
+    private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl<T> extends SuperBuilderCustomized.Parent.ParentBuilder<T, SuperBuilderCustomized.Parent<T>, SuperBuilderCustomized.Parent.ParentBuilderImpl<T>> {
       private ParentBuilderImpl() {
         super();
       }
-      protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderCustomized.Parent.ParentBuilderImpl self() {
+      protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderCustomized.Parent.ParentBuilderImpl<T> self() {
         return this;
       }
-      public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderCustomized.Parent build() {
-        return new SuperBuilderCustomized.Parent(this);
+      public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderCustomized.Parent<T> build() {
+        return new SuperBuilderCustomized.Parent<T>(this);
       }
     }
     int field1;
-    protected Parent(ParentBuilder<?, ?> b) {
+    protected Parent(ParentBuilder<?, ?, ?> b) {
       super();
       if ((b.field1 == 0))
           throw new IllegalArgumentException("field1 must be != 0");
       this.field1 = b.field1;
     }
-    public static SuperBuilderCustomized.Parent.ParentBuilder<?, ?> builder(int field1) {
+    public static SuperBuilderCustomized.Parent.ParentBuilder<?, ?, ?> builder(int field1) {
       return new SuperBuilderCustomized.Parent.ParentBuilderImpl().field1(field1);
     }
   }
diff --git a/test/transform/resource/before/SuperBuilderCustomized.java b/test/transform/resource/before/SuperBuilderCustomized.java
@@ -3,8 +3,8 @@
 
 public class SuperBuilderCustomized {
 	@lombok.experimental.SuperBuilder
-	public static class Parent {
-		public static abstract class ParentBuilder<C extends Parent, B extends ParentBuilder<C, B>> {
+	public static class Parent<T> {
+		public static abstract class ParentBuilder<T, C extends Parent<T>, B extends ParentBuilder<T, C, B>> {
 			public B resetToDefault() {
 				field1 = 0;
 				return self();
@@ -16,19 +16,19 @@ public B field1(int field1) {
 		}
 		int field1;
 		
-		protected Parent(ParentBuilder<?, ?> b) {
+		protected Parent(ParentBuilder<?, ?, ?> b) {
 			if (b.field1 == 0)
 				throw new IllegalArgumentException("field1 must be != 0");
 			this.field1 = b.field1;
 		}
 		
-		public static SuperBuilderCustomized.Parent.ParentBuilder<?, ?> builder(int field1) {
+		public static SuperBuilderCustomized.Parent.ParentBuilder<?, ?, ?> builder(int field1) {
 			return new SuperBuilderCustomized.Parent.ParentBuilderImpl().field1(field1);
 		}
 	}
 	
 	@lombok.experimental.SuperBuilder
-	public static class Child extends Parent {
+	public static class Child extends Parent<String> {
 		private static final class ChildBuilderImpl extends ChildBuilder<Child, ChildBuilderImpl> {
 			@Override
 			public Child build() {

Original file line number	Diff line number	Diff line change
`@@ -1160,7 +1160,7 @@ private boolean constructorExists(JavacNode type, String builderClassName) {`
`1160`	`1160`	`if (lastIndexOfDot >= 0) {`
`1161`	`1161`	`typeName = typeName.substring(lastIndexOfDot+1);`
`1162`	`1162`	`}`
`1163`		`- if ((builderClassName+"<?, ?>").equals(typeName))`
	`1163`	`+ if (typeName.startsWith(builderClassName) && typeName.endsWith("?, ?>"))`
`1164`	`1164`	`return true;`
`1165`	`1165`	`}`
`1166`	`1166`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import java.util.List;`
`2`	`2`	`public class SuperBuilderCustomized {`
`3`		`- public static @lombok.experimental.SuperBuilder class Parent {`
`4`		`- public static abstract class ParentBuilder<C extends Parent, B extends ParentBuilder<C, B>> {`
	`3`	`+ public static @lombok.experimental.SuperBuilder class Parent<T> {`
	`4`	`+ public static abstract class ParentBuilder<T, C extends Parent<T>, B extends ParentBuilder<T, C, B>> {`
`5`	`5`	`private @java.lang.SuppressWarnings("all") int field1;`
`6`	`6`	`public ParentBuilder() {`
`7`	`7`	`super();`
`@@ -20,25 +20,25 @@ public B field1(int field1) {`
`20`	`20`	`return (("SuperBuilderCustomized.Parent.ParentBuilder(field1=" + this.field1) + ")");`
`21`	`21`	`}`
`22`	`22`	`}`
`23`		`- private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends SuperBuilderCustomized.Parent.ParentBuilder<SuperBuilderCustomized.Parent, SuperBuilderCustomized.Parent.ParentBuilderImpl> {`
	`23`	`+ private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl<T> extends SuperBuilderCustomized.Parent.ParentBuilder<T, SuperBuilderCustomized.Parent<T>, SuperBuilderCustomized.Parent.ParentBuilderImpl<T>> {`
`24`	`24`	`private ParentBuilderImpl() {`
`25`	`25`	`super();`
`26`	`26`	`}`
`27`		`- protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderCustomized.Parent.ParentBuilderImpl self() {`
	`27`	`+ protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderCustomized.Parent.ParentBuilderImpl<T> self() {`
`28`	`28`	`return this;`
`29`	`29`	`}`
`30`		`- public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderCustomized.Parent build() {`
`31`		`- return new SuperBuilderCustomized.Parent(this);`
	`30`	`+ public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderCustomized.Parent<T> build() {`
	`31`	`+ return new SuperBuilderCustomized.Parent<T>(this);`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`	`int field1;`
`35`		`- protected Parent(ParentBuilder<?, ?> b) {`
	`35`	`+ protected Parent(ParentBuilder<?, ?, ?> b) {`
`36`	`36`	`super();`
`37`	`37`	`if ((b.field1 == 0))`
`38`	`38`	`throw new IllegalArgumentException("field1 must be != 0");`
`39`	`39`	`this.field1 = b.field1;`
`40`	`40`	`}`
`41`		`- public static SuperBuilderCustomized.Parent.ParentBuilder<?, ?> builder(int field1) {`
	`41`	`+ public static SuperBuilderCustomized.Parent.ParentBuilder<?, ?, ?> builder(int field1) {`
`42`	`42`	`return new SuperBuilderCustomized.Parent.ParentBuilderImpl().field1(field1);`
`43`	`43`	`}`
`44`	`44`	`}`