From 2a6c0c16b303b6af0b96e296858c2c54140f6dfe Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot <reinier@zwitserloot.com>
Date: Wed, 28 Mar 2018 00:38:07 +0200
Subject: [PATCH] =?UTF-8?q?[builderParentClass]=20Code=20to=20handle=20bui?=
 =?UTF-8?q?lder=20on=20enums=20removed;=20that=20doesn=E2=80=99t=20make=20?=
 =?UTF-8?q?a=20heck=20of=20a=20lot=20of=20sense=20and=20enums=20aren?=
 =?UTF-8?q?=E2=80=99t=20extensible=20in=20the=20first=20place.=20Also=20fi?=
 =?UTF-8?q?xed=20up=20a=20wrong=20access=20level;=20now=20all=20existing?=
 =?UTF-8?q?=20builder=20tests=20pass.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/lombok/eclipse/handlers/HandleBuilder.java | 5 +----
 src/core/lombok/javac/handlers/HandleBuilder.java   | 7 ++-----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/core/lombok/eclipse/handlers/HandleBuilder.java b/src/core/lombok/eclipse/handlers/HandleBuilder.java
index b5c6e79384..08ef91b58e 100644
--- a/src/core/lombok/eclipse/handlers/HandleBuilder.java
+++ b/src/core/lombok/eclipse/handlers/HandleBuilder.java
@@ -604,12 +604,9 @@ private void generateBuilderBasedConstructor(EclipseNode typeNode, List<BuilderF
 		TypeDeclaration typeDeclaration = ((TypeDeclaration) typeNode.get());
 		long p = (long) source.sourceStart << 32 | source.sourceEnd;
 		
-		boolean isEnum = (((TypeDeclaration) typeNode.get()).modifiers & ClassFileConstants.AccEnum) != 0;
-		AccessLevel level = isEnum ? AccessLevel.PRIVATE : AccessLevel.PROTECTED;
-		
 		ConstructorDeclaration constructor = new ConstructorDeclaration(((CompilationUnitDeclaration) typeNode.top().get()).compilationResult);
 		
-		constructor.modifiers = toEclipseModifier(level);
+		constructor.modifiers = toEclipseModifier(AccessLevel.PROTECTED);
 		constructor.selector = typeDeclaration.name;
 		if (callBuilderBasedSuperConstructor) {
 			constructor.constructorCall = new ExplicitConstructorCall(ExplicitConstructorCall.Super);
diff --git a/src/core/lombok/javac/handlers/HandleBuilder.java b/src/core/lombok/javac/handlers/HandleBuilder.java
index 4c575d91c4..a74ebfda42 100644
--- a/src/core/lombok/javac/handlers/HandleBuilder.java
+++ b/src/core/lombok/javac/handlers/HandleBuilder.java
@@ -195,7 +195,7 @@ private static class BuilderFieldData {
 				boolean callBuilderBasedSuperConstructor = extendsClause != null;
 				generateBuilderBasedConstructor(tdParent, builderFields, annotationNode, builderClassName, callBuilderBasedSuperConstructor);
 			} else {
-				handleConstructor.generateConstructor(tdParent, AccessLevel.PROTECTED, List.<JCAnnotation>nil(), allFields.toList(), false, null, SkipIfConstructorExists.I_AM_BUILDER, annotationNode);
+				handleConstructor.generateConstructor(tdParent, AccessLevel.PACKAGE, List.<JCAnnotation>nil(), allFields.toList(), false, null, SkipIfConstructorExists.I_AM_BUILDER, annotationNode);
 			}
 			
 			returnType = namePlusTypeParamsToTypeReference(tdParent.getTreeMaker(), td.name, td.typarams);
@@ -569,9 +569,6 @@ private JCMethodDecl generateToBuilderMethod(String toBuilderMethodName, String
 	private void generateBuilderBasedConstructor(JavacNode typeNode, java.util.List<BuilderFieldData> builderFields, JavacNode source, String builderClassnameAsParameter, boolean callBuilderBasedSuperConstructor) {
 		JavacTreeMaker maker = typeNode.getTreeMaker();
 		
-		boolean isEnum = (((JCClassDecl) typeNode.get()).mods.flags & Flags.ENUM) != 0;
-		AccessLevel level = isEnum ? AccessLevel.PRIVATE : AccessLevel.PROTECTED;
-		
 		ListBuffer<JCStatement> nullChecks = new ListBuffer<JCStatement>();
 		ListBuffer<JCStatement> statements = new ListBuffer<JCStatement>();
 		
@@ -599,7 +596,7 @@ private void generateBuilderBasedConstructor(JavacNode typeNode, java.util.List<
 			statements.append(maker.Exec(assign));
 		}
 		
-		JCModifiers mods = maker.Modifiers(toJavacModifier(level), List.<JCAnnotation>nil());
+		JCModifiers mods = maker.Modifiers(toJavacModifier(AccessLevel.PROTECTED), List.<JCAnnotation>nil());
 		
 		// Create a constructor that has just the builder as parameter.
 		ListBuffer<JCVariableDecl> params = new ListBuffer<JCVariableDecl>();