From e8cd744d3b2d986dd847b9ff6bdf2750a8dd6764 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Sat, 13 Mar 2021 04:53:44 +0100 Subject: [superbuilder] toBuilder + singular + javac6 was broken superbuilder generated the node `x.pluralName(plural == null ? Collections.emptyList() : plural)`. java6 is not smart enough to infer the appropriate generics for the emptyList() call. Fixed by always specifying the needed type explicitly: Collections.emptyList(); --- test/transform/resource/after-delombok/SuperBuilderBasicToBuilder.java | 2 +- .../resource/after-delombok/SuperBuilderWithGenericsAndToBuilder.java | 2 +- .../transform/resource/after-delombok/SuperBuilderWithSetterPrefix.java | 2 +- test/transform/resource/after-ecj/SuperBuilderBasicToBuilder.java | 2 +- .../resource/after-ecj/SuperBuilderWithGenericsAndToBuilder.java | 2 +- test/transform/resource/after-ecj/SuperBuilderWithSetterPrefix.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'test') diff --git a/test/transform/resource/after-delombok/SuperBuilderBasicToBuilder.java b/test/transform/resource/after-delombok/SuperBuilderBasicToBuilder.java index 14e2bbf7..add6f841 100644 --- a/test/transform/resource/after-delombok/SuperBuilderBasicToBuilder.java +++ b/test/transform/resource/after-delombok/SuperBuilderBasicToBuilder.java @@ -35,7 +35,7 @@ public class SuperBuilderBasicToBuilder { b.obtainViaField(instance.field1); b.obtainViaMethod(instance.method()); b.obtainViaStaticMethod(SuperBuilderBasicToBuilder.Parent.staticMethod(instance)); - b.items(instance.items == null ? java.util.Collections.emptyList() : instance.items); + b.items(instance.items == null ? java.util.Collections.emptyList() : instance.items); } @java.lang.SuppressWarnings("all") protected abstract B self(); diff --git a/test/transform/resource/after-delombok/SuperBuilderWithGenericsAndToBuilder.java b/test/transform/resource/after-delombok/SuperBuilderWithGenericsAndToBuilder.java index 25a8fda1..28c48db3 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithGenericsAndToBuilder.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithGenericsAndToBuilder.java @@ -19,7 +19,7 @@ public class SuperBuilderWithGenericsAndToBuilder { @java.lang.SuppressWarnings("all") private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderWithGenericsAndToBuilder.Parent instance, final SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder b) { b.field1(instance.field1); - b.items(instance.items == null ? java.util.Collections.emptyMap() : instance.items); + b.items(instance.items == null ? java.util.Collections.emptyMap() : instance.items); } @java.lang.SuppressWarnings("all") protected abstract B self(); diff --git a/test/transform/resource/after-delombok/SuperBuilderWithSetterPrefix.java b/test/transform/resource/after-delombok/SuperBuilderWithSetterPrefix.java index 1490540e..88db8511 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithSetterPrefix.java @@ -35,7 +35,7 @@ public class SuperBuilderWithSetterPrefix { b.withObtainViaField(instance.field1); b.withObtainViaMethod(instance.method()); b.withObtainViaStaticMethod(SuperBuilderWithSetterPrefix.Parent.staticMethod(instance)); - b.withItems(instance.items == null ? java.util.Collections.emptyList() : instance.items); + b.withItems(instance.items == null ? java.util.Collections.emptyList() : instance.items); } @java.lang.SuppressWarnings("all") protected abstract B self(); diff --git a/test/transform/resource/after-ecj/SuperBuilderBasicToBuilder.java b/test/transform/resource/after-ecj/SuperBuilderBasicToBuilder.java index 70b54c16..67ee62f6 100644 --- a/test/transform/resource/after-ecj/SuperBuilderBasicToBuilder.java +++ b/test/transform/resource/after-ecj/SuperBuilderBasicToBuilder.java @@ -19,7 +19,7 @@ public class SuperBuilderBasicToBuilder { b.obtainViaField(instance.field1); b.obtainViaMethod(instance.method()); b.obtainViaStaticMethod(SuperBuilderBasicToBuilder.Parent.staticMethod(instance)); - b.items(((instance.items == null) ? java.util.Collections.emptyList() : instance.items)); + b.items(((instance.items == null) ? java.util.Collections.emptyList() : instance.items)); } protected abstract @java.lang.SuppressWarnings("all") B self(); public abstract @java.lang.SuppressWarnings("all") C build(); diff --git a/test/transform/resource/after-ecj/SuperBuilderWithGenericsAndToBuilder.java b/test/transform/resource/after-ecj/SuperBuilderWithGenericsAndToBuilder.java index be819a2f..829b50b9 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithGenericsAndToBuilder.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithGenericsAndToBuilder.java @@ -14,7 +14,7 @@ public class SuperBuilderWithGenericsAndToBuilder { } private static @java.lang.SuppressWarnings("all") void $fillValuesFromInstanceIntoBuilder(final SuperBuilderWithGenericsAndToBuilder.Parent instance, final SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder b) { b.field1(instance.field1); - b.items(((instance.items == null) ? java.util.Collections.emptyMap() : instance.items)); + b.items(((instance.items == null) ? java.util.Collections.emptyMap() : instance.items)); } protected abstract @java.lang.SuppressWarnings("all") B self(); public abstract @java.lang.SuppressWarnings("all") C build(); diff --git a/test/transform/resource/after-ecj/SuperBuilderWithSetterPrefix.java b/test/transform/resource/after-ecj/SuperBuilderWithSetterPrefix.java index 38a0a55b..3a1278c1 100644 --- a/test/transform/resource/after-ecj/SuperBuilderWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/SuperBuilderWithSetterPrefix.java @@ -19,7 +19,7 @@ public class SuperBuilderWithSetterPrefix { b.withObtainViaField(instance.field1); b.withObtainViaMethod(instance.method()); b.withObtainViaStaticMethod(SuperBuilderWithSetterPrefix.Parent.staticMethod(instance)); - b.withItems(((instance.items == null) ? java.util.Collections.emptyList() : instance.items)); + b.withItems(((instance.items == null) ? java.util.Collections.emptyList() : instance.items)); } protected abstract @java.lang.SuppressWarnings("all") B self(); public abstract @java.lang.SuppressWarnings("all") C build(); -- cgit