Fixes #3120

3 files changed, 106 insertions, 0 deletions

diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeWithNonNullByDefault.java b/test/transform/resource/after-delombok/EqualsAndHashCodeWithNonNullByDefault.java
new file mode 100644
index 00000000..f83cbc32
--- /dev/null
+++ b/test/transform/resource/after-delombok/EqualsAndHashCodeWithNonNullByDefault.java
@@ -0,0 +1,45 @@
+import javax.annotation.ParametersAreNonnullByDefault;
+@ParametersAreNonnullByDefault
+class EqualsAndHashCodeWithNonNullByDefault {
+	int x;
+	boolean[] y;
+	Object[] z;
+	String a;
+	String b;
+	@java.lang.Override
+	@java.lang.SuppressWarnings("all")
+	public boolean equals(@javax.annotation.Nullable final java.lang.Object o) {
+		if (o == this) return true;
+		if (!(o instanceof EqualsAndHashCodeWithNonNullByDefault)) return false;
+		final EqualsAndHashCodeWithNonNullByDefault other = (EqualsAndHashCodeWithNonNullByDefault) o;
+		if (!other.canEqual((java.lang.Object) this)) return false;
+		if (this.x != other.x) return false;
+		if (!java.util.Arrays.equals(this.y, other.y)) return false;
+		if (!java.util.Arrays.deepEquals(this.z, other.z)) return false;
+		final java.lang.Object this$a = this.a;
+		final java.lang.Object other$a = other.a;
+		if (this$a == null ? other$a != null : !this$a.equals(other$a)) return false;
+		final java.lang.Object this$b = this.b;
+		final java.lang.Object other$b = other.b;
+		if (this$b == null ? other$b != null : !this$b.equals(other$b)) return false;
+		return true;
+	}
+	@java.lang.SuppressWarnings("all")
+	protected boolean canEqual(@javax.annotation.Nullable final java.lang.Object other) {
+		return other instanceof EqualsAndHashCodeWithNonNullByDefault;
+	}
+	@java.lang.Override
+	@java.lang.SuppressWarnings("all")
+	public int hashCode() {
+		final int PRIME = 59;
+		int result = 1;
+		result = result * PRIME + this.x;
+		result = result * PRIME + java.util.Arrays.hashCode(this.y);
+		result = result * PRIME + java.util.Arrays.deepHashCode(this.z);
+		final java.lang.Object $a = this.a;
+		result = result * PRIME + ($a == null ? 43 : $a.hashCode());
+		final java.lang.Object $b = this.b;
+		result = result * PRIME + ($b == null ? 43 : $b.hashCode());
+		return result;
+	}
+}
diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeWithNonNullByDefault.java b/test/transform/resource/after-ecj/EqualsAndHashCodeWithNonNullByDefault.java
new file mode 100644
index 00000000..5a679e50
--- /dev/null
+++ b/test/transform/resource/after-ecj/EqualsAndHashCodeWithNonNullByDefault.java
@@ -0,0 +1,50 @@
+import javax.annotation.ParametersAreNonnullByDefault;
+@lombok.EqualsAndHashCode @ParametersAreNonnullByDefault class EqualsAndHashCodeWithNonNullByDefault {
+  int x;
+  boolean[] y;
+  Object[] z;
+  String a;
+  String b;
+  EqualsAndHashCodeWithNonNullByDefault() {
+    super();
+  }
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final @javax.annotation.Nullable java.lang.Object o) {
+    if ((o == this))
+        return true;
+    if ((! (o instanceof EqualsAndHashCodeWithNonNullByDefault)))
+        return false;
+    final EqualsAndHashCodeWithNonNullByDefault other = (EqualsAndHashCodeWithNonNullByDefault) o;
+    if ((! other.canEqual((java.lang.Object) this)))
+        return false;
+    if ((this.x != other.x))
+        return false;
+    if ((! java.util.Arrays.equals(this.y, other.y)))
+        return false;
+    if ((! java.util.Arrays.deepEquals(this.z, other.z)))
+        return false;
+    final java.lang.Object this$a = this.a;
+    final java.lang.Object other$a = other.a;
+    if (((this$a == null) ? (other$a != null) : (! this$a.equals(other$a))))
+        return false;
+    final java.lang.Object this$b = this.b;
+    final java.lang.Object other$b = other.b;
+    if (((this$b == null) ? (other$b != null) : (! this$b.equals(other$b))))
+        return false;
+    return true;
+  }
+  protected @java.lang.SuppressWarnings("all") boolean canEqual(final @javax.annotation.Nullable java.lang.Object other) {
+    return (other instanceof EqualsAndHashCodeWithNonNullByDefault);
+  }
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+    final int PRIME = 59;
+    int result = 1;
+    result = ((result * PRIME) + this.x);
+    result = ((result * PRIME) + java.util.Arrays.hashCode(this.y));
+    result = ((result * PRIME) + java.util.Arrays.deepHashCode(this.z));
+    final java.lang.Object $a = this.a;
+    result = ((result * PRIME) + (($a == null) ? 43 : $a.hashCode()));
+    final java.lang.Object $b = this.b;
+    result = ((result * PRIME) + (($b == null) ? 43 : $b.hashCode()));
+    return result;
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/EqualsAndHashCodeWithNonNullByDefault.java b/test/transform/resource/before/EqualsAndHashCodeWithNonNullByDefault.java
new file mode 100644
index 00000000..ee8e0086
--- /dev/null
+++ b/test/transform/resource/before/EqualsAndHashCodeWithNonNullByDefault.java
@@ -0,0 +1,11 @@
+//CONF: lombok.addNullAnnotations = javax
+import javax.annotation.ParametersAreNonnullByDefault;
+@lombok.EqualsAndHashCode
+@ParametersAreNonnullByDefault
+class EqualsAndHashCodeWithNonNullByDefault {
+	int x;
+	boolean[] y;
+	Object[] z;
+	String a;
+	String b;
+}
\ No newline at end of file