From 46837d6d8be26cea9d0b8cf2959866ac308cbf2d Mon Sep 17 00:00:00 2001
From: Jan Rieke <rieke@subshell.com>
Date: Thu, 16 Aug 2018 17:48:50 +0200
Subject: do null checks after assignment so that default==null is covered

---
 .../resource/before/SuperBuilderWithNonNull.java     | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 test/transform/resource/before/SuperBuilderWithNonNull.java

(limited to 'test/transform/resource/before')

diff --git a/test/transform/resource/before/SuperBuilderWithNonNull.java b/test/transform/resource/before/SuperBuilderWithNonNull.java
new file mode 100644
index 00000000..21f67a47
--- /dev/null
+++ b/test/transform/resource/before/SuperBuilderWithNonNull.java
@@ -0,0 +1,20 @@
+import java.util.List;
+
+public class SuperBuilderWithNonNull {
+	@lombok.experimental.SuperBuilder
+	public static class Parent {
+		@lombok.NonNull
+		@lombok.Builder.Default
+		String nonNullParentField = "default";
+	}
+	
+	@lombok.experimental.SuperBuilder
+	public static class Child extends Parent {
+		@lombok.NonNull
+		String nonNullChildField;
+	}
+	
+	public static void test() {
+		Child x = Child.builder().nonNullChildField("child").nonNullParentField("parent").build();
+	}
+}
-- 
cgit 


From 31aef5219d6e6a39afe5dfa5d888bddd6e942e25 Mon Sep 17 00:00:00 2001
From: Jan Rieke <rieke@subshell.com>
Date: Thu, 16 Aug 2018 17:58:05 +0200
Subject: only assign value once so that final fields work (javac)

---
 src/core/lombok/javac/handlers/HandleSuperBuilder.java             | 7 ++++---
 .../transform/resource/after-delombok/SuperBuilderWithNonNull.java | 6 +++---
 test/transform/resource/before/SuperBuilderWithNonNull.java        | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'test/transform/resource/before')

diff --git a/src/core/lombok/javac/handlers/HandleSuperBuilder.java b/src/core/lombok/javac/handlers/HandleSuperBuilder.java
index cc295beb..aaf94dd8 100644
--- a/src/core/lombok/javac/handlers/HandleSuperBuilder.java
+++ b/src/core/lombok/javac/handlers/HandleSuperBuilder.java
@@ -420,14 +420,15 @@ public class HandleSuperBuilder extends JavacAnnotationHandler<SuperBuilder> {
 			JCFieldAccess fieldInThis = maker.Select(maker.Ident(typeNode.toName("this")), bfd.rawName);
 			
 			JCStatement assign = maker.Exec(maker.Assign(fieldInThis, rhs));
-			statements.append(assign);
 			
-			// In case of @Builder.Default, set the value to the default if it was NOT set in the builder.
+			// In case of @Builder.Default, set the value to the default if it was not set in the builder.
 			if (bfd.nameOfSetFlag != null) {
 				JCFieldAccess setField = maker.Select(maker.Ident(builderVariableName), bfd.nameOfSetFlag);
 				fieldInThis = maker.Select(maker.Ident(typeNode.toName("this")), bfd.rawName);
 				JCAssign assignDefault = maker.Assign(fieldInThis, maker.Apply(typeParameterNames(maker, ((JCClassDecl) typeNode.get()).typarams), maker.Select(maker.Ident(((JCClassDecl) typeNode.get()).name), bfd.nameOfDefaultProvider), List.<JCExpression>nil()));
-				statements.append(maker.If(maker.Unary(CTC_NOT, setField), maker.Exec(assignDefault), null));
+				statements.append(maker.If(setField, assign, maker.Exec(assignDefault)));
+			} else {
+				statements.append(assign);
 			}
 			
 			List<JCAnnotation> nonNulls = findAnnotations(bfd.originalFieldNode, NON_NULL_PATTERN);
diff --git a/test/transform/resource/after-delombok/SuperBuilderWithNonNull.java b/test/transform/resource/after-delombok/SuperBuilderWithNonNull.java
index 6fea9d17..5eba938f 100644
--- a/test/transform/resource/after-delombok/SuperBuilderWithNonNull.java
+++ b/test/transform/resource/after-delombok/SuperBuilderWithNonNull.java
@@ -2,7 +2,7 @@ import java.util.List;
 public class SuperBuilderWithNonNull {
 	public static class Parent {
 		@lombok.NonNull
-		String nonNullParentField;
+		final String nonNullParentField;
 		@java.lang.SuppressWarnings("all")
 		private static String $default$nonNullParentField() {
 			return "default";
@@ -47,8 +47,8 @@ public class SuperBuilderWithNonNull {
 		}
 		@java.lang.SuppressWarnings("all")
 		protected Parent(final ParentBuilder<?, ?> b) {
-			this.nonNullParentField = b.nonNullParentField;
-			if (!b.nonNullParentField$set) this.nonNullParentField = Parent.$default$nonNullParentField();
+			if (b.nonNullParentField$set) this.nonNullParentField = b.nonNullParentField;
+			 else this.nonNullParentField = Parent.$default$nonNullParentField();
 			if (nonNullParentField == null) {
 				throw new java.lang.NullPointerException("nonNullParentField is marked @NonNull but is null");
 			}
diff --git a/test/transform/resource/before/SuperBuilderWithNonNull.java b/test/transform/resource/before/SuperBuilderWithNonNull.java
index 21f67a47..34668bbc 100644
--- a/test/transform/resource/before/SuperBuilderWithNonNull.java
+++ b/test/transform/resource/before/SuperBuilderWithNonNull.java
@@ -5,7 +5,7 @@ public class SuperBuilderWithNonNull {
 	public static class Parent {
 		@lombok.NonNull
 		@lombok.Builder.Default
-		String nonNullParentField = "default";
+		final String nonNullParentField = "default";
 	}
 	
 	@lombok.experimental.SuperBuilder
-- 
cgit