Merge branch 'master' of https://github.com/kchirls/lombok into kchirls-master

Fixes #869, fixes #1018

7 files changed, 86 insertions, 6 deletions

diff --git a/AUTHORS b/AUTHORS
index 6a54b021..38ceadeb 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -7,6 +7,7 @@ Dave Brosius <dbrosius@mebigfatguy.com>
 Dawid Rusin <dawidrusin90@gmail.com>
 Enrique da Costa Cambio <enrique.dacostacambio@gmail.com>
 Jappe van der Hel <jappe.vanderhel@gmail.com>
+Kevin Chirls <kchirls@users.noreply.github.com>
 Liu DongMiao <liudongmiao@gmail.com>
 Luan Nico <luannico27@gmail.com>
 Maarten Mulders <mthmulders@users.noreply.github.com>
diff --git a/src/core/lombok/eclipse/handlers/HandleConstructor.java b/src/core/lombok/eclipse/handlers/HandleConstructor.java
index 856f3611..3469e6bf 100644
--- a/src/core/lombok/eclipse/handlers/HandleConstructor.java
+++ b/src/core/lombok/eclipse/handlers/HandleConstructor.java
@@ -350,7 +350,7 @@ public class HandleConstructor {
 				Annotation[] nonNulls = findAnnotations(field, NON_NULL_PATTERN);
 				Annotation[] nullables = findAnnotations(field, NULLABLE_PATTERN);
 				if (nonNulls.length != 0) {
-					Statement nullCheck = generateNullCheck(field, sourceNode);
+					Statement nullCheck = generateNullCheck(parameter, sourceNode);
 					if (nullCheck != null) nullChecks.add(nullCheck);
 				}
 				parameter.annotations = copyAnnotations(source, nonNulls, nullables);
diff --git a/src/core/lombok/javac/handlers/HandleConstructor.java b/src/core/lombok/javac/handlers/HandleConstructor.java
index 56036963..929de3cd 100644
--- a/src/core/lombok/javac/handlers/HandleConstructor.java
+++ b/src/core/lombok/javac/handlers/HandleConstructor.java
@@ -289,7 +289,7 @@ public class HandleConstructor {
 				JCVariableDecl param = maker.VarDef(maker.Modifiers(flags, nonNulls.appendList(nullables)), fieldName, field.vartype, null);
 				params.append(param);
 				if (!nonNulls.isEmpty()) {
-					JCStatement nullCheck = generateNullCheck(maker, fieldNode, source);
+					JCStatement nullCheck = generateNullCheck(maker, fieldNode, param, source);
 					if (nullCheck != null) nullChecks.append(nullCheck);
 				}
 			}
diff --git a/src/core/lombok/javac/handlers/JavacHandlerUtil.java b/src/core/lombok/javac/handlers/JavacHandlerUtil.java
index 1ec2939e..b4dcb097 100644
--- a/src/core/lombok/javac/handlers/JavacHandlerUtil.java
+++ b/src/core/lombok/javac/handlers/JavacHandlerUtil.java
@@ -1211,16 +1211,23 @@ public class JavacHandlerUtil {
 	}
 	
 	/**
-	 * Generates a new statement that checks if the given variable is null, and if so, throws a specified exception with the
+	 * Generates a new statement that checks if the given variable is null, and if so, throws a configured exception with the
 	 * variable name as message.
-	 * 
-	 * @param exName The name of the exception to throw; normally {@code java.lang.NullPointerException}.
 	 */
 	public static JCStatement generateNullCheck(JavacTreeMaker maker, JavacNode variable, JavacNode source) {
+		return generateNullCheck(maker, variable, (JCVariableDecl)variable.get(), source);
+	}
+
+	/**
+	 * Generates a new statement that checks if the given variable is null, and if so, throws a configured exception with the
+	 * variable name as message. This is a special case method reserved for use when the provided declaration differs from the
+	 * variable's declaration, i.e. in a constructor or setter where the local parameter is named the same but with the prefix
+	 * stripped as a result of @Accessors.prefix.
+	 */
+	public static JCStatement generateNullCheck(JavacTreeMaker maker, JavacNode variable, JCVariableDecl varDecl, JavacNode source) {
 		NullCheckExceptionType exceptionType = source.getAst().readConfiguration(ConfigurationKeys.NON_NULL_EXCEPTION_TYPE);
 		if (exceptionType == null) exceptionType = NullCheckExceptionType.NULL_POINTER_EXCEPTION;
 		
-		JCVariableDecl varDecl = (JCVariableDecl) variable.get();
 		if (isPrimitive(varDecl.vartype)) return null;
 		Name fieldName = varDecl.name;
 		JCExpression exType = genTypeRef(variable, exceptionType.getExceptionType());
diff --git a/test/transform/resource/after-delombok/ConstructorsWithAccessors.java b/test/transform/resource/after-delombok/ConstructorsWithAccessors.java
index 43c0ea66..6e9398ba 100644
--- a/test/transform/resource/after-delombok/ConstructorsWithAccessors.java
+++ b/test/transform/resource/after-delombok/ConstructorsWithAccessors.java
@@ -14,3 +14,37 @@ class ConstructorsWithAccessors {
 		this.__huh2 = _huh2;
 	}
 }
+
+class NonNullConstructorsWithAccessors {
+	@lombok.NonNull
+	Integer plower;
+	@lombok.NonNull
+	Integer pUpper;
+	@lombok.NonNull
+	Integer _huh;
+	@lombok.NonNull
+	final Integer __huh2;
+
+	@java.beans.ConstructorProperties({"plower", "upper", "huh", "_huh2"})
+	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
+	public NonNullConstructorsWithAccessors(@lombok.NonNull final Integer plower, @lombok.NonNull final Integer upper, @lombok.NonNull final Integer huh, @lombok.NonNull final Integer _huh2) {
+		if (plower == null) {
+			throw new java.lang.NullPointerException("plower");
+		}
+		if (upper == null) {
+			throw new java.lang.NullPointerException("upper");
+		}
+		if (huh == null) {
+			throw new java.lang.NullPointerException("huh");
+		}
+		if (_huh2 == null) {
+			throw new java.lang.NullPointerException("_huh2");
+		}
+		this.plower = plower;
+		this.pUpper = upper;
+		this._huh = huh;
+		this.__huh2 = _huh2;
+	}
+}
+
diff --git a/test/transform/resource/after-ecj/ConstructorsWithAccessors.java b/test/transform/resource/after-ecj/ConstructorsWithAccessors.java
index 7c691b42..b7a20e18 100644
--- a/test/transform/resource/after-ecj/ConstructorsWithAccessors.java
+++ b/test/transform/resource/after-ecj/ConstructorsWithAccessors.java
@@ -11,3 +11,33 @@
     this.__huh2 = _huh2;
   }
 }
