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

Merge pull request #2770 from janrieke/superBuilderNPEinConstructorExists

Browse Source 
[fixes #2704] SuperBuilder: avoid NPE on existing constructors
This commit is contained in:
Reinier Zwitserloot authored and GitHub committed 2021-03-21 05:09:13 +01:00
2 parents 5ef5c77198 26cc8af4d8
commit 38faf6d350
4 files changed
+77 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/core/lombok/eclipse/handlers/HandleSuperBuilder.java
+1 -1
View File
@@ -1204,7 +1204,7 @@ public class HandleSuperBuilder extends EclipseAnnotationHandler<SuperBuilder> {
if ((def.bits & ASTNode.IsDefaultConstructor) != 0) continue;
if (!def.isConstructor()) continue;
if (isTolerate(type, def)) continue;
if (def.arguments.length != 1) continue;
if (def.arguments == null || def.arguments.length != 1) continue;
// Cannot use typeMatches() here, because the parameter could be fully-qualified, partially-qualified, or not qualified.
// A string-compare of the last part should work. If it's a false-positive, users could still @Tolerate it.
test/transform/resource/after-delombok/SuperBuilderWithExistingConstuctor.java
+39
View File
@@ -0,0 +1,39 @@
public class SuperBuilderWithExistingConstuctor {
public SuperBuilderWithExistingConstuctor() {
}
@java.lang.SuppressWarnings("all")
public static abstract class SuperBuilderWithExistingConstuctorBuilder<C extends SuperBuilderWithExistingConstuctor, B extends SuperBuilderWithExistingConstuctor.SuperBuilderWithExistingConstuctorBuilder<C, B>> {
@java.lang.SuppressWarnings("all")
protected abstract B self();
@java.lang.SuppressWarnings("all")
public abstract C build();
@java.lang.Override
@java.lang.SuppressWarnings("all")
public java.lang.String toString() {
return "SuperBuilderWithExistingConstuctor.SuperBuilderWithExistingConstuctorBuilder()";
}
}
@java.lang.SuppressWarnings("all")
private static final class SuperBuilderWithExistingConstuctorBuilderImpl extends SuperBuilderWithExistingConstuctor.SuperBuilderWithExistingConstuctorBuilder<SuperBuilderWithExistingConstuctor, SuperBuilderWithExistingConstuctor.SuperBuilderWithExistingConstuctorBuilderImpl> {
@java.lang.SuppressWarnings("all")
private SuperBuilderWithExistingConstuctorBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected SuperBuilderWithExistingConstuctor.SuperBuilderWithExistingConstuctorBuilderImpl self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public SuperBuilderWithExistingConstuctor build() {
return new SuperBuilderWithExistingConstuctor(this);
}
}
@java.lang.SuppressWarnings("all")
protected SuperBuilderWithExistingConstuctor(final SuperBuilderWithExistingConstuctor.SuperBuilderWithExistingConstuctorBuilder<?, ?> b) {
}
@java.lang.SuppressWarnings("all")
public static SuperBuilderWithExistingConstuctor.SuperBuilderWithExistingConstuctorBuilder<?, ?> builder() {
return new SuperBuilderWithExistingConstuctor.SuperBuilderWithExistingConstuctorBuilderImpl();
}
}
test/transform/resource/after-ecj/SuperBuilderWithExistingConstuctor.java
+32
View File
@@ -0,0 +1,32 @@
public @lombok.experimental.SuperBuilder class SuperBuilderWithExistingConstuctor {
public static abstract @java.lang.SuppressWarnings("all") class SuperBuilderWithExistingConstuctorBuilder<C extends SuperBuilderWithExistingConstuctor, B extends SuperBuilderWithExistingConstuctor.SuperBuilderWithExistingConstuctorBuilder<C, B>> {
public SuperBuilderWithExistingConstuctorBuilder() {
super();
}
protected abstract @java.lang.SuppressWarnings("all") B self();
public abstract @java.lang.SuppressWarnings("all") C build();
public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
return "SuperBuilderWithExistingConstuctor.SuperBuilderWithExistingConstuctorBuilder()";
}
}
private static final @java.lang.SuppressWarnings("all") class SuperBuilderWithExistingConstuctorBuilderImpl extends SuperBuilderWithExistingConstuctor.SuperBuilderWithExistingConstuctorBuilder<SuperBuilderWithExistingConstuctor, SuperBuilderWithExistingConstuctor.SuperBuilderWithExistingConstuctorBuilderImpl> {
private SuperBuilderWithExistingConstuctorBuilderImpl() {
super();
}
protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithExistingConstuctor.SuperBuilderWithExistingConstuctorBuilderImpl self() {
return this;
}
public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderWithExistingConstuctor build() {
return new SuperBuilderWithExistingConstuctor(this);
}
}
public SuperBuilderWithExistingConstuctor() {
super();
}
protected @java.lang.SuppressWarnings("all") SuperBuilderWithExistingConstuctor(final SuperBuilderWithExistingConstuctor.SuperBuilderWithExistingConstuctorBuilder<?, ?> b) {
super();
}
public static @java.lang.SuppressWarnings("all") SuperBuilderWithExistingConstuctor.SuperBuilderWithExistingConstuctorBuilder<?, ?> builder() {
return new SuperBuilderWithExistingConstuctor.SuperBuilderWithExistingConstuctorBuilderImpl();
}
}
test/transform/resource/before/SuperBuilderWithExistingConstuctor.java
+5
View File
@@ -0,0 +1,5 @@
@lombok.experimental.SuperBuilder
public class SuperBuilderWithExistingConstuctor {
public SuperBuilderWithExistingConstuctor() {
}
}