[fixes #2019] Lombok now properly deals with `@NonNull` specifically on the ‘type use’ of a parameter (and, in case of arrays, on the outermost dimension which is actually the first one listed. Weird corner case of the JLS).

3 files changed, 91 insertions, 0 deletions

diff --git a/test/transform/resource/after-delombok/NonNullTypeUse.java b/test/transform/resource/after-delombok/NonNullTypeUse.java
new file mode 100644
index 00000000..27719480
--- /dev/null
+++ b/test/transform/resource/after-delombok/NonNullTypeUse.java
@@ -0,0 +1,32 @@
+import lombok.NonNull;
+class NonNullTypeUse {
+	void test1(@NonNull String[][][] args) {
+		if (args == null) {
+			throw new java.lang.NullPointerException("args is marked @NonNull but is null");
+		}
+	}
+	void test2(String @NonNull [][][] args) {
+		if (args == null) {
+			throw new java.lang.NullPointerException("args is marked @NonNull but is null");
+		}
+	}
+	void test3(String[] @NonNull [][] args) {
+	}
+	void test4(String[][] @NonNull [] args) {
+	}
+	void test5(@NonNull String simple) {
+		if (simple == null) {
+			throw new java.lang.NullPointerException("simple is marked @NonNull but is null");
+		}
+	}
+	void test6(java.lang.@NonNull String weird) {
+		if (weird == null) {
+			throw new java.lang.NullPointerException("weird is marked @NonNull but is null");
+		}
+	}
+	void test7(java.lang.String @NonNull [][] weird) {
+		if (weird == null) {
+			throw new java.lang.NullPointerException("weird is marked @NonNull but is null");
+		}
+	}
+}
diff --git a/test/transform/resource/after-ecj/NonNullTypeUse.java b/test/transform/resource/after-ecj/NonNullTypeUse.java
new file mode 100644
index 00000000..4cf1aa5a
--- /dev/null
+++ b/test/transform/resource/after-ecj/NonNullTypeUse.java
@@ -0,0 +1,40 @@
+import lombok.NonNull;
+class NonNullTypeUse {
+  NonNullTypeUse() {
+    super();
+  }
+  void test1(@NonNull String[][][] args) {
+    if ((args == null))
+        {
+          throw new java.lang.NullPointerException("args is marked @NonNull but is null");
+        }
+  }
+  void test2(String @NonNull [][][] args) {
+    if ((args == null))
+        {
+          throw new java.lang.NullPointerException("args is marked @NonNull but is null");
+        }
+  }
+  void test3(String[] @NonNull [][] args) {
+  }
+  void test4(String[][] @NonNull [] args) {
+  }
+  void test5(@NonNull String simple) {
+    if ((simple == null))
+        {
+          throw new java.lang.NullPointerException("simple is marked @NonNull but is null");
+        }
+  }
+  void test6(java.lang.@NonNull String weird) {
+    if ((weird == null))
+        {
+          throw new java.lang.NullPointerException("weird is marked @NonNull but is null");
+        }
+  }
+  void test7(java.lang.String @NonNull [][] weird) {
+    if ((weird == null))
+        {
+          throw new java.lang.NullPointerException("weird is marked @NonNull but is null");
+        }
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/NonNullTypeUse.java b/test/transform/resource/before/NonNullTypeUse.java
new file mode 100644
index 00000000..32179351
--- /dev/null
+++ b/test/transform/resource/before/NonNullTypeUse.java
@@ -0,0 +1,19 @@
+//version 8:
+import lombok.NonNull;
+
+class NonNullTypeUse {
+	void test1(@NonNull String[][][] args) {
+	}
+	void test2(String @NonNull [][][] args) {
+	}
+	void test3(String [] @NonNull [][] args) {
+	}
+	void test4(String [][] @NonNull [] args) {
+	}
+	void test5(@NonNull String simple) {
+	}
+	void test6(java.lang.@NonNull String weird) {
+	}
+	void test7(java.lang.String @NonNull [][] weird) {
+	}
+}