tiennm99/lombok
1
0 Fork 0
mirror of https://github.com/tiennm99/lombok.git synced 2026-10-11 12:19:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed toBuilder on Singular fields with wildcards (javac)

Browse Source
This commit is contained in:
Jan Rieke committed 2018-10-12 09:06:34 +02:00
1 parent 3bb6f69a5b
commit d6057f8eb7
4 files changed
+109 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/core/lombok/javac/handlers/HandleBuilder.java
+2 -1
View File
@@ -521,7 +521,8 @@ public class HandleBuilder extends JavacAnnotationHandler<Builder> {
arg = tgt[0];
} else {
JCExpression eqNull = maker.Binary(CTC_EQUAL, tgt[0], maker.Literal(CTC_BOT, null));
List<JCExpression> tas = cloneTypes(maker, bfd.singularData.getTypeArgs(), ast, type.getContext());
// Use the singularizer to create the type args (will remove possible wildcards on the type).
List<JCExpression> tas = bfd.singularData.getSingularizer().createTypeArgs(bfd.singularData.getTypeArgs().size(), false, type, bfd.singularData.getTypeArgs(), type.get());
JCExpression emptyList = maker.Apply(tas, chainDots(type, "java", "util", "Collections", "emptyList"), List.<JCExpression>nil());
arg = maker.Conditional(eqNull, emptyList, tgt[1]);
}
src/core/lombok/javac/handlers/singulars/JavacGuavaSingularizer.java
+3 -3
View File
@@ -169,13 +169,13 @@ abstract class JavacGuavaSingularizer extends JavacSingularizer {
List<JCExpression> jceBlank = List.nil();
JCExpression varType = chainDotsString(builderType, data.getTargetFqn());
int agrumentsCount = getTypeArgumentsCount();
varType = addTypeArgs(agrumentsCount, false, builderType, varType, data.getTypeArgs(), source);
int argumentsCount = getTypeArgumentsCount();
varType = addTypeArgs(argumentsCount, false, builderType, varType, data.getTypeArgs(), source);
JCExpression empty; {
//ImmutableX.of()
JCExpression emptyMethod = chainDots(builderType, "com", "google", "common", "collect", getSimpleTargetTypeName(data), "of");
List<JCExpression> invokeTypeArgs = createTypeArgs(agrumentsCount, false, builderType, data.getTypeArgs(), source);
List<JCExpression> invokeTypeArgs = createTypeArgs(argumentsCount, false, builderType, data.getTypeArgs(), source);
empty = maker.Apply(invokeTypeArgs, emptyMethod, jceBlank);
}
test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilder.java
+94
View File
@@ -0,0 +1,94 @@
import java.util.List;
import java.util.Collection;
class BuilderSingularWildcardListsWithToBuilder {
private List<?> objects;
private Collection<? extends Number> numbers;
@java.lang.SuppressWarnings("all")
BuilderSingularWildcardListsWithToBuilder(final List<?> objects, final Collection<? extends Number> numbers) {
this.objects = objects;
this.numbers = numbers;
}
@java.lang.SuppressWarnings("all")
public static class BuilderSingularWildcardListsWithToBuilderBuilder {
@java.lang.SuppressWarnings("all")
private java.util.ArrayList<java.lang.Object> objects;
@java.lang.SuppressWarnings("all")
private java.util.ArrayList<Number> numbers;
@java.lang.SuppressWarnings("all")
BuilderSingularWildcardListsWithToBuilderBuilder() {
}
@java.lang.SuppressWarnings("all")
public BuilderSingularWildcardListsWithToBuilderBuilder object(final java.lang.Object object) {
if (this.objects == null) this.objects = new java.util.ArrayList<java.lang.Object>();
this.objects.add(object);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularWildcardListsWithToBuilderBuilder objects(final java.util.Collection<?> objects) {
if (this.objects == null) this.objects = new java.util.ArrayList<java.lang.Object>();
this.objects.addAll(objects);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularWildcardListsWithToBuilderBuilder clearObjects() {
if (this.objects != null) this.objects.clear();
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularWildcardListsWithToBuilderBuilder number(final Number number) {
if (this.numbers == null) this.numbers = new java.util.ArrayList<Number>();
this.numbers.add(number);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularWildcardListsWithToBuilderBuilder numbers(final java.util.Collection<? extends Number> numbers) {
if (this.numbers == null) this.numbers = new java.util.ArrayList<Number>();
this.numbers.addAll(numbers);
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularWildcardListsWithToBuilderBuilder clearNumbers() {
if (this.numbers != null) this.numbers.clear();
return this;
}
@java.lang.SuppressWarnings("all")
public BuilderSingularWildcardListsWithToBuilder build() {
java.util.List<java.lang.Object> objects;
switch (this.objects == null ? 0 : this.objects.size()) {
case 0:
objects = java.util.Collections.emptyList();
break;
case 1:
objects = java.util.Collections.singletonList(this.objects.get(0));
break;
default:
objects = java.util.Collections.unmodifiableList(new java.util.ArrayList<java.lang.Object>(this.objects));
}
java.util.Collection<Number> numbers;
switch (this.numbers == null ? 0 : this.numbers.size()) {
case 0:
numbers = java.util.Collections.emptyList();
break;
case 1:
numbers = java.util.Collections.singletonList(this.numbers.get(0));
break;
default:
numbers = java.util.Collections.unmodifiableList(new java.util.ArrayList<Number>(this.numbers));
}
return new BuilderSingularWildcardListsWithToBuilder(objects, numbers);
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public java.lang.String toString() {
return "BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder(objects=" + this.objects + ", numbers=" + this.numbers + ")";
}
}
@java.lang.SuppressWarnings("all")
public static BuilderSingularWildcardListsWithToBuilderBuilder builder() {
return new BuilderSingularWildcardListsWithToBuilderBuilder();
}
@java.lang.SuppressWarnings("all")
public BuilderSingularWildcardListsWithToBuilderBuilder toBuilder() {
return new BuilderSingularWildcardListsWithToBuilderBuilder().objects(this.objects == null ? java.util.Collections.<java.lang.Object>emptyList() : this.objects).numbers(this.numbers == null ? java.util.Collections.<Number>emptyList() : this.numbers);
}
}
test/transform/resource/before/BuilderSingularWildcardListsWithToBuilder.java
+10
View File
@@ -0,0 +1,10 @@
import java.util.List;
import java.util.Collection;
import lombok.Singular;
@lombok.Builder(toBuilder = true)
class BuilderSingularWildcardListsWithToBuilder {
@Singular private List<?> objects;
@Singular private Collection<? extends Number> numbers;
}