tiennm99/lombok
1
0 Fork 0
mirror of https://github.com/tiennm99/lombok.git synced 2026-10-14 06:17:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fixes #2701] fix NPE on customized SuperBuilder with Singular

Browse Source
This commit is contained in:
Jan Rieke committed 2021-03-12 11:51:18 +01:00
1 parent f8c16ed8ac
commit 14f861b5f1
4 files changed
+157 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/core/lombok/javac/handlers/HandleSuperBuilder.java
+1 -1
View File
@@ -303,7 +303,7 @@ public class HandleSuperBuilder extends JavacAnnotationHandler<SuperBuilder> {
if (sd == null) continue;
JavacSingularizer singularizer = sd.getSingularizer();
if (singularizer == null) continue;
if (singularizer.checkForAlreadyExistingNodesAndGenerateError(job.builderType, sd)) {
if (singularizer.checkForAlreadyExistingNodesAndGenerateError(job.builderAbstractType, sd)) {
bfd.singularData = null;
}
}
test/transform/resource/after-delombok/SuperBuilderSingularCustomized.java
+77
View File
@@ -0,0 +1,77 @@
import java.util.Set;
class SuperBuilderSingularCustomized {
private Set<String> foos;
public static abstract class SuperBuilderSingularCustomizedBuilder<C extends SuperBuilderSingularCustomized, B extends SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilder<C, B>> {
@java.lang.SuppressWarnings("all")
private java.util.ArrayList<String> foos;
public B custom(final String value) {
return self();
}
@java.lang.SuppressWarnings("all")
protected abstract B self();
@java.lang.SuppressWarnings("all")
public abstract C build();
@java.lang.SuppressWarnings("all")
public B foo(final String foo) {
if (this.foos == null) this.foos = new java.util.ArrayList<String>();
this.foos.add(foo);
return self();
}
@java.lang.SuppressWarnings("all")
public B foos(final java.util.Collection<? extends String> foos) {
if (foos == null) {
throw new java.lang.NullPointerException("foos cannot be null");
}
if (this.foos == null) this.foos = new java.util.ArrayList<String>();
this.foos.addAll(foos);
return self();
}
@java.lang.SuppressWarnings("all")
public B clearFoos() {
if (this.foos != null) this.foos.clear();
return self();
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public java.lang.String toString() {
return "SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilder(foos=" + this.foos + ")";
}
}
@java.lang.SuppressWarnings("all")
private static final class SuperBuilderSingularCustomizedBuilderImpl extends SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilder<SuperBuilderSingularCustomized, SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilderImpl> {
@java.lang.SuppressWarnings("all")
private SuperBuilderSingularCustomizedBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilderImpl self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public SuperBuilderSingularCustomized build() {
return new SuperBuilderSingularCustomized(this);
}
}
@java.lang.SuppressWarnings("all")
protected SuperBuilderSingularCustomized(final SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilder<?, ?> b) {
java.util.Set<String> foos;
switch (b.foos == null ? 0 : b.foos.size()) {
case 0:
foos = java.util.Collections.emptySet();
break;
case 1:
foos = java.util.Collections.singleton(b.foos.get(0));
break;
default:
foos = new java.util.LinkedHashSet<String>(b.foos.size() < 1073741824 ? 1 + b.foos.size() + (b.foos.size() - 3) / 3 : java.lang.Integer.MAX_VALUE);
foos.addAll(b.foos);
foos = java.util.Collections.unmodifiableSet(foos);
}
this.foos = foos;
}
@java.lang.SuppressWarnings("all")
public static SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilder<?, ?> builder() {
return new SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilderImpl();
}
}
test/transform/resource/after-ecj/SuperBuilderSingularCustomized.java
+70
View File
@@ -0,0 +1,70 @@
import java.util.Set;
@lombok.experimental.SuperBuilder class SuperBuilderSingularCustomized {
public static abstract class SuperBuilderSingularCustomizedBuilder<C extends SuperBuilderSingularCustomized, B extends SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilder<C, B>> {
private @java.lang.SuppressWarnings("all") java.util.ArrayList<String> foos;
public SuperBuilderSingularCustomizedBuilder() {
super();
}
public B custom(final String value) {
return self();
}
protected abstract @java.lang.SuppressWarnings("all") B self();
public abstract @java.lang.SuppressWarnings("all") C build();
public @java.lang.SuppressWarnings("all") B foo(final String foo) {
if ((this.foos == null))
this.foos = new java.util.ArrayList<String>();
this.foos.add(foo);
return self();
}
public @java.lang.SuppressWarnings("all") B foos(final java.util.Collection<? extends String> foos) {
if ((foos == null))
{
throw new java.lang.NullPointerException("foos cannot be null");
}
if ((this.foos == null))
this.foos = new java.util.ArrayList<String>();
this.foos.addAll(foos);
return self();
}
public @java.lang.SuppressWarnings("all") B clearFoos() {
if ((this.foos != null))
this.foos.clear();
return self();
}
public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
return (("SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilder(foos=" + this.foos) + ")");
}
}
private static final @java.lang.SuppressWarnings("all") class SuperBuilderSingularCustomizedBuilderImpl extends SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilder<SuperBuilderSingularCustomized, SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilderImpl> {
private SuperBuilderSingularCustomizedBuilderImpl() {
super();
}
protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilderImpl self() {
return this;
}
public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderSingularCustomized build() {
return new SuperBuilderSingularCustomized(this);
}
}
private @lombok.Singular Set<String> foos;
protected @java.lang.SuppressWarnings("all") SuperBuilderSingularCustomized(final SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilder<?, ?> b) {
super();
java.util.Set<String> foos;
switch (((b.foos == null) ? 0 : b.foos.size())) {
case 0 :
foos = java.util.Collections.emptySet();
break;
case 1 :
foos = java.util.Collections.singleton(b.foos.get(0));
break;
default :
foos = new java.util.LinkedHashSet<String>(((b.foos.size() < 0x40000000) ? ((1 + b.foos.size()) + ((b.foos.size() - 3) / 3)) : java.lang.Integer.MAX_VALUE));
foos.addAll(b.foos);
foos = java.util.Collections.unmodifiableSet(foos);
}
this.foos = foos;
}
public static @java.lang.SuppressWarnings("all") SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilder<?, ?> builder() {
return new SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilderImpl();
}
}
test/transform/resource/before/SuperBuilderSingularCustomized.java
+9
View File
@@ -0,0 +1,9 @@
import java.util.Set;
@lombok.experimental.SuperBuilder
class SuperBuilderSingularCustomized {
@lombok.Singular private Set<String> foos;
public static abstract class SuperBuilderSingularCustomizedBuilder<C extends SuperBuilderSingularCustomized, B extends SuperBuilderSingularCustomized.SuperBuilderSingularCustomizedBuilder<C, B>> {
public B custom(final String value) {
return self();
}
}}