From 889c935ec9f0e45bba1e88b0f256e1f29a734f39 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Thu, 19 Dec 2019 21:26:35 +0100 Subject: [fixes #2268] make lombok generate qualified types in order to avoid name clashes. --- .../SuperBuilderWithCustomBuilderMethod.java | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'test/transform/resource/after-delombok/SuperBuilderWithCustomBuilderMethod.java') diff --git a/test/transform/resource/after-delombok/SuperBuilderWithCustomBuilderMethod.java b/test/transform/resource/after-delombok/SuperBuilderWithCustomBuilderMethod.java index fc303583..e042b238 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithCustomBuilderMethod.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithCustomBuilderMethod.java @@ -4,7 +4,7 @@ public class SuperBuilderWithCustomBuilderMethod { A field1; List items; @java.lang.SuppressWarnings("all") - public static abstract class ParentBuilder, B extends ParentBuilder> { + public static abstract class ParentBuilder, B extends SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder> { @java.lang.SuppressWarnings("all") private A field1; @java.lang.SuppressWarnings("all") @@ -42,23 +42,23 @@ public class SuperBuilderWithCustomBuilderMethod { } } @java.lang.SuppressWarnings("all") - private static final class ParentBuilderImpl extends ParentBuilder, ParentBuilderImpl> { + private static final class ParentBuilderImpl extends SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder, SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilderImpl> { @java.lang.SuppressWarnings("all") private ParentBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") - protected ParentBuilderImpl self() { + protected SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") - public Parent build() { - return new Parent(this); + public SuperBuilderWithCustomBuilderMethod.Parent build() { + return new SuperBuilderWithCustomBuilderMethod.Parent(this); } } @java.lang.SuppressWarnings("all") - protected Parent(final ParentBuilder b) { + protected Parent(final SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder b) { this.field1 = b.field1; java.util.List items; switch (b.items == null ? 0 : b.items.size()) { @@ -74,8 +74,8 @@ public class SuperBuilderWithCustomBuilderMethod { this.items = items; } @java.lang.SuppressWarnings("all") - public static ParentBuilder builder() { - return new ParentBuilderImpl(); + public static SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder builder() { + return new SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilderImpl(); } } public static class Child extends Parent { @@ -84,7 +84,7 @@ public class SuperBuilderWithCustomBuilderMethod { return new ChildBuilderImpl().item("default item"); } @java.lang.SuppressWarnings("all") - public static abstract class ChildBuilder, B extends ChildBuilder> extends Parent.ParentBuilder { + public static abstract class ChildBuilder, B extends SuperBuilderWithCustomBuilderMethod.Child.ChildBuilder> extends Parent.ParentBuilder { @java.lang.SuppressWarnings("all") private double field3; @java.lang.Override @@ -105,23 +105,23 @@ public class SuperBuilderWithCustomBuilderMethod { } } @java.lang.SuppressWarnings("all") - private static final class ChildBuilderImpl extends ChildBuilder, ChildBuilderImpl> { + private static final class ChildBuilderImpl extends SuperBuilderWithCustomBuilderMethod.Child.ChildBuilder, SuperBuilderWithCustomBuilderMethod.Child.ChildBuilderImpl> { @java.lang.SuppressWarnings("all") private ChildBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") - protected ChildBuilderImpl self() { + protected SuperBuilderWithCustomBuilderMethod.Child.ChildBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") - public Child build() { - return new Child(this); + public SuperBuilderWithCustomBuilderMethod.Child build() { + return new SuperBuilderWithCustomBuilderMethod.Child(this); } } @java.lang.SuppressWarnings("all") - protected Child(final ChildBuilder b) { + protected Child(final SuperBuilderWithCustomBuilderMethod.Child.ChildBuilder b) { super(b); this.field3 = b.field3; } -- cgit