[fixes #2268] make lombok generate qualified types in order to avoid name clashes.

This commit is contained in:
Reinier Zwitserloot committed 2020-01-06 05:19:37 +01:00
1 parent 0bb5619230
commit 889c935ec9
166 files changed
+1451 -3425

No files matched your search

@@ -12,7 +12,7 @@ public class SuperBuilderWithDefaults {
return null;
}
@java.lang.SuppressWarnings("all")
public static abstract class ParentBuilder<N extends Number, C extends Parent<N>, B extends ParentBuilder<N, C, B>> {
public static abstract class ParentBuilder<N extends Number, C extends SuperBuilderWithDefaults.Parent<N>, B extends SuperBuilderWithDefaults.Parent.ParentBuilder<N, C, B>> {
@java.lang.SuppressWarnings("all")
private boolean millis$set;
@java.lang.SuppressWarnings("all")
@@ -44,31 +44,31 @@ public class SuperBuilderWithDefaults {
}
}
@java.lang.SuppressWarnings("all")
private static final class ParentBuilderImpl<N extends Number> extends ParentBuilder<N, Parent<N>, ParentBuilderImpl<N>> {
private static final class ParentBuilderImpl<N extends Number> extends SuperBuilderWithDefaults.Parent.ParentBuilder<N, SuperBuilderWithDefaults.Parent<N>, SuperBuilderWithDefaults.Parent.ParentBuilderImpl<N>> {
@java.lang.SuppressWarnings("all")
private ParentBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected ParentBuilderImpl<N> self() {
protected SuperBuilderWithDefaults.Parent.ParentBuilderImpl<N> self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public Parent<N> build() {
return new Parent<N>(this);
public SuperBuilderWithDefaults.Parent<N> build() {
return new SuperBuilderWithDefaults.Parent<N>(this);
}
}
@java.lang.SuppressWarnings("all")
protected Parent(final ParentBuilder<N, ?, ?> b) {
protected Parent(final SuperBuilderWithDefaults.Parent.ParentBuilder<N, ?, ?> b) {
if (b.millis$set) this.millis = b.millis$value;
else this.millis = Parent.<N>$default$millis();
else this.millis = SuperBuilderWithDefaults.Parent.<N>$default$millis();
if (b.numberField$set) this.numberField = b.numberField$value;
else this.numberField = Parent.<N>$default$numberField();
else this.numberField = SuperBuilderWithDefaults.Parent.<N>$default$numberField();
}
@java.lang.SuppressWarnings("all")
public static <N extends Number> ParentBuilder<N, ?, ?> builder() {
return new ParentBuilderImpl<N>();
public static <N extends Number> SuperBuilderWithDefaults.Parent.ParentBuilder<N, ?, ?> builder() {
return new SuperBuilderWithDefaults.Parent.ParentBuilderImpl<N>();
}
}
public static class Child extends Parent<Integer> {
@@ -78,7 +78,7 @@ public class SuperBuilderWithDefaults {
return Math.PI;
}
@java.lang.SuppressWarnings("all")
public static abstract class ChildBuilder<C extends Child, B extends ChildBuilder<C, B>> extends Parent.ParentBuilder<Integer, C, B> {
public static abstract class ChildBuilder<C extends SuperBuilderWithDefaults.Child, B extends SuperBuilderWithDefaults.Child.ChildBuilder<C, B>> extends Parent.ParentBuilder<Integer, C, B> {
@java.lang.SuppressWarnings("all")
private boolean doubleField$set;
@java.lang.SuppressWarnings("all")
@@ -102,30 +102,30 @@ public class SuperBuilderWithDefaults {
}
}
@java.lang.SuppressWarnings("all")
private static final class ChildBuilderImpl extends ChildBuilder<Child, ChildBuilderImpl> {
private static final class ChildBuilderImpl extends SuperBuilderWithDefaults.Child.ChildBuilder<SuperBuilderWithDefaults.Child, SuperBuilderWithDefaults.Child.ChildBuilderImpl> {
@java.lang.SuppressWarnings("all")
private ChildBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected ChildBuilderImpl self() {
protected SuperBuilderWithDefaults.Child.ChildBuilderImpl self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public Child build() {
return new Child(this);
public SuperBuilderWithDefaults.Child build() {
return new SuperBuilderWithDefaults.Child(this);
}
}
@java.lang.SuppressWarnings("all")
protected Child(final ChildBuilder<?, ?> b) {
protected Child(final SuperBuilderWithDefaults.Child.ChildBuilder<?, ?> b) {
super(b);
if (b.doubleField$set) this.doubleField = b.doubleField$value;
else this.doubleField = Child.$default$doubleField();
else this.doubleField = SuperBuilderWithDefaults.Child.$default$doubleField();
}
@java.lang.SuppressWarnings("all")
public static ChildBuilder<?, ?> builder() {
return new ChildBuilderImpl();
public static SuperBuilderWithDefaults.Child.ChildBuilder<?, ?> builder() {
return new SuperBuilderWithDefaults.Child.ChildBuilderImpl();
}
}
public static void test() {