From dbc173ba5c575eea404d3a76b3bc24d35656767c Mon Sep 17 00:00:00 2001 From: Jan Rieke Date: Thu, 16 Aug 2018 14:38:44 +0200 Subject: @SuperBuilder adapts @Builder.Default behavior from @Builder as #1347 is fixed now (javac) --- .../after-delombok/SuperBuilderWithDefaults.java | 27 +++++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) (limited to 'test/transform') diff --git a/test/transform/resource/after-delombok/SuperBuilderWithDefaults.java b/test/transform/resource/after-delombok/SuperBuilderWithDefaults.java index 7b6b4578..06d88f4d 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithDefaults.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithDefaults.java @@ -1,8 +1,16 @@ import java.util.List; public class SuperBuilderWithDefaults { public static class Parent { - private long millis = System.currentTimeMillis(); - private N numberField = null; + private long millis; + private N numberField; + @java.lang.SuppressWarnings("all") + private static long $default$millis() { + return System.currentTimeMillis(); + } + @java.lang.SuppressWarnings("all") + private static N $default$numberField() { + return null; + } @java.lang.SuppressWarnings("all") public static abstract class ParentBuilder, B extends ParentBuilder> { @java.lang.SuppressWarnings("all") @@ -53,8 +61,10 @@ public class SuperBuilderWithDefaults { } @java.lang.SuppressWarnings("all") protected Parent(final ParentBuilder b) { - if (b.millis$set) this.millis = b.millis; - if (b.numberField$set) this.numberField = b.numberField; + this.millis = b.millis; + if (!b.millis$set) this.millis = Parent.$default$millis(); + this.numberField = b.numberField; + if (!b.numberField$set) this.numberField = Parent.$default$numberField(); } @java.lang.SuppressWarnings("all") public static ParentBuilder builder() { @@ -62,7 +72,11 @@ public class SuperBuilderWithDefaults { } } public static class Child extends Parent { - private double doubleField = Math.PI; + private double doubleField; + @java.lang.SuppressWarnings("all") + private static double $default$doubleField() { + return Math.PI; + } @java.lang.SuppressWarnings("all") public static abstract class ChildBuilder> extends Parent.ParentBuilder { @java.lang.SuppressWarnings("all") @@ -106,7 +120,8 @@ public class SuperBuilderWithDefaults { @java.lang.SuppressWarnings("all") protected Child(final ChildBuilder b) { super(b); - if (b.doubleField$set) this.doubleField = b.doubleField; + this.doubleField = b.doubleField; + if (!b.doubleField$set) this.doubleField = Child.$default$doubleField(); } @java.lang.SuppressWarnings("all") public static ChildBuilder builder() { -- cgit From 8439cb5428a7dedbfa836b7028db7c7dba61293a Mon Sep 17 00:00:00 2001 From: Jan Rieke Date: Thu, 16 Aug 2018 15:27:54 +0200 Subject: @SuperBuilder adapts @Builder.Default behavior from @Builder as #1347 is fixed now (ecj) --- .../after-ecj/SuperBuilderWithDefaults.java | 30 +++++++++++++++------- 1 file changed, 21 insertions(+), 9 deletions(-) (limited to 'test/transform') diff --git a/test/transform/resource/after-ecj/SuperBuilderWithDefaults.java b/test/transform/resource/after-ecj/SuperBuilderWithDefaults.java index f0e3d8be..731bd9f2 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithDefaults.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithDefaults.java @@ -36,14 +36,22 @@ public class SuperBuilderWithDefaults { return new Parent(this); } } - private @lombok.Builder.Default long millis = System.currentTimeMillis(); - private @lombok.Builder.Default N numberField = null; + private @lombok.Builder.Default long millis; + private @lombok.Builder.Default N numberField; + private static @java.lang.SuppressWarnings("all") long $default$millis() { + return System.currentTimeMillis(); + } + private static @java.lang.SuppressWarnings("all") N $default$numberField() { + return null; + } protected @java.lang.SuppressWarnings("all") Parent(final ParentBuilder b) { super(); - if (b.millis$set) - this.millis = b.millis; - if (b.numberField$set) - this.numberField = b.numberField; + this.millis = b.millis; + if ((! b.millis$set)) + this.millis = Parent.$default$millis(); + this.numberField = b.numberField; + if ((! b.numberField$set)) + this.numberField = Parent.$default$numberField(); } public static @java.lang.SuppressWarnings("all") ParentBuilder builder() { return new ParentBuilderImpl(); @@ -78,11 +86,15 @@ public class SuperBuilderWithDefaults { return new Child(this); } } - private @lombok.Builder.Default double doubleField = Math.PI; + private @lombok.Builder.Default double doubleField; + private static @java.lang.SuppressWarnings("all") double $default$doubleField() { + return Math.PI; + } protected @java.lang.SuppressWarnings("all") Child(final ChildBuilder b) { super(b); - if (b.doubleField$set) - this.doubleField = b.doubleField; + this.doubleField = b.doubleField; + if ((! b.doubleField$set)) + this.doubleField = Child.$default$doubleField(); } public static @java.lang.SuppressWarnings("all") ChildBuilder builder() { return new ChildBuilderImpl(); -- cgit From 46837d6d8be26cea9d0b8cf2959866ac308cbf2d Mon Sep 17 00:00:00 2001 From: Jan Rieke 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/transform') 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> { + @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 { + @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> extends Parent.ParentBuilder { + @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 { + @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 From 31aef5219d6e6a39afe5dfa5d888bddd6e942e25 Mon Sep 17 00:00:00 2001 From: Jan Rieke Date: Thu, 16 Aug 2018 17:58:05 +0200 Subject: only assign value once so that final fields work (javac) --- test/transform/resource/after-delombok/SuperBuilderWithNonNull.java | 6 +++--- test/transform/resource/before/SuperBuilderWithNonNull.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'test/transform') diff --git a/test/transform/resource/after-delombok/SuperBuilderWithNonNull.java b/test/transform/resource/after-delombok/SuperBuilderWithNonNull.java index 6fea9d17..5eba938f 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithNonNull.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithNonNull.java @@ -2,7 +2,7 @@ import java.util.List; public class SuperBuilderWithNonNull { public static class Parent { @lombok.NonNull - String nonNullParentField; + final String nonNullParentField; @java.lang.SuppressWarnings("all") private static String $default$nonNullParentField() { return "default"; @@ -47,8 +47,8 @@ public class SuperBuilderWithNonNull { } @java.lang.SuppressWarnings("all") protected Parent(final ParentBuilder b) { - this.nonNullParentField = b.nonNullParentField; - if (!b.nonNullParentField$set) this.nonNullParentField = Parent.$default$nonNullParentField(); + if (b.nonNullParentField$set) this.nonNullParentField = b.nonNullParentField; + else this.nonNullParentField = Parent.$default$nonNullParentField(); if (nonNullParentField == null) { throw new java.lang.NullPointerException("nonNullParentField is marked @NonNull but is null"); } diff --git a/test/transform/resource/before/SuperBuilderWithNonNull.java b/test/transform/resource/before/SuperBuilderWithNonNull.java index 21f67a47..34668bbc 100644 --- a/test/transform/resource/before/SuperBuilderWithNonNull.java +++ b/test/transform/resource/before/SuperBuilderWithNonNull.java @@ -5,7 +5,7 @@ public class SuperBuilderWithNonNull { public static class Parent { @lombok.NonNull @lombok.Builder.Default - String nonNullParentField = "default"; + final String nonNullParentField = "default"; } @lombok.experimental.SuperBuilder -- cgit From 76f6013b5950b64dbc776d6ddebdca439653381b Mon Sep 17 00:00:00 2001 From: Jan Rieke Date: Thu, 16 Aug 2018 18:31:19 +0200 Subject: do null checks after assignment so that default==null is covered; only assign value once so that final fields work (ecj) --- .../after-ecj/SuperBuilderWithNonNull.java | 97 ++++++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 test/transform/resource/after-ecj/SuperBuilderWithNonNull.java (limited to 'test/transform') diff --git a/test/transform/resource/after-ecj/SuperBuilderWithNonNull.java b/test/transform/resource/after-ecj/SuperBuilderWithNonNull.java new file mode 100644 index 00000000..106b8326 --- /dev/null +++ b/test/transform/resource/after-ecj/SuperBuilderWithNonNull.java @@ -0,0 +1,97 @@ +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") boolean nonNullParentField$set; + public ParentBuilder() { + super(); + } + protected abstract @java.lang.SuppressWarnings("all") B self(); + public abstract @java.lang.SuppressWarnings("all") C build(); + public @java.lang.SuppressWarnings("all") B nonNullParentField(final String nonNullParentField) { + this.nonNullParentField = 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) + ")"); + } + } + private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends ParentBuilder { + private ParentBuilderImpl() { + super(); + } + protected @java.lang.Override @java.lang.SuppressWarnings("all") ParentBuilderImpl self() { + return this; + } + public @java.lang.Override @java.lang.SuppressWarnings("all") Parent build() { + return new Parent(this); + } + } + final @lombok.NonNull @lombok.Builder.Default String nonNullParentField; + private static @java.lang.SuppressWarnings("all") String $default$nonNullParentField() { + return "default"; + } + protected @java.lang.SuppressWarnings("all") Parent(final ParentBuilder b) { + super(); + if (b.nonNullParentField$set) + this.nonNullParentField = b.nonNullParentField; + else + this.nonNullParentField = Parent.$default$nonNullParentField(); + if ((nonNullParentField == null)) + { + throw new java.lang.NullPointerException("nonNullParentField is marked @NonNull but is null"); + } + } + public static @java.lang.SuppressWarnings("all") ParentBuilder builder() { + return new ParentBuilderImpl(); + } + } + 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") String nonNullChildField; + public ChildBuilder() { + super(); + } + 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 nonNullChildField(final String nonNullChildField) { + this.nonNullChildField = nonNullChildField; + return self(); + } + public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + return (((("SuperBuilderWithNonNull.Child.ChildBuilder(super=" + super.toString()) + ", nonNullChildField=") + this.nonNullChildField) + ")"); + } + } + private static final @java.lang.SuppressWarnings("all") class ChildBuilderImpl extends ChildBuilder { + private ChildBuilderImpl() { + super(); + } + protected @java.lang.Override @java.lang.SuppressWarnings("all") ChildBuilderImpl self() { + return this; + } + public @java.lang.Override @java.lang.SuppressWarnings("all") Child build() { + return new Child(this); + } + } + @lombok.NonNull String nonNullChildField; + protected @java.lang.SuppressWarnings("all") 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"); + } + } + public static @java.lang.SuppressWarnings("all") ChildBuilder builder() { + return new ChildBuilderImpl(); + } + } + public SuperBuilderWithNonNull() { + super(); + } + public static void test() { + Child x = Child.builder().nonNullChildField("child").nonNullParentField("parent").build(); + } +} -- cgit From 16fc34f36c77832b2bb7d383105c0b4c4dc5ddb6 Mon Sep 17 00:00:00 2001 From: Jan Rieke Date: Thu, 16 Aug 2018 18:37:34 +0200 Subject: adapted existing tests to changed default assignment generation --- .../resource/after-delombok/SuperBuilderWithDefaults.java | 12 ++++++------ .../resource/after-ecj/SuperBuilderWithDefaults.java | 15 +++++++++------ 2 files changed, 15 insertions(+), 12 deletions(-) (limited to 'test/transform') diff --git a/test/transform/resource/after-delombok/SuperBuilderWithDefaults.java b/test/transform/resource/after-delombok/SuperBuilderWithDefaults.java index 06d88f4d..17707bf5 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithDefaults.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithDefaults.java @@ -61,10 +61,10 @@ public class SuperBuilderWithDefaults { } @java.lang.SuppressWarnings("all") protected Parent(final ParentBuilder b) { - this.millis = b.millis; - if (!b.millis$set) this.millis = Parent.$default$millis(); - this.numberField = b.numberField; - if (!b.numberField$set) this.numberField = Parent.$default$numberField(); + if (b.millis$set) this.millis = b.millis; + else this.millis = Parent.$default$millis(); + if (b.numberField$set) this.numberField = b.numberField; + else this.numberField = Parent.$default$numberField(); } @java.lang.SuppressWarnings("all") public static ParentBuilder builder() { @@ -120,8 +120,8 @@ public class SuperBuilderWithDefaults { @java.lang.SuppressWarnings("all") protected Child(final ChildBuilder b) { super(b); - this.doubleField = b.doubleField; - if (!b.doubleField$set) this.doubleField = Child.$default$doubleField(); + if (b.doubleField$set) this.doubleField = b.doubleField; + else this.doubleField = Child.$default$doubleField(); } @java.lang.SuppressWarnings("all") public static ChildBuilder builder() { diff --git a/test/transform/resource/after-ecj/SuperBuilderWithDefaults.java b/test/transform/resource/after-ecj/SuperBuilderWithDefaults.java index 731bd9f2..ef0713c5 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithDefaults.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithDefaults.java @@ -46,11 +46,13 @@ public class SuperBuilderWithDefaults { } protected @java.lang.SuppressWarnings("all") Parent(final ParentBuilder b) { super(); - this.millis = b.millis; - if ((! b.millis$set)) + if (b.millis$set) + this.millis = b.millis; + else this.millis = Parent.$default$millis(); - this.numberField = b.numberField; - if ((! b.numberField$set)) + if (b.numberField$set) + this.numberField = b.numberField; + else this.numberField = Parent.$default$numberField(); } public static @java.lang.SuppressWarnings("all") ParentBuilder builder() { @@ -92,8 +94,9 @@ public class SuperBuilderWithDefaults { } protected @java.lang.SuppressWarnings("all") Child(final ChildBuilder b) { super(b); - this.doubleField = b.doubleField; - if ((! b.doubleField$set)) + if (b.doubleField$set) + this.doubleField = b.doubleField; + else this.doubleField = Child.$default$doubleField(); } public static @java.lang.SuppressWarnings("all") ChildBuilder builder() { -- cgit