diff options
| author | Roel Spilker <r.spilker@gmail.com> | 2018-08-27 21:37:25 +0200 |
|---|---|---|
| committer | Roel Spilker <r.spilker@gmail.com> | 2018-08-27 21:37:25 +0200 |
| commit | d548879e7d638fea93817bdbbc745c1370eabc42 (patch) | |
| tree | 49fbeb4ef47948bb678c2a55587246e0dc7758ad /test/transform/resource/after-delombok/SuperBuilderWithDefaults.java | |
| parent | ecf754c87d3aaf1f788c9f00e5815ce7174f3722 (diff) | |
| parent | 0cb87873c2bc75478a5caf651af6148ed1d7e412 (diff) | |
| download | lombok-d548879e7d638fea93817bdbbc745c1370eabc42.tar.gz lombok-d548879e7d638fea93817bdbbc745c1370eabc42.tar.bz2 lombok-d548879e7d638fea93817bdbbc745c1370eabc42.zip | |
Merge branch 'janrieke-superBuilderNonNull'
Diffstat (limited to 'test/transform/resource/after-delombok/SuperBuilderWithDefaults.java')
| -rw-r--r-- | test/transform/resource/after-delombok/SuperBuilderWithDefaults.java | 12 |
1 files changed, 6 insertions, 6 deletions
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<N, ?, ?> b) {
- this.millis = b.millis;
- if (!b.millis$set) this.millis = Parent.<N>$default$millis();
- this.numberField = b.numberField;
- if (!b.numberField$set) this.numberField = Parent.<N>$default$numberField();
+ if (b.millis$set) this.millis = b.millis;
+ else this.millis = Parent.<N>$default$millis();
+ if (b.numberField$set) this.numberField = b.numberField;
+ else this.numberField = Parent.<N>$default$numberField();
}
@java.lang.SuppressWarnings("all")
public static <N extends Number> ParentBuilder<N, ?, ?> 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() {
|