From f765730526e061d39c3ecd44f37de6a7f7887cf0 Mon Sep 17 00:00:00 2001
From: Kevin Chirls <kchirls@gmail.com>
Date: Tue, 31 Jan 2017 20:08:41 -0800
Subject: Fix for issues #869 and #1018

Generates the null check on the constructor parameter instead of the
instance field. Fix for issues #869 and #1018.
---
 .../after-delombok/ConstructorsWithAccessors.java  | 35 ++++++++++++++++++++++
 .../resource/before/ConstructorsWithAccessors.java |  8 +++++
 2 files changed, 43 insertions(+)

(limited to 'test')

diff --git a/test/transform/resource/after-delombok/ConstructorsWithAccessors.java b/test/transform/resource/after-delombok/ConstructorsWithAccessors.java
index b83c4cec..c5295ec7 100644
--- a/test/transform/resource/after-delombok/ConstructorsWithAccessors.java
+++ b/test/transform/resource/after-delombok/ConstructorsWithAccessors.java
@@ -15,3 +15,38 @@ class ConstructorsWithAccessors {
 		this.__huh2 = _huh2;
 	}
 }
+
+class NonNullConstructorsWithAccessors {
+	@lombok.NonNull
+	Integer plower;
+	@lombok.NonNull
+	Integer pUpper;
+	@lombok.NonNull
+	Integer _huh;
+	@lombok.NonNull
+	Integer __huh2;
+
+	@java.beans.ConstructorProperties({"plower", "upper", "huh", "_huh2"})
+	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
+	@lombok.Generated
+	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/before/ConstructorsWithAccessors.java b/test/transform/resource/before/ConstructorsWithAccessors.java
index e5d2939f..6facb03a 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 Integer __huh2;
+}
+
-- 
cgit