+@lombok.AllArgsConstructor @lombok.experimental.Accessors(prefix = {"p", "_"}) class NonNullConstructorsWithAccessors {
+  @lombok.NonNull Integer plower;
+  @lombok.NonNull Integer pUpper;
+  @lombok.NonNull Integer _huh;
+  final @lombok.NonNull Integer __huh2;
+  public @java.beans.ConstructorProperties({"plower", "upper", "huh", "_huh2"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") NonNullConstructorsWithAccessors(final @lombok.NonNull Integer plower, final @lombok.NonNull Integer upper, final @lombok.NonNull Integer huh, final @lombok.NonNull Integer _huh2) {
+    super();
+    if ((plower == null))
+        {
+          throw new java.lang.NullPointerException("plower");
+        }
+    if ((upper == null))
+        {
+          throw new java.lang.NullPointerException("upper");
+        }
+    if ((huh == null))
+        {
+          throw new java.lang.NullPointerException("huh");
+        }
+    if ((_huh2 == null))
+        {
+          throw new java.lang.NullPointerException("_huh2");
+        }
+    this.plower = plower;
+    this.pUpper = upper;
+    this._huh = huh;
+    this.__huh2 = _huh2;
+  }
+}
+
diff --git a/test/transform/resource/before/ConstructorsWithAccessors.java b/test/transform/resource/before/ConstructorsWithAccessors.java
index e5d2939f..12221ab7 100644
--- a/test/transform/resource/before/ConstructorsWithAccessors.java
+++ b/test/transform/resource/before/ConstructorsWithAccessors.java
@@ -4,3 +4,11 @@
 	int _huh;
 	int __huh2;
 }
+
+@lombok.AllArgsConstructor @lombok.experimental.Accessors(prefix={"p", "_"}) class NonNullConstructorsWithAccessors {
+	@lombok.NonNull Integer plower;
+	@lombok.NonNull Integer pUpper;
+	@lombok.NonNull Integer _huh;
+	@lombok.NonNull final Integer __huh2;
+}
+