From b439e4ce771813a12300c3006f9fcc12f25678d7 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Tue, 16 Jul 2019 01:24:18 +0200 Subject: [Fixes #2115] builder fields tracking a property that has a default set is now called `$value` in order to convey that you shouldnt manually mess with it. --- .../resource/after-delombok/BuilderDefaults.java | 20 ++++++++-------- .../after-delombok/BuilderDefaultsGenerics.java | 28 +++++++++++----------- .../ConstructorsWithBuilderDefaults.java | 12 +++++----- .../ConstructorsWithBuilderDefaults2.java | 20 ++++++++-------- .../after-delombok/SuperBuilderWithDefaults.java | 22 ++++++++--------- .../after-delombok/SuperBuilderWithNonNull.java | 8 +++---- .../resource/after-ecj/BuilderDefaults.java | 12 +++++----- .../after-ecj/BuilderDefaultsGenerics.java | 16 ++++++------- .../after-ecj/ConstructorsWithBuilderDefaults.java | 8 +++---- .../ConstructorsWithBuilderDefaults2.java | 12 +++++----- .../after-ecj/SuperBuilderWithDefaults.java | 22 ++++++++--------- .../after-ecj/SuperBuilderWithNonNull.java | 8 +++---- 12 files changed, 94 insertions(+), 94 deletions(-) (limited to 'test/transform') diff --git a/test/transform/resource/after-delombok/BuilderDefaults.java b/test/transform/resource/after-delombok/BuilderDefaults.java index b916b725..475b3f3c 100644 --- a/test/transform/resource/after-delombok/BuilderDefaults.java +++ b/test/transform/resource/after-delombok/BuilderDefaults.java @@ -21,19 +21,19 @@ public final class BuilderDefaults { @java.lang.SuppressWarnings("all") private boolean x$set; @java.lang.SuppressWarnings("all") - private int x; + private int x$value; @java.lang.SuppressWarnings("all") private String name; @java.lang.SuppressWarnings("all") private boolean z$set; @java.lang.SuppressWarnings("all") - private long z; + private long z$value; @java.lang.SuppressWarnings("all") BuilderDefaultsBuilder() { } @java.lang.SuppressWarnings("all") public BuilderDefaultsBuilder x(final int x) { - this.x = x; + this.x$value = x; x$set = true; return this; } @@ -44,22 +44,22 @@ public final class BuilderDefaults { } @java.lang.SuppressWarnings("all") public BuilderDefaultsBuilder z(final long z) { - this.z = z; + this.z$value = z; z$set = true; return this; } @java.lang.SuppressWarnings("all") public BuilderDefaults build() { - int x = this.x; - if (!x$set) x = BuilderDefaults.$default$x(); - long z = this.z; - if (!z$set) z = BuilderDefaults.$default$z(); - return new BuilderDefaults(x, name, z); + int x$value = this.x$value; + if (!x$set) x$value = BuilderDefaults.$default$x(); + long z$value = this.z$value; + if (!z$set) z$value = BuilderDefaults.$default$z(); + return new BuilderDefaults(x$value, name, z$value); } @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "BuilderDefaults.BuilderDefaultsBuilder(x=" + this.x + ", name=" + this.name + ", z=" + this.z + ")"; + return "BuilderDefaults.BuilderDefaultsBuilder(x$value=" + this.x$value + ", name=" + this.name + ", z$value=" + this.z$value + ")"; } } @java.lang.SuppressWarnings("all") diff --git a/test/transform/resource/after-delombok/BuilderDefaultsGenerics.java b/test/transform/resource/after-delombok/BuilderDefaultsGenerics.java index b88a61be..46fcd6b4 100644 --- a/test/transform/resource/after-delombok/BuilderDefaultsGenerics.java +++ b/test/transform/resource/after-delombok/BuilderDefaultsGenerics.java @@ -26,50 +26,50 @@ public class BuilderDefaultsGenerics> { @java.lang.SuppressWarnings("all") private boolean callable$set; @java.lang.SuppressWarnings("all") - private java.util.concurrent.Callable callable; + private java.util.concurrent.Callable callable$value; @java.lang.SuppressWarnings("all") private boolean tee$set; @java.lang.SuppressWarnings("all") - private T tee; + private T tee$value; @java.lang.SuppressWarnings("all") private boolean arrr$set; @java.lang.SuppressWarnings("all") - private R arrr; + private R arrr$value; @java.lang.SuppressWarnings("all") BuilderDefaultsGenericsBuilder() { } @java.lang.SuppressWarnings("all") public BuilderDefaultsGenericsBuilder callable(final java.util.concurrent.Callable callable) { - this.callable = callable; + this.callable$value = callable; callable$set = true; return this; } @java.lang.SuppressWarnings("all") public BuilderDefaultsGenericsBuilder tee(final T tee) { - this.tee = tee; + this.tee$value = tee; tee$set = true; return this; } @java.lang.SuppressWarnings("all") public BuilderDefaultsGenericsBuilder arrr(final R arrr) { - this.arrr = arrr; + this.arrr$value = arrr; arrr$set = true; return this; } @java.lang.SuppressWarnings("all") public BuilderDefaultsGenerics build() { - java.util.concurrent.Callable callable = this.callable; - if (!callable$set) callable = BuilderDefaultsGenerics.$default$callable(); - T tee = this.tee; - if (!tee$set) tee = BuilderDefaultsGenerics.$default$tee(); - R arrr = this.arrr; - if (!arrr$set) arrr = BuilderDefaultsGenerics.$default$arrr(); - return new BuilderDefaultsGenerics(callable, tee, arrr); + java.util.concurrent.Callable callable$value = this.callable$value; + if (!callable$set) callable$value = BuilderDefaultsGenerics.$default$callable(); + T tee$value = this.tee$value; + if (!tee$set) tee$value = BuilderDefaultsGenerics.$default$tee(); + R arrr$value = this.arrr$value; + if (!arrr$set) arrr$value = BuilderDefaultsGenerics.$default$arrr(); + return new BuilderDefaultsGenerics(callable$value, tee$value, arrr$value); } @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder(callable=" + this.callable + ", tee=" + this.tee + ", arrr=" + this.arrr + ")"; + return "BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder(callable$value=" + this.callable$value + ", tee$value=" + this.tee$value + ", arrr$value=" + this.arrr$value + ")"; } } @java.lang.SuppressWarnings("all") diff --git a/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults.java b/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults.java index 91f5b8be..f37c68af 100644 --- a/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults.java +++ b/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults.java @@ -10,7 +10,7 @@ final class ConstructorsWithBuilderDefaults { @java.lang.SuppressWarnings("all") private boolean x$set; @java.lang.SuppressWarnings("all") - private int x; + private int x$value; @java.lang.SuppressWarnings("all") private int y; @java.lang.SuppressWarnings("all") @@ -18,7 +18,7 @@ final class ConstructorsWithBuilderDefaults { } @java.lang.SuppressWarnings("all") public ConstructorsWithBuilderDefaultsBuilder x(final int x) { - this.x = x; + this.x$value = x; x$set = true; return this; } @@ -29,14 +29,14 @@ final class ConstructorsWithBuilderDefaults { } @java.lang.SuppressWarnings("all") public ConstructorsWithBuilderDefaults build() { - int x = this.x; - if (!x$set) x = ConstructorsWithBuilderDefaults.$default$x(); - return new ConstructorsWithBuilderDefaults(x, y); + int x$value = this.x$value; + if (!x$set) x$value = ConstructorsWithBuilderDefaults.$default$x(); + return new ConstructorsWithBuilderDefaults(x$value, y); } @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder(x=" + this.x + ", y=" + this.y + ")"; + return "ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder(x$value=" + this.x$value + ", y=" + this.y + ")"; } } @java.lang.SuppressWarnings("all") diff --git a/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults2.java b/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults2.java index 8a9c9b48..7816b0c8 100644 --- a/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults2.java +++ b/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults2.java @@ -23,11 +23,11 @@ final class ConstructorsWithBuilderDefaults { @java.lang.SuppressWarnings("all") private boolean z$set; @java.lang.SuppressWarnings("all") - private java.util.List z; + private java.util.List z$value; @java.lang.SuppressWarnings("all") private boolean x$set; @java.lang.SuppressWarnings("all") - private T x; + private T x$value; @java.lang.SuppressWarnings("all") private T q; @java.lang.SuppressWarnings("all") @@ -35,13 +35,13 @@ final class ConstructorsWithBuilderDefaults { } @java.lang.SuppressWarnings("all") public ConstructorsWithBuilderDefaultsBuilder z(final java.util.List z) { - this.z = z; + this.z$value = z; z$set = true; return this; } @java.lang.SuppressWarnings("all") public ConstructorsWithBuilderDefaultsBuilder x(final T x) { - this.x = x; + this.x$value = x; x$set = true; return this; } @@ -53,16 +53,16 @@ final class ConstructorsWithBuilderDefaults { @java.lang.SuppressWarnings("all") public ConstructorsWithBuilderDefaults build() { - java.util.List z = this.z; - if (!z$set) z = ConstructorsWithBuilderDefaults.$default$z(); - T x = this.x; - if (!x$set) x = ConstructorsWithBuilderDefaults.$default$x(); - return new ConstructorsWithBuilderDefaults(z, x, q); + java.util.List z$value = this.z$value; + if (!z$set) z$value = ConstructorsWithBuilderDefaults.$default$z(); + T x$value = this.x$value; + if (!x$set) x$value = ConstructorsWithBuilderDefaults.$default$x(); + return new ConstructorsWithBuilderDefaults(z$value, x$value, q); } @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder(z=" + this.z + ", x=" + this.x + ", q=" + this.q + ")"; + return "ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder(z$value=" + this.z$value + ", x$value=" + this.x$value + ", q=" + this.q + ")"; } } @java.lang.SuppressWarnings("all") diff --git a/test/transform/resource/after-delombok/SuperBuilderWithDefaults.java b/test/transform/resource/after-delombok/SuperBuilderWithDefaults.java index 842b7e55..2ac3d1b7 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithDefaults.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithDefaults.java @@ -16,31 +16,31 @@ public class SuperBuilderWithDefaults { @java.lang.SuppressWarnings("all") private boolean millis$set; @java.lang.SuppressWarnings("all") - private long millis; + private long millis$value; @java.lang.SuppressWarnings("all") private boolean numberField$set; @java.lang.SuppressWarnings("all") - private N numberField; + private N numberField$value; @java.lang.SuppressWarnings("all") protected abstract B self(); @java.lang.SuppressWarnings("all") public abstract C build(); @java.lang.SuppressWarnings("all") public B millis(final long millis) { - this.millis = millis; + this.millis$value = millis; millis$set = true; return self(); } @java.lang.SuppressWarnings("all") public B numberField(final N numberField) { - this.numberField = numberField; + this.numberField$value = numberField; numberField$set = true; return self(); } @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "SuperBuilderWithDefaults.Parent.ParentBuilder(millis=" + this.millis + ", numberField=" + this.numberField + ")"; + return "SuperBuilderWithDefaults.Parent.ParentBuilder(millis$value=" + this.millis$value + ", numberField$value=" + this.numberField$value + ")"; } } @java.lang.SuppressWarnings("all") @@ -61,9 +61,9 @@ public class SuperBuilderWithDefaults { } @java.lang.SuppressWarnings("all") protected Parent(final ParentBuilder b) { - if (b.millis$set) this.millis = b.millis; + if (b.millis$set) this.millis = b.millis$value; else this.millis = Parent.$default$millis(); - if (b.numberField$set) this.numberField = b.numberField; + if (b.numberField$set) this.numberField = b.numberField$value; else this.numberField = Parent.$default$numberField(); } @java.lang.SuppressWarnings("all") @@ -82,7 +82,7 @@ public class SuperBuilderWithDefaults { @java.lang.SuppressWarnings("all") private boolean doubleField$set; @java.lang.SuppressWarnings("all") - private double doubleField; + private double doubleField$value; @java.lang.Override @java.lang.SuppressWarnings("all") protected abstract B self(); @@ -91,14 +91,14 @@ public class SuperBuilderWithDefaults { public abstract C build(); @java.lang.SuppressWarnings("all") public B doubleField(final double doubleField) { - this.doubleField = doubleField; + this.doubleField$value = doubleField; doubleField$set = true; return self(); } @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "SuperBuilderWithDefaults.Child.ChildBuilder(super=" + super.toString() + ", doubleField=" + this.doubleField + ")"; + return "SuperBuilderWithDefaults.Child.ChildBuilder(super=" + super.toString() + ", doubleField$value=" + this.doubleField$value + ")"; } } @java.lang.SuppressWarnings("all") @@ -120,7 +120,7 @@ public class SuperBuilderWithDefaults { @java.lang.SuppressWarnings("all") protected Child(final ChildBuilder b) { super(b); - if (b.doubleField$set) this.doubleField = b.doubleField; + if (b.doubleField$set) this.doubleField = b.doubleField$value; else this.doubleField = Child.$default$doubleField(); } @java.lang.SuppressWarnings("all") diff --git a/test/transform/resource/after-delombok/SuperBuilderWithNonNull.java b/test/transform/resource/after-delombok/SuperBuilderWithNonNull.java index ce5c838c..52328780 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithNonNull.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithNonNull.java @@ -12,7 +12,7 @@ public class SuperBuilderWithNonNull { @java.lang.SuppressWarnings("all") private boolean nonNullParentField$set; @java.lang.SuppressWarnings("all") - private String nonNullParentField; + private String nonNullParentField$value; @java.lang.SuppressWarnings("all") protected abstract B self(); @java.lang.SuppressWarnings("all") @@ -22,14 +22,14 @@ public class SuperBuilderWithNonNull { if (nonNullParentField == null) { throw new java.lang.NullPointerException("nonNullParentField is marked non-null but is null"); } - this.nonNullParentField = nonNullParentField; + this.nonNullParentField$value = 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 + ")"; + return "SuperBuilderWithNonNull.Parent.ParentBuilder(nonNullParentField$value=" + this.nonNullParentField$value + ")"; } } @java.lang.SuppressWarnings("all") @@ -50,7 +50,7 @@ public class SuperBuilderWithNonNull { } @java.lang.SuppressWarnings("all") protected Parent(final ParentBuilder b) { - if (b.nonNullParentField$set) this.nonNullParentField = b.nonNullParentField; + if (b.nonNullParentField$set) this.nonNullParentField = b.nonNullParentField$value; else this.nonNullParentField = Parent.$default$nonNullParentField(); if (nonNullParentField == null) { throw new java.lang.NullPointerException("nonNullParentField is marked non-null but is null"); diff --git a/test/transform/resource/after-ecj/BuilderDefaults.java b/test/transform/resource/after-ecj/BuilderDefaults.java index 1a0f1168..b9588386 100644 --- a/test/transform/resource/after-ecj/BuilderDefaults.java +++ b/test/transform/resource/after-ecj/BuilderDefaults.java @@ -2,16 +2,16 @@ import lombok.Builder; import lombok.Value; public final @Value @Builder class BuilderDefaults { public static @java.lang.SuppressWarnings("all") class BuilderDefaultsBuilder { - private @java.lang.SuppressWarnings("all") int x; + private @java.lang.SuppressWarnings("all") int x$value; private @java.lang.SuppressWarnings("all") boolean x$set; private @java.lang.SuppressWarnings("all") String name; - private @java.lang.SuppressWarnings("all") long z; + private @java.lang.SuppressWarnings("all") long z$value; private @java.lang.SuppressWarnings("all") boolean z$set; @java.lang.SuppressWarnings("all") BuilderDefaultsBuilder() { super(); } public @java.lang.SuppressWarnings("all") BuilderDefaultsBuilder x(final int x) { - this.x = x; + this.x$value = x; x$set = true; return this; } @@ -20,15 +20,15 @@ public final @Value @Builder class BuilderDefaults { return this; } public @java.lang.SuppressWarnings("all") BuilderDefaultsBuilder z(final long z) { - this.z = z; + this.z$value = z; z$set = true; return this; } public @java.lang.SuppressWarnings("all") BuilderDefaults build() { - return new BuilderDefaults((x$set ? x : BuilderDefaults.$default$x()), name, (z$set ? z : BuilderDefaults.$default$z())); + return new BuilderDefaults((x$set ? x$value : BuilderDefaults.$default$x()), name, (z$set ? z$value : BuilderDefaults.$default$z())); } public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { - return (((((("BuilderDefaults.BuilderDefaultsBuilder(x=" + this.x) + ", name=") + this.name) + ", z=") + this.z) + ")"); + return (((((("BuilderDefaults.BuilderDefaultsBuilder(x$value=" + this.x$value) + ", name=") + this.name) + ", z$value=") + this.z$value) + ")"); } } private final @Builder.Default int x; diff --git a/test/transform/resource/after-ecj/BuilderDefaultsGenerics.java b/test/transform/resource/after-ecj/BuilderDefaultsGenerics.java index a8f81afa..8f9da4b3 100644 --- a/test/transform/resource/after-ecj/BuilderDefaultsGenerics.java +++ b/test/transform/resource/after-ecj/BuilderDefaultsGenerics.java @@ -2,35 +2,35 @@ import lombok.Builder; import java.util.*; public @Builder class BuilderDefaultsGenerics> { public static @java.lang.SuppressWarnings("all") class BuilderDefaultsGenericsBuilder> { - private @java.lang.SuppressWarnings("all") java.util.concurrent.Callable callable; + private @java.lang.SuppressWarnings("all") java.util.concurrent.Callable callable$value; private @java.lang.SuppressWarnings("all") boolean callable$set; - private @java.lang.SuppressWarnings("all") T tee; + private @java.lang.SuppressWarnings("all") T tee$value; private @java.lang.SuppressWarnings("all") boolean tee$set; - private @java.lang.SuppressWarnings("all") R arrr; + private @java.lang.SuppressWarnings("all") R arrr$value; private @java.lang.SuppressWarnings("all") boolean arrr$set; @java.lang.SuppressWarnings("all") BuilderDefaultsGenericsBuilder() { super(); } public @java.lang.SuppressWarnings("all") BuilderDefaultsGenericsBuilder callable(final java.util.concurrent.Callable callable) { - this.callable = callable; + this.callable$value = callable; callable$set = true; return this; } public @java.lang.SuppressWarnings("all") BuilderDefaultsGenericsBuilder tee(final T tee) { - this.tee = tee; + this.tee$value = tee; tee$set = true; return this; } public @java.lang.SuppressWarnings("all") BuilderDefaultsGenericsBuilder arrr(final R arrr) { - this.arrr = arrr; + this.arrr$value = arrr; arrr$set = true; return this; } public @java.lang.SuppressWarnings("all") BuilderDefaultsGenerics build() { - return new BuilderDefaultsGenerics((callable$set ? callable : BuilderDefaultsGenerics.$default$callable()), (tee$set ? tee : BuilderDefaultsGenerics.$default$tee()), (arrr$set ? arrr : BuilderDefaultsGenerics.$default$arrr())); + return new BuilderDefaultsGenerics((callable$set ? callable$value : BuilderDefaultsGenerics.$default$callable()), (tee$set ? tee$value : BuilderDefaultsGenerics.$default$tee()), (arrr$set ? arrr$value : BuilderDefaultsGenerics.$default$arrr())); } public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { - return (((((("BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder(callable=" + this.callable) + ", tee=") + this.tee) + ", arrr=") + this.arrr) + ")"); + return (((((("BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder(callable$value=" + this.callable$value) + ", tee$value=") + this.tee$value) + ", arrr$value=") + this.arrr$value) + ")"); } } private @Builder.Default java.util.concurrent.Callable callable; diff --git a/test/transform/resource/after-ecj/ConstructorsWithBuilderDefaults.java b/test/transform/resource/after-ecj/ConstructorsWithBuilderDefaults.java index 9d4c42c1..fd860c69 100644 --- a/test/transform/resource/after-ecj/ConstructorsWithBuilderDefaults.java +++ b/test/transform/resource/after-ecj/ConstructorsWithBuilderDefaults.java @@ -4,14 +4,14 @@ import lombok.Value; import lombok.Builder; final @NoArgsConstructor(force = true) @AllArgsConstructor @Builder @Value class ConstructorsWithBuilderDefaults { public static @java.lang.SuppressWarnings("all") class ConstructorsWithBuilderDefaultsBuilder { - private @java.lang.SuppressWarnings("all") int x; + private @java.lang.SuppressWarnings("all") int x$value; private @java.lang.SuppressWarnings("all") boolean x$set; private @java.lang.SuppressWarnings("all") int y; @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaultsBuilder() { super(); } public @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaultsBuilder x(final int x) { - this.x = x; + this.x$value = x; x$set = true; return this; } @@ -20,10 +20,10 @@ final @NoArgsConstructor(force = true) @AllArgsConstructor @Builder @Value class return this; } public @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults build() { - return new ConstructorsWithBuilderDefaults((x$set ? x : ConstructorsWithBuilderDefaults.$default$x()), y); + return new ConstructorsWithBuilderDefaults((x$set ? x$value : ConstructorsWithBuilderDefaults.$default$x()), y); } public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { - return (((("ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder(x=" + this.x) + ", y=") + this.y) + ")"); + return (((("ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder(x$value=" + this.x$value) + ", y=") + this.y) + ")"); } } private final @Builder.Default int x; diff --git a/test/transform/resource/after-ecj/ConstructorsWithBuilderDefaults2.java b/test/transform/resource/after-ecj/ConstructorsWithBuilderDefaults2.java index cc96c674..776899fb 100644 --- a/test/transform/resource/after-ecj/ConstructorsWithBuilderDefaults2.java +++ b/test/transform/resource/after-ecj/ConstructorsWithBuilderDefaults2.java @@ -3,21 +3,21 @@ import lombok.Value; import lombok.Builder; final @Builder @Value class ConstructorsWithBuilderDefaults { public static @java.lang.SuppressWarnings("all") class ConstructorsWithBuilderDefaultsBuilder { - private @java.lang.SuppressWarnings("all") java.util.List z; + private @java.lang.SuppressWarnings("all") java.util.List z$value; private @java.lang.SuppressWarnings("all") boolean z$set; - private @java.lang.SuppressWarnings("all") T x; + private @java.lang.SuppressWarnings("all") T x$value; private @java.lang.SuppressWarnings("all") boolean x$set; private @java.lang.SuppressWarnings("all") T q; @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaultsBuilder() { super(); } public @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaultsBuilder z(final java.util.List z) { - this.z = z; + this.z$value = z; z$set = true; return this; } public @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaultsBuilder x(final T x) { - this.x = x; + this.x$value = x; x$set = true; return this; } @@ -26,10 +26,10 @@ final @Builder @Value class ConstructorsWithBuilderDefaults { return this; } public @java.lang.SuppressWarnings("all") ConstructorsWithBuilderDefaults build() { - return new ConstructorsWithBuilderDefaults((z$set ? z : ConstructorsWithBuilderDefaults.$default$z()), (x$set ? x : ConstructorsWithBuilderDefaults.$default$x()), q); + return new ConstructorsWithBuilderDefaults((z$set ? z$value : ConstructorsWithBuilderDefaults.$default$z()), (x$set ? x$value : ConstructorsWithBuilderDefaults.$default$x()), q); } public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { - return (((((("ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder(z=" + this.z) + ", x=") + this.x) + ", q=") + this.q) + ")"); + return (((((("ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder(z$value=" + this.z$value) + ", x$value=") + this.x$value) + ", q=") + this.q) + ")"); } } private final @Builder.Default java.util.List z; diff --git a/test/transform/resource/after-ecj/SuperBuilderWithDefaults.java b/test/transform/resource/after-ecj/SuperBuilderWithDefaults.java index e259b68d..ff1b5931 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithDefaults.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithDefaults.java @@ -2,9 +2,9 @@ import java.util.List; public class SuperBuilderWithDefaults { public static @lombok.experimental.SuperBuilder class Parent { public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder, B extends ParentBuilder> { - private @java.lang.SuppressWarnings("all") long millis; + private @java.lang.SuppressWarnings("all") long millis$value; private @java.lang.SuppressWarnings("all") boolean millis$set; - private @java.lang.SuppressWarnings("all") N numberField; + private @java.lang.SuppressWarnings("all") N numberField$value; private @java.lang.SuppressWarnings("all") boolean numberField$set; public ParentBuilder() { super(); @@ -12,17 +12,17 @@ public class SuperBuilderWithDefaults { protected abstract @java.lang.SuppressWarnings("all") B self(); public abstract @java.lang.SuppressWarnings("all") C build(); public @java.lang.SuppressWarnings("all") B millis(final long millis) { - this.millis = millis; + this.millis$value = millis; millis$set = true; return self(); } public @java.lang.SuppressWarnings("all") B numberField(final N numberField) { - this.numberField = numberField; + this.numberField$value = numberField; numberField$set = true; return self(); } public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { - return (((("SuperBuilderWithDefaults.Parent.ParentBuilder(millis=" + this.millis) + ", numberField=") + this.numberField) + ")"); + return (((("SuperBuilderWithDefaults.Parent.ParentBuilder(millis$value=" + this.millis$value) + ", numberField$value=") + this.numberField$value) + ")"); } } private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends ParentBuilder, ParentBuilderImpl> { @@ -47,11 +47,11 @@ public class SuperBuilderWithDefaults { protected @java.lang.SuppressWarnings("all") Parent(final ParentBuilder b) { super(); if (b.millis$set) - this.millis = b.millis; + this.millis = b.millis$value; else this.millis = Parent.$default$millis(); if (b.numberField$set) - this.numberField = b.numberField; + this.numberField = b.numberField$value; else this.numberField = Parent.$default$numberField(); } @@ -61,7 +61,7 @@ public class SuperBuilderWithDefaults { } public static @lombok.experimental.SuperBuilder class Child extends Parent { public static abstract @java.lang.SuppressWarnings("all") class ChildBuilder> extends Parent.ParentBuilder { - private @java.lang.SuppressWarnings("all") double doubleField; + private @java.lang.SuppressWarnings("all") double doubleField$value; private @java.lang.SuppressWarnings("all") boolean doubleField$set; public ChildBuilder() { super(); @@ -69,12 +69,12 @@ public class SuperBuilderWithDefaults { protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self(); public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build(); public @java.lang.SuppressWarnings("all") B doubleField(final double doubleField) { - this.doubleField = doubleField; + this.doubleField$value = doubleField; doubleField$set = true; return self(); } public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { - return (((("SuperBuilderWithDefaults.Child.ChildBuilder(super=" + super.toString()) + ", doubleField=") + this.doubleField) + ")"); + return (((("SuperBuilderWithDefaults.Child.ChildBuilder(super=" + super.toString()) + ", doubleField$value=") + this.doubleField$value) + ")"); } } private static final @java.lang.SuppressWarnings("all") class ChildBuilderImpl extends ChildBuilder { @@ -95,7 +95,7 @@ public class SuperBuilderWithDefaults { protected @java.lang.SuppressWarnings("all") Child(final ChildBuilder b) { super(b); if (b.doubleField$set) - this.doubleField = b.doubleField; + this.doubleField = b.doubleField$value; else this.doubleField = Child.$default$doubleField(); } diff --git a/test/transform/resource/after-ecj/SuperBuilderWithNonNull.java b/test/transform/resource/after-ecj/SuperBuilderWithNonNull.java index 616d7083..31198ee1 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithNonNull.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithNonNull.java @@ -2,7 +2,7 @@ import java.util.List; public class SuperBuilderWithNonNull { public static @lombok.experimental.SuperBuilder class Parent { public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder> { - private @java.lang.SuppressWarnings("all") String nonNullParentField; + private @java.lang.SuppressWarnings("all") String nonNullParentField$value; private @java.lang.SuppressWarnings("all") boolean nonNullParentField$set; public ParentBuilder() { super(); @@ -14,12 +14,12 @@ public class SuperBuilderWithNonNull { { throw new java.lang.NullPointerException("nonNullParentField is marked non-null but is null"); } - this.nonNullParentField = nonNullParentField; + this.nonNullParentField$value = nonNullParentField; nonNullParentField$set = true; return self(); } public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { - return (("SuperBuilderWithNonNull.Parent.ParentBuilder(nonNullParentField=" + this.nonNullParentField) + ")"); + return (("SuperBuilderWithNonNull.Parent.ParentBuilder(nonNullParentField$value=" + this.nonNullParentField$value) + ")"); } } private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends ParentBuilder { @@ -40,7 +40,7 @@ public class SuperBuilderWithNonNull { protected @java.lang.SuppressWarnings("all") Parent(final ParentBuilder b) { super(); if (b.nonNullParentField$set) - this.nonNullParentField = b.nonNullParentField; + this.nonNullParentField = b.nonNullParentField$value; else this.nonNullParentField = Parent.$default$nonNullParentField(); if ((nonNullParentField == null)) -- cgit From e1d1415d6e147edacaa50d8954737a168fbdafb5 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Tue, 16 Jul 2019 01:50:16 +0200 Subject: [fixes #2168] Added JsonSetter as a copyable annotation --- test/transform/resource/after-delombok/JacksonJsonProperty.java | 5 +++++ test/transform/resource/after-ecj/JacksonJsonProperty.java | 8 +++++--- test/transform/resource/before/JacksonJsonProperty.java | 3 +++ 3 files changed, 13 insertions(+), 3 deletions(-) (limited to 'test/transform') diff --git a/test/transform/resource/after-delombok/JacksonJsonProperty.java b/test/transform/resource/after-delombok/JacksonJsonProperty.java index 842ba298..16a8039e 100644 --- a/test/transform/resource/after-delombok/JacksonJsonProperty.java +++ b/test/transform/resource/after-delombok/JacksonJsonProperty.java @@ -1,6 +1,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; public class JacksonJsonProperty { @JsonProperty("kebab-case-prop") + @JsonSetter(nulls = Nulls.SKIP) public String kebabCaseProp; @java.lang.SuppressWarnings("all") JacksonJsonProperty(final String kebabCaseProp) { @@ -14,6 +17,7 @@ public class JacksonJsonProperty { JacksonJsonPropertyBuilder() { } @JsonProperty("kebab-case-prop") + @JsonSetter(nulls = Nulls.SKIP) @java.lang.SuppressWarnings("all") public JacksonJsonPropertyBuilder kebabCaseProp(final String kebabCaseProp) { this.kebabCaseProp = kebabCaseProp; @@ -34,6 +38,7 @@ public class JacksonJsonProperty { return new JacksonJsonPropertyBuilder(); } @JsonProperty("kebab-case-prop") + @JsonSetter(nulls = Nulls.SKIP) @java.lang.SuppressWarnings("all") public void setKebabCaseProp(final String kebabCaseProp) { this.kebabCaseProp = kebabCaseProp; diff --git a/test/transform/resource/after-ecj/JacksonJsonProperty.java b/test/transform/resource/after-ecj/JacksonJsonProperty.java index 73049b2a..c0485251 100644 --- a/test/transform/resource/after-ecj/JacksonJsonProperty.java +++ b/test/transform/resource/after-ecj/JacksonJsonProperty.java @@ -1,4 +1,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import lombok.Builder; import lombok.Setter; public @Builder class JacksonJsonProperty { @@ -7,7 +9,7 @@ public @Builder class JacksonJsonProperty { @java.lang.SuppressWarnings("all") JacksonJsonPropertyBuilder() { super(); } - public @JsonProperty("kebab-case-prop") @java.lang.SuppressWarnings("all") JacksonJsonPropertyBuilder kebabCaseProp(final String kebabCaseProp) { + public @JsonProperty("kebab-case-prop") @JsonSetter(nulls = Nulls.SKIP) @java.lang.SuppressWarnings("all") JacksonJsonPropertyBuilder kebabCaseProp(final String kebabCaseProp) { this.kebabCaseProp = kebabCaseProp; return this; } @@ -18,7 +20,7 @@ public @Builder class JacksonJsonProperty { return (("JacksonJsonProperty.JacksonJsonPropertyBuilder(kebabCaseProp=" + this.kebabCaseProp) + ")"); } } - public @JsonProperty("kebab-case-prop") @Setter String kebabCaseProp; + public @JsonProperty("kebab-case-prop") @JsonSetter(nulls = Nulls.SKIP) @Setter String kebabCaseProp; @java.lang.SuppressWarnings("all") JacksonJsonProperty(final String kebabCaseProp) { super(); this.kebabCaseProp = kebabCaseProp; @@ -26,7 +28,7 @@ public @Builder class JacksonJsonProperty { public static @java.lang.SuppressWarnings("all") JacksonJsonPropertyBuilder builder() { return new JacksonJsonPropertyBuilder(); } - public @JsonProperty("kebab-case-prop") @java.lang.SuppressWarnings("all") void setKebabCaseProp(final String kebabCaseProp) { + public @JsonProperty("kebab-case-prop") @JsonSetter(nulls = Nulls.SKIP) @java.lang.SuppressWarnings("all") void setKebabCaseProp(final String kebabCaseProp) { this.kebabCaseProp = kebabCaseProp; } } \ No newline at end of file diff --git a/test/transform/resource/before/JacksonJsonProperty.java b/test/transform/resource/before/JacksonJsonProperty.java index f002dc48..f0b7b2f2 100644 --- a/test/transform/resource/before/JacksonJsonProperty.java +++ b/test/transform/resource/before/JacksonJsonProperty.java @@ -1,10 +1,13 @@ import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import lombok.Builder; import lombok.Setter; @Builder public class JacksonJsonProperty { @JsonProperty("kebab-case-prop") + @JsonSetter(nulls = Nulls.SKIP) @Setter public String kebabCaseProp; } -- cgit From aa80e1baf92f3327383b36466a771e92d8a91b05 Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Tue, 16 Jul 2019 02:04:11 +0200 Subject: Fixes #1197, add Objects.requireNonNull and Preconditions.checkkNotNull to supported null-check styles --- .../resource/after-delombok/NonNullWithGuava.java | 35 ++++++++++++++++++++ .../resource/after-delombok/NonNullWithJdk.java | 36 +++++++++++++++++++++ .../resource/after-ecj/NonNullWithGuava.java | 36 +++++++++++++++++++++ .../resource/after-ecj/NonNullWithJdk.java | 37 ++++++++++++++++++++++ .../resource/before/NonNullWithGuava.java | 33 +++++++++++++++++++ test/transform/resource/before/NonNullWithJdk.java | 34 ++++++++++++++++++++ 6 files changed, 211 insertions(+) create mode 100644 test/transform/resource/after-delombok/NonNullWithGuava.java create mode 100644 test/transform/resource/after-delombok/NonNullWithJdk.java create mode 100644 test/transform/resource/after-ecj/NonNullWithGuava.java create mode 100644 test/transform/resource/after-ecj/NonNullWithJdk.java create mode 100644 test/transform/resource/before/NonNullWithGuava.java create mode 100644 test/transform/resource/before/NonNullWithJdk.java (limited to 'test/transform') diff --git a/test/transform/resource/after-delombok/NonNullWithGuava.java b/test/transform/resource/after-delombok/NonNullWithGuava.java new file mode 100644 index 00000000..b3c13d30 --- /dev/null +++ b/test/transform/resource/after-delombok/NonNullWithGuava.java @@ -0,0 +1,35 @@ +import static com.google.common.base.Preconditions.*; +public class NonNullWithGuava { + @lombok.NonNull + private String test; + public void testMethod(@lombok.NonNull String arg) { + com.google.common.base.Preconditions.checkNotNull(arg, "arg is marked non-null but is null"); + System.out.println(arg); + } + public void testMethodWithCheck1(@lombok.NonNull String arg) { + checkNotNull(arg); + } + public void testMethodWithCheckAssign(@lombok.NonNull String arg) { + test = checkNotNull(arg); + } + public void testMethodWithCheck2(@lombok.NonNull String arg) { + com.google.common.base.Preconditions.checkNotNull(arg); + } + public void testMethodWithFakeCheck1(@lombok.NonNull String arg) { + com.google.common.base.Preconditions.checkNotNull(arg, "arg is marked non-null but is null"); + checkNotNull(""); + } + public void testMethodWithFakeCheck2(@lombok.NonNull String arg) { + com.google.common.base.Preconditions.checkNotNull(arg, "arg is marked non-null but is null"); + com.google.common.base.Preconditions.checkNotNull(test); + } + public void testMethodWithFakeCheckAssign(@lombok.NonNull String arg) { + com.google.common.base.Preconditions.checkNotNull(arg, "arg is marked non-null but is null"); + test = checkNotNull(test); + } + @java.lang.SuppressWarnings("all") + public void setTest(@lombok.NonNull final String test) { + com.google.common.base.Preconditions.checkNotNull(test, "test is marked non-null but is null"); + this.test = test; + } +} \ No newline at end of file diff --git a/test/transform/resource/after-delombok/NonNullWithJdk.java b/test/transform/resource/after-delombok/NonNullWithJdk.java new file mode 100644 index 00000000..d7e2958c --- /dev/null +++ b/test/transform/resource/after-delombok/NonNullWithJdk.java @@ -0,0 +1,36 @@ +//version 7: +import static java.util.Objects.*; +public class NonNullWithJdk { + @lombok.NonNull + private String test; + public void testMethod(@lombok.NonNull String arg) { + java.util.Objects.requireNonNull(arg, "arg is marked non-null but is null"); + System.out.println(arg); + } + public void testMethodWithCheck1(@lombok.NonNull String arg) { + requireNonNull(arg); + } + public void testMethodWithCheckAssign(@lombok.NonNull String arg) { + test = requireNonNull(arg); + } + public void testMethodWithCheck2(@lombok.NonNull String arg) { + java.util.Objects.requireNonNull(arg); + } + public void testMethodWithFakeCheck1(@lombok.NonNull String arg) { + java.util.Objects.requireNonNull(arg, "arg is marked non-null but is null"); + requireNonNull(""); + } + public void testMethodWithFakeCheck2(@lombok.NonNull String arg) { + java.util.Objects.requireNonNull(arg, "arg is marked non-null but is null"); + java.util.Objects.requireNonNull(test); + } + public void testMethodWithFakeCheckAssign(@lombok.NonNull String arg) { + java.util.Objects.requireNonNull(arg, "arg is marked non-null but is null"); + test = requireNonNull(test); + } + @java.lang.SuppressWarnings("all") + public void setTest(@lombok.NonNull final String test) { + java.util.Objects.requireNonNull(test, "test is marked non-null but is null"); + this.test = test; + } +} \ No newline at end of file diff --git a/test/transform/resource/after-ecj/NonNullWithGuava.java b/test/transform/resource/after-ecj/NonNullWithGuava.java new file mode 100644 index 00000000..c7f5a7fe --- /dev/null +++ b/test/transform/resource/after-ecj/NonNullWithGuava.java @@ -0,0 +1,36 @@ +import static com.google.common.base.Preconditions.*; +public class NonNullWithGuava { + private @lombok.NonNull @lombok.Setter String test; + public NonNullWithGuava() { + super(); + } + public void testMethod(@lombok.NonNull String arg) { + com.google.common.base.Preconditions.checkNotNull(arg, "arg is marked non-null but is null"); + System.out.println(arg); + } + public void testMethodWithCheck1(@lombok.NonNull String arg) { + checkNotNull(arg); + } + public void testMethodWithCheckAssign(@lombok.NonNull String arg) { + test = checkNotNull(arg); + } + public void testMethodWithCheck2(@lombok.NonNull String arg) { + com.google.common.base.Preconditions.checkNotNull(arg); + } + public void testMethodWithFakeCheck1(@lombok.NonNull String arg) { + com.google.common.base.Preconditions.checkNotNull(arg, "arg is marked non-null but is null"); + checkNotNull(""); + } + public void testMethodWithFakeCheck2(@lombok.NonNull String arg) { + com.google.common.base.Preconditions.checkNotNull(arg, "arg is marked non-null but is null"); + com.google.common.base.Preconditions.checkNotNull(test); + } + public void testMethodWithFakeCheckAssign(@lombok.NonNull String arg) { + com.google.common.base.Preconditions.checkNotNull(arg, "arg is marked non-null but is null"); + test = checkNotNull(test); + } + public @java.lang.SuppressWarnings("all") void setTest(final @lombok.NonNull String test) { + com.google.common.base.Preconditions.checkNotNull(test, "test is marked non-null but is null"); + this.test = test; + } +} diff --git a/test/transform/resource/after-ecj/NonNullWithJdk.java b/test/transform/resource/after-ecj/NonNullWithJdk.java new file mode 100644 index 00000000..7d522260 --- /dev/null +++ b/test/transform/resource/after-ecj/NonNullWithJdk.java @@ -0,0 +1,37 @@ +//version 7: +import static java.util.Objects.*; +public class NonNullWithJdk { + private @lombok.NonNull @lombok.Setter String test; + public NonNullWithJdk() { + super(); + } + public void testMethod(@lombok.NonNull String arg) { + java.util.Objects.requireNonNull(arg, "arg is marked non-null but is null"); + System.out.println(arg); + } + public void testMethodWithCheck1(@lombok.NonNull String arg) { + requireNonNull(arg); + } + public void testMethodWithCheckAssign(@lombok.NonNull String arg) { + test = requireNonNull(arg); + } + public void testMethodWithCheck2(@lombok.NonNull String arg) { + java.util.Objects.requireNonNull(arg); + } + public void testMethodWithFakeCheck1(@lombok.NonNull String arg) { + java.util.Objects.requireNonNull(arg, "arg is marked non-null but is null"); + requireNonNull(""); + } + public void testMethodWithFakeCheck2(@lombok.NonNull String arg) { + java.util.Objects.requireNonNull(arg, "arg is marked non-null but is null"); + java.util.Objects.requireNonNull(test); + } + public void testMethodWithFakeCheckAssign(@lombok.NonNull String arg) { + java.util.Objects.requireNonNull(arg, "arg is marked non-null but is null"); + test = requireNonNull(test); + } + public @java.lang.SuppressWarnings("all") void setTest(final @lombok.NonNull String test) { + java.util.Objects.requireNonNull(test, "test is marked non-null but is null"); + this.test = test; + } +} diff --git a/test/transform/resource/before/NonNullWithGuava.java b/test/transform/resource/before/NonNullWithGuava.java new file mode 100644 index 00000000..dc877daa --- /dev/null +++ b/test/transform/resource/before/NonNullWithGuava.java @@ -0,0 +1,33 @@ +//CONF: lombok.nonNull.exceptionType = Guava +import static com.google.common.base.Preconditions.*; +public class NonNullWithGuava { + @lombok.NonNull @lombok.Setter private String test; + + public void testMethod(@lombok.NonNull String arg) { + System.out.println(arg); + } + + public void testMethodWithCheck1(@lombok.NonNull String arg) { + checkNotNull(arg); + } + + public void testMethodWithCheckAssign(@lombok.NonNull String arg) { + test = checkNotNull(arg); + } + + public void testMethodWithCheck2(@lombok.NonNull String arg) { + com.google.common.base.Preconditions.checkNotNull(arg); + } + + public void testMethodWithFakeCheck1(@lombok.NonNull String arg) { + checkNotNull(""); + } + + public void testMethodWithFakeCheck2(@lombok.NonNull String arg) { + com.google.common.base.Preconditions.checkNotNull(test); + } + + public void testMethodWithFakeCheckAssign(@lombok.NonNull String arg) { + test = checkNotNull(test); + } +} diff --git a/test/transform/resource/before/NonNullWithJdk.java b/test/transform/resource/before/NonNullWithJdk.java new file mode 100644 index 00000000..c8cbf2ee --- /dev/null +++ b/test/transform/resource/before/NonNullWithJdk.java @@ -0,0 +1,34 @@ +//version 7: +//CONF: lombok.nonNull.exceptionType = Jdk +import static java.util.Objects.*; +public class NonNullWithJdk { + @lombok.NonNull @lombok.Setter private String test; + + public void testMethod(@lombok.NonNull String arg) { + System.out.println(arg); + } + + public void testMethodWithCheck1(@lombok.NonNull String arg) { + requireNonNull(arg); + } + + public void testMethodWithCheckAssign(@lombok.NonNull String arg) { + test = requireNonNull(arg); + } + + public void testMethodWithCheck2(@lombok.NonNull String arg) { + java.util.Objects.requireNonNull(arg); + } + + public void testMethodWithFakeCheck1(@lombok.NonNull String arg) { + requireNonNull(""); + } + + public void testMethodWithFakeCheck2(@lombok.NonNull String arg) { + java.util.Objects.requireNonNull(test); + } + + public void testMethodWithFakeCheckAssign(@lombok.NonNull String arg) { + test = requireNonNull(test); + } +} -- cgit