From 22444b78e2b12680929acf1576b15a0717f267e2 Mon Sep 17 00:00:00 2001 From: JohnPaulTaylorII Date: Wed, 23 Feb 2022 13:29:58 -0500 Subject: Fixes #3120 --- .../eclipse/handlers/EclipseHandlerUtil.java | 7 +++ .../eclipse/handlers/HandleEqualsAndHashCode.java | 21 +++++---- .../EqualsAndHashCodeWithNonNullByDefault.java | 45 +++++++++++++++++++ .../EqualsAndHashCodeWithNonNullByDefault.java | 50 ++++++++++++++++++++++ .../EqualsAndHashCodeWithNonNullByDefault.java | 11 +++++ 5 files changed, 125 insertions(+), 9 deletions(-) create mode 100644 test/transform/resource/after-delombok/EqualsAndHashCodeWithNonNullByDefault.java create mode 100644 test/transform/resource/after-ecj/EqualsAndHashCodeWithNonNullByDefault.java create mode 100644 test/transform/resource/before/EqualsAndHashCodeWithNonNullByDefault.java diff --git a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java index 65e2c5c8..c313cf51 100644 --- a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java +++ b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java @@ -2608,6 +2608,13 @@ public class EclipseHandlerUtil { applyAnnotationToVarDecl(typeNode, arg, lib.getNullableAnnotation(), lib.isTypeUse()); } + public static void createRelevantNullableAnnotation(EclipseNode typeNode, Argument arg, List applied) { + NullAnnotationLibrary lib = typeNode.getAst().readConfiguration(ConfigurationKeys.ADD_NULL_ANNOTATIONS); + if (lib == null || applied.contains(lib)) return; + + applyAnnotationToVarDecl(typeNode, arg, lib.getNullableAnnotation(), lib.isTypeUse()); + } + public static void createRelevantNonNullAnnotation(EclipseNode typeNode, Argument arg) { NullAnnotationLibrary lib = typeNode.getAst().readConfiguration(ConfigurationKeys.ADD_NULL_ANNOTATIONS); if (lib == null) return; diff --git a/src/core/lombok/eclipse/handlers/HandleEqualsAndHashCode.java b/src/core/lombok/eclipse/handlers/HandleEqualsAndHashCode.java index a5e8dfb5..940612e7 100755 --- a/src/core/lombok/eclipse/handlers/HandleEqualsAndHashCode.java +++ b/src/core/lombok/eclipse/handlers/HandleEqualsAndHashCode.java @@ -44,6 +44,7 @@ import lombok.core.handlers.InclusionExclusionUtils.Included; import lombok.core.AnnotationValues; import lombok.core.configuration.CallSuperType; import lombok.core.configuration.CheckerFrameworkVersion; +import lombok.core.configuration.NullAnnotationLibrary; import lombok.eclipse.Eclipse; import lombok.eclipse.EclipseAnnotationHandler; import lombok.eclipse.EclipseNode; @@ -606,19 +607,20 @@ public class HandleEqualsAndHashCode extends EclipseAnnotationHandler applied = new ArrayList(); + Annotation[] onParamNullable = null; String nearest = scanForNearestAnnotation(type, "javax.annotation.ParametersAreNullableByDefault", "javax.annotation.ParametersAreNonnullByDefault"); if ("javax.annotation.ParametersAreNonnullByDefault".equals(nearest)) { - onParamType = new Annotation[1]; - onParamType[0] = new MarkerAnnotation(generateQualifiedTypeRef(source, JAVAX_ANNOTATION_NULLABLE), 0); + onParamNullable = new Annotation[] { new MarkerAnnotation(generateQualifiedTypeRef(source, JAVAX_ANNOTATION_NULLABLE), 0) }; + applied.add(NullAnnotationLibrary.JAVAX); } + Annotation[] onParamTypeNullable = null; nearest = scanForNearestAnnotation(type, "org.eclipse.jdt.annotation.NonNullByDefault"); if (nearest != null) { - Annotation a = new MarkerAnnotation(generateQualifiedTypeRef(source, ORG_ECLIPSE_JDT_ANNOTATION_NULLABLE), 0); - if (onParamType != null) onParamType = new Annotation[] {onParamType[0], a}; - else onParamType = new Annotation[] {a}; + onParamTypeNullable = new Annotation[] { new MarkerAnnotation(generateQualifiedTypeRef(source, ORG_ECLIPSE_JDT_ANNOTATION_NULLABLE), 0) }; + applied.add(NullAnnotationLibrary.ECLIPSE); } MethodDeclaration method = new MethodDeclaration(((CompilationUnitDeclaration) type.top().get()).compilationResult); @@ -640,12 +642,13 @@ public class HandleEqualsAndHashCode extends EclipseAnnotationHandler statements = new ArrayList(); 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 -- cgit From c67909e2039cdac449808464ff28a8e71a56b7a1 Mon Sep 17 00:00:00 2001 From: JohnPaulTaylorII Date: Fri, 25 Feb 2022 16:48:35 -0500 Subject: Fixes #3120 Update AUTHORS file. Remove extraneous code from EqualsAndHashCodeWithNonNullByDefault test case. --- AUTHORS | 1 + .../EqualsAndHashCodeWithNonNullByDefault.java | 24 +----------------- .../EqualsAndHashCodeWithNonNullByDefault.java | 29 +--------------------- .../EqualsAndHashCodeWithNonNullByDefault.java | 5 ---- 4 files changed, 3 insertions(+), 56 deletions(-) diff --git a/AUTHORS b/AUTHORS index 810efce9..f2e13ec6 100755 --- a/AUTHORS +++ b/AUTHORS @@ -19,6 +19,7 @@ Jacob Middag Jan Matèrne Jan Rieke Jappe van der Hel +John Paul Taylor II Kevin Chirls Liu DongMiao Luan Nico diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeWithNonNullByDefault.java b/test/transform/resource/after-delombok/EqualsAndHashCodeWithNonNullByDefault.java index f83cbc32..37711004 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashCodeWithNonNullByDefault.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeWithNonNullByDefault.java @@ -1,11 +1,6 @@ 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) { @@ -13,15 +8,6 @@ class EqualsAndHashCodeWithNonNullByDefault { 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") @@ -31,15 +17,7 @@ class 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()); + final int result = 1; return result; } } diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeWithNonNullByDefault.java b/test/transform/resource/after-ecj/EqualsAndHashCodeWithNonNullByDefault.java index 5a679e50..0cd170b4 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashCodeWithNonNullByDefault.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeWithNonNullByDefault.java @@ -1,10 +1,5 @@ import javax.annotation.ParametersAreNonnullByDefault; @lombok.EqualsAndHashCode @ParametersAreNonnullByDefault class EqualsAndHashCodeWithNonNullByDefault { - int x; - boolean[] y; - Object[] z; - String a; - String b; EqualsAndHashCodeWithNonNullByDefault() { super(); } @@ -16,35 +11,13 @@ import javax.annotation.ParametersAreNonnullByDefault; 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())); + final int result = 1; return result; } } \ No newline at end of file diff --git a/test/transform/resource/before/EqualsAndHashCodeWithNonNullByDefault.java b/test/transform/resource/before/EqualsAndHashCodeWithNonNullByDefault.java index ee8e0086..f91bce3c 100644 --- a/test/transform/resource/before/EqualsAndHashCodeWithNonNullByDefault.java +++ b/test/transform/resource/before/EqualsAndHashCodeWithNonNullByDefault.java @@ -3,9 +3,4 @@ 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 -- cgit