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

---
 .../after-delombok/SuperBuilderWithNonNull.java    | 117 +++++++++++++++++++++
 .../resource/before/SuperBuilderWithNonNull.java   |  20 ++++
 2 files changed, 137 insertions(+)
 create mode 100644 test/transform/resource/after-delombok/SuperBuilderWithNonNull.java
 create mode 100644 test/transform/resource/before/SuperBuilderWithNonNull.java

(limited to 'test')

diff --git a/test/transform/resource/after-delombok/SuperBuilderWithNonNull.java b/test/transform/resource/after-delombok/SuperBuilderWithNonNull.java
new file mode 100644
index 00000000..6fea9d17
--- /dev/null
+++ b/test/transform/resource/after-delombok/SuperBuilderWithNonNull.java
@@ -0,0 +1,117 @@
+import java.util.List;
+public class SuperBuilderWithNonNull {
+	public static class Parent {
+		@lombok.NonNull
+		String nonNullParentField;
+		@java.lang.SuppressWarnings("all")
+		private static String $default$nonNullParentField() {
+			return "default";
+		}
+		@java.lang.SuppressWarnings("all")
+		public static abstract class ParentBuilder<C extends Parent, B extends ParentBuilder<C, B>> {
+			@java.lang.SuppressWarnings("all")
+			private boolean nonNullParentField$set;
+			@java.lang.SuppressWarnings("all")
+			private String nonNullParentField;
+			@java.lang.SuppressWarnings("all")
+			protected abstract B self();
+			@java.lang.SuppressWarnings("all")
+			public abstract C build();
+			@java.lang.SuppressWarnings("all")
+			public B nonNullParentField(final String nonNullParentField) {
+				this.nonNullParentField = nonNullParentField;
+				nonNullParentField$set = true;
+				return self();
+			}
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			public java.lang.String toString() {
+				return "SuperBuilderWithNonNull.Parent.ParentBuilder(nonNullParentField=" + this.nonNullParentField + ")";
+			}
+		}
+		@java.lang.SuppressWarnings("all")
+		private static final class ParentBuilderImpl extends ParentBuilder<Parent, ParentBuilderImpl> {
+			@java.lang.SuppressWarnings("all")
+			private ParentBuilderImpl() {
+			}
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			protected ParentBuilderImpl self() {
+				return this;
+			}
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			public Parent build() {
+				return new Parent(this);
+			}
+		}
+		@java.lang.SuppressWarnings("all")
+		protected Parent(final ParentBuilder<?, ?> b) {
+			this.nonNullParentField = b.nonNullParentField;
+			if (!b.nonNullParentField$set) this.nonNullParentField = Parent.$default$nonNullParentField();
+			if (nonNullParentField == null) {
+				throw new java.lang.NullPointerException("nonNullParentField is marked @NonNull but is null");
+			}
+		}
+		@java.lang.SuppressWarnings("all")
+		public static ParentBuilder<?, ?> builder() {
+			return new ParentBuilderImpl();
+		}
+	}
+	public static class Child extends Parent {
+		@lombok.NonNull
+		String nonNullChildField;
+		@java.lang.SuppressWarnings("all")
+		public static abstract class ChildBuilder<C extends Child, B extends ChildBuilder<C, B>> extends Parent.ParentBuilder<C, B> {
+			@java.lang.SuppressWarnings("all")
+			private String nonNullChildField;
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			protected abstract B self();
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			public abstract C build();
+			@java.lang.SuppressWarnings("all")
+			public B nonNullChildField(final String nonNullChildField) {
+				this.nonNullChildField = nonNullChildField;
+				return self();
+			}
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			public java.lang.String toString() {
+				return "SuperBuilderWithNonNull.Child.ChildBuilder(super=" + super.toString() + ", nonNullChildField=" + this.nonNullChildField + ")";
+			}
+		}
+		@java.lang.SuppressWarnings("all")
+		private static final class ChildBuilderImpl extends ChildBuilder<Child, ChildBuilderImpl> {
+			@java.lang.SuppressWarnings("all")
+			private ChildBuilderImpl() {
+			}
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			protected ChildBuilderImpl self() {
+				return this;
+			}
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			public Child build() {
+				return new Child(this);
+			}
+		}
+		@java.lang.SuppressWarnings("all")
+		protected Child(final ChildBuilder<?, ?> b) {
+			super(b);
+			this.nonNullChildField = b.nonNullChildField;
+			if (nonNullChildField == null) {
+				throw new java.lang.NullPointerException("nonNullChildField is marked @NonNull but is null");
+			}
+		}
+		@java.lang.SuppressWarnings("all")
+		public static ChildBuilder<?, ?> builder() {
+			return new ChildBuilderImpl();
+		}
+	}
+	public static void test() {
+		Child x = Child.builder().nonNullChildField("child").nonNullParentField("parent").build();
+	}
+}
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