From abb0d2374e0ca6cda55c5ea63f51235111701081 Mon Sep 17 00:00:00 2001 From: Jan Rieke Date: Tue, 11 Sep 2018 14:52:15 +0200 Subject: SuperBuilder: generate fillValuesFrom method (javac) --- .../resource/after-delombok/SuperBuilderBasicToBuilder.java | 5 ++--- test/transform/resource/after-ecj/SuperBuilderBasicToBuilder.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'test') diff --git a/test/transform/resource/after-delombok/SuperBuilderBasicToBuilder.java b/test/transform/resource/after-delombok/SuperBuilderBasicToBuilder.java index ae3f5f31..404984b9 100644 --- a/test/transform/resource/after-delombok/SuperBuilderBasicToBuilder.java +++ b/test/transform/resource/after-delombok/SuperBuilderBasicToBuilder.java @@ -1,5 +1,4 @@ import java.util.List; - public class SuperBuilderBasicToBuilder { public static class Parent { int field1; @@ -13,7 +12,7 @@ public class SuperBuilderBasicToBuilder { @java.lang.SuppressWarnings("all") protected B $fillValuesFrom(final C instance) { this.field1(instance.field1); - this.items(instance.items); + this.items(instance.items == null ? java.util.Collections.emptyList() : instance.items); return self(); } @java.lang.SuppressWarnings("all") @@ -97,7 +96,7 @@ public class SuperBuilderBasicToBuilder { private double field3; @java.lang.Override @java.lang.SuppressWarnings("all") - protected B $fillValuesFrom(C instance) { + protected B $fillValuesFrom(final C instance) { super.$fillValuesFrom(instance); this.field3(instance.field3); return self(); diff --git a/test/transform/resource/after-ecj/SuperBuilderBasicToBuilder.java b/test/transform/resource/after-ecj/SuperBuilderBasicToBuilder.java index a2299a9c..5e5f9760 100644 --- a/test/transform/resource/after-ecj/SuperBuilderBasicToBuilder.java +++ b/test/transform/resource/after-ecj/SuperBuilderBasicToBuilder.java @@ -10,7 +10,7 @@ public class SuperBuilderBasic { } protected @java.lang.SuppressWarnings("all") B $fillValuesFrom(final C instance) { this.field1(instance.field1); - this.items(instance.items); + this.items(instance.items == null ? java.util.Collections.emptyList() : instance.items); return self(); } protected abstract @java.lang.SuppressWarnings("all") B self(); -- cgit