From bae66a3450cf6118d7447a390baf333f862c7d8e Mon Sep 17 00:00:00 2001
From: Caleb Brinkman <cbrinkman@sonatype.com>
Date: Thu, 19 Sep 2019 13:14:43 -0500
Subject: Fix null pointers and incorrect tests

---
 src/core/lombok/javac/handlers/JavacSingularsRecipes.java      |  7 ++++---
 .../resource/after-delombok/BuilderSimpleWithSetterPrefix.java |  2 +-
 .../resource/after-ecj/BuilderSimpleWithSetterPrefix.java      | 10 +++++-----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/core/lombok/javac/handlers/JavacSingularsRecipes.java b/src/core/lombok/javac/handlers/JavacSingularsRecipes.java
index f693af83..56116346 100644
--- a/src/core/lombok/javac/handlers/JavacSingularsRecipes.java
+++ b/src/core/lombok/javac/handlers/JavacSingularsRecipes.java
@@ -126,7 +126,7 @@ public class JavacSingularsRecipes {
 			this.typeArgs = typeArgs;
 			this.targetFqn = targetFqn;
 			this.singularizer = singularizer;
-			this.setterPrefix = null;
+			this.setterPrefix = "";
 		}
 
 		public SingularData(JavacNode annotation, Name singularName, Name pluralName, List<JCExpression> typeArgs, String targetFqn, JavacSingularizer singularizer, String setterPrefix) {
@@ -293,8 +293,9 @@ public class JavacSingularsRecipes {
 			ListBuffer<JCStatement> statements = generateSingularMethodStatements(maker, data, builderType, source);
 			List<JCVariableDecl> params = generateSingularMethodParameters(maker, data, builderType, source);
 			Name name = data.getSingularName();
-			Name prefixedSingularName = data.getSetterPrefix().length() == 0 ? name :
-				builderType.toName(HandlerUtil.buildAccessorName(data.getSetterPrefix(), name.toString()));
+			String setterPrefix = data.getSetterPrefix();
+			Name prefixedSingularName = setterPrefix.isEmpty() ? name :
+				builderType.toName(HandlerUtil.buildAccessorName(setterPrefix, name.toString()));
 
 			name = fluent ? prefixedSingularName : builderType.toName(HandlerUtil.buildAccessorName(getAddMethodName(),
 				name.toString()));
diff --git a/test/transform/resource/after-delombok/BuilderSimpleWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSimpleWithSetterPrefix.java
index b10ad619..24ca09d6 100644
--- a/test/transform/resource/after-delombok/BuilderSimpleWithSetterPrefix.java
+++ b/test/transform/resource/after-delombok/BuilderSimpleWithSetterPrefix.java
@@ -10,7 +10,7 @@ class BuilderSimpleWithSetterPrefix<T> {
 		@java.lang.SuppressWarnings("all")
 		private int unprefixed;
 		@java.lang.SuppressWarnings("all")
-		BuilderSimpelWithSetterPrefixBuilder() {
+		BuilderSimpleWithSetterPrefixBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
 		public BuilderSimpleWithSetterPrefixBuilder<T> withUnprefixed(final int unprefixed) {
diff --git a/test/transform/resource/after-ecj/BuilderSimpleWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderSimpleWithSetterPrefix.java
index 98c42fe9..3bc8d882 100644
--- a/test/transform/resource/after-ecj/BuilderSimpleWithSetterPrefix.java
+++ b/test/transform/resource/after-ecj/BuilderSimpleWithSetterPrefix.java
@@ -1,6 +1,6 @@
 import java.util.List;
-@lombok.Builder(access = lombok.AccessLevel.PROTECTED,setterPrefix = "with") class BuilderWithPrefix<T> {
-  protected static @java.lang.SuppressWarnings("all") class BuilderWithPrefixBuilder<T> {
+@lombok.Builder(access = lombok.AccessLevel.PROTECTED,setterPrefix = "with") class BulderSimpleWithSetterPrefix<T> {
+  protected static @java.lang.SuppressWarnings("all") class BuilderSimpleWithSetterPrefix<T> {
     private @java.lang.SuppressWarnings("all") int unprefixed;
     @java.lang.SuppressWarnings("all") BuilderWithPrefixBuilder() {
       super();
@@ -17,11 +17,11 @@ import java.util.List;
     }
   }
   private int unprefixed;
-  @java.lang.SuppressWarnings("all") BuilderWithPrefix(final int unprefixed) {
+  @java.lang.SuppressWarnings("all") BuilderSimpleWithSetterPrefixBuilder(final int unprefixed) {
     super();
     this.unprefixed = unprefixed;
   }
-  protected static @java.lang.SuppressWarnings("all") <T>BuilderWithPrefixBuilder<T> builder() {
-    return new BuilderWithPrefixBuilder<T>();
+  protected static @java.lang.SuppressWarnings("all") <T>BuilderSimpleWithSetterPrefixBuilder<T> builder() {
+    return new BuilderSimpleWithSetterPrefixBuilder<T>();
   }
 }
-- 
cgit