tiennm99/lombok
1
0
Fork 0
mirror of https://github.com/tiennm99/lombok.git synced 2026-09-03 14:18:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

[superbuilder] toBuilder + singular + javac6 was broken

Browse Source 
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.<String>emptyList();
This commit is contained in:
Reinier Zwitserloot
2021-03-13 04:53:44 +01:00
parent c1bf4ec3b6
commit e8cd744d3b
13 changed files with 49 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/transform/resource/after-delombok/SuperBuilderBasicToBuilder.java
+1 -1
View File
@@ -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.<String>emptyList() : instance.items);
}
@java.lang.SuppressWarnings("all")
protected abstract B self();
test/transform/resource/after-delombok/SuperBuilderWithGenericsAndToBuilder.java
+1 -1
View File
@@ -19,7 +19,7 @@ public class SuperBuilderWithGenericsAndToBuilder {
@java.lang.SuppressWarnings("all")
private static <A> void $fillValuesFromInstanceIntoBuilder(final SuperBuilderWithGenericsAndToBuilder.Parent<A> instance, final SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder<A, ?, ?> b) {
b.field1(instance.field1);
b.items(instance.items == null ? java.util.Collections.emptyMap() : instance.items);
b.items(instance.items == null ? java.util.Collections.<Integer, String>emptyMap() : instance.items);
}
@java.lang.SuppressWarnings("all")
protected abstract B self();
test/transform/resource/after-delombok/SuperBuilderWithSetterPrefix.java
+1 -1
View File
@@ -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.<String>emptyList() : instance.items);
}
@java.lang.SuppressWarnings("all")
protected abstract B self();
test/transform/resource/after-ecj/SuperBuilderBasicToBuilder.java
+1 -1
View File
@@ -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.<String>emptyList() : instance.items));
}
protected abstract @java.lang.SuppressWarnings("all") B self();
public abstract @java.lang.SuppressWarnings("all") C build();
test/transform/resource/after-ecj/SuperBuilderWithGenericsAndToBuilder.java
+1 -1
View File
@@ -14,7 +14,7 @@ public class SuperBuilderWithGenericsAndToBuilder {
}
private static @java.lang.SuppressWarnings("all") <A>void $fillValuesFromInstanceIntoBuilder(final SuperBuilderWithGenericsAndToBuilder.Parent<A> instance, final SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder<A, ?, ?> b) {
b.field1(instance.field1);
b.items(((instance.items == null) ? java.util.Collections.emptyMap() : instance.items));
b.items(((instance.items == null) ? java.util.Collections.<Integer, String>emptyMap() : instance.items));
}
protected abstract @java.lang.SuppressWarnings("all") B self();
public abstract @java.lang.SuppressWarnings("all") C build();
test/transform/resource/after-ecj/SuperBuilderWithSetterPrefix.java
+1 -1
View File
@@ -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.<String>emptyList() : instance.items));
}
protected abstract @java.lang.SuppressWarnings("all") B self();
public abstract @java.lang.SuppressWarnings("all") C build();