From f2530ab37efecf60e9ed1df2ed232822df209e4e Mon Sep 17 00:00:00 2001
From: Roel Spilker <r.spilker@gmail.com>
Date: Tue, 12 Dec 2017 01:03:51 +0100
Subject: handle @Builder.Default on generic fields. Fixes #1527

---
 src/core/lombok/javac/handlers/HandleBuilder.java    |  8 ++++----
 src/core/lombok/javac/handlers/JavacHandlerUtil.java | 19 ++++++++++---------
 2 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'src/core/lombok/javac/handlers')

diff --git a/src/core/lombok/javac/handlers/HandleBuilder.java b/src/core/lombok/javac/handlers/HandleBuilder.java
index 157828a0..ea436422 100644
--- a/src/core/lombok/javac/handlers/HandleBuilder.java
+++ b/src/core/lombok/javac/handlers/HandleBuilder.java
@@ -171,7 +171,7 @@ public class HandleBuilder extends JavacAnnotationHandler<Builder> {
 				if (isDefault != null) {
 					bfd.nameOfDefaultProvider = parent.toName("$default$" + bfd.name);
 					bfd.nameOfSetFlag = parent.toName(bfd.name + "$set");
-					JCMethodDecl md = generateDefaultProvider(bfd.nameOfDefaultProvider, fieldNode);
+					JCMethodDecl md = generateDefaultProvider(bfd.nameOfDefaultProvider, fieldNode, td.typarams);
 					recursiveSetGeneratedBy(md, ast, annotationNode.getContext());
 					if (md != null) injectMethod(tdParent, md);
 				}
@@ -543,7 +543,7 @@ public class HandleBuilder extends JavacAnnotationHandler<Builder> {
 		for (BuilderFieldData bfd : builderFields) {
 			if (bfd.nameOfSetFlag != null) {
 				args.append(maker.Conditional(maker.Ident(bfd.nameOfSetFlag), maker.Ident(bfd.name),
-					maker.Apply(List.<JCExpression>nil(), maker.Select(maker.Ident(((JCClassDecl) tdParent.get()).name), bfd.nameOfDefaultProvider), List.<JCExpression>nil())));
+					maker.Apply(typeParameterNames(maker, ((JCClassDecl) tdParent.get()).typarams), maker.Select(maker.Ident(((JCClassDecl) tdParent.get()).name), bfd.nameOfDefaultProvider), List.<JCExpression>nil())));
 			} else {
 				args.append(maker.Ident(bfd.name));
 			}
@@ -577,7 +577,7 @@ public class HandleBuilder extends JavacAnnotationHandler<Builder> {
 		return maker.MethodDef(maker.Modifiers(Flags.PUBLIC), type.toName(buildName), returnType, List.<JCTypeParameter>nil(), List.<JCVariableDecl>nil(), thrownExceptions, body, null);
 	}
 	
-	public JCMethodDecl generateDefaultProvider(Name methodName, JavacNode fieldNode) {
+	public JCMethodDecl generateDefaultProvider(Name methodName, JavacNode fieldNode, List<JCTypeParameter> params) {
 		JavacTreeMaker maker = fieldNode.getTreeMaker();
 		JCVariableDecl field = (JCVariableDecl) fieldNode.get();
 		
@@ -586,7 +586,7 @@ public class HandleBuilder extends JavacAnnotationHandler<Builder> {
 		
 		JCBlock body = maker.Block(0, List.<JCStatement>of(statement));
 		int modifiers = Flags.PRIVATE | Flags.STATIC;
-		return maker.MethodDef(maker.Modifiers(modifiers), methodName, cloneType(maker, field.vartype, field, fieldNode.getContext()), List.<JCTypeParameter>nil(), List.<JCVariableDecl>nil(), List.<JCExpression>nil(), body, null);
+		return maker.MethodDef(maker.Modifiers(modifiers), methodName, cloneType(maker, field.vartype, field, fieldNode.getContext()), copyTypeParams(fieldNode, params), List.<JCVariableDecl>nil(), List.<JCExpression>nil(), body, null);
 	}
 	
 	public JCMethodDecl generateBuilderMethod(boolean isStatic, String builderMethodName, String builderClassName, JavacNode source, JavacNode type, List<JCTypeParameter> typeParams) {
diff --git a/src/core/lombok/javac/handlers/JavacHandlerUtil.java b/src/core/lombok/javac/handlers/JavacHandlerUtil.java
index 23206b43..956ab446 100644
--- a/src/core/lombok/javac/handlers/JavacHandlerUtil.java
+++ b/src/core/lombok/javac/handlers/JavacHandlerUtil.java
@@ -1388,17 +1388,18 @@ public class JavacHandlerUtil {
 	}
 	
 	public static JCExpression namePlusTypeParamsToTypeReference(JavacTreeMaker maker, Name typeName, List<JCTypeParameter> params) {
+		if (params.isEmpty()) {
+			return maker.Ident(typeName);
+		}
+		return maker.TypeApply(maker.Ident(typeName), typeParameterNames(maker, params));
+	}
+	
+	public static List<JCExpression> typeParameterNames(JavacTreeMaker maker, List<JCTypeParameter> params) {
 		ListBuffer<JCExpression> typeArgs = new ListBuffer<JCExpression>();
-		
-		if (!params.isEmpty()) {
-			for (JCTypeParameter param : params) {
-				typeArgs.append(maker.Ident(param.name));
-			}
-			
-			return maker.TypeApply(maker.Ident(typeName), typeArgs.toList());
+		for (JCTypeParameter param : params) {
+			typeArgs.append(maker.Ident(param.name));
 		}
-		
-		return maker.Ident(typeName);
+		return typeArgs.toList();
 	}
 	
 	public static void sanityCheckForMethodGeneratingAnnotationsOnBuilderClass(JavacNode typeNode, JavacNode errorNode) {
-- 
cgit