[#2693] Review and updates for javabeans-style capitalization lombok.config

3 files changed, 7 insertions, 7 deletions

diff --git a/src/core/lombok/javac/handlers/HandleBuilder.java b/src/core/lombok/javac/handlers/HandleBuilder.java
index bb852b55..d8fdfb1b 100644
--- a/src/core/lombok/javac/handlers/HandleBuilder.java
+++ b/src/core/lombok/javac/handlers/HandleBuilder.java
@@ -636,7 +636,7 @@ public class HandleBuilder extends JavacAnnotationHandler<Builder> {
 		for (BuilderFieldData bfd : job.builderFields) {
 			String setterPrefix = !prefix.isEmpty() ? prefix : job.oldFluent ? "" : "set";
 			String prefixedSetterName = bfd.name.toString();
-			if (!setterPrefix.isEmpty()) prefixedSetterName = HandlerUtil.buildAccessorName(setterPrefix, prefixedSetterName);
+			if (!setterPrefix.isEmpty()) prefixedSetterName = HandlerUtil.buildAccessorName(job.sourceNode, setterPrefix, prefixedSetterName);
 			
 			Name setterName = job.toName(prefixedSetterName);
 			JCExpression[] tgt = new JCExpression[bfd.singularData == null ? 1 : 2];
@@ -901,7 +901,7 @@ public class HandleBuilder extends JavacAnnotationHandler<Builder> {
 	private void makePrefixedSetterMethodForBuilder(BuilderJob job, BuilderFieldData bfd, boolean deprecate, String prefix) {
 		JavacNode fieldNode = bfd.createdFields.get(0);
 		String setterPrefix = !prefix.isEmpty() ? prefix : job.oldFluent ? "" : "set";
-		String setterName = HandlerUtil.buildAccessorName(setterPrefix, bfd.name.toString());
+		String setterName = HandlerUtil.buildAccessorName(job.sourceNode, setterPrefix, bfd.name.toString());
 		Name setterName_ = job.builderType.toName(setterName);
 		
 		for (JavacNode child : job.builderType.down()) {
diff --git a/src/core/lombok/javac/handlers/HandleSuperBuilder.java b/src/core/lombok/javac/handlers/HandleSuperBuilder.java
index 50193f99..b5bc73fb 100644
--- a/src/core/lombok/javac/handlers/HandleSuperBuilder.java
+++ b/src/core/lombok/javac/handlers/HandleSuperBuilder.java
@@ -777,7 +777,7 @@ public class HandleSuperBuilder extends JavacAnnotationHandler<SuperBuilder> {
 			arg = maker.Conditional(eqNull, emptyCollection, tgt[1]);
 		}
 		
-		String setterName = HandlerUtil.buildAccessorName(setterPrefix, bfd.name.toString());
+		String setterName = HandlerUtil.buildAccessorName(job.sourceNode, setterPrefix, bfd.name.toString());
 		JCMethodInvocation apply = maker.Apply(List.<JCExpression>nil(), maker.Select(maker.Ident(job.toName(BUILDER_VARIABLE_NAME)), job.toName(setterName)), List.of(arg));
 		JCExpressionStatement exec = maker.Exec(apply);
 		return exec;
@@ -949,7 +949,7 @@ public class HandleSuperBuilder extends JavacAnnotationHandler<SuperBuilder> {
 	}
 	
 	private void generateSimpleSetterMethodForBuilder(SuperBuilderJob job, boolean deprecate, JavacNode fieldNode, Name paramName, Name nameOfSetFlag, JCExpression returnType, JCStatement returnStatement, List<JCAnnotation> annosOnParam, JavacNode originalFieldNode, String setterPrefix) {
-		String setterName = HandlerUtil.buildAccessorName(setterPrefix, paramName.toString());
+		String setterName = HandlerUtil.buildAccessorName(job.sourceNode, setterPrefix, paramName.toString());
 		Name setterName_ = job.builderType.toName(setterName);
 		
 		for (JavacNode child : job.builderType.down()) {
diff --git a/src/core/lombok/javac/handlers/JavacSingularsRecipes.java b/src/core/lombok/javac/handlers/JavacSingularsRecipes.java
index 4ca09b82..77fcd4ea 100644
--- a/src/core/lombok/javac/handlers/JavacSingularsRecipes.java
+++ b/src/core/lombok/javac/handlers/JavacSingularsRecipes.java
@@ -300,7 +300,7 @@ public class JavacSingularsRecipes {
 			ListBuffer<JCStatement> statements = new ListBuffer<JCStatement>();
 			statements.append(clearStatement);
 			
-			Name methodName = builderType.toName(HandlerUtil.buildAccessorName("clear", data.getPluralName().toString()));
+			Name methodName = builderType.toName(HandlerUtil.buildAccessorName(source, "clear", data.getPluralName().toString()));
 			finishAndInjectMethod(cfv, maker, returnType, returnStatement, data, builderType, source, deprecate, statements, methodName, List.<JCVariableDecl>nil(), List.<JCAnnotation>nil(), access, null);
 		}
 		
@@ -312,7 +312,7 @@ public class JavacSingularsRecipes {
 			Name name = data.getSingularName();
 			String setterPrefix = data.getSetterPrefix();
 			if (setterPrefix.isEmpty() && !fluent) setterPrefix = getAddMethodName();
-			if (!setterPrefix.isEmpty()) name = builderType.toName(HandlerUtil.buildAccessorName(setterPrefix, name.toString()));
+			if (!setterPrefix.isEmpty()) name = builderType.toName(HandlerUtil.buildAccessorName(source, setterPrefix, name.toString()));
 			
 			statements.prepend(createConstructBuilderVarIfNeeded(maker, data, builderType, source));
 			List<JCAnnotation> methodAnnotations = copyAnnotations(findCopyableToBuilderSingularSetterAnnotations(data.annotation.up()));
@@ -344,7 +344,7 @@ public class JavacSingularsRecipes {
 			Name name = data.getPluralName();
 			String setterPrefix = data.getSetterPrefix();
 			if (setterPrefix.isEmpty() && !fluent) setterPrefix = getAddMethodName() + "All";
-			if (!setterPrefix.isEmpty()) name = builderType.toName(HandlerUtil.buildAccessorName(setterPrefix, name.toString()));
+			if (!setterPrefix.isEmpty()) name = builderType.toName(HandlerUtil.buildAccessorName(source, setterPrefix, name.toString()));
 			JCExpression paramType = getPluralMethodParamType(builderType);
 			paramType = addTypeArgs(getTypeArgumentsCount(), true, builderType, paramType, data.getTypeArgs(), source);
 			long paramFlags = JavacHandlerUtil.addFinalIfNeeded(Flags.PARAMETER, builderType.getContext());