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. --- .../resource/after-delombok/BuilderComplex.java | 12 +- .../resource/after-delombok/BuilderCustomName.java | 12 +- .../resource/after-delombok/BuilderDefaults.java | 10 +- .../after-delombok/BuilderDefaultsGenerics.java | 10 +- .../after-delombok/BuilderDefaultsWarnings.java | 18 +-- .../after-delombok/BuilderGenericMethod.java | 8 +- .../after-delombok/BuilderInstanceMethod.java | 12 +- .../resource/after-delombok/BuilderJavadoc.java | 8 +- .../resource/after-delombok/BuilderSimple.java | 8 +- .../BuilderSimpleWithSetterPrefix.java | 6 +- .../BuilderSingularAnnotatedTypes.java | 16 +-- ...lderSingularAnnotatedTypesWithSetterPrefix.java | 16 +-- .../BuilderSingularGuavaListsSets.java | 34 ++--- ...lderSingularGuavaListsSetsWithSetterPrefix.java | 140 -------------------- .../after-delombok/BuilderSingularGuavaMaps.java | 22 ++-- .../BuilderSingularGuavaMapsWithSetterPrefix.java | 94 ------------- .../after-delombok/BuilderSingularLists.java | 22 ++-- .../BuilderSingularListsWithSetterPrefix.java | 123 ----------------- .../after-delombok/BuilderSingularMaps.java | 28 ++-- .../BuilderSingularMapsWithSetterPrefix.java | 28 ++-- .../after-delombok/BuilderSingularNoAuto.java | 22 ++-- .../BuilderSingularNoAutoWithSetterPrefix.java | 22 ++-- .../BuilderSingularRedirectToGuava.java | 22 ++-- ...derSingularRedirectToGuavaWithSetterPrefix.java | 93 ------------- .../after-delombok/BuilderSingularSets.java | 28 ++-- .../BuilderSingularSetsWithSetterPrefix.java | 28 ++-- .../BuilderSingularToBuilderWithNull.java | 14 +- ...rSingularToBuilderWithNullWithSetterPrefix.java | 14 +- .../BuilderSingularWildcardListsWithToBuilder.java | 20 +-- ...WildcardListsWithToBuilderWithSetterPrefix.java | 97 -------------- .../BuilderSingularWithPrefixes.java | 10 +- ...uilderSingularWithPrefixesWithSetterPrefix.java | 10 +- .../resource/after-delombok/BuilderTypeAnnos.java | 6 +- .../BuilderTypeAnnosWithSetterPrefix.java | 6 +- .../resource/after-delombok/BuilderValueData.java | 8 +- .../BuilderValueDataWithSetterPrefix.java | 8 +- .../after-delombok/BuilderWithAccessors.java | 12 +- .../BuilderWithAccessorsWithSetterPrefix.java | 60 --------- .../after-delombok/BuilderWithBadNames.java | 8 +- .../BuilderWithBadNamesWithSetterPrefix.java | 42 ------ .../after-delombok/BuilderWithDeprecated.java | 20 +-- .../BuilderWithDeprecatedWithSetterPrefix.java | 114 ---------------- .../BuilderWithExistingBuilderClass.java | 8 +- ...erWithExistingBuilderClassWithSetterPrefix.java | 8 +- .../after-delombok/BuilderWithNoBuilderMethod.java | 6 +- ...BuilderWithNoBuilderMethodWithSetterPrefix.java | 33 ----- .../after-delombok/BuilderWithNonNull.java | 6 +- .../BuilderWithNonNullWithSetterPrefix.java | 6 +- .../BuilderWithRecursiveGenerics.java | 12 +- ...ilderWithRecursiveGenericsWithSetterPrefix.java | 85 ------------ .../after-delombok/BuilderWithToBuilder.java | 34 ++--- .../BuilderWithToBuilderWithSetterPrefix.java | 146 --------------------- .../after-delombok/BuilderWithTolerate.java | 6 +- .../BuilderWithTolerateWithSetterPrefix.java | 40 ------ .../after-delombok/CheckerFrameworkBuilder.java | 18 +-- .../CheckerFrameworkSuperBuilder.java | 50 +++---- .../ConstructorsWithBuilderDefaults.java | 8 +- .../ConstructorsWithBuilderDefaults2.java | 10 +- .../after-delombok/JacksonJsonProperty.java | 6 +- .../after-delombok/SuperBuilderAbstract.java | 36 ++--- .../SuperBuilderAbstractToBuilder.java | 56 ++++---- .../resource/after-delombok/SuperBuilderBasic.java | 32 ++--- .../after-delombok/SuperBuilderBasicToBuilder.java | 50 +++---- .../after-delombok/SuperBuilderCustomized.java | 20 +-- .../SuperBuilderSingularAnnotatedTypes.java | 12 +- .../SuperBuilderWithCustomBuilderMethod.java | 28 ++-- .../after-delombok/SuperBuilderWithDefaults.java | 38 +++--- .../after-delombok/SuperBuilderWithGenerics.java | 32 ++--- .../after-delombok/SuperBuilderWithGenerics2.java | 32 ++--- .../after-delombok/SuperBuilderWithGenerics3.java | 32 ++--- .../SuperBuilderWithGenericsAndToBuilder.java | 48 +++---- .../after-delombok/SuperBuilderWithNonNull.java | 34 ++--- .../after-delombok/SuperBuilderWithPrefixes.java | 12 +- .../resource/after-ecj/BuilderComplex.java | 12 +- .../resource/after-ecj/BuilderCustomName.java | 12 +- .../resource/after-ecj/BuilderDefaults.java | 10 +- .../after-ecj/BuilderDefaultsGenerics.java | 10 +- .../after-ecj/BuilderDefaultsWarnings.java | 18 +-- .../resource/after-ecj/BuilderGenericMethod.java | 8 +- .../resource/after-ecj/BuilderInstanceMethod.java | 12 +- .../resource/after-ecj/BuilderJavadoc.java | 8 +- .../resource/after-ecj/BuilderSimple.java | 8 +- .../after-ecj/BuilderSimpleWithSetterPrefix.java | 6 +- .../after-ecj/BuilderSingularAnnotatedTypes.java | 16 +-- ...lderSingularAnnotatedTypesWithSetterPrefix.java | 16 +-- .../after-ecj/BuilderSingularGuavaListsSets.java | 34 ++--- ...lderSingularGuavaListsSetsWithSetterPrefix.java | 125 ------------------ .../after-ecj/BuilderSingularGuavaMaps.java | 22 ++-- .../BuilderSingularGuavaMapsWithSetterPrefix.java | 83 ------------ .../resource/after-ecj/BuilderSingularLists.java | 22 ++-- .../BuilderSingularListsWithSetterPrefix.java | 116 ---------------- .../resource/after-ecj/BuilderSingularMaps.java | 28 ++-- .../BuilderSingularMapsWithSetterPrefix.java | 28 ++-- .../resource/after-ecj/BuilderSingularNoAuto.java | 22 ++-- .../BuilderSingularNoAutoWithSetterPrefix.java | 22 ++-- .../after-ecj/BuilderSingularRedirectToGuava.java | 22 ++-- ...derSingularRedirectToGuavaWithSetterPrefix.java | 83 ------------ .../resource/after-ecj/BuilderSingularSets.java | 28 ++-- .../BuilderSingularSetsWithSetterPrefix.java | 28 ++-- .../BuilderSingularToBuilderWithNull.java | 14 +- ...rSingularToBuilderWithNullWithSetterPrefix.java | 14 +- .../BuilderSingularWildcardListsWithToBuilder.java | 20 +-- ...WildcardListsWithToBuilderWithSetterPrefix.java | 92 ------------- .../after-ecj/BuilderSingularWithPrefixes.java | 10 +- ...uilderSingularWithPrefixesWithSetterPrefix.java | 10 +- .../resource/after-ecj/BuilderTypeAnnos.java | 6 +- .../BuilderTypeAnnosWithSetterPrefix.java | 6 +- .../resource/after-ecj/BuilderValueData.java | 8 +- .../BuilderValueDataWithSetterPrefix.java | 8 +- .../resource/after-ecj/BuilderWithAccessors.java | 12 +- .../BuilderWithAccessorsWithSetterPrefix.java | 47 ------- .../resource/after-ecj/BuilderWithBadNames.java | 8 +- .../BuilderWithBadNamesWithSetterPrefix.java | 33 ----- .../resource/after-ecj/BuilderWithDeprecated.java | 20 +-- .../BuilderWithDeprecatedWithSetterPrefix.java | 87 ------------ .../after-ecj/BuilderWithExistingBuilderClass.java | 8 +- ...erWithExistingBuilderClassWithSetterPrefix.java | 8 +- .../after-ecj/BuilderWithNoBuilderMethod.java | 6 +- ...BuilderWithNoBuilderMethodWithSetterPrefix.java | 27 ---- .../resource/after-ecj/BuilderWithNonNull.java | 6 +- .../BuilderWithNonNullWithSetterPrefix.java | 6 +- .../after-ecj/BuilderWithRecursiveGenerics.java | 12 +- ...ilderWithRecursiveGenericsWithSetterPrefix.java | 78 ----------- .../resource/after-ecj/BuilderWithToBuilder.java | 34 ++--- .../BuilderWithToBuilderWithSetterPrefix.java | 124 ----------------- .../resource/after-ecj/BuilderWithTolerate.java | 6 +- .../BuilderWithTolerateWithSetterPrefix.java | 34 ----- .../after-ecj/CheckerFrameworkBuilder.java | 18 +-- .../after-ecj/CheckerFrameworkSuperBuilder.java | 50 +++---- .../after-ecj/ConstructorsWithBuilderDefaults.java | 8 +- .../ConstructorsWithBuilderDefaults2.java | 10 +- .../resource/after-ecj/JacksonJsonProperty.java | 6 +- .../resource/after-ecj/SuperBuilderAbstract.java | 36 ++--- .../after-ecj/SuperBuilderAbstractToBuilder.java | 56 ++++---- .../resource/after-ecj/SuperBuilderBasic.java | 32 ++--- .../after-ecj/SuperBuilderBasicToBuilder.java | 50 +++---- .../resource/after-ecj/SuperBuilderCustomized.java | 20 +-- .../SuperBuilderSingularAnnotatedTypes.java | 12 +- .../SuperBuilderWithCustomBuilderMethod.java | 28 ++-- .../after-ecj/SuperBuilderWithDefaults.java | 38 +++--- .../after-ecj/SuperBuilderWithGenerics.java | 32 ++--- .../after-ecj/SuperBuilderWithGenerics2.java | 32 ++--- .../after-ecj/SuperBuilderWithGenerics3.java | 32 ++--- .../SuperBuilderWithGenericsAndToBuilder.java | 48 +++---- .../after-ecj/SuperBuilderWithNonNull.java | 34 ++--- .../after-ecj/SuperBuilderWithPrefixes.java | 12 +- ...lderSingularGuavaListsSetsWithSetterPrefix.java | 16 --- .../BuilderSingularGuavaMapsWithSetterPrefix.java | 12 -- .../BuilderSingularListsWithSetterPrefix.java | 11 -- ...derSingularRedirectToGuavaWithSetterPrefix.java | 13 -- ...WildcardListsWithToBuilderWithSetterPrefix.java | 10 -- .../BuilderWithAccessorsWithSetterPrefix.java | 7 - .../BuilderWithBadNamesWithSetterPrefix.java | 5 - .../BuilderWithDeprecatedWithSetterPrefix.java | 11 -- ...BuilderWithNoBuilderMethodWithSetterPrefix.java | 5 - ...ilderWithRecursiveGenericsWithSetterPrefix.java | 13 -- .../BuilderWithToBuilderWithSetterPrefix.java | 20 --- .../BuilderWithTolerateWithSetterPrefix.java | 18 --- 158 files changed, 1168 insertions(+), 3305 deletions(-) delete mode 100644 test/transform/resource/after-delombok/BuilderSingularGuavaListsSetsWithSetterPrefix.java delete mode 100644 test/transform/resource/after-delombok/BuilderSingularGuavaMapsWithSetterPrefix.java delete mode 100644 test/transform/resource/after-delombok/BuilderSingularListsWithSetterPrefix.java delete mode 100644 test/transform/resource/after-delombok/BuilderSingularRedirectToGuavaWithSetterPrefix.java delete mode 100644 test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java delete mode 100644 test/transform/resource/after-delombok/BuilderWithAccessorsWithSetterPrefix.java delete mode 100644 test/transform/resource/after-delombok/BuilderWithBadNamesWithSetterPrefix.java delete mode 100644 test/transform/resource/after-delombok/BuilderWithDeprecatedWithSetterPrefix.java delete mode 100644 test/transform/resource/after-delombok/BuilderWithNoBuilderMethodWithSetterPrefix.java delete mode 100644 test/transform/resource/after-delombok/BuilderWithRecursiveGenericsWithSetterPrefix.java delete mode 100644 test/transform/resource/after-delombok/BuilderWithToBuilderWithSetterPrefix.java delete mode 100644 test/transform/resource/after-delombok/BuilderWithTolerateWithSetterPrefix.java delete mode 100644 test/transform/resource/after-ecj/BuilderSingularGuavaListsSetsWithSetterPrefix.java delete mode 100644 test/transform/resource/after-ecj/BuilderSingularGuavaMapsWithSetterPrefix.java delete mode 100644 test/transform/resource/after-ecj/BuilderSingularListsWithSetterPrefix.java delete mode 100644 test/transform/resource/after-ecj/BuilderSingularRedirectToGuavaWithSetterPrefix.java delete mode 100644 test/transform/resource/after-ecj/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java delete mode 100644 test/transform/resource/after-ecj/BuilderWithAccessorsWithSetterPrefix.java delete mode 100644 test/transform/resource/after-ecj/BuilderWithBadNamesWithSetterPrefix.java delete mode 100644 test/transform/resource/after-ecj/BuilderWithDeprecatedWithSetterPrefix.java delete mode 100644 test/transform/resource/after-ecj/BuilderWithNoBuilderMethodWithSetterPrefix.java delete mode 100644 test/transform/resource/after-ecj/BuilderWithRecursiveGenericsWithSetterPrefix.java delete mode 100644 test/transform/resource/after-ecj/BuilderWithToBuilderWithSetterPrefix.java delete mode 100644 test/transform/resource/after-ecj/BuilderWithTolerateWithSetterPrefix.java delete mode 100644 test/transform/resource/before/BuilderSingularGuavaListsSetsWithSetterPrefix.java delete mode 100644 test/transform/resource/before/BuilderSingularGuavaMapsWithSetterPrefix.java delete mode 100644 test/transform/resource/before/BuilderSingularListsWithSetterPrefix.java delete mode 100644 test/transform/resource/before/BuilderSingularRedirectToGuavaWithSetterPrefix.java delete mode 100644 test/transform/resource/before/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java delete mode 100644 test/transform/resource/before/BuilderWithAccessorsWithSetterPrefix.java delete mode 100644 test/transform/resource/before/BuilderWithBadNamesWithSetterPrefix.java delete mode 100644 test/transform/resource/before/BuilderWithDeprecatedWithSetterPrefix.java delete mode 100644 test/transform/resource/before/BuilderWithNoBuilderMethodWithSetterPrefix.java delete mode 100644 test/transform/resource/before/BuilderWithRecursiveGenericsWithSetterPrefix.java delete mode 100644 test/transform/resource/before/BuilderWithToBuilderWithSetterPrefix.java delete mode 100644 test/transform/resource/before/BuilderWithTolerateWithSetterPrefix.java (limited to 'test/transform') diff --git a/test/transform/resource/after-delombok/BuilderComplex.java b/test/transform/resource/after-delombok/BuilderComplex.java index c63d7b59..a82a0497 100644 --- a/test/transform/resource/after-delombok/BuilderComplex.java +++ b/test/transform/resource/after-delombok/BuilderComplex.java @@ -16,22 +16,22 @@ class BuilderComplex { TestVoidName() { } @java.lang.SuppressWarnings("all") - public TestVoidName number(final T number) { + public BuilderComplex.TestVoidName number(final T number) { this.number = number; return this; } @java.lang.SuppressWarnings("all") - public TestVoidName arg2(final int arg2) { + public BuilderComplex.TestVoidName arg2(final int arg2) { this.arg2 = arg2; return this; } @java.lang.SuppressWarnings("all") - public TestVoidName arg3(final String arg3) { + public BuilderComplex.TestVoidName arg3(final String arg3) { this.arg3 = arg3; return this; } @java.lang.SuppressWarnings("all") - public TestVoidName selfRef(final BuilderComplex selfRef) { + public BuilderComplex.TestVoidName selfRef(final BuilderComplex selfRef) { this.selfRef = selfRef; return this; } @@ -46,7 +46,7 @@ class BuilderComplex { } } @java.lang.SuppressWarnings("all") - public static TestVoidName builder() { - return new TestVoidName(); + public static BuilderComplex.TestVoidName builder() { + return new BuilderComplex.TestVoidName(); } } diff --git a/test/transform/resource/after-delombok/BuilderCustomName.java b/test/transform/resource/after-delombok/BuilderCustomName.java index 4db08220..4b423ee0 100644 --- a/test/transform/resource/after-delombok/BuilderCustomName.java +++ b/test/transform/resource/after-delombok/BuilderCustomName.java @@ -2,7 +2,7 @@ import java.util.List; class BuilderCustomName { private final int field; @java.lang.SuppressWarnings("all") - public static abstract class SimpleTestBuilder, B extends SimpleTestBuilder> { + public static abstract class SimpleTestBuilder, B extends BuilderCustomName.SimpleTestBuilder> { @java.lang.SuppressWarnings("all") private int field; @java.lang.SuppressWarnings("all") @@ -21,13 +21,13 @@ class BuilderCustomName { } } @java.lang.SuppressWarnings("all") - private static final class SimpleTestBuilderImpl extends SimpleTestBuilder, SimpleTestBuilderImpl> { + private static final class SimpleTestBuilderImpl extends BuilderCustomName.SimpleTestBuilder, BuilderCustomName.SimpleTestBuilderImpl> { @java.lang.SuppressWarnings("all") private SimpleTestBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") - protected SimpleTestBuilderImpl self() { + protected BuilderCustomName.SimpleTestBuilderImpl self() { return this; } @java.lang.Override @@ -37,11 +37,11 @@ class BuilderCustomName { } } @java.lang.SuppressWarnings("all") - protected BuilderCustomName(final SimpleTestBuilder b) { + protected BuilderCustomName(final BuilderCustomName.SimpleTestBuilder b) { this.field = b.field; } @java.lang.SuppressWarnings("all") - public static SimpleTestBuilder builder() { - return new SimpleTestBuilderImpl(); + public static BuilderCustomName.SimpleTestBuilder builder() { + return new BuilderCustomName.SimpleTestBuilderImpl(); } } \ No newline at end of file diff --git a/test/transform/resource/after-delombok/BuilderDefaults.java b/test/transform/resource/after-delombok/BuilderDefaults.java index 475b3f3c..eb692267 100644 --- a/test/transform/resource/after-delombok/BuilderDefaults.java +++ b/test/transform/resource/after-delombok/BuilderDefaults.java @@ -32,18 +32,18 @@ public final class BuilderDefaults { BuilderDefaultsBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderDefaultsBuilder x(final int x) { + public BuilderDefaults.BuilderDefaultsBuilder x(final int x) { this.x$value = x; x$set = true; return this; } @java.lang.SuppressWarnings("all") - public BuilderDefaultsBuilder name(final String name) { + public BuilderDefaults.BuilderDefaultsBuilder name(final String name) { this.name = name; return this; } @java.lang.SuppressWarnings("all") - public BuilderDefaultsBuilder z(final long z) { + public BuilderDefaults.BuilderDefaultsBuilder z(final long z) { this.z$value = z; z$set = true; return this; @@ -63,8 +63,8 @@ public final class BuilderDefaults { } } @java.lang.SuppressWarnings("all") - public static BuilderDefaultsBuilder builder() { - return new BuilderDefaultsBuilder(); + public static BuilderDefaults.BuilderDefaultsBuilder builder() { + return new BuilderDefaults.BuilderDefaultsBuilder(); } @java.lang.SuppressWarnings("all") public int getX() { diff --git a/test/transform/resource/after-delombok/BuilderDefaultsGenerics.java b/test/transform/resource/after-delombok/BuilderDefaultsGenerics.java index 46fcd6b4..fb187e27 100644 --- a/test/transform/resource/after-delombok/BuilderDefaultsGenerics.java +++ b/test/transform/resource/after-delombok/BuilderDefaultsGenerics.java @@ -39,19 +39,19 @@ public class BuilderDefaultsGenerics> { BuilderDefaultsGenericsBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderDefaultsGenericsBuilder callable(final java.util.concurrent.Callable callable) { + public BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder callable(final java.util.concurrent.Callable callable) { this.callable$value = callable; callable$set = true; return this; } @java.lang.SuppressWarnings("all") - public BuilderDefaultsGenericsBuilder tee(final T tee) { + public BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder tee(final T tee) { this.tee$value = tee; tee$set = true; return this; } @java.lang.SuppressWarnings("all") - public BuilderDefaultsGenericsBuilder arrr(final R arrr) { + public BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder arrr(final R arrr) { this.arrr$value = arrr; arrr$set = true; return this; @@ -73,7 +73,7 @@ public class BuilderDefaultsGenerics> { } } @java.lang.SuppressWarnings("all") - public static > BuilderDefaultsGenericsBuilder builder() { - return new BuilderDefaultsGenericsBuilder(); + public static > BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder builder() { + return new BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder(); } } diff --git a/test/transform/resource/after-delombok/BuilderDefaultsWarnings.java b/test/transform/resource/after-delombok/BuilderDefaultsWarnings.java index 7e645dc1..f00d42af 100644 --- a/test/transform/resource/after-delombok/BuilderDefaultsWarnings.java +++ b/test/transform/resource/after-delombok/BuilderDefaultsWarnings.java @@ -21,29 +21,29 @@ public class BuilderDefaultsWarnings { BuilderDefaultsWarningsBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderDefaultsWarningsBuilder x(final long x) { + public BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder x(final long x) { this.x = x; return this; } @java.lang.SuppressWarnings("all") - public BuilderDefaultsWarningsBuilder z(final int z) { + public BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder z(final int z) { this.z = z; return this; } @java.lang.SuppressWarnings("all") - public BuilderDefaultsWarningsBuilder item(final String item) { + public BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder item(final String item) { if (this.items == null) this.items = new java.util.ArrayList(); this.items.add(item); return this; } @java.lang.SuppressWarnings("all") - public BuilderDefaultsWarningsBuilder items(final java.util.Collection items) { + public BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder items(final java.util.Collection items) { if (this.items == null) this.items = new java.util.ArrayList(); this.items.addAll(items); return this; } @java.lang.SuppressWarnings("all") - public BuilderDefaultsWarningsBuilder clearItems() { + public BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder clearItems() { if (this.items != null) this.items.clear(); return this; } @@ -69,8 +69,8 @@ public class BuilderDefaultsWarnings { } } @java.lang.SuppressWarnings("all") - public static BuilderDefaultsWarningsBuilder builder() { - return new BuilderDefaultsWarningsBuilder(); + public static BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder builder() { + return new BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder(); } } class NoBuilderButHasDefaults { @@ -93,7 +93,7 @@ class NoBuilderButHasDefaults { } } @java.lang.SuppressWarnings("all") - public static NoBuilderButHasDefaultsBuilder builder() { - return new NoBuilderButHasDefaultsBuilder(); + public static NoBuilderButHasDefaults.NoBuilderButHasDefaultsBuilder builder() { + return new NoBuilderButHasDefaults.NoBuilderButHasDefaultsBuilder(); } } diff --git a/test/transform/resource/after-delombok/BuilderGenericMethod.java b/test/transform/resource/after-delombok/BuilderGenericMethod.java index f70ae871..053e8ce4 100644 --- a/test/transform/resource/after-delombok/BuilderGenericMethod.java +++ b/test/transform/resource/after-delombok/BuilderGenericMethod.java @@ -14,12 +14,12 @@ class BuilderGenericMethod { MapBuilder() { } @java.lang.SuppressWarnings("all") - public MapBuilder a(final int a) { + public BuilderGenericMethod.MapBuilder a(final int a) { this.a = a; return this; } @java.lang.SuppressWarnings("all") - public MapBuilder b(final long b) { + public BuilderGenericMethod.MapBuilder b(final long b) { this.b = b; return this; } @@ -34,7 +34,7 @@ class BuilderGenericMethod { } } @java.lang.SuppressWarnings("all") - public MapBuilder builder() { - return new MapBuilder(); + public BuilderGenericMethod.MapBuilder builder() { + return this.new MapBuilder(); } } diff --git a/test/transform/resource/after-delombok/BuilderInstanceMethod.java b/test/transform/resource/after-delombok/BuilderInstanceMethod.java index 12b76a8f..9389d871 100644 --- a/test/transform/resource/after-delombok/BuilderInstanceMethod.java +++ b/test/transform/resource/after-delombok/BuilderInstanceMethod.java @@ -17,22 +17,22 @@ class BuilderInstanceMethod { StringBuilder() { } @java.lang.SuppressWarnings("all") - public StringBuilder show(final int show) { + public BuilderInstanceMethod.StringBuilder show(final int show) { this.show = show; return this; } @java.lang.SuppressWarnings("all") - public StringBuilder yes(final int yes) { + public BuilderInstanceMethod.StringBuilder yes(final int yes) { this.yes = yes; return this; } @java.lang.SuppressWarnings("all") - public StringBuilder also(final List also) { + public BuilderInstanceMethod.StringBuilder also(final List also) { this.also = also; return this; } @java.lang.SuppressWarnings("all") - public StringBuilder $andMe(final int $andMe) { + public BuilderInstanceMethod.StringBuilder $andMe(final int $andMe) { this.$andMe = $andMe; return this; } @@ -47,7 +47,7 @@ class BuilderInstanceMethod { } } @java.lang.SuppressWarnings("all") - public StringBuilder builder() { - return new StringBuilder(); + public BuilderInstanceMethod.StringBuilder builder() { + return this.new StringBuilder(); } } diff --git a/test/transform/resource/after-delombok/BuilderJavadoc.java b/test/transform/resource/after-delombok/BuilderJavadoc.java index 196ced3b..1e004e1e 100644 --- a/test/transform/resource/after-delombok/BuilderJavadoc.java +++ b/test/transform/resource/after-delombok/BuilderJavadoc.java @@ -54,7 +54,7 @@ class BuilderJavadoc { * @param tag is moved to the setter. */ @java.lang.SuppressWarnings("all") - public BuilderJavadocBuilder basic(final int basic) { + public BuilderJavadoc.BuilderJavadocBuilder basic(final int basic) { this.basic = basic; return this; } @@ -63,7 +63,7 @@ class BuilderJavadoc { * @param tag is moved to the setters and wither. */ @java.lang.SuppressWarnings("all") - public BuilderJavadocBuilder getsetwith(final int getsetwith) { + public BuilderJavadoc.BuilderJavadocBuilder getsetwith(final int getsetwith) { this.getsetwith = getsetwith; return this; } @@ -85,8 +85,8 @@ class BuilderJavadoc { this.predefWithJavadoc = predefWithJavadoc; } @java.lang.SuppressWarnings("all") - public static BuilderJavadocBuilder builder() { - return new BuilderJavadocBuilder(); + public static BuilderJavadoc.BuilderJavadocBuilder builder() { + return new BuilderJavadoc.BuilderJavadocBuilder(); } /** * getsetwith gets a builder setter, an instance getter and setter, and a wither. diff --git a/test/transform/resource/after-delombok/BuilderSimple.java b/test/transform/resource/after-delombok/BuilderSimple.java index 4cd20b23..2c031af0 100644 --- a/test/transform/resource/after-delombok/BuilderSimple.java +++ b/test/transform/resource/after-delombok/BuilderSimple.java @@ -19,12 +19,12 @@ class BuilderSimple { BuilderSimpleBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderSimpleBuilder yes(final int yes) { + public BuilderSimple.BuilderSimpleBuilder yes(final int yes) { this.yes = yes; return this; } @java.lang.SuppressWarnings("all") - public BuilderSimpleBuilder also(final List also) { + public BuilderSimple.BuilderSimpleBuilder also(final List also) { this.also = also; return this; } @@ -39,7 +39,7 @@ class BuilderSimple { } } @java.lang.SuppressWarnings("all") - protected static BuilderSimpleBuilder builder() { - return new BuilderSimpleBuilder(); + protected static BuilderSimple.BuilderSimpleBuilder builder() { + return new BuilderSimple.BuilderSimpleBuilder(); } } diff --git a/test/transform/resource/after-delombok/BuilderSimpleWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSimpleWithSetterPrefix.java index 24ca09d6..873fa928 100644 --- a/test/transform/resource/after-delombok/BuilderSimpleWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderSimpleWithSetterPrefix.java @@ -13,7 +13,7 @@ class BuilderSimpleWithSetterPrefix { BuilderSimpleWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderSimpleWithSetterPrefixBuilder withUnprefixed(final int unprefixed) { + public BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder withUnprefixed(final int unprefixed) { this.unprefixed = unprefixed; return this; } @@ -28,7 +28,7 @@ class BuilderSimpleWithSetterPrefix { } } @java.lang.SuppressWarnings("all") - protected static BuilderSimpleWithSetterPrefixBuilder builder() { - return new BuilderSimpleWithSetterPrefixBuilder(); + protected static BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder builder() { + return new BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder(); } } diff --git a/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypes.java b/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypes.java index 88459e67..6bd3390c 100644 --- a/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypes.java +++ b/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypes.java @@ -26,7 +26,7 @@ class BuilderSingularAnnotatedTypes { BuilderSingularAnnotatedTypesBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderSingularAnnotatedTypesBuilder foo(@MyAnnotation @NonNull final String foo) { + public BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder foo(@MyAnnotation @NonNull final String foo) { if (foo == null) { throw new java.lang.NullPointerException("foo is marked non-null but is null"); } @@ -35,18 +35,18 @@ class BuilderSingularAnnotatedTypes { return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularAnnotatedTypesBuilder foos(final java.util.Collection foos) { + public BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder foos(final java.util.Collection foos) { if (this.foos == null) this.foos = new java.util.ArrayList<@MyAnnotation @NonNull String>(); this.foos.addAll(foos); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularAnnotatedTypesBuilder clearFoos() { + public BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder clearFoos() { if (this.foos != null) this.foos.clear(); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularAnnotatedTypesBuilder bar(@MyAnnotation @NonNull final String barKey, @MyAnnotation @NonNull final Integer barValue) { + public BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder bar(@MyAnnotation @NonNull final String barKey, @MyAnnotation @NonNull final Integer barValue) { if (barKey == null) { throw new java.lang.NullPointerException("barKey is marked non-null but is null"); } @@ -62,7 +62,7 @@ class BuilderSingularAnnotatedTypes { return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularAnnotatedTypesBuilder bars(final java.util.Map bars) { + public BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder bars(final java.util.Map bars) { if (this.bars$key == null) { this.bars$key = new java.util.ArrayList<@MyAnnotation @NonNull String>(); this.bars$value = new java.util.ArrayList<@MyAnnotation @NonNull Integer>(); @@ -74,7 +74,7 @@ class BuilderSingularAnnotatedTypes { return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularAnnotatedTypesBuilder clearBars() { + public BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder clearBars() { if (this.bars$key != null) { this.bars$key.clear(); this.bars$value.clear(); @@ -118,7 +118,7 @@ class BuilderSingularAnnotatedTypes { } } @java.lang.SuppressWarnings("all") - public static BuilderSingularAnnotatedTypesBuilder builder() { - return new BuilderSingularAnnotatedTypesBuilder(); + public static BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder builder() { + return new BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder(); } } \ No newline at end of file diff --git a/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypesWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypesWithSetterPrefix.java index 6e9c2cee..d1047567 100644 --- a/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypesWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypesWithSetterPrefix.java @@ -26,7 +26,7 @@ class BuilderSingularAnnotatedTypesWithSetterPrefix { BuilderSingularAnnotatedTypesWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withFoo(@MyAnnotation @NonNull final String foo) { + public BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withFoo(@MyAnnotation @NonNull final String foo) { if (foo == null) { throw new java.lang.NullPointerException("foo is marked non-null but is null"); } @@ -35,18 +35,18 @@ class BuilderSingularAnnotatedTypesWithSetterPrefix { return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withFoos(final java.util.Collection foos) { + public BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withFoos(final java.util.Collection foos) { if (this.foos == null) this.foos = new java.util.ArrayList<@MyAnnotation @NonNull String>(); this.foos.addAll(foos); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularAnnotatedTypesWithSetterPrefixBuilder clearFoos() { + public BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder clearFoos() { if (this.foos != null) this.foos.clear(); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withBar(@MyAnnotation @NonNull final String barKey, @MyAnnotation @NonNull final Integer barValue) { + public BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withBar(@MyAnnotation @NonNull final String barKey, @MyAnnotation @NonNull final Integer barValue) { if (barKey == null) { throw new java.lang.NullPointerException("barKey is marked non-null but is null"); } @@ -62,7 +62,7 @@ class BuilderSingularAnnotatedTypesWithSetterPrefix { return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withBars(final java.util.Map bars) { + public BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withBars(final java.util.Map bars) { if (this.bars$key == null) { this.bars$key = new java.util.ArrayList<@MyAnnotation @NonNull String>(); this.bars$value = new java.util.ArrayList<@MyAnnotation @NonNull Integer>(); @@ -74,7 +74,7 @@ class BuilderSingularAnnotatedTypesWithSetterPrefix { return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularAnnotatedTypesWithSetterPrefixBuilder clearBars() { + public BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder clearBars() { if (this.bars$key != null) { this.bars$key.clear(); this.bars$value.clear(); @@ -118,7 +118,7 @@ class BuilderSingularAnnotatedTypesWithSetterPrefix { } } @java.lang.SuppressWarnings("all") - public static BuilderSingularAnnotatedTypesWithSetterPrefixBuilder builder() { - return new BuilderSingularAnnotatedTypesWithSetterPrefixBuilder(); + public static BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder builder() { + return new BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder(); } } diff --git a/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java b/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java index cf90e883..b6fb5732 100644 --- a/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java +++ b/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java @@ -34,87 +34,87 @@ class BuilderSingularGuavaListsSets { BuilderSingularGuavaListsSetsBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsBuilder card(final T card) { + public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder card(final T card) { if (this.cards == null) this.cards = com.google.common.collect.ImmutableList.builder(); this.cards.add(card); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsBuilder cards(final java.lang.Iterable cards) { + public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder cards(final java.lang.Iterable cards) { if (this.cards == null) this.cards = com.google.common.collect.ImmutableList.builder(); this.cards.addAll(cards); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsBuilder clearCards() { + public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder clearCards() { this.cards = null; return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsBuilder frog(final Number frog) { + public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder frog(final Number frog) { if (this.frogs == null) this.frogs = com.google.common.collect.ImmutableList.builder(); this.frogs.add(frog); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsBuilder frogs(final java.lang.Iterable frogs) { + public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder frogs(final java.lang.Iterable frogs) { if (this.frogs == null) this.frogs = com.google.common.collect.ImmutableList.builder(); this.frogs.addAll(frogs); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsBuilder clearFrogs() { + public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder clearFrogs() { this.frogs = null; return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsBuilder rawSet(final java.lang.Object rawSet) { + public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder rawSet(final java.lang.Object rawSet) { if (this.rawSet == null) this.rawSet = com.google.common.collect.ImmutableSet.builder(); this.rawSet.add(rawSet); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsBuilder rawSet(final java.lang.Iterable rawSet) { + public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder rawSet(final java.lang.Iterable rawSet) { if (this.rawSet == null) this.rawSet = com.google.common.collect.ImmutableSet.builder(); this.rawSet.addAll(rawSet); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsBuilder clearRawSet() { + public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder clearRawSet() { this.rawSet = null; return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsBuilder pass(final String pass) { + public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder pass(final String pass) { if (this.passes == null) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder(); this.passes.add(pass); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsBuilder passes(final java.lang.Iterable passes) { + public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder passes(final java.lang.Iterable passes) { if (this.passes == null) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder(); this.passes.addAll(passes); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsBuilder clearPasses() { + public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder clearPasses() { this.passes = null; return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsBuilder user(final Number rowKey, final Number columnKey, final String value) { + public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder user(final Number rowKey, final Number columnKey, final String value) { if (this.users == null) this.users = com.google.common.collect.ImmutableTable.builder(); this.users.put(rowKey, columnKey, value); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsBuilder users(final com.google.common.collect.Table users) { + public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder users(final com.google.common.collect.Table users) { if (this.users == null) this.users = com.google.common.collect.ImmutableTable.builder(); this.users.putAll(users); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsBuilder clearUsers() { + public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder clearUsers() { this.users = null; return this; } @@ -134,7 +134,7 @@ class BuilderSingularGuavaListsSets { } } @java.lang.SuppressWarnings("all") - public static BuilderSingularGuavaListsSetsBuilder builder() { - return new BuilderSingularGuavaListsSetsBuilder(); + public static BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder builder() { + return new BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder(); } } diff --git a/test/transform/resource/after-delombok/BuilderSingularGuavaListsSetsWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularGuavaListsSetsWithSetterPrefix.java deleted file mode 100644 index b349b160..00000000 --- a/test/transform/resource/after-delombok/BuilderSingularGuavaListsSetsWithSetterPrefix.java +++ /dev/null @@ -1,140 +0,0 @@ -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableCollection; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.ImmutableSortedSet; -import com.google.common.collect.ImmutableTable; -class BuilderSingularGuavaListsSetsWithSetterPrefix { - private ImmutableList cards; - private ImmutableCollection frogs; - @SuppressWarnings("all") - private ImmutableSet rawSet; - private ImmutableSortedSet passes; - private ImmutableTable users; - @java.lang.SuppressWarnings("all") - BuilderSingularGuavaListsSetsWithSetterPrefix(final ImmutableList cards, final ImmutableCollection frogs, final ImmutableSet rawSet, final ImmutableSortedSet passes, final ImmutableTable users) { - this.cards = cards; - this.frogs = frogs; - this.rawSet = rawSet; - this.passes = passes; - this.users = users; - } - @java.lang.SuppressWarnings("all") - public static class BuilderSingularGuavaListsSetsWithSetterPrefixBuilder { - @java.lang.SuppressWarnings("all") - private com.google.common.collect.ImmutableList.Builder cards; - @java.lang.SuppressWarnings("all") - private com.google.common.collect.ImmutableList.Builder frogs; - @java.lang.SuppressWarnings("all") - private com.google.common.collect.ImmutableSet.Builder rawSet; - @java.lang.SuppressWarnings("all") - private com.google.common.collect.ImmutableSortedSet.Builder passes; - @java.lang.SuppressWarnings("all") - private com.google.common.collect.ImmutableTable.Builder users; - @java.lang.SuppressWarnings("all") - BuilderSingularGuavaListsSetsWithSetterPrefixBuilder() { - } - @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder withCard(final T card) { - if (this.cards == null) this.cards = com.google.common.collect.ImmutableList.builder(); - this.cards.add(card); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder withCards(final java.lang.Iterable cards) { - if (this.cards == null) this.cards = com.google.common.collect.ImmutableList.builder(); - this.cards.addAll(cards); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder clearCards() { - this.cards = null; - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder withFrog(final Number frog) { - if (this.frogs == null) this.frogs = com.google.common.collect.ImmutableList.builder(); - this.frogs.add(frog); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder withFrogs(final java.lang.Iterable frogs) { - if (this.frogs == null) this.frogs = com.google.common.collect.ImmutableList.builder(); - this.frogs.addAll(frogs); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder clearFrogs() { - this.frogs = null; - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder withRawSet(final java.lang.Object rawSet) { - if (this.rawSet == null) this.rawSet = com.google.common.collect.ImmutableSet.builder(); - this.rawSet.add(rawSet); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder withRawSet(final java.lang.Iterable rawSet) { - if (this.rawSet == null) this.rawSet = com.google.common.collect.ImmutableSet.builder(); - this.rawSet.addAll(rawSet); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder clearRawSet() { - this.rawSet = null; - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder withPass(final String pass) { - if (this.passes == null) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder(); - this.passes.add(pass); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder withPasses(final java.lang.Iterable passes) { - if (this.passes == null) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder(); - this.passes.addAll(passes); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder clearPasses() { - this.passes = null; - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder withUser(final Number rowKey, final Number columnKey, final String value) { - if (this.users == null) this.users = com.google.common.collect.ImmutableTable.builder(); - this.users.put(rowKey, columnKey, value); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder withUsers(final com.google.common.collect.Table users) { - if (this.users == null) this.users = com.google.common.collect.ImmutableTable.builder(); - this.users.putAll(users); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder clearUsers() { - this.users = null; - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsWithSetterPrefix build() { - com.google.common.collect.ImmutableList cards = this.cards == null ? com.google.common.collect.ImmutableList.of() : this.cards.build(); - com.google.common.collect.ImmutableCollection frogs = this.frogs == null ? com.google.common.collect.ImmutableList.of() : this.frogs.build(); - com.google.common.collect.ImmutableSet rawSet = this.rawSet == null ? com.google.common.collect.ImmutableSet.of() : this.rawSet.build(); - com.google.common.collect.ImmutableSortedSet passes = this.passes == null ? com.google.common.collect.ImmutableSortedSet.of() : this.passes.build(); - com.google.common.collect.ImmutableTable users = this.users == null ? com.google.common.collect.ImmutableTable.of() : this.users.build(); - return new BuilderSingularGuavaListsSetsWithSetterPrefix(cards, frogs, rawSet, passes, users); - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public java.lang.String toString() { - return "BuilderSingularGuavaListsSetsWithSetterPrefix.BuilderSingularGuavaListsSetsWithSetterPrefixBuilder(cards=" + this.cards + ", frogs=" + this.frogs + ", rawSet=" + this.rawSet + ", passes=" + this.passes + ", users=" + this.users + ")"; - } - } - @java.lang.SuppressWarnings("all") - public static BuilderSingularGuavaListsSetsWithSetterPrefixBuilder builder() { - return new BuilderSingularGuavaListsSetsWithSetterPrefixBuilder(); - } -} diff --git a/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java b/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java index e29c7e94..a6043475 100644 --- a/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java +++ b/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java @@ -24,53 +24,53 @@ class BuilderSingularGuavaMaps { BuilderSingularGuavaMapsBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaMapsBuilder battleaxe(final K key, final V value) { + public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder battleaxe(final K key, final V value) { if (this.battleaxes == null) this.battleaxes = com.google.common.collect.ImmutableMap.builder(); this.battleaxes.put(key, value); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaMapsBuilder battleaxes(final java.util.Map battleaxes) { + public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder battleaxes(final java.util.Map battleaxes) { if (this.battleaxes == null) this.battleaxes = com.google.common.collect.ImmutableMap.builder(); this.battleaxes.putAll(battleaxes); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaMapsBuilder clearBattleaxes() { + public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder clearBattleaxes() { this.battleaxes = null; return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaMapsBuilder vertex(final Integer key, final V value) { + public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder vertex(final Integer key, final V value) { if (this.vertices == null) this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.vertices.put(key, value); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaMapsBuilder vertices(final java.util.Map vertices) { + public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder vertices(final java.util.Map vertices) { if (this.vertices == null) this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.vertices.putAll(vertices); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaMapsBuilder clearVertices() { + public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder clearVertices() { this.vertices = null; return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaMapsBuilder rawMap(final java.lang.Object key, final java.lang.Object value) { + public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder rawMap(final java.lang.Object key, final java.lang.Object value) { if (this.rawMap == null) this.rawMap = com.google.common.collect.ImmutableBiMap.builder(); this.rawMap.put(key, value); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaMapsBuilder rawMap(final java.util.Map rawMap) { + public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder rawMap(final java.util.Map rawMap) { if (this.rawMap == null) this.rawMap = com.google.common.collect.ImmutableBiMap.builder(); this.rawMap.putAll(rawMap); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaMapsBuilder clearRawMap() { + public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder clearRawMap() { this.rawMap = null; return this; } @@ -88,7 +88,7 @@ class BuilderSingularGuavaMaps { } } @java.lang.SuppressWarnings("all") - public static BuilderSingularGuavaMapsBuilder builder() { - return new BuilderSingularGuavaMapsBuilder(); + public static BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder builder() { + return new BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder(); } } diff --git a/test/transform/resource/after-delombok/BuilderSingularGuavaMapsWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularGuavaMapsWithSetterPrefix.java deleted file mode 100644 index b3162854..00000000 --- a/test/transform/resource/after-delombok/BuilderSingularGuavaMapsWithSetterPrefix.java +++ /dev/null @@ -1,94 +0,0 @@ -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableBiMap; -import com.google.common.collect.ImmutableSortedMap; -class BuilderSingularGuavaMapsWithSetterPrefix { - private ImmutableMap battleaxes; - private ImmutableSortedMap vertices; - @SuppressWarnings("all") - private ImmutableBiMap rawMap; - @java.lang.SuppressWarnings("all") - BuilderSingularGuavaMapsWithSetterPrefix(final ImmutableMap battleaxes, final ImmutableSortedMap vertices, final ImmutableBiMap rawMap) { - this.battleaxes = battleaxes; - this.vertices = vertices; - this.rawMap = rawMap; - } - @java.lang.SuppressWarnings("all") - public static class BuilderSingularGuavaMapsWithSetterPrefixBuilder { - @java.lang.SuppressWarnings("all") - private com.google.common.collect.ImmutableMap.Builder battleaxes; - @java.lang.SuppressWarnings("all") - private com.google.common.collect.ImmutableSortedMap.Builder vertices; - @java.lang.SuppressWarnings("all") - private com.google.common.collect.ImmutableBiMap.Builder rawMap; - @java.lang.SuppressWarnings("all") - BuilderSingularGuavaMapsWithSetterPrefixBuilder() { - } - @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaMapsWithSetterPrefixBuilder withBattleaxe(final K key, final V value) { - if (this.battleaxes == null) this.battleaxes = com.google.common.collect.ImmutableMap.builder(); - this.battleaxes.put(key, value); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaMapsWithSetterPrefixBuilder withBattleaxes(final java.util.Map battleaxes) { - if (this.battleaxes == null) this.battleaxes = com.google.common.collect.ImmutableMap.builder(); - this.battleaxes.putAll(battleaxes); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaMapsWithSetterPrefixBuilder clearBattleaxes() { - this.battleaxes = null; - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaMapsWithSetterPrefixBuilder withVertex(final Integer key, final V value) { - if (this.vertices == null) this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder(); - this.vertices.put(key, value); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaMapsWithSetterPrefixBuilder withVertices(final java.util.Map vertices) { - if (this.vertices == null) this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder(); - this.vertices.putAll(vertices); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaMapsWithSetterPrefixBuilder clearVertices() { - this.vertices = null; - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaMapsWithSetterPrefixBuilder withRawMap(final java.lang.Object key, final java.lang.Object value) { - if (this.rawMap == null) this.rawMap = com.google.common.collect.ImmutableBiMap.builder(); - this.rawMap.put(key, value); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaMapsWithSetterPrefixBuilder withRawMap(final java.util.Map rawMap) { - if (this.rawMap == null) this.rawMap = com.google.common.collect.ImmutableBiMap.builder(); - this.rawMap.putAll(rawMap); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaMapsWithSetterPrefixBuilder clearRawMap() { - this.rawMap = null; - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaMapsWithSetterPrefix build() { - com.google.common.collect.ImmutableMap battleaxes = this.battleaxes == null ? com.google.common.collect.ImmutableMap.of() : this.battleaxes.build(); - com.google.common.collect.ImmutableSortedMap vertices = this.vertices == null ? com.google.common.collect.ImmutableSortedMap.of() : this.vertices.build(); - com.google.common.collect.ImmutableBiMap rawMap = this.rawMap == null ? com.google.common.collect.ImmutableBiMap.of() : this.rawMap.build(); - return new BuilderSingularGuavaMapsWithSetterPrefix(battleaxes, vertices, rawMap); - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public java.lang.String toString() { - return "BuilderSingularGuavaMapsWithSetterPrefix.BuilderSingularGuavaMapsWithSetterPrefixBuilder(battleaxes=" + this.battleaxes + ", vertices=" + this.vertices + ", rawMap=" + this.rawMap + ")"; - } - } - @java.lang.SuppressWarnings("all") - public static BuilderSingularGuavaMapsWithSetterPrefixBuilder builder() { - return new BuilderSingularGuavaMapsWithSetterPrefixBuilder(); - } -} diff --git a/test/transform/resource/after-delombok/BuilderSingularLists.java b/test/transform/resource/after-delombok/BuilderSingularLists.java index a0be0c12..971a2851 100644 --- a/test/transform/resource/after-delombok/BuilderSingularLists.java +++ b/test/transform/resource/after-delombok/BuilderSingularLists.java @@ -23,53 +23,53 @@ class BuilderSingularLists { BuilderSingularListsBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderSingularListsBuilder child(final T child) { + public BuilderSingularLists.BuilderSingularListsBuilder child(final T child) { if (this.children == null) this.children = new java.util.ArrayList(); this.children.add(child); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularListsBuilder children(final java.util.Collection children) { + public BuilderSingularLists.BuilderSingularListsBuilder children(final java.util.Collection children) { if (this.children == null) this.children = new java.util.ArrayList(); this.children.addAll(children); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularListsBuilder clearChildren() { + public BuilderSingularLists.BuilderSingularListsBuilder clearChildren() { if (this.children != null) this.children.clear(); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularListsBuilder scarf(final Number scarf) { + public BuilderSingularLists.BuilderSingularListsBuilder scarf(final Number scarf) { if (this.scarves == null) this.scarves = new java.util.ArrayList(); this.scarves.add(scarf); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularListsBuilder scarves(final java.util.Collection scarves) { + public BuilderSingularLists.BuilderSingularListsBuilder scarves(final java.util.Collection scarves) { if (this.scarves == null) this.scarves = new java.util.ArrayList(); this.scarves.addAll(scarves); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularListsBuilder clearScarves() { + public BuilderSingularLists.BuilderSingularListsBuilder clearScarves() { if (this.scarves != null) this.scarves.clear(); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularListsBuilder rawList(final java.lang.Object rawList) { + public BuilderSingularLists.BuilderSingularListsBuilder rawList(final java.lang.Object rawList) { if (this.rawList == null) this.rawList = new java.util.ArrayList(); this.rawList.add(rawList); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularListsBuilder rawList(final java.util.Collection rawList) { + public BuilderSingularLists.BuilderSingularListsBuilder rawList(final java.util.Collection rawList) { if (this.rawList == null) this.rawList = new java.util.ArrayList(); this.rawList.addAll(rawList); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularListsBuilder clearRawList() { + public BuilderSingularLists.BuilderSingularListsBuilder clearRawList() { if (this.rawList != null) this.rawList.clear(); return this; } @@ -117,7 +117,7 @@ class BuilderSingularLists { } } @java.lang.SuppressWarnings("all") - public static BuilderSingularListsBuilder builder() { - return new BuilderSingularListsBuilder(); + public static BuilderSingularLists.BuilderSingularListsBuilder builder() { + return new BuilderSingularLists.BuilderSingularListsBuilder(); } } diff --git a/test/transform/resource/after-delombok/BuilderSingularListsWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularListsWithSetterPrefix.java deleted file mode 100644 index c685a352..00000000 --- a/test/transform/resource/after-delombok/BuilderSingularListsWithSetterPrefix.java +++ /dev/null @@ -1,123 +0,0 @@ -import java.util.List; -import java.util.Collection; -class BuilderSingularListsWithSetterPrefix { - private