diff options
Diffstat (limited to 'test/transform/resource/after-delombok')
73 files changed, 584 insertions, 1651 deletions
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<T> number(final T number) { + public BuilderComplex.TestVoidName<T> number(final T number) { this.number = number; return this; } @java.lang.SuppressWarnings("all") - public TestVoidName<T> arg2(final int arg2) { + public BuilderComplex.TestVoidName<T> arg2(final int arg2) { this.arg2 = arg2; return this; } @java.lang.SuppressWarnings("all") - public TestVoidName<T> arg3(final String arg3) { + public BuilderComplex.TestVoidName<T> arg3(final String arg3) { this.arg3 = arg3; return this; } @java.lang.SuppressWarnings("all") - public TestVoidName<T> selfRef(final BuilderComplex selfRef) { + public BuilderComplex.TestVoidName<T> selfRef(final BuilderComplex selfRef) { this.selfRef = selfRef; return this; } @@ -46,7 +46,7 @@ class BuilderComplex { } } @java.lang.SuppressWarnings("all") - public static <T extends Number> TestVoidName<T> builder() { - return new TestVoidName<T>(); + public static <T extends Number> BuilderComplex.TestVoidName<T> builder() { + return new BuilderComplex.TestVoidName<T>(); } } 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<T> { private final int field; @java.lang.SuppressWarnings("all") - public static abstract class SimpleTestBuilder<T, C extends BuilderCustomName<T>, B extends SimpleTestBuilder<T, C, B>> { + public static abstract class SimpleTestBuilder<T, C extends BuilderCustomName<T>, B extends BuilderCustomName.SimpleTestBuilder<T, C, B>> { @java.lang.SuppressWarnings("all") private int field; @java.lang.SuppressWarnings("all") @@ -21,13 +21,13 @@ class BuilderCustomName<T> { } } @java.lang.SuppressWarnings("all") - private static final class SimpleTestBuilderImpl<T> extends SimpleTestBuilder<T, BuilderCustomName<T>, SimpleTestBuilderImpl<T>> { + private static final class SimpleTestBuilderImpl<T> extends BuilderCustomName.SimpleTestBuilder<T, BuilderCustomName<T>, BuilderCustomName.SimpleTestBuilderImpl<T>> { @java.lang.SuppressWarnings("all") private SimpleTestBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") - protected SimpleTestBuilderImpl<T> self() { + protected BuilderCustomName.SimpleTestBuilderImpl<T> self() { return this; } @java.lang.Override @@ -37,11 +37,11 @@ class BuilderCustomName<T> { } } @java.lang.SuppressWarnings("all") - protected BuilderCustomName(final SimpleTestBuilder<T, ?, ?> b) { + protected BuilderCustomName(final BuilderCustomName.SimpleTestBuilder<T, ?, ?> b) { this.field = b.field; } @java.lang.SuppressWarnings("all") - public static <T> SimpleTestBuilder<T, ?, ?> builder() { - return new SimpleTestBuilderImpl<T>(); + public static <T> BuilderCustomName.SimpleTestBuilder<T, ?, ?> builder() { + return new BuilderCustomName.SimpleTestBuilderImpl<T>(); } }
\ 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<N extends Number, T, R extends List<T>> { BuilderDefaultsGenericsBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderDefaultsGenericsBuilder<N, T, R> callable(final java.util.concurrent.Callable<N> callable) { + public BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder<N, T, R> callable(final java.util.concurrent.Callable<N> callable) { this.callable$value = callable; callable$set = true; return this; } @java.lang.SuppressWarnings("all") - public BuilderDefaultsGenericsBuilder<N, T, R> tee(final T tee) { + public BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder<N, T, R> tee(final T tee) { this.tee$value = tee; tee$set = true; return this; } @java.lang.SuppressWarnings("all") - public BuilderDefaultsGenericsBuilder<N, T, R> arrr(final R arrr) { + public BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder<N, T, R> arrr(final R arrr) { this.arrr$value = arrr; arrr$set = true; return this; @@ -73,7 +73,7 @@ public class BuilderDefaultsGenerics<N extends Number, T, R extends List<T>> { } } @java.lang.SuppressWarnings("all") - public static <N extends Number, T, R extends List<T>> BuilderDefaultsGenericsBuilder<N, T, R> builder() { - return new BuilderDefaultsGenericsBuilder<N, T, R>(); + public static <N extends Number, T, R extends List<T>> BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder<N, T, R> builder() { + return new BuilderDefaultsGenerics.BuilderDefaultsGenericsBuilder<N, T, R>(); } } 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<String>(); this.items.add(item); return this; } @java.lang.SuppressWarnings("all") - public BuilderDefaultsWarningsBuilder items(final java.util.Collection<? extends String> items) { + public BuilderDefaultsWarnings.BuilderDefaultsWarningsBuilder items(final java.util.Collection<? extends String> items) { if (this.items == null) this.items = new java.util.ArrayList<String>(); 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<T> { MapBuilder() { } @java.lang.SuppressWarnings("all") - public MapBuilder<N> a(final int a) { + public BuilderGenericMethod<T>.MapBuilder<N> a(final int a) { this.a = a; return this; } @java.lang.SuppressWarnings("all") - public MapBuilder<N> b(final long b) { + public BuilderGenericMethod<T>.MapBuilder<N> b(final long b) { this.b = b; return this; } @@ -34,7 +34,7 @@ class BuilderGenericMethod<T> { } } @java.lang.SuppressWarnings("all") - public <N extends Number> MapBuilder<N> builder() { - return new MapBuilder<N>(); + public <N extends Number> BuilderGenericMethod<T>.MapBuilder<N> builder() { + return this.new MapBuilder<N>(); } } 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<T> { StringBuilder() { } @java.lang.SuppressWarnings("all") - public StringBuilder show(final int show) { + public BuilderInstanceMethod<T>.StringBuilder show(final int show) { this.show = show; return this; } @java.lang.SuppressWarnings("all") - public StringBuilder yes(final int yes) { + public BuilderInstanceMethod<T>.StringBuilder yes(final int yes) { this.yes = yes; return this; } @java.lang.SuppressWarnings("all") - public StringBuilder also(final List<T> also) { + public BuilderInstanceMethod<T>.StringBuilder also(final List<T> also) { this.also = also; return this; } @java.lang.SuppressWarnings("all") - public StringBuilder $andMe(final int $andMe) { + public BuilderInstanceMethod<T>.StringBuilder $andMe(final int $andMe) { this.$andMe = $andMe; return this; } @@ -47,7 +47,7 @@ class BuilderInstanceMethod<T> { } } @java.lang.SuppressWarnings("all") - public StringBuilder builder() { - return new StringBuilder(); + public BuilderInstanceMethod<T>.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<T> { * @param tag is moved to the setter. */ @java.lang.SuppressWarnings("all") - public BuilderJavadocBuilder<T> basic(final int basic) { + public BuilderJavadoc.BuilderJavadocBuilder<T> basic(final int basic) { this.basic = basic; return this; } @@ -63,7 +63,7 @@ class BuilderJavadoc<T> { * @param tag is moved to the setters and wither. */ @java.lang.SuppressWarnings("all") - public BuilderJavadocBuilder<T> getsetwith(final int getsetwith) { + public BuilderJavadoc.BuilderJavadocBuilder<T> getsetwith(final int getsetwith) { this.getsetwith = getsetwith; return this; } @@ -85,8 +85,8 @@ class BuilderJavadoc<T> { this.predefWithJavadoc = predefWithJavadoc; } @java.lang.SuppressWarnings("all") - public static <T> BuilderJavadocBuilder<T> builder() { - return new BuilderJavadocBuilder<T>(); + public static <T> BuilderJavadoc.BuilderJavadocBuilder<T> builder() { + return new BuilderJavadoc.BuilderJavadocBuilder<T>(); } /** * 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<T> { BuilderSimpleBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderSimpleBuilder<T> yes(final int yes) { + public BuilderSimple.BuilderSimpleBuilder<T> yes(final int yes) { this.yes = yes; return this; } @java.lang.SuppressWarnings("all") - public BuilderSimpleBuilder<T> also(final List<T> also) { + public BuilderSimple.BuilderSimpleBuilder<T> also(final List<T> also) { this.also = also; return this; } @@ -39,7 +39,7 @@ class BuilderSimple<T> { } } @java.lang.SuppressWarnings("all") - protected static <T> BuilderSimpleBuilder<T> builder() { - return new BuilderSimpleBuilder<T>(); + protected static <T> BuilderSimple.BuilderSimpleBuilder<T> builder() { + return new BuilderSimple.BuilderSimpleBuilder<T>(); } } 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<T> { BuilderSimpleWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderSimpleWithSetterPrefixBuilder<T> withUnprefixed(final int unprefixed) { + public BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder<T> withUnprefixed(final int unprefixed) { this.unprefixed = unprefixed; return this; } @@ -28,7 +28,7 @@ class BuilderSimpleWithSetterPrefix<T> { } } @java.lang.SuppressWarnings("all") - protected static <T> BuilderSimpleWithSetterPrefixBuilder<T> builder() { - return new BuilderSimpleWithSetterPrefixBuilder<T>(); + protected static <T> BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder<T> builder() { + return new BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder<T>(); } } 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<? extends @MyAnnotation @NonNull String> foos) { + public BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder foos(final java.util.Collection<? extends @MyAnnotation @NonNull String> 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<? extends @MyAnnotation @NonNull String, ? extends @MyAnnotation @NonNull Integer> bars) { + public BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder bars(final java.util.Map<? extends @MyAnnotation @NonNull String, ? extends @MyAnnotation @NonNull Integer> 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<? extends @MyAnnotation @NonNull String> foos) { + public BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withFoos(final java.util.Collection<? extends @MyAnnotation @NonNull String> 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<? extends @MyAnnotation @NonNull String, ? extends @MyAnnotation @NonNull Integer> bars) { + public BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withBars(final java.util.Map<? extends @MyAnnotation @NonNull String, ? extends @MyAnnotation @NonNull Integer> 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<T> { BuilderSingularGuavaListsSetsBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsBuilder<T> card(final T card) { + public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> 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<T> cards(final java.lang.Iterable<? extends T> cards) { + public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> cards(final java.lang.Iterable<? extends T> 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<T> clearCards() { + public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> clearCards() { this.cards = null; return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsBuilder<T> frog(final Number frog) { + public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> 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<T> frogs(final java.lang.Iterable<? extends Number> frogs) { + public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> frogs(final java.lang.Iterable<? extends Number> 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<T> clearFrogs() { + public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> clearFrogs() { this.frogs = null; return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsBuilder<T> rawSet(final java.lang.Object rawSet) { + public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> 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<T> rawSet(final java.lang.Iterable<?> rawSet) { + public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> 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<T> clearRawSet() { + public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> clearRawSet() { this.rawSet = null; return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsBuilder<T> pass(final String pass) { + public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> 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<T> passes(final java.lang.Iterable<? extends String> passes) { + public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> passes(final java.lang.Iterable<? extends String> 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<T> clearPasses() { + public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> clearPasses() { this.passes = null; return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsBuilder<T> user(final Number rowKey, final Number columnKey, final String value) { + public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> 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<T> users(final com.google.common.collect.Table<? extends Number, ? extends Number, ? extends String> users) { + public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> users(final com.google.common.collect.Table<? extends Number, ? extends Number, ? extends String> 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<T> clearUsers() { + public BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> clearUsers() { this.users = null; return this; } @@ -134,7 +134,7 @@ class BuilderSingularGuavaListsSets<T> { } } @java.lang.SuppressWarnings("all") - public static <T> BuilderSingularGuavaListsSetsBuilder<T> builder() { - return new BuilderSingularGuavaListsSetsBuilder<T>(); + public static <T> BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T> builder() { + return new BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder<T>(); } } 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<T> { - private ImmutableList<T> cards; - private ImmutableCollection<? extends Number> frogs; - @SuppressWarnings("all") - private ImmutableSet rawSet; - private ImmutableSortedSet<String> passes; - private ImmutableTable<? extends Number, ? extends Number, String> users; - @java.lang.SuppressWarnings("all") - BuilderSingularGuavaListsSetsWithSetterPrefix(final ImmutableList<T> cards, final ImmutableCollection<? extends Number> frogs, final ImmutableSet rawSet, final ImmutableSortedSet<String> passes, final ImmutableTable<? extends Number, ? extends Number, String> users) { - this.cards = cards; - this.frogs = frogs; - this.rawSet = rawSet; - this.passes = passes; - this.users = users; - } - @java.lang.SuppressWarnings("all") - public static class BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> { - @java.lang.SuppressWarnings("all") - private com.google.common.collect.ImmutableList.Builder<T> cards; - @java.lang.SuppressWarnings("all") - private com.google.common.collect.ImmutableList.Builder<Number> frogs; - @java.lang.SuppressWarnings("all") - private com.google.common.collect.ImmutableSet.Builder<java.lang.Object> rawSet; - @java.lang.SuppressWarnings("all") - private com.google.common.collect.ImmutableSortedSet.Builder<String> passes; - @java.lang.SuppressWarnings("all") - private com.google.common.collect.ImmutableTable.Builder<Number, Number, String> users; - @java.lang.SuppressWarnings("all") - BuilderSingularGuavaListsSetsWithSetterPrefixBuilder() { - } - @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> 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<T> withCards(final java.lang.Iterable<? extends T> 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<T> clearCards() { - this.cards = null; - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> 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<T> withFrogs(final java.lang.Iterable<? extends Number> 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<T> clearFrogs() { - this.frogs = null; - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> 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<T> 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<T> clearRawSet() { - this.rawSet = null; - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> 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<T> withPasses(final java.lang.Iterable<? extends String> 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<T> clearPasses() { - this.passes = null; - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> 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<T> withUsers(final com.google.common.collect.Table<? extends Number, ? extends Number, ? extends String> 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<T> clearUsers() { - this.users = null; - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsWithSetterPrefix<T> build() { - com.google.common.collect.ImmutableList<T> cards = this.cards == null ? com.google.common.collect.ImmutableList.<T>of() : this.cards.build(); - com.google.common.collect.ImmutableCollection<Number> frogs = this.frogs == null ? com.google.common.collect.ImmutableList.<Number>of() : this.frogs.build(); - com.google.common.collect.ImmutableSet<java.lang.Object> rawSet = this.rawSet == null ? com.google.common.collect.ImmutableSet.<java.lang.Object>of() : this.rawSet.build(); - com.google.common.collect.ImmutableSortedSet<String> passes = this.passes == null ? com.google.common.collect.ImmutableSortedSet.<String>of() : this.passes.build(); - com.google.common.collect.ImmutableTable<Number, Number, String> users = this.users == null ? com.google.common.collect.ImmutableTable.<Number, Number, String>of() : this.users.build(); - return new BuilderSingularGuavaListsSetsWithSetterPrefix<T>(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 <T> BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T> builder() { - return new BuilderSingularGuavaListsSetsWithSetterPrefixBuilder<T>(); - } -} 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<K, V> { BuilderSingularGuavaMapsBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaMapsBuilder<K, V> battleaxe(final K key, final V value) { + public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder<K, V> 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<K, V> battleaxes(final java.util.Map<? extends K, ? extends V> battleaxes) { + public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder<K, V> battleaxes(final java.util.Map<? extends K, ? extends V> 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<K, V> clearBattleaxes() { + public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder<K, V> clearBattleaxes() { this.battleaxes = null; return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaMapsBuilder<K, V> vertex(final Integer key, final V value) { + public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder<K, V> 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<K, V> vertices(final java.util.Map<? extends Integer, ? extends V> vertices) { + public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder<K, V> vertices(final java.util.Map<? extends Integer, ? extends V> 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<K, V> clearVertices() { + public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder<K, V> clearVertices() { this.vertices = null; return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaMapsBuilder<K, V> rawMap(final java.lang.Object key, final java.lang.Object value) { + public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder<K, V> 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<K, V> rawMap(final java.util.Map<?, ?> rawMap) { + public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder<K, V> 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<K, V> clearRawMap() { + public BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder<K, V> clearRawMap() { this.rawMap = null; return this; } @@ -88,7 +88,7 @@ class BuilderSingularGuavaMaps<K, V> { } } @java.lang.SuppressWarnings("all") - public static <K, V> BuilderSingularGuavaMapsBuilder<K, V> builder() { - return new BuilderSingularGuavaMapsBuilder<K, V>(); + public static <K, V> BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder<K, V> builder() { + return new BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder<K, V>(); } } 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<K, V> { - private ImmutableMap<K, V> battleaxes; - private ImmutableSortedMap<Integer, ? extends V> vertices; - @SuppressWarnings("all") - private ImmutableBiMap rawMap; - @java.lang.SuppressWarnings("all") - BuilderSingularGuavaMapsWithSetterPrefix(final ImmutableMap<K, V> battleaxes, final ImmutableSortedMap<Integer, ? extends V> vertices, final ImmutableBiMap rawMap) { - this.battleaxes = battleaxes; - this.vertices = vertices; - this.rawMap = rawMap; - } - @java.lang.SuppressWarnings("all") - public static class BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V> { - @java.lang.SuppressWarnings("all") - private com.google.common.collect.ImmutableMap.Builder<K, V> battleaxes; - @java.lang.SuppressWarnings("all") - private com.google.common.collect.ImmutableSortedMap.Builder<Integer, V> vertices; - @java.lang.SuppressWarnings("all") - private com.google.common.collect.ImmutableBiMap.Builder<java.lang.Object, java.lang.Object> rawMap; - @java.lang.SuppressWarnings("all") - BuilderSingularGuavaMapsWithSetterPrefixBuilder() { - } - @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V> 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<K, V> withBattleaxes(final java.util.Map<? extends K, ? extends V> 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<K, V> clearBattleaxes() { - this.battleaxes = null; - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V> 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<K, V> withVertices(final java.util.Map<? extends Integer, ? extends V> 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<K, V> clearVertices() { - this.vertices = null; - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V> 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<K, V> 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<K, V> clearRawMap() { - this.rawMap = null; - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaMapsWithSetterPrefix<K, V> build() { - com.google.common.collect.ImmutableMap<K, V> battleaxes = this.battleaxes == null ? com.google.common.collect.ImmutableMap.<K, V>of() : this.battleaxes.build(); - com.google.common.collect.ImmutableSortedMap<Integer, V> vertices = this.vertices == null ? com.google.common.collect.ImmutableSortedMap.<Integer, V>of() : this.vertices.build(); - com.google.common.collect.ImmutableBiMap<java.lang.Object, java.lang.Object> rawMap = this.rawMap == null ? com.google.common.collect.ImmutableBiMap.<java.lang.Object, java.lang.Object>of() : this.rawMap.build(); - return new BuilderSingularGuavaMapsWithSetterPrefix<K, V>(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 <K, V> BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V> builder() { - return new BuilderSingularGuavaMapsWithSetterPrefixBuilder<K, V>(); - } -} 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<T> { BuilderSingularListsBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderSingularListsBuilder<T> child(final T child) { + public BuilderSingularLists.BuilderSingularListsBuilder<T> child(final T child) { if (this.children == null) this.children = new java.util.ArrayList<T>(); this.children.add(child); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularListsBuilder<T> children(final java.util.Collection<? extends T> children) { + public BuilderSingularLists.BuilderSingularListsBuilder<T> children(final java.util.Collection<? extends T> children) { if (this.children == null) this.children = new java.util.ArrayList<T>(); this.children.addAll(children); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularListsBuilder<T> clearChildren() { + public BuilderSingularLists.BuilderSingularListsBuilder<T> clearChildren() { if (this.children != null) this.children.clear(); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularListsBuilder<T> scarf(final Number scarf) { + public BuilderSingularLists.BuilderSingularListsBuilder<T> scarf(final Number scarf) { if (this.scarves == null) this.scarves = new java.util.ArrayList<Number>(); this.scarves.add(scarf); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularListsBuilder<T> scarves(final java.util.Collection<? extends Number> scarves) { + public BuilderSingularLists.BuilderSingularListsBuilder<T> scarves(final java.util.Collection<? extends Number> scarves) { if (this.scarves == null) this.scarves = new java.util.ArrayList<Number>(); this.scarves.addAll(scarves); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularListsBuilder<T> clearScarves() { + public BuilderSingularLists.BuilderSingularListsBuilder<T> clearScarves() { if (this.scarves != null) this.scarves.clear(); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularListsBuilder<T> rawList(final java.lang.Object rawList) { + public BuilderSingularLists.BuilderSingularListsBuilder<T> rawList(final java.lang.Object rawList) { if (this.rawList == null) this.rawList = new java.util.ArrayList<java.lang.Object>(); this.rawList.add(rawList); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularListsBuilder<T> rawList(final java.util.Collection<?> rawList) { + public BuilderSingularLists.BuilderSingularListsBuilder<T> rawList(final java.util.Collection<?> rawList) { if (this.rawList == null) this.rawList = new java.util.ArrayList<java.lang.Object>(); this.rawList.addAll(rawList); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularListsBuilder<T> clearRawList() { + public BuilderSingularLists.BuilderSingularListsBuilder<T> clearRawList() { if (this.rawList != null) this.rawList.clear(); return this; } @@ -117,7 +117,7 @@ class BuilderSingularLists<T> { } } @java.lang.SuppressWarnings("all") - public static <T> BuilderSingularListsBuilder<T> builder() { - return new BuilderSingularListsBuilder<T>(); + public static <T> BuilderSingularLists.BuilderSingularListsBuilder<T> builder() { + return new BuilderSingularLists.BuilderSingularListsBuilder<T>(); } } 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<T> { - private List<T> children; - private Collection<? extends Number> scarves; - @SuppressWarnings("all") - private List rawList; - @java.lang.SuppressWarnings("all") - BuilderSingularListsWithSetterPrefix(final List<T> children, final Collection<? extends Number> scarves, final List rawList) { - this.children = children; - this.scarves = scarves; - this.rawList = rawList; - } - @java.lang.SuppressWarnings("all") - public static class BuilderSingularListsWithSetterPrefixBuilder<T> { - @java.lang.SuppressWarnings("all") - private java.util.ArrayList<T> children; - @java.lang.SuppressWarnings("all") - private java.util.ArrayList<Number> scarves; - @java.lang.SuppressWarnings("all") - private java.util.ArrayList<java.lang.Object> rawList; - @java.lang.SuppressWarnings("all") - BuilderSingularListsWithSetterPrefixBuilder() { - } - @java.lang.SuppressWarnings("all") - public BuilderSingularListsWithSetterPrefixBuilder<T> withChild(final T child) { - if (this.children == null) this.children = new java.util.ArrayList<T>(); - this.children.add(child); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularListsWithSetterPrefixBuilder<T> withChildren(final java.util.Collection<? extends T> children) { - if (this.children == null) this.children = new java.util.ArrayList<T>(); - this.children.addAll(children); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularListsWithSetterPrefixBuilder<T> clearChildren() { - if (this.children != null) this.children.clear(); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularListsWithSetterPrefixBuilder<T> withScarf(final Number scarf) { - if (this.scarves == null) this.scarves = new java.util.ArrayList<Number>(); - this.scarves.add(scarf); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularListsWithSetterPrefixBuilder<T> withScarves(final java.util.Collection<? extends Number> scarves) { - if (this.scarves == null) this.scarves = new java.util.ArrayList<Number>(); - this.scarves.addAll(scarves); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularListsWithSetterPrefixBuilder<T> clearScarves() { - if (this.scarves != null) this.scarves.clear(); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularListsWithSetterPrefixBuilder<T> withRawList(final java.lang.Object rawList) { - if (this.rawList == null) this.rawList = new java.util.ArrayList<java.lang.Object>(); - this.rawList.add(rawList); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularListsWithSetterPrefixBuilder<T> withRawList(final java.util.Collection<?> rawList) { - if (this.rawList == null) this.rawList = new java.util.ArrayList<java.lang.Object>(); - this.rawList.addAll(rawList); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularListsWithSetterPrefixBuilder<T> clearRawList() { - if (this.rawList != null) this.rawList.clear(); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularListsWithSetterPrefix<T> build() { - java.util.List<T> children; - switch (this.children == null ? 0 : this.children.size()) { - case 0: - children = java.util.Collections.emptyList(); - break; - case 1: - children = java.util.Collections.singletonList(this.children.get(0)); - break; - default: - children = java.util.Collections.unmodifiableList(new java.util.ArrayList<T>(this.children)); - } - java.util.Collection<Number> scarves; - switch (this.scarves == null ? 0 : this.scarves.size()) { - case 0: - scarves = java.util.Collections.emptyList(); - break; - case 1: - scarves = java.util.Collections.singletonList(this.scarves.get(0)); - break; - default: - scarves = java.util.Collections.unmodifiableList(new java.util.ArrayList<Number>(this.scarves)); - } - java.util.List<java.lang.Object> rawList; - switch (this.rawList == null ? 0 : this.rawList.size()) { - case 0: - rawList = java.util.Collections.emptyList(); - break; - case 1: - rawList = java.util.Collections.singletonList(this.rawList.get(0)); - break; - default: - rawList = java.util.Collections.unmodifiableList(new java.util.ArrayList<java.lang.Object>(this.rawList)); - } - return new BuilderSingularListsWithSetterPrefix<T>(children, scarves, rawList); - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public java.lang.String toString() { - return "BuilderSingularListsWithSetterPrefix.BuilderSingularListsWithSetterPrefixBuilder(children=" + this.children + ", scarves=" + this.scarves + ", rawList=" + this.rawList + ")"; - } - } - @java.lang.SuppressWarnings("all") - public static <T> BuilderSingularListsWithSetterPrefixBuilder<T> builder() { - return new BuilderSingularListsWithSetterPrefixBuilder<T>(); - } -} diff --git a/test/transform/resource/after-delombok/BuilderSingularMaps.java b/test/transform/resource/after-delombok/BuilderSingularMaps.java index 6520568b..240a6e3b 100644 --- a/test/transform/resource/after-delombok/BuilderSingularMaps.java +++ b/test/transform/resource/after-delombok/BuilderSingularMaps.java @@ -35,7 +35,7 @@ class BuilderSingularMaps<K, V> { BuilderSingularMapsBuilder() { } @SuppressWarnings("all") - public BuilderSingularMapsBuilder<K, V> woman(K womanKey, V womanValue) { + public BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> woman(K womanKey, V womanValue) { if (this.women$key == null) { this.women$key = new java.util.ArrayList<K>(); this.women$value = new java.util.ArrayList<V>(); @@ -45,7 +45,7 @@ class BuilderSingularMaps<K, V> { return this; } @SuppressWarnings("all") - public BuilderSingularMapsBuilder<K, V> women(java.util.Map<? extends K, ? extends V> women) { + public BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> women(java.util.Map<? extends K, ? extends V> women) { if (this.women$key == null) { this.women$key = new java.util.ArrayList<K>(); this.women$value = new java.util.ArrayList<V>(); @@ -57,7 +57,7 @@ class BuilderSingularMaps<K, V> { return this; } @SuppressWarnings("all") - public BuilderSingularMapsBuilder<K, V> clearWomen() { + public BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> clearWomen() { if (this.women$key != null) { this.women$key.clear(); this.women$value.clear(); @@ -65,7 +65,7 @@ class BuilderSingularMaps<K, V> { return this; } @SuppressWarnings("all") - public BuilderSingularMapsBuilder<K, V> man(K manKey, Number manValue) { + public BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> man(K manKey, Number manValue) { if (this.men$key == null) { this.men$key = new java.util.ArrayList<K>(); this.men$value = new java.util.ArrayList<Number>(); @@ -75,7 +75,7 @@ class BuilderSingularMaps<K, V> { return this; } @SuppressWarnings("all") - public BuilderSingularMapsBuilder<K, V> men(java.util.Map<? extends K, ? extends Number> men) { + public BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> men(java.util.Map<? extends K, ? extends Number> men) { if (this.men$key == null) { this.men$key = new java.util.ArrayList<K>(); this.men$value = new java.util.ArrayList<Number>(); @@ -87,7 +87,7 @@ class BuilderSingularMaps<K, V> { return this; } @SuppressWarnings("all") - public BuilderSingularMapsBuilder<K, V> clearMen() { + public BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> clearMen() { if (this.men$key != null) { this.men$key.clear(); this.men$value.clear(); @@ -95,7 +95,7 @@ class BuilderSingularMaps<K, V> { return this; } @SuppressWarnings("all") - public BuilderSingularMapsBuilder<K, V> rawMap(Object rawMapKey, Object rawMapValue) { + public BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> rawMap(Object rawMapKey, Object rawMapValue) { if (this.rawMap$key == null) { this.rawMap$key = new java.util.ArrayList<Object>(); this.rawMap$value = new java.util.ArrayList<Object>(); @@ -105,7 +105,7 @@ class BuilderSingularMaps<K, V> { return this; } @SuppressWarnings("all") - public BuilderSingularMapsBuilder<K, V> rawMap(java.util.Map<?, ?> rawMap) { + public BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> rawMap(java.util.Map<?, ?> rawMap) { if (this.rawMap$key == null) { this.rawMap$key = new java.util.ArrayList<Object>(); this.rawMap$value = new java.util.ArrayList<Object>(); @@ -117,7 +117,7 @@ class BuilderSingularMaps<K, V> { return this; } @SuppressWarnings("all") - public BuilderSingularMapsBuilder<K, V> clearRawMap() { + public BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> clearRawMap() { if (this.rawMap$key != null) { this.rawMap$key.clear(); this.rawMap$value.clear(); @@ -125,7 +125,7 @@ class BuilderSingularMaps<K, V> { return this; } @SuppressWarnings("all") - public BuilderSingularMapsBuilder<K, V> stringMap(String stringMapKey, V stringMapValue) { + public BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> stringMap(String stringMapKey, V stringMapValue) { if (this.stringMap$key == null) { this.stringMap$key = new java.util.ArrayList<String>(); this.stringMap$value = new java.util.ArrayList<V>(); @@ -135,7 +135,7 @@ class BuilderSingularMaps<K, V> { return this; } @SuppressWarnings("all") - public BuilderSingularMapsBuilder<K, V> stringMap(java.util.Map<? extends String, ? extends V> stringMap) { + public BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> stringMap(java.util.Map<? extends String, ? extends V> stringMap) { if (this.stringMap$key == null) { this.stringMap$key = new java.util.ArrayList<String>(); this.stringMap$value = new java.util.ArrayList<V>(); @@ -147,7 +147,7 @@ class BuilderSingularMaps<K, V> { return this; } @SuppressWarnings("all") - public BuilderSingularMapsBuilder<K, V> clearStringMap() { + public BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> clearStringMap() { if (this.stringMap$key != null) { this.stringMap$key.clear(); this.stringMap$value.clear(); @@ -207,7 +207,7 @@ class BuilderSingularMaps<K, V> { } } @SuppressWarnings("all") - public static <K, V> BuilderSingularMapsBuilder<K, V> builder() { - return new BuilderSingularMapsBuilder<K, V>(); + public static <K, V> BuilderSingularMaps.BuilderSingularMapsBuilder<K, V> builder() { + return new BuilderSingularMaps.BuilderSingularMapsBuilder<K, V>(); } } diff --git a/test/transform/resource/after-delombok/BuilderSingularMapsWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularMapsWithSetterPrefix.java index a4afb8a8..bfc2e750 100644 --- a/test/transform/resource/after-delombok/BuilderSingularMapsWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderSingularMapsWithSetterPrefix.java @@ -35,7 +35,7 @@ class BuilderSingularMapsWithSetterPrefix<K, V> { BuilderSingularMapsWithSetterPrefixBuilder() { } @SuppressWarnings("all") - public BuilderSingularMapsWithSetterPrefixBuilder<K, V> withWoman(K womanKey, V womanValue) { + public BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder<K, V> withWoman(K womanKey, V womanValue) { if (this.women$key == null) { this.women$key = new java.util.ArrayList<K>(); this.women$value = new java.util.ArrayList<V>(); @@ -45,7 +45,7 @@ class BuilderSingularMapsWithSetterPrefix<K, V> { return this; } @SuppressWarnings("all") - public BuilderSingularMapsWithSetterPrefixBuilder<K, V> withWomen(java.util.Map<? extends K, ? extends V> women) { + public BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder<K, V> withWomen(java.util.Map<? extends K, ? extends V> women) { if (this.women$key == null) { this.women$key = new java.util.ArrayList<K>(); this.women$value = new java.util.ArrayList<V>(); @@ -57,7 +57,7 @@ class BuilderSingularMapsWithSetterPrefix<K, V> { return this; } @SuppressWarnings("all") - public BuilderSingularMapsWithSetterPrefixBuilder<K, V> clearWomen() { + public BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder<K, V> clearWomen() { if (this.women$key != null) { this.women$key.clear(); this.women$value.clear(); @@ -65,7 +65,7 @@ class BuilderSingularMapsWithSetterPrefix<K, V> { return this; } @SuppressWarnings("all") - public BuilderSingularMapsWithSetterPrefixBuilder<K, V> withMan(K manKey, Number manValue) { + public BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder<K, V> withMan(K manKey, Number manValue) { if (this.men$key == null) { this.men$key = new java.util.ArrayList<K>(); this.men$value = new java.util.ArrayList<Number>(); @@ -75,7 +75,7 @@ class BuilderSingularMapsWithSetterPrefix<K, V> { return this; } @SuppressWarnings("all") - public BuilderSingularMapsWithSetterPrefixBuilder<K, V> withMen(java.util.Map<? extends K, ? extends Number> men) { + public BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder<K, V> withMen(java.util.Map<? extends K, ? extends Number> men) { if (this.men$key == null) { this.men$key = new java.util.ArrayList<K>(); this.men$value = new java.util.ArrayList<Number>(); @@ -87,7 +87,7 @@ class BuilderSingularMapsWithSetterPrefix<K, V> { return this; } @SuppressWarnings("all") - public BuilderSingularMapsWithSetterPrefixBuilder<K, V> clearMen() { + public BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder<K, V> clearMen() { if (this.men$key != null) { this.men$key.clear(); this.men$value.clear(); @@ -95,7 +95,7 @@ class BuilderSingularMapsWithSetterPrefix<K, V> { return this; } @SuppressWarnings("all") - public BuilderSingularMapsWithSetterPrefixBuilder<K, V> withRawMap(Object rawMapKey, Object rawMapValue) { + public BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder<K, V> withRawMap(Object rawMapKey, Object rawMapValue) { if (this.rawMap$key == null) { this.rawMap$key = new java.util.ArrayList<Object>(); this.rawMap$value = new java.util.ArrayList<Object>(); @@ -105,7 +105,7 @@ class BuilderSingularMapsWithSetterPrefix<K, V> { return this; } @SuppressWarnings("all") - public BuilderSingularMapsWithSetterPrefixBuilder<K, V> withRawMap(java.util.Map<?, ?> rawMap) { + public BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder<K, V> withRawMap(java.util.Map<?, ?> rawMap) { if (this.rawMap$key == null) { this.rawMap$key = new java.util.ArrayList<Object>(); this.rawMap$value = new java.util.ArrayList<Object>(); @@ -117,7 +117,7 @@ class BuilderSingularMapsWithSetterPrefix<K, V> { return this; } @SuppressWarnings("all") - public BuilderSingularMapsWithSetterPrefixBuilder<K, V> clearRawMap() { + public BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder<K, V> clearRawMap() { if (this.rawMap$key != null) { this.rawMap$key.clear(); this.rawMap$value.clear(); @@ -125,7 +125,7 @@ class BuilderSingularMapsWithSetterPrefix<K, V> { return this; } @SuppressWarnings("all") - public BuilderSingularMapsWithSetterPrefixBuilder<K, V> withStringMap(String stringMapKey, V stringMapValue) { + public BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder<K, V> withStringMap(String stringMapKey, V stringMapValue) { if (this.stringMap$key == null) { this.stringMap$key = new java.util.ArrayList<String>(); this.stringMap$value = new java.util.ArrayList<V>(); @@ -135,7 +135,7 @@ class BuilderSingularMapsWithSetterPrefix<K, V> { return this; } @SuppressWarnings("all") - public BuilderSingularMapsWithSetterPrefixBuilder<K, V> withStringMap(java.util.Map<? extends String, ? extends V> stringMap) { + public BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder<K, V> withStringMap(java.util.Map<? extends String, ? extends V> stringMap) { if (this.stringMap$key == null) { this.stringMap$key = new java.util.ArrayList<String>(); this.stringMap$value = new java.util.ArrayList<V>(); @@ -147,7 +147,7 @@ class BuilderSingularMapsWithSetterPrefix<K, V> { return this; } @SuppressWarnings("all") - public BuilderSingularMapsWithSetterPrefixBuilder<K, V> clearStringMap() { + public BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder<K, V> clearStringMap() { if (this.stringMap$key != null) { this.stringMap$key.clear(); this.stringMap$value.clear(); @@ -207,7 +207,7 @@ class BuilderSingularMapsWithSetterPrefix<K, V> { } } @SuppressWarnings("all") - public static <K, V> BuilderSingularMapsWithSetterPrefixBuilder<K, V> builder() { - return new BuilderSingularMapsWithSetterPrefixBuilder<K, V>(); + public static <K, V> BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder<K, V> builder() { + return new BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder<K, V>(); } } diff --git a/test/transform/resource/after-delombok/BuilderSingularNoAuto.java b/test/transform/resource/after-delombok/BuilderSingularNoAuto.java index 189408da..a38effc0 100644 --- a/test/transform/resource/after-delombok/BuilderSingularNoAuto.java +++ b/test/transform/resource/after-delombok/BuilderSingularNoAuto.java @@ -21,53 +21,53 @@ class BuilderSingularNoAuto { BuilderSingularNoAutoBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderSingularNoAutoBuilder things(final String things) { + public BuilderSingularNoAuto.BuilderSingularNoAutoBuilder things(final String things) { if (this.things == null) this.things = new java.util.ArrayList<String>(); this.things.add(things); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularNoAutoBuilder things(final java.util.Collection<? extends String> things) { + public BuilderSingularNoAuto.BuilderSingularNoAutoBuilder things(final java.util.Collection<? extends String> things) { if (this.things == null) this.things = new java.util.ArrayList<String>(); this.things.addAll(things); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularNoAutoBuilder clearThings() { + public BuilderSingularNoAuto.BuilderSingularNoAutoBuilder clearThings() { if (this.things != null) this.things.clear(); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularNoAutoBuilder widget(final String widget) { + public BuilderSingularNoAuto.BuilderSingularNoAutoBuilder widget(final String widget) { if (this.widgets == null) this.widgets = new java.util.ArrayList<String>(); this.widgets.add(widget); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularNoAutoBuilder widgets(final java.util.Collection<? extends String> widgets) { + public BuilderSingularNoAuto.BuilderSingularNoAutoBuilder widgets(final java.util.Collection<? extends String> widgets) { if (this.widgets == null) this.widgets = new java.util.ArrayList<String>(); this.widgets.addAll(widgets); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularNoAutoBuilder clearWidgets() { + public BuilderSingularNoAuto.BuilderSingularNoAutoBuilder clearWidgets() { if (this.widgets != null) this.widgets.clear(); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularNoAutoBuilder items(final String items) { + public BuilderSingularNoAuto.BuilderSingularNoAutoBuilder items(final String items) { if (this.items == null) this.items = new java.util.ArrayList<String>(); this.items.add(items); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularNoAutoBuilder items(final java.util.Collection<? extends String> items) { + public BuilderSingularNoAuto.BuilderSingularNoAutoBuilder items(final java.util.Collection<? extends String> items) { if (this.items == null) this.items = new java.util.ArrayList<String>(); this.items.addAll(items); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularNoAutoBuilder clearItems() { + public BuilderSingularNoAuto.BuilderSingularNoAutoBuilder clearItems() { if (this.items != null) this.items.clear(); return this; } @@ -115,7 +115,7 @@ class BuilderSingularNoAuto { } } @java.lang.SuppressWarnings("all") - public static BuilderSingularNoAutoBuilder builder() { - return new BuilderSingularNoAutoBuilder(); + public static BuilderSingularNoAuto.BuilderSingularNoAutoBuilder builder() { + return new BuilderSingularNoAuto.BuilderSingularNoAutoBuilder(); } } diff --git a/test/transform/resource/after-delombok/BuilderSingularNoAutoWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularNoAutoWithSetterPrefix.java index d2b5ff37..57bef625 100644 --- a/test/transform/resource/after-delombok/BuilderSingularNoAutoWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderSingularNoAutoWithSetterPrefix.java @@ -21,53 +21,53 @@ class BuilderSingularNoAutoWithSetterPrefix { BuilderSingularNoAutoWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderSingularNoAutoWithSetterPrefixBuilder withThings(final String things) { + public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withThings(final String things) { if (this.things == null) this.things = new java.util.ArrayList<String>(); this.things.add(things); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularNoAutoWithSetterPrefixBuilder withThings(final java.util.Collection<? extends String> things) { + public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withThings(final java.util.Collection<? extends String> things) { if (this.things == null) this.things = new java.util.ArrayList<String>(); this.things.addAll(things); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularNoAutoWithSetterPrefixBuilder clearThings() { + public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder clearThings() { if (this.things != null) this.things.clear(); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularNoAutoWithSetterPrefixBuilder withWidget(final String widget) { + public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withWidget(final String widget) { if (this.widgets == null) this.widgets = new java.util.ArrayList<String>(); this.widgets.add(widget); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularNoAutoWithSetterPrefixBuilder withWidgets(final java.util.Collection<? extends String> widgets) { + public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withWidgets(final java.util.Collection<? extends String> widgets) { if (this.widgets == null) this.widgets = new java.util.ArrayList<String>(); this.widgets.addAll(widgets); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularNoAutoWithSetterPrefixBuilder clearWidgets() { + public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder clearWidgets() { if (this.widgets != null) this.widgets.clear(); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularNoAutoWithSetterPrefixBuilder withItems(final String items) { + public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withItems(final String items) { if (this.items == null) this.items = new java.util.ArrayList<String>(); this.items.add(items); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularNoAutoWithSetterPrefixBuilder withItems(final java.util.Collection<? extends String> items) { + public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder withItems(final java.util.Collection<? extends String> items) { if (this.items == null) this.items = new java.util.ArrayList<String>(); this.items.addAll(items); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularNoAutoWithSetterPrefixBuilder clearItems() { + public BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder clearItems() { if (this.items != null) this.items.clear(); return this; } @@ -115,7 +115,7 @@ class BuilderSingularNoAutoWithSetterPrefix { } } @java.lang.SuppressWarnings("all") - public static BuilderSingularNoAutoWithSetterPrefixBuilder builder() { - return new BuilderSingularNoAutoWithSetterPrefixBuilder(); + public static BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder builder() { + return new BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder(); } } diff --git a/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java b/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java index 938f3bbc..4ce5cae5 100644 --- a/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java +++ b/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java @@ -23,53 +23,53 @@ class BuilderSingularRedirectToGuava { BuilderSingularRedirectToGuavaBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderSingularRedirectToGuavaBuilder dangerMouse(final String dangerMouse) { + public BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder dangerMouse(final String dangerMouse) { if (this.dangerMice == null) this.dangerMice = com.google.common.collect.ImmutableSet.builder(); this.dangerMice.add(dangerMouse); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularRedirectToGuavaBuilder dangerMice(final java.lang.Iterable<? extends String> dangerMice) { + public BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder dangerMice(final java.lang.Iterable<? extends String> dangerMice) { if (this.dangerMice == null) this.dangerMice = com.google.common.collect.ImmutableSet.builder(); this.dangerMice.addAll(dangerMice); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularRedirectToGuavaBuilder clearDangerMice() { + public BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder clearDangerMice() { this.dangerMice = null; return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularRedirectToGuavaBuilder thing(final Integer key, final Number value) { + public BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder thing(final Integer key, final Number value) { if (this.things == null) this.things = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.things.put(key, value); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularRedirectToGuavaBuilder things(final java.util.Map<? extends Integer, ? extends Number> things) { + public BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder things(final java.util.Map<? extends Integer, ? extends Number> things) { if (this.things == null) this.things = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.things.putAll(things); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularRedirectToGuavaBuilder clearThings() { + public BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder clearThings() { this.things = null; return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularRedirectToGuavaBuilder doohickey(final Class<?> doohickey) { + public BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder doohickey(final Class<?> doohickey) { if (this.doohickeys == null) this.doohickeys = com.google.common.collect.ImmutableList.builder(); this.doohickeys.add(doohickey); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularRedirectToGuavaBuilder doohickeys(final java.lang.Iterable<? extends Class<?>> doohickeys) { + public BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder doohickeys(final java.lang.Iterable<? extends Class<?>> doohickeys) { if (this.doohickeys == null) this.doohickeys = com.google.common.collect.ImmutableList.builder(); this.doohickeys.addAll(doohickeys); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularRedirectToGuavaBuilder clearDoohickeys() { + public BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder clearDoohickeys() { this.doohickeys = null; return this; } @@ -87,7 +87,7 @@ class BuilderSingularRedirectToGuava { } } @java.lang.SuppressWarnings("all") - public static BuilderSingularRedirectToGuavaBuilder builder() { - return new BuilderSingularRedirectToGuavaBuilder(); + public static BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder builder() { + return new BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder(); } } diff --git a/test/transform/resource/after-delombok/BuilderSingularRedirectToGuavaWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularRedirectToGuavaWithSetterPrefix.java deleted file mode 100644 index b0fe8135..00000000 --- a/test/transform/resource/after-delombok/BuilderSingularRedirectToGuavaWithSetterPrefix.java +++ /dev/null @@ -1,93 +0,0 @@ -import java.util.Set; -import java.util.NavigableMap; -import java.util.Collection; -class BuilderSingularRedirectToGuavaWithSetterPrefix { - private Set<String> dangerMice; - private NavigableMap<Integer, Number> things; - private Collection<Class<?>> doohickeys; - @java.lang.SuppressWarnings("all") - BuilderSingularRedirectToGuavaWithSetterPrefix(final Set<String> dangerMice, final NavigableMap<Integer, Number> things, final Collection<Class<?>> doohickeys) { - this.dangerMice = dangerMice; - this.things = things; - this.doohickeys = doohickeys; - } - @java.lang.SuppressWarnings("all") - public static class BuilderSingularRedirectToGuavaWithSetterPrefixBuilder { - @java.lang.SuppressWarnings("all") - private com.google.common.collect.ImmutableSet.Builder<String> dangerMice; - @java.lang.SuppressWarnings("all") - private com.google.common.collect.ImmutableSortedMap.Builder<Integer, Number> things; - @java.lang.SuppressWarnings("all") - private com.google.common.collect.ImmutableList.Builder<Class<?>> doohickeys; - @java.lang.SuppressWarnings("all") - BuilderSingularRedirectToGuavaWithSetterPrefixBuilder() { - } - @java.lang.SuppressWarnings("all") - public BuilderSingularRedirectToGuavaWithSetterPrefixBuilder withDangerMouse(final String dangerMouse) { - if (this.dangerMice == null) this.dangerMice = com.google.common.collect.ImmutableSet.builder(); - this.dangerMice.add(dangerMouse); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularRedirectToGuavaWithSetterPrefixBuilder withDangerMice(final java.lang.Iterable<? extends String> dangerMice) { - if (this.dangerMice == null) this.dangerMice = com.google.common.collect.ImmutableSet.builder(); - this.dangerMice.addAll(dangerMice); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularRedirectToGuavaWithSetterPrefixBuilder clearDangerMice() { - this.dangerMice = null; - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularRedirectToGuavaWithSetterPrefixBuilder withThing(final Integer key, final Number value) { - if (this.things == null) this.things = com.google.common.collect.ImmutableSortedMap.naturalOrder(); - this.things.put(key, value); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularRedirectToGuavaWithSetterPrefixBuilder withThings(final java.util.Map<? extends Integer, ? extends Number> things) { - if (this.things == null) this.things = com.google.common.collect.ImmutableSortedMap.naturalOrder(); - this.things.putAll(things); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularRedirectToGuavaWithSetterPrefixBuilder clearThings() { - this.things = null; - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularRedirectToGuavaWithSetterPrefixBuilder withDoohickey(final Class<?> doohickey) { - if (this.doohickeys == null) this.doohickeys = com.google.common.collect.ImmutableList.builder(); - this.doohickeys.add(doohickey); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularRedirectToGuavaWithSetterPrefixBuilder withDoohickeys(final java.lang.Iterable<? extends Class<?>> doohickeys) { - if (this.doohickeys == null) this.doohickeys = com.google.common.collect.ImmutableList.builder(); - this.doohickeys.addAll(doohickeys); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularRedirectToGuavaWithSetterPrefixBuilder clearDoohickeys() { - this.doohickeys = null; - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularRedirectToGuavaWithSetterPrefix build() { - java.util.Set<String> dangerMice = this.dangerMice == null ? com.google.common.collect.ImmutableSet.<String>of() : this.dangerMice.build(); - java.util.NavigableMap<Integer, Number> things = this.things == null ? com.google.common.collect.ImmutableSortedMap.<Integer, Number>of() : this.things.build(); - java.util.Collection<Class<?>> doohickeys = this.doohickeys == null ? com.google.common.collect.ImmutableList.<Class<?>>of() : this.doohickeys.build(); - return new BuilderSingularRedirectToGuavaWithSetterPrefix(dangerMice, things, doohickeys); - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public java.lang.String toString() { - return "BuilderSingularRedirectToGuavaWithSetterPrefix.BuilderSingularRedirectToGuavaWithSetterPrefixBuilder(dangerMice=" + this.dangerMice + ", things=" + this.things + ", doohickeys=" + this.doohickeys + ")"; - } - } - @java.lang.SuppressWarnings("all") - public static BuilderSingularRedirectToGuavaWithSetterPrefixBuilder builder() { - return new BuilderSingularRedirectToGuavaWithSetterPrefixBuilder(); - } -} diff --git a/test/transform/resource/after-delombok/BuilderSingularSets.java b/test/transform/resource/after-delombok/BuilderSingularSets.java index 2d75b294..c85bbb99 100644 --- a/test/transform/resource/after-delombok/BuilderSingularSets.java +++ b/test/transform/resource/after-delombok/BuilderSingularSets.java @@ -27,70 +27,70 @@ class BuilderSingularSets<T> { BuilderSingularSetsBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderSingularSetsBuilder<T> dangerMouse(final T dangerMouse) { + public BuilderSingularSets.BuilderSingularSetsBuilder<T> dangerMouse(final T dangerMouse) { if (this.dangerMice == null) this.dangerMice = new java.util.ArrayList<T>(); this.dangerMice.add(dangerMouse); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularSetsBuilder<T> dangerMice(final java.util.Collection<? extends T> dangerMice) { + public BuilderSingularSets.BuilderSingularSetsBuilder<T> dangerMice(final java.util.Collection<? extends T> dangerMice) { if (this.dangerMice == null) this.dangerMice = new java.util.ArrayList<T>(); this.dangerMice.addAll(dangerMice); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularSetsBuilder<T> clearDangerMice() { + public BuilderSingularSets.BuilderSingularSetsBuilder<T> clearDangerMice() { if (this.dangerMice != null) this.dangerMice.clear(); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularSetsBuilder<T> octopus(final Number octopus) { + public BuilderSingularSets.BuilderSingularSetsBuilder<T> octopus(final Number octopus) { if (this.octopodes == null) this.octopodes = new java.util.ArrayList<Number>(); this.octopodes.add(octopus); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularSetsBuilder<T> octopodes(final java.util.Collection<? extends Number> octopodes) { + public BuilderSingularSets.BuilderSingularSetsBuilder<T> octopodes(final java.util.Collection<? extends Number> octopodes) { if (this.octopodes == null) this.octopodes = new java.util.ArrayList<Number>(); this.octopodes.addAll(octopodes); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularSetsBuilder<T> clearOctopodes() { + public BuilderSingularSets.BuilderSingularSetsBuilder<T> clearOctopodes() { if (this.octopodes != null) this.octopodes.clear(); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularSetsBuilder<T> rawSet(final java.lang.Object rawSet) { + public BuilderSingularSets.BuilderSingularSetsBuilder<T> rawSet(final java.lang.Object rawSet) { if (this.rawSet == null) this.rawSet = new java.util.ArrayList<java.lang.Object>(); this.rawSet.add(rawSet); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularSetsBuilder<T> rawSet(final java.util.Collection<?> rawSet) { + public BuilderSingularSets.BuilderSingularSetsBuilder<T> rawSet(final java.util.Collection<?> rawSet) { if (this.rawSet == null) this.rawSet = new java.util.ArrayList<java.lang.Object>(); this.rawSet.addAll(rawSet); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularSetsBuilder<T> clearRawSet() { + public BuilderSingularSets.BuilderSingularSetsBuilder<T> clearRawSet() { if (this.rawSet != null) this.rawSet.clear(); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularSetsBuilder<T> stringSet(final String stringSet) { + public BuilderSingularSets.BuilderSingularSetsBuilder<T> stringSet(final String stringSet) { if (this.stringSet == null) this.stringSet = new java.util.ArrayList<String>(); this.stringSet.add(stringSet); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularSetsBuilder<T> stringSet(final java.util.Collection<? extends String> stringSet) { + public BuilderSingularSets.BuilderSingularSetsBuilder<T> stringSet(final java.util.Collection<? extends String> stringSet) { if (this.stringSet == null) this.stringSet = new java.util.ArrayList<String>(); this.stringSet.addAll(stringSet); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularSetsBuilder<T> clearStringSet() { + public BuilderSingularSets.BuilderSingularSetsBuilder<T> clearStringSet() { if (this.stringSet != null) this.stringSet.clear(); return this; } @@ -147,7 +147,7 @@ class BuilderSingularSets<T> { } } @java.lang.SuppressWarnings("all") - public static <T> BuilderSingularSetsBuilder<T> builder() { - return new BuilderSingularSetsBuilder<T>(); + public static <T> BuilderSingularSets.BuilderSingularSetsBuilder<T> builder() { + return new BuilderSingularSets.BuilderSingularSetsBuilder<T>(); } } diff --git a/test/transform/resource/after-delombok/BuilderSingularSetsWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularSetsWithSetterPrefix.java index 9702b850..6c9abf2f 100644 --- a/test/transform/resource/after-delombok/BuilderSingularSetsWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderSingularSetsWithSetterPrefix.java @@ -27,70 +27,70 @@ class BuilderSingularSetsWithSetterPrefix<T> { BuilderSingularSetsWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderSingularSetsWithSetterPrefixBuilder<T> withDangerMouse(final T dangerMouse) { + public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder<T> withDangerMouse(final T dangerMouse) { if (this.dangerMice == null) this.dangerMice = new java.util.ArrayList<T>(); this.dangerMice.add(dangerMouse); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularSetsWithSetterPrefixBuilder<T> withDangerMice(final java.util.Collection<? extends T> dangerMice) { + public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder<T> withDangerMice(final java.util.Collection<? extends T> dangerMice) { if (this.dangerMice == null) this.dangerMice = new java.util.ArrayList<T>(); this.dangerMice.addAll(dangerMice); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularSetsWithSetterPrefixBuilder<T> clearDangerMice() { + public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder<T> clearDangerMice() { if (this.dangerMice != null) this.dangerMice.clear(); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularSetsWithSetterPrefixBuilder<T> withOctopus(final Number octopus) { + public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder<T> withOctopus(final Number octopus) { if (this.octopodes == null) this.octopodes = new java.util.ArrayList<Number>(); this.octopodes.add(octopus); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularSetsWithSetterPrefixBuilder<T> withOctopodes(final java.util.Collection<? extends Number> octopodes) { + public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder<T> withOctopodes(final java.util.Collection<? extends Number> octopodes) { if (this.octopodes == null) this.octopodes = new java.util.ArrayList<Number>(); this.octopodes.addAll(octopodes); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularSetsWithSetterPrefixBuilder<T> clearOctopodes() { + public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder<T> clearOctopodes() { if (this.octopodes != null) this.octopodes.clear(); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularSetsWithSetterPrefixBuilder<T> withRawSet(final java.lang.Object rawSet) { + public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder<T> withRawSet(final java.lang.Object rawSet) { if (this.rawSet == null) this.rawSet = new java.util.ArrayList<java.lang.Object>(); this.rawSet.add(rawSet); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularSetsWithSetterPrefixBuilder<T> withRawSet(final java.util.Collection<?> rawSet) { + public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder<T> withRawSet(final java.util.Collection<?> rawSet) { if (this.rawSet == null) this.rawSet = new java.util.ArrayList<java.lang.Object>(); this.rawSet.addAll(rawSet); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularSetsWithSetterPrefixBuilder<T> clearRawSet() { + public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder<T> clearRawSet() { if (this.rawSet != null) this.rawSet.clear(); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularSetsWithSetterPrefixBuilder<T> withStringSet(final String stringSet) { + public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder<T> withStringSet(final String stringSet) { if (this.stringSet == null) this.stringSet = new java.util.ArrayList<String>(); this.stringSet.add(stringSet); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularSetsWithSetterPrefixBuilder<T> withStringSet(final java.util.Collection<? extends String> stringSet) { + public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder<T> withStringSet(final java.util.Collection<? extends String> stringSet) { if (this.stringSet == null) this.stringSet = new java.util.ArrayList<String>(); this.stringSet.addAll(stringSet); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularSetsWithSetterPrefixBuilder<T> clearStringSet() { + public BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder<T> clearStringSet() { if (this.stringSet != null) this.stringSet.clear(); return this; } @@ -147,7 +147,7 @@ class BuilderSingularSetsWithSetterPrefix<T> { } } @java.lang.SuppressWarnings("all") - public static <T> BuilderSingularSetsWithSetterPrefixBuilder<T> builder() { - return new BuilderSingularSetsWithSetterPrefixBuilder<T>(); + public static <T> BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder<T> builder() { + return new BuilderSingularSetsWithSetterPrefix.BuilderSingularSetsWithSetterPrefixBuilder<T>(); } } diff --git a/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNull.java b/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNull.java index 96ffd2dc..2166491b 100644 --- a/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNull.java +++ b/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNull.java @@ -15,19 +15,19 @@ class BuilderSingularToBuilderWithNull { BuilderSingularToBuilderWithNullBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderSingularToBuilderWithNullBuilder elem(final String elem) { + public BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder elem(final String elem) { if (this.elems == null) this.elems = new java.util.ArrayList<String>(); this.elems.add(elem); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularToBuilderWithNullBuilder elems(final java.util.Collection<? extends String> elems) { + public BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder elems(final java.util.Collection<? extends String> elems) { if (this.elems == null) this.elems = new java.util.ArrayList<String>(); this.elems.addAll(elems); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularToBuilderWithNullBuilder clearElems() { + public BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder clearElems() { if (this.elems != null) this.elems.clear(); return this; } @@ -53,12 +53,12 @@ class BuilderSingularToBuilderWithNull { } } @java.lang.SuppressWarnings("all") - public static BuilderSingularToBuilderWithNullBuilder builder() { - return new BuilderSingularToBuilderWithNullBuilder(); + public static BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder builder() { + return new BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder(); } @java.lang.SuppressWarnings("all") - public BuilderSingularToBuilderWithNullBuilder toBuilder() { - final BuilderSingularToBuilderWithNullBuilder builder = new BuilderSingularToBuilderWithNullBuilder(); + public BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder toBuilder() { + final BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder builder = new BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder(); if (this.elems != null) builder.elems(this.elems); return builder; } diff --git a/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNullWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNullWithSetterPrefix.java index 5f42d87e..79f11978 100644 --- a/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNullWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNullWithSetterPrefix.java @@ -15,19 +15,19 @@ class BuilderSingularToBuilderWithNullWithSetterPrefix { BuilderSingularToBuilderWithNullWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderSingularToBuilderWithNullWithSetterPrefixBuilder withElem(final String elem) { + public BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder withElem(final String elem) { if (this.elems == null) this.elems = new java.util.ArrayList<String>(); this.elems.add(elem); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularToBuilderWithNullWithSetterPrefixBuilder withElems(final java.util.Collection<? extends String> elems) { + public BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder withElems(final java.util.Collection<? extends String> elems) { if (this.elems == null) this.elems = new java.util.ArrayList<String>(); this.elems.addAll(elems); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularToBuilderWithNullWithSetterPrefixBuilder clearElems() { + public BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder clearElems() { if (this.elems != null) this.elems.clear(); return this; } @@ -53,12 +53,12 @@ class BuilderSingularToBuilderWithNullWithSetterPrefix { } } @java.lang.SuppressWarnings("all") - public static BuilderSingularToBuilderWithNullWithSetterPrefixBuilder builder() { - return new BuilderSingularToBuilderWithNullWithSetterPrefixBuilder(); + public static BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder builder() { + return new BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder(); } @java.lang.SuppressWarnings("all") - public BuilderSingularToBuilderWithNullWithSetterPrefixBuilder toBuilder() { - final BuilderSingularToBuilderWithNullWithSetterPrefixBuilder builder = new BuilderSingularToBuilderWithNullWithSetterPrefixBuilder(); + public BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder toBuilder() { + final BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder builder = new BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder(); if (this.elems != null) builder.withElems(this.elems); return builder; } diff --git a/test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilder.java b/test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilder.java index f0acf4f2..ec05ea2d 100644 --- a/test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilder.java +++ b/test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilder.java @@ -18,36 +18,36 @@ class BuilderSingularWildcardListsWithToBuilder { BuilderSingularWildcardListsWithToBuilderBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderSingularWildcardListsWithToBuilderBuilder object(final java.lang.Object object) { + public BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder object(final java.lang.Object object) { if (this.objects == null) this.objects = new java.util.ArrayList<java.lang.Object>(); this.objects.add(object); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularWildcardListsWithToBuilderBuilder objects(final java.util.Collection<?> objects) { + public BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder objects(final java.util.Collection<?> objects) { if (this.objects == null) this.objects = new java.util.ArrayList<java.lang.Object>(); this.objects.addAll(objects); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularWildcardListsWithToBuilderBuilder clearObjects() { + public BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder clearObjects() { if (this.objects != null) this.objects.clear(); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularWildcardListsWithToBuilderBuilder number(final Number number) { + public BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder number(final Number number) { if (this.numbers == null) this.numbers = new java.util.ArrayList<Number>(); this.numbers.add(number); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularWildcardListsWithToBuilderBuilder numbers(final java.util.Collection<? extends Number> numbers) { + public BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder numbers(final java.util.Collection<? extends Number> numbers) { if (this.numbers == null) this.numbers = new java.util.ArrayList<Number>(); this.numbers.addAll(numbers); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularWildcardListsWithToBuilderBuilder clearNumbers() { + public BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder clearNumbers() { if (this.numbers != null) this.numbers.clear(); return this; } @@ -84,12 +84,12 @@ class BuilderSingularWildcardListsWithToBuilder { } } @java.lang.SuppressWarnings("all") - public static BuilderSingularWildcardListsWithToBuilderBuilder builder() { - return new BuilderSingularWildcardListsWithToBuilderBuilder(); + public static BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder builder() { + return new BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder(); } @java.lang.SuppressWarnings("all") - public BuilderSingularWildcardListsWithToBuilderBuilder toBuilder() { - final BuilderSingularWildcardListsWithToBuilderBuilder builder = new BuilderSingularWildcardListsWithToBuilderBuilder(); + public BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder toBuilder() { + final BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder builder = new BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder(); if (this.objects != null) builder.objects(this.objects); if (this.numbers != null) builder.numbers(this.numbers); return builder; diff --git a/test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java deleted file mode 100644 index 367f0ac1..00000000 --- a/test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java +++ /dev/null @@ -1,97 +0,0 @@ -import java.util.List; -import java.util.Collection; -class BuilderSingularWildcardListsWithToBuilderWithSetterPrefix { - private List<?> objects; - private Collection<? extends Number> numbers; - @java.lang.SuppressWarnings("all") - BuilderSingularWildcardListsWithToBuilderWithSetterPrefix(final List<?> objects, final Collection<? extends Number> numbers) { - this.objects = objects; - this.numbers = numbers; - } - @java.lang.SuppressWarnings("all") - public static class BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder { - @java.lang.SuppressWarnings("all") - private java.util.ArrayList<java.lang.Object> objects; - @java.lang.SuppressWarnings("all") - private java.util.ArrayList<Number> numbers; - @java.lang.SuppressWarnings("all") - BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder() { - } - @java.lang.SuppressWarnings("all") - public BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder withObject(final java.lang.Object object) { - if (this.objects == null) this.objects = new java.util.ArrayList<java.lang.Object>(); - this.objects.add(object); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder withObjects(final java.util.Collection<?> objects) { - if (this.objects == null) this.objects = new java.util.ArrayList<java.lang.Object>(); - this.objects.addAll(objects); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder clearObjects() { - if (this.objects != null) this.objects.clear(); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder withNumber(final Number number) { - if (this.numbers == null) this.numbers = new java.util.ArrayList<Number>(); - this.numbers.add(number); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder withNumbers(final java.util.Collection<? extends Number> numbers) { - if (this.numbers == null) this.numbers = new java.util.ArrayList<Number>(); - this.numbers.addAll(numbers); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder clearNumbers() { - if (this.numbers != null) this.numbers.clear(); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderSingularWildcardListsWithToBuilderWithSetterPrefix build() { - java.util.List<java.lang.Object> objects; - switch (this.objects == null ? 0 : this.objects.size()) { - case 0: - objects = java.util.Collections.emptyList(); - break; - case 1: - objects = java.util.Collections.singletonList(this.objects.get(0)); - break; - default: - objects = java.util.Collections.unmodifiableList(new java.util.ArrayList<java.lang.Object>(this.objects)); - } - java.util.Collection<Number> numbers; - switch (this.numbers == null ? 0 : this.numbers.size()) { - case 0: - numbers = java.util.Collections.emptyList(); - break; - case 1: - numbers = java.util.Collections.singletonList(this.numbers.get(0)); - break; - default: - numbers = java.util.Collections.unmodifiableList(new java.util.ArrayList<Number>(this.numbers)); - } - return new BuilderSingularWildcardListsWithToBuilderWithSetterPrefix(objects, numbers); - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public java.lang.String toString() { - return "BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder(objects=" + this.objects + ", numbers=" + this.numbers + ")"; - } - } - @java.lang.SuppressWarnings("all") - public static BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder builder() { - return new BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder(); - } - @java.lang.SuppressWarnings("all") - public BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder toBuilder() { - final BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder builder = new BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder(); - if (this.objects != null) builder.withObjects(this.objects); - if (this.numbers != null) builder.withNumbers(this.numbers); - return builder; - } -} diff --git a/test/transform/resource/after-delombok/BuilderSingularWithPrefixes.java b/test/transform/resource/after-delombok/BuilderSingularWithPrefixes.java index e103d6dd..976866d3 100644 --- a/test/transform/resource/after-delombok/BuilderSingularWithPrefixes.java +++ b/test/transform/resource/after-delombok/BuilderSingularWithPrefixes.java @@ -12,19 +12,19 @@ class BuilderSingularWithPrefixes { BuilderSingularWithPrefixesBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderSingularWithPrefixesBuilder elem(final String elem) { + public BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder elem(final String elem) { if (this.elems == null) this.elems = new java.util.ArrayList<String>(); this.elems.add(elem); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularWithPrefixesBuilder elems(final java.util.Collection<? extends String> elems) { + public BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder elems(final java.util.Collection<? extends String> elems) { if (this.elems == null) this.elems = new java.util.ArrayList<String>(); this.elems.addAll(elems); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularWithPrefixesBuilder clearElems() { + public BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder clearElems() { if (this.elems != null) this.elems.clear(); return this; } @@ -50,7 +50,7 @@ class BuilderSingularWithPrefixes { } } @java.lang.SuppressWarnings("all") - public static BuilderSingularWithPrefixesBuilder builder() { - return new BuilderSingularWithPrefixesBuilder(); + public static BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder builder() { + return new BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder(); } } diff --git a/test/transform/resource/after-delombok/BuilderSingularWithPrefixesWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularWithPrefixesWithSetterPrefix.java index 2f163caf..e2be79de 100644 --- a/test/transform/resource/after-delombok/BuilderSingularWithPrefixesWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderSingularWithPrefixesWithSetterPrefix.java @@ -12,19 +12,19 @@ class BuilderSingularWithPrefixesWithSetterPrefix { BuilderSingularWithPrefixesWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderSingularWithPrefixesWithSetterPrefixBuilder withElem(final String elem) { + public BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder withElem(final String elem) { if (this.elems == null) this.elems = new java.util.ArrayList<String>(); this.elems.add(elem); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularWithPrefixesWithSetterPrefixBuilder withElems(final java.util.Collection<? extends String> elems) { + public BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder withElems(final java.util.Collection<? extends String> elems) { if (this.elems == null) this.elems = new java.util.ArrayList<String>(); this.elems.addAll(elems); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularWithPrefixesWithSetterPrefixBuilder clearElems() { + public BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder clearElems() { if (this.elems != null) this.elems.clear(); return this; } @@ -50,7 +50,7 @@ class BuilderSingularWithPrefixesWithSetterPrefix { } } @java.lang.SuppressWarnings("all") - public static BuilderSingularWithPrefixesWithSetterPrefixBuilder builder() { - return new BuilderSingularWithPrefixesWithSetterPrefixBuilder(); + public static BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder builder() { + return new BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder(); } } diff --git a/test/transform/resource/after-delombok/BuilderTypeAnnos.java b/test/transform/resource/after-delombok/BuilderTypeAnnos.java index 8a31762a..92a7e3f1 100644 --- a/test/transform/resource/after-delombok/BuilderTypeAnnos.java +++ b/test/transform/resource/after-delombok/BuilderTypeAnnos.java @@ -23,7 +23,7 @@ class BuilderTypeAnnos { BuilderTypeAnnosBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderTypeAnnosBuilder foo(@TA final List<String> foo) { + public BuilderTypeAnnos.BuilderTypeAnnosBuilder foo(@TA final List<String> foo) { this.foo = foo; return this; } @@ -38,8 +38,8 @@ class BuilderTypeAnnos { } } @java.lang.SuppressWarnings("all") - public static BuilderTypeAnnosBuilder builder() { - return new BuilderTypeAnnosBuilder(); + public static BuilderTypeAnnos.BuilderTypeAnnosBuilder builder() { + return new BuilderTypeAnnos.BuilderTypeAnnosBuilder(); } } diff --git a/test/transform/resource/after-delombok/BuilderTypeAnnosWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderTypeAnnosWithSetterPrefix.java index 0d4f8059..51261508 100644 --- a/test/transform/resource/after-delombok/BuilderTypeAnnosWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderTypeAnnosWithSetterPrefix.java @@ -23,7 +23,7 @@ class BuilderTypeAnnosWithSetterPrefix { BuilderTypeAnnosWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderTypeAnnosWithSetterPrefixBuilder withFoo(@TA final List<String> foo) { + public BuilderTypeAnnosWithSetterPrefix.BuilderTypeAnnosWithSetterPrefixBuilder withFoo(@TA final List<String> foo) { this.foo = foo; return this; } @@ -38,8 +38,8 @@ class BuilderTypeAnnosWithSetterPrefix { } } @java.lang.SuppressWarnings("all") - public static BuilderTypeAnnosWithSetterPrefixBuilder builder() { - return new BuilderTypeAnnosWithSetterPrefixBuilder(); + public static BuilderTypeAnnosWithSetterPrefix.BuilderTypeAnnosWithSetterPrefixBuilder builder() { + return new BuilderTypeAnnosWithSetterPrefix.BuilderTypeAnnosWithSetterPrefixBuilder(); } } diff --git a/test/transform/resource/after-delombok/BuilderValueData.java b/test/transform/resource/after-delombok/BuilderValueData.java index e1c107da..0af32fe5 100644 --- a/test/transform/resource/after-delombok/BuilderValueData.java +++ b/test/transform/resource/after-delombok/BuilderValueData.java @@ -20,8 +20,8 @@ final class BuilderAndValue { } } @java.lang.SuppressWarnings("all") - public static BuilderAndValueBuilder builder() { - return new BuilderAndValueBuilder(); + public static BuilderAndValue.BuilderAndValueBuilder builder() { + return new BuilderAndValue.BuilderAndValueBuilder(); } @java.lang.SuppressWarnings("all") public int getZero() { @@ -72,8 +72,8 @@ class BuilderAndData { } } @java.lang.SuppressWarnings("all") - public static BuilderAndDataBuilder builder() { - return new BuilderAndDataBuilder(); + public static BuilderAndData.BuilderAndDataBuilder builder() { + return new BuilderAndData.BuilderAndDataBuilder(); } @java.lang.SuppressWarnings("all") public int getZero() { diff --git a/test/transform/resource/after-delombok/BuilderValueDataWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderValueDataWithSetterPrefix.java index 87905208..de83d5db 100644 --- a/test/transform/resource/after-delombok/BuilderValueDataWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderValueDataWithSetterPrefix.java @@ -20,8 +20,8 @@ final class BuilderAndValueWithSetterPrefix { } } @java.lang.SuppressWarnings("all") - public static BuilderAndValueWithSetterPrefixBuilder builder() { - return new BuilderAndValueWithSetterPrefixBuilder(); + public static BuilderAndValueWithSetterPrefix.BuilderAndValueWithSetterPrefixBuilder builder() { + return new BuilderAndValueWithSetterPrefix.BuilderAndValueWithSetterPrefixBuilder(); } @java.lang.SuppressWarnings("all") public int getZero() { @@ -72,8 +72,8 @@ class BuilderAndDataWithSetterPrefix { } } @java.lang.SuppressWarnings("all") - public static BuilderAndDataWithSetterPrefixBuilder builder() { - return new BuilderAndDataWithSetterPrefixBuilder(); + public static BuilderAndDataWithSetterPrefix.BuilderAndDataWithSetterPrefixBuilder builder() { + return new BuilderAndDataWithSetterPrefix.BuilderAndDataWithSetterPrefixBuilder(); } @java.lang.SuppressWarnings("all") public int getZero() { diff --git a/test/transform/resource/after-delombok/BuilderWithAccessors.java b/test/transform/resource/after-delombok/BuilderWithAccessors.java index e6a6da79..f13200cf 100644 --- a/test/transform/resource/after-delombok/BuilderWithAccessors.java +++ b/test/transform/resource/after-delombok/BuilderWithAccessors.java @@ -24,22 +24,22 @@ class BuilderWithAccessors { BuilderWithAccessorsBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderWithAccessorsBuilder plower(final int plower) { + public BuilderWithAccessors.BuilderWithAccessorsBuilder plower(final int plower) { this.plower = plower; return this; } @java.lang.SuppressWarnings("all") - public BuilderWithAccessorsBuilder upper(final int upper) { + public BuilderWithAccessors.BuilderWithAccessorsBuilder upper(final int upper) { this.upper = upper; return this; } @java.lang.SuppressWarnings("all") - public BuilderWithAccessorsBuilder foo(final int foo) { + public BuilderWithAccessors.BuilderWithAccessorsBuilder foo(final int foo) { this.foo = foo; return this; } @java.lang.SuppressWarnings("all") - public BuilderWithAccessorsBuilder _bar(final int _bar) { + public BuilderWithAccessors.BuilderWithAccessorsBuilder _bar(final int _bar) { this._bar = _bar; return this; } @@ -54,7 +54,7 @@ class BuilderWithAccessors { } } @java.lang.SuppressWarnings("all") - public static BuilderWithAccessorsBuilder builder() { - return new BuilderWithAccessorsBuilder(); + public static BuilderWithAccessors.BuilderWithAccessorsBuilder builder() { + return new BuilderWithAccessors.BuilderWithAccessorsBuilder(); } } diff --git a/test/transform/resource/after-delombok/BuilderWithAccessorsWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithAccessorsWithSetterPrefix.java deleted file mode 100644 index 45a79fdc..00000000 --- a/test/transform/resource/after-delombok/BuilderWithAccessorsWithSetterPrefix.java +++ /dev/null @@ -1,60 +0,0 @@ -class BuilderWithAccessorsWithSetterPrefix { - private final int plower; - private final int pUpper; - private int _foo; - private int __bar; - @java.lang.SuppressWarnings("all") - BuilderWithAccessorsWithSetterPrefix(final int plower, final int upper, final int foo, final int _bar) { - this.plower = plower; - this.pUpper = upper; - this._foo = foo; - this.__bar = _bar; - } - @java.lang.SuppressWarnings("all") - public static class BuilderWithAccessorsWithSetterPrefixBuilder { - @java.lang.SuppressWarnings("all") - private int plower; - @java.lang.SuppressWarnings("all") - private int upper; - @java.lang.SuppressWarnings("all") - private int foo; - @java.lang.SuppressWarnings("all") - private int _bar; - @java.lang.SuppressWarnings("all") - BuilderWithAccessorsWithSetterPrefixBuilder() { - } - @java.lang.SuppressWarnings("all") - public BuilderWithAccessorsWithSetterPrefixBuilder withPlower(final int plower) { - this.plower = plower; - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderWithAccessorsWithSetterPrefixBuilder withUpper(final int upper) { - this.upper = upper; - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderWithAccessorsWithSetterPrefixBuilder withFoo(final int foo) { - this.foo = foo; - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderWithAccessorsWithSetterPrefixBuilder with_bar(final int _bar) { - this._bar = _bar; - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderWithAccessorsWithSetterPrefix build() { - return new BuilderWithAccessorsWithSetterPrefix(plower, upper, foo, _bar); - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public java.lang.String toString() { - return "BuilderWithAccessorsWithSetterPrefix.BuilderWithAccessorsWithSetterPrefixBuilder(plower=" + this.plower + ", upper=" + this.upper + ", foo=" + this.foo + ", _bar=" + this._bar + ")"; - } - } - @java.lang.SuppressWarnings("all") - public static BuilderWithAccessorsWithSetterPrefixBuilder builder() { - return new BuilderWithAccessorsWithSetterPrefixBuilder(); - } -} diff --git a/test/transform/resource/after-delombok/BuilderWithBadNames.java b/test/transform/resource/after-delombok/BuilderWithBadNames.java index f413be23..fee61299 100644 --- a/test/transform/resource/after-delombok/BuilderWithBadNames.java +++ b/test/transform/resource/after-delombok/BuilderWithBadNames.java @@ -16,12 +16,12 @@ public class BuilderWithBadNames { BuilderWithBadNamesBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderWithBadNamesBuilder build(final String build) { + public BuilderWithBadNames.BuilderWithBadNamesBuilder build(final String build) { this.build = build; return this; } @java.lang.SuppressWarnings("all") - public BuilderWithBadNamesBuilder toString(final String toString) { + public BuilderWithBadNames.BuilderWithBadNamesBuilder toString(final String toString) { this.toString = toString; return this; } @@ -36,7 +36,7 @@ public class BuilderWithBadNames { } } @java.lang.SuppressWarnings("all") - public static BuilderWithBadNamesBuilder builder() { - return new BuilderWithBadNamesBuilder(); + public static BuilderWithBadNames.BuilderWithBadNamesBuilder builder() { + return new BuilderWithBadNames.BuilderWithBadNamesBuilder(); } } diff --git a/test/transform/resource/after-delombok/BuilderWithBadNamesWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithBadNamesWithSetterPrefix.java deleted file mode 100644 index be7a78c7..00000000 --- a/test/transform/resource/after-delombok/BuilderWithBadNamesWithSetterPrefix.java +++ /dev/null @@ -1,42 +0,0 @@ -public class BuilderWithBadNamesWithSetterPrefix { - String build; - String toString; - @java.lang.SuppressWarnings("all") - BuilderWithBadNamesWithSetterPrefix(final String build, final String toString) { - this.build = build; - this.toString = toString; - } - @java.lang.SuppressWarnings("all") - public static class BuilderWithBadNamesWithSetterPrefixBuilder { - @java.lang.SuppressWarnings("all") - private String build; - @java.lang.SuppressWarnings("all") - private String toString; - @java.lang.SuppressWarnings("all") - BuilderWithBadNamesWithSetterPrefixBuilder() { - } - @java.lang.SuppressWarnings("all") - public BuilderWithBadNamesWithSetterPrefixBuilder withBuild(final String build) { - this.build = build; - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderWithBadNamesWithSetterPrefixBuilder withToString(final String toString) { - this.toString = toString; - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderWithBadNamesWithSetterPrefix build() { - return new BuilderWithBadNamesWithSetterPrefix(build, toString); - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public java.lang.String toString() { - return "BuilderWithBadNamesWithSetterPrefix.BuilderWithBadNamesWithSetterPrefixBuilder(build=" + this.build + ", toString=" + this.toString + ")"; - } - } - @java.lang.SuppressWarnings("all") - public static BuilderWithBadNamesWithSetterPrefixBuilder builder() { - return new BuilderWithBadNamesWithSetterPrefixBuilder(); - } -} diff --git a/test/transform/resource/after-delombok/BuilderWithDeprecated.java b/test/transform/resource/after-delombok/BuilderWithDeprecated.java index f06a11f2..2ac252c5 100644 --- a/test/transform/resource/after-delombok/BuilderWithDeprecated.java +++ b/test/transform/resource/after-delombok/BuilderWithDeprecated.java @@ -35,53 +35,53 @@ public class BuilderWithDeprecated { */ @java.lang.Deprecated @java.lang.SuppressWarnings("all") - public BuilderWithDeprecatedBuilder dep1(final String dep1) { + public BuilderWithDeprecated.BuilderWithDeprecatedBuilder dep1(final String dep1) { this.dep1 = dep1; return this; } @java.lang.Deprecated @java.lang.SuppressWarnings("all") - public BuilderWithDeprecatedBuilder dep2(final int dep2) { + public BuilderWithDeprecated.BuilderWithDeprecatedBuilder dep2(final int dep2) { this.dep2 = dep2; return this; } @java.lang.Deprecated @java.lang.SuppressWarnings("all") - public BuilderWithDeprecatedBuilder string(final String string) { + public BuilderWithDeprecated.BuilderWithDeprecatedBuilder string(final String string) { if (this.strings == null) this.strings = new java.util.ArrayList<String>(); this.strings.add(string); return this; } @java.lang.Deprecated @java.lang.SuppressWarnings("all") - public BuilderWithDeprecatedBuilder strings(final java.util.Collection<? extends String> strings) { + public BuilderWithDeprecated.BuilderWithDeprecatedBuilder strings(final java.util.Collection<? extends String> strings) { if (this.strings == null) this.strings = new java.util.ArrayList<String>(); this.strings.addAll(strings); return this; } @java.lang.Deprecated @java.lang.SuppressWarnings("all") - public BuilderWithDeprecatedBuilder clearStrings() { + public BuilderWithDeprecated.BuilderWithDeprecatedBuilder clearStrings() { if (this.strings != null) this.strings.clear(); return this; } @java.lang.Deprecated @java.lang.SuppressWarnings("all") - public BuilderWithDeprecatedBuilder number(final Integer number) { + public BuilderWithDeprecated.BuilderWithDeprecatedBuilder number(final Integer number) { if (this.numbers == null) this.numbers = com.google.common.collect.ImmutableList.builder(); this.numbers.add(number); return this; } @java.lang.Deprecated @java.lang.SuppressWarnings("all") - public BuilderWithDeprecatedBuilder numbers(final java.lang.Iterable<? extends Integer> numbers) { + public BuilderWithDeprecated.BuilderWithDeprecatedBuilder numbers(final java.lang.Iterable<? extends Integer> numbers) { if (this.numbers == null) this.numbers = com.google.common.collect.ImmutableList.builder(); this.numbers.addAll(numbers); return this; } @java.lang.Deprecated @java.lang.SuppressWarnings("all") - public BuilderWithDeprecatedBuilder clearNumbers() { + public BuilderWithDeprecated.BuilderWithDeprecatedBuilder clearNumbers() { this.numbers = null; return this; } @@ -108,7 +108,7 @@ public class BuilderWithDeprecated { } } @java.lang.SuppressWarnings("all") - public static BuilderWithDeprecatedBuilder builder() { - return new BuilderWithDeprecatedBuilder(); + public static BuilderWithDeprecated.BuilderWithDeprecatedBuilder builder() { + return new BuilderWithDeprecated.BuilderWithDeprecatedBuilder(); } } diff --git a/test/transform/resource/after-delombok/BuilderWithDeprecatedWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithDeprecatedWithSetterPrefix.java deleted file mode 100644 index 5f6f2c32..00000000 --- a/test/transform/resource/after-delombok/BuilderWithDeprecatedWithSetterPrefix.java +++ /dev/null @@ -1,114 +0,0 @@ -import com.google.common.collect.ImmutableList; -public class BuilderWithDeprecatedWithSetterPrefix { - /** - * @deprecated since always - */ - String dep1; - @Deprecated - int dep2; - @Deprecated - java.util.List<String> strings; - @Deprecated - ImmutableList<Integer> numbers; - @java.lang.SuppressWarnings("all") - BuilderWithDeprecatedWithSetterPrefix(final String dep1, final int dep2, final java.util.List<String> strings, final ImmutableList<Integer> numbers) { - this.dep1 = dep1; - this.dep2 = dep2; - this.strings = strings; - this.numbers = numbers; - } - @java.lang.SuppressWarnings("all") - public static class BuilderWithDeprecatedWithSetterPrefixBuilder { - @java.lang.SuppressWarnings("all") - private String dep1; - @java.lang.SuppressWarnings("all") - private int dep2; - @java.lang.SuppressWarnings("all") - private java.util.ArrayList<String> strings; - @java.lang.SuppressWarnings("all") - private com.google.common.collect.ImmutableList.Builder<Integer> numbers; - @java.lang.SuppressWarnings("all") - BuilderWithDeprecatedWithSetterPrefixBuilder() { - } - /** - * @deprecated since always - */ - @java.lang.Deprecated - @java.lang.SuppressWarnings("all") - public BuilderWithDeprecatedWithSetterPrefixBuilder withDep1(final String dep1) { - this.dep1 = dep1; - return this; - } - @java.lang.Deprecated - @java.lang.SuppressWarnings("all") - public BuilderWithDeprecatedWithSetterPrefixBuilder withDep2(final int dep2) { - this.dep2 = dep2; - return this; - } - @java.lang.Deprecated - @java.lang.SuppressWarnings("all") - public BuilderWithDeprecatedWithSetterPrefixBuilder withString(final String string) { - if (this.strings == null) this.strings = new java.util.ArrayList<String>(); - this.strings.add(string); - return this; - } - @java.lang.Deprecated - @java.lang.SuppressWarnings("all") - public BuilderWithDeprecatedWithSetterPrefixBuilder withStrings(final java.util.Collection<? extends String> strings) { - if (this.strings == null) this.strings = new java.util.ArrayList<String>(); - this.strings.addAll(strings); - return this; - } - @java.lang.Deprecated - @java.lang.SuppressWarnings("all") - public BuilderWithDeprecatedWithSetterPrefixBuilder clearStrings() { - if (this.strings != null) this.strings.clear(); - return this; - } - @java.lang.Deprecated - @java.lang.SuppressWarnings("all") - public BuilderWithDeprecatedWithSetterPrefixBuilder withNumber(final Integer number) { - if (this.numbers == null) this.numbers = com.google.common.collect.ImmutableList.builder(); - this.numbers.add(number); - return this; - } - @java.lang.Deprecated - @java.lang.SuppressWarnings("all") - public BuilderWithDeprecatedWithSetterPrefixBuilder withNumbers(final java.lang.Iterable<? extends Integer> numbers) { - if (this.numbers == null) this.numbers = com.google.common.collect.ImmutableList.builder(); - this.numbers.addAll(numbers); - return this; - } - @java.lang.Deprecated - @java.lang.SuppressWarnings("all") - public BuilderWithDeprecatedWithSetterPrefixBuilder clearNumbers() { - this.numbers = null; - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderWithDeprecatedWithSetterPrefix build() { - java.util.List<String> strings; - switch (this.strings == null ? 0 : this.strings.size()) { - case 0: - strings = java.util.Collections.emptyList(); - break; - case 1: - strings = java.util.Collections.singletonList(this.strings.get(0)); - break; - default: - strings = java.util.Collections.unmodifiableList(new java.util.ArrayList<String>(this.strings)); - } - com.google.common.collect.ImmutableList<Integer> numbers = this.numbers == null ? com.google.common.collect.ImmutableList.<Integer>of() : this.numbers.build(); - return new BuilderWithDeprecatedWithSetterPrefix(dep1, dep2, strings, numbers); - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public java.lang.String toString() { - return "BuilderWithDeprecatedWithSetterPrefix.BuilderWithDeprecatedWithSetterPrefixBuilder(dep1=" + this.dep1 + ", dep2=" + this.dep2 + ", strings=" + this.strings + ", numbers=" + this.numbers + ")"; - } - } - @java.lang.SuppressWarnings("all") - public static BuilderWithDeprecatedWithSetterPrefixBuilder builder() { - return new BuilderWithDeprecatedWithSetterPrefixBuilder(); - } -} diff --git a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java index 0a5edacd..82597b6e 100644 --- a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java +++ b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java @@ -14,12 +14,12 @@ class BuilderWithExistingBuilderClass<T, K extends Number> { BuilderWithExistingBuilderClassBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderWithExistingBuilderClassBuilder<Z> arg1(final Z arg1) { + public BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder<Z> arg1(final Z arg1) { this.arg1 = arg1; return this; } @java.lang.SuppressWarnings("all") - public BuilderWithExistingBuilderClassBuilder<Z> arg3(final String arg3) { + public BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder<Z> arg3(final String arg3) { this.arg3 = arg3; return this; } @@ -34,7 +34,7 @@ class BuilderWithExistingBuilderClass<T, K extends Number> { } } @java.lang.SuppressWarnings("all") - public static <Z extends Number> BuilderWithExistingBuilderClassBuilder<Z> builder() { - return new BuilderWithExistingBuilderClassBuilder<Z>(); + public static <Z extends Number> BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder<Z> builder() { + return new BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder<Z>(); } } diff --git a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java index 95f89c9d..0d3dcab8 100644 --- a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java @@ -14,12 +14,12 @@ class BuilderWithExistingBuilderClassWithSetterPrefix<T, K extends Number> { BuilderWithExistingBuilderClassWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderWithExistingBuilderClassWithSetterPrefixBuilder<Z> withArg1(final Z arg1) { + public BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder<Z> withArg1(final Z arg1) { this.arg1 = arg1; return this; } @java.lang.SuppressWarnings("all") - public BuilderWithExistingBuilderClassWithSetterPrefixBuilder<Z> withArg3(final String arg3) { + public BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder<Z> withArg3(final String arg3) { this.arg3 = arg3; return this; } @@ -34,7 +34,7 @@ class BuilderWithExistingBuilderClassWithSetterPrefix<T, K extends Number> { } } @java.lang.SuppressWarnings("all") - public static <Z extends Number> BuilderWithExistingBuilderClassWithSetterPrefixBuilder<Z> builder() { - return new BuilderWithExistingBuilderClassWithSetterPrefixBuilder<Z>(); + public static <Z extends Number> BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder<Z> builder() { + return new BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder<Z>(); } } diff --git a/test/transform/resource/after-delombok/BuilderWithNoBuilderMethod.java b/test/transform/resource/after-delombok/BuilderWithNoBuilderMethod.java index 35e2c79e..cfd86ef7 100644 --- a/test/transform/resource/after-delombok/BuilderWithNoBuilderMethod.java +++ b/test/transform/resource/after-delombok/BuilderWithNoBuilderMethod.java @@ -12,7 +12,7 @@ class BuilderWithNoBuilderMethod { BuilderWithNoBuilderMethodBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderWithNoBuilderMethodBuilder a(final String a) { + public BuilderWithNoBuilderMethod.BuilderWithNoBuilderMethodBuilder a(final String a) { this.a = a; return this; } @@ -27,7 +27,7 @@ class BuilderWithNoBuilderMethod { } } @java.lang.SuppressWarnings("all") - public BuilderWithNoBuilderMethodBuilder toBuilder() { - return new BuilderWithNoBuilderMethodBuilder().a(this.a); + public BuilderWithNoBuilderMethod.BuilderWithNoBuilderMethodBuilder toBuilder() { + return new BuilderWithNoBuilderMethod.BuilderWithNoBuilderMethodBuilder().a(this.a); } } diff --git a/test/transform/resource/after-delombok/BuilderWithNoBuilderMethodWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithNoBuilderMethodWithSetterPrefix.java deleted file mode 100644 index 0f478ed1..00000000 --- a/test/transform/resource/after-delombok/BuilderWithNoBuilderMethodWithSetterPrefix.java +++ /dev/null @@ -1,33 +0,0 @@ -class BuilderWithNoBuilderMethodWithSetterPrefix { - private String a = ""; - @java.lang.SuppressWarnings("all") - BuilderWithNoBuilderMethodWithSetterPrefix(final String a) { - this.a = a; - } - @java.lang.SuppressWarnings("all") - public static class BuilderWithNoBuilderMethodWithSetterPrefixBuilder { - @java.lang.SuppressWarnings("all") - private String a; - @java.lang.SuppressWarnings("all") - BuilderWithNoBuilderMethodWithSetterPrefixBuilder() { - } - @java.lang.SuppressWarnings("all") - public BuilderWithNoBuilderMethodWithSetterPrefixBuilder withA(final String a) { - this.a = a; - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderWithNoBuilderMethodWithSetterPrefix build() { - return new BuilderWithNoBuilderMethodWithSetterPrefix(a); - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public java.lang.String toString() { - return "BuilderWithNoBuilderMethodWithSetterPrefix.BuilderWithNoBuilderMethodWithSetterPrefixBuilder(a=" + this.a + ")"; - } - } - @java.lang.SuppressWarnings("all") - public BuilderWithNoBuilderMethodWithSetterPrefixBuilder toBuilder() { - return new BuilderWithNoBuilderMethodWithSetterPrefixBuilder().withA(this.a); - } -} diff --git a/test/transform/resource/after-delombok/BuilderWithNonNull.java b/test/transform/resource/after-delombok/BuilderWithNonNull.java index bee7d415..b32507da 100644 --- a/test/transform/resource/after-delombok/BuilderWithNonNull.java +++ b/test/transform/resource/after-delombok/BuilderWithNonNull.java @@ -16,7 +16,7 @@ class BuilderWithNonNull { BuilderWithNonNullBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderWithNonNullBuilder id(@lombok.NonNull final String id) { + public BuilderWithNonNull.BuilderWithNonNullBuilder id(@lombok.NonNull final String id) { if (id == null) { throw new java.lang.NullPointerException("id is marked non-null but is null"); } @@ -34,7 +34,7 @@ class BuilderWithNonNull { } } @java.lang.SuppressWarnings("all") - public static BuilderWithNonNullBuilder builder() { - return new BuilderWithNonNullBuilder(); + public static BuilderWithNonNull.BuilderWithNonNullBuilder builder() { + return new BuilderWithNonNull.BuilderWithNonNullBuilder(); } }
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/BuilderWithNonNullWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithNonNullWithSetterPrefix.java index 49be1717..4faeb5ce 100644 --- a/test/transform/resource/after-delombok/BuilderWithNonNullWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderWithNonNullWithSetterPrefix.java @@ -16,7 +16,7 @@ class BuilderWithNonNullWithSetterPrefix { BuilderWithNonNullWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderWithNonNullWithSetterPrefixBuilder withId(@lombok.NonNull final String id) { + public BuilderWithNonNullWithSetterPrefix.BuilderWithNonNullWithSetterPrefixBuilder withId(@lombok.NonNull final String id) { if (id == null) { throw new java.lang.NullPointerException("id is marked non-null but is null"); } @@ -34,7 +34,7 @@ class BuilderWithNonNullWithSetterPrefix { } } @java.lang.SuppressWarnings("all") - public static BuilderWithNonNullWithSetterPrefixBuilder builder() { - return new BuilderWithNonNullWithSetterPrefixBuilder(); + public static BuilderWithNonNullWithSetterPrefix.BuilderWithNonNullWithSetterPrefixBuilder builder() { + return new BuilderWithNonNullWithSetterPrefix.BuilderWithNonNullWithSetterPrefixBuilder(); } } diff --git a/test/transform/resource/after-delombok/BuilderWithRecursiveGenerics.java b/test/transform/resource/after-delombok/BuilderWithRecursiveGenerics.java index 7fb300e4..8a89d421 100644 --- a/test/transform/resource/after-delombok/BuilderWithRecursiveGenerics.java +++ b/test/transform/resource/after-delombok/BuilderWithRecursiveGenerics.java @@ -20,18 +20,18 @@ public class BuilderWithRecursiveGenerics { TestBuilder() { } @java.lang.SuppressWarnings("all") - public TestBuilder<Foo, Bar, Quz> foo(final Foo foo) { + public BuilderWithRecursiveGenerics.Test.TestBuilder<Foo, Bar, Quz> foo(final Foo foo) { this.foo = foo; return this; } @java.lang.SuppressWarnings("all") - public TestBuilder<Foo, Bar, Quz> bar(final Bar bar) { + public BuilderWithRecursiveGenerics.Test.TestBuilder<Foo, Bar, Quz> bar(final Bar bar) { this.bar = bar; return this; } @java.lang.SuppressWarnings("all") - public Test<Foo, Bar, Quz> build() { - return new Test<Foo, Bar, Quz>(foo, bar); + public BuilderWithRecursiveGenerics.Test<Foo, Bar, Quz> build() { + return new BuilderWithRecursiveGenerics.Test<Foo, Bar, Quz>(foo, bar); } @java.lang.Override @java.lang.SuppressWarnings("all") @@ -40,8 +40,8 @@ public class BuilderWithRecursiveGenerics { } } @java.lang.SuppressWarnings("all") - public static <Foo, Bar extends Set<Foo>, Quz extends Inter<Bar, Quz>> TestBuilder<Foo, Bar, Quz> builder() { - return new TestBuilder<Foo, Bar, Quz>(); + public static <Foo, Bar extends Set<Foo>, Quz extends Inter<Bar, Quz>> BuilderWithRecursiveGenerics.Test.TestBuilder<Foo, Bar, Quz> builder() { + return new BuilderWithRecursiveGenerics.Test.TestBuilder<Foo, Bar, Quz>(); } @java.lang.SuppressWarnings("all") public Foo getFoo() { diff --git a/test/transform/resource/after-delombok/BuilderWithRecursiveGenericsWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithRecursiveGenericsWithSetterPrefix.java deleted file mode 100644 index 04494ff9..00000000 --- a/test/transform/resource/after-delombok/BuilderWithRecursiveGenericsWithSetterPrefix.java +++ /dev/null @@ -1,85 +0,0 @@ -import java.util.Set; -public class BuilderWithRecursiveGenericsWithSetterPrefix { - interface Inter<T, U extends Inter<T, U>> { - } - public static final class Test<Foo, Bar extends Set<Foo>, Quz extends Inter<Bar, Quz>> { - private final Foo foo; - private final Bar bar; - @java.lang.SuppressWarnings("all") - Test(final Foo foo, final Bar bar) { - this.foo = foo; - this.bar = bar; - } - @java.lang.SuppressWarnings("all") - public static class TestBuilder<Foo, Bar extends Set<Foo>, Quz extends Inter<Bar, Quz>> { - @java.lang.SuppressWarnings("all") - private Foo foo; - @java.lang.SuppressWarnings("all") - private Bar bar; - @java.lang.SuppressWarnings("all") - TestBuilder() { - } - @java.lang.SuppressWarnings("all") - public TestBuilder<Foo, Bar, Quz> withFoo(final Foo foo) { - this.foo = foo; - return this; - } - @java.lang.SuppressWarnings("all") - public TestBuilder<Foo, Bar, Quz> withBar(final Bar bar) { - this.bar = bar; - return this; - } - @java.lang.SuppressWarnings("all") - public Test<Foo, Bar, Quz> build() { - return new Test<Foo, Bar, Quz>(foo, bar); - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public java.lang.String toString() { - return "BuilderWithRecursiveGenericsWithSetterPrefix.Test.TestBuilder(foo=" + this.foo + ", bar=" + this.bar + ")"; - } - } - @java.lang.SuppressWarnings("all") - public static <Foo, Bar extends Set<Foo>, Quz extends Inter<Bar, Quz>> TestBuilder<Foo, Bar, Quz> builder() { - return new TestBuilder<Foo, Bar, Quz>(); - } - @java.lang.SuppressWarnings("all") - public Foo getFoo() { - return this.foo; - } - @java.lang.SuppressWarnings("all") - public Bar getBar() { - return this.bar; - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public boolean equals(final java.lang.Object o) { - if (o == this) return true; - if (!(o instanceof BuilderWithRecursiveGenericsWithSetterPrefix.Test)) return false; - final BuilderWithRecursiveGenericsWithSetterPrefix.Test<?, ?, ?> other = (BuilderWithRecursiveGenericsWithSetterPrefix.Test<?, ?, ?>) o; - final java.lang.Object this$foo = this.getFoo(); - final java.lang.Object other$foo = other.getFoo(); - if (this$foo == null ? other$foo != null : !this$foo.equals(other$foo)) return false; - final java.lang.Object this$bar = this.getBar(); - final java.lang.Object other$bar = other.getBar(); - if (this$bar == null ? other$bar != null : !this$bar.equals(other$bar)) return false; - return true; - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public int hashCode() { - final int PRIME = 59; - int result = 1; - final java.lang.Object $foo = this.getFoo(); - result = result * PRIME + ($foo == null ? 43 : $foo.hashCode()); - final java.lang.Object $bar = this.getBar(); - result = result * PRIME + ($bar == null ? 43 : $bar.hashCode()); - return result; - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public java.lang.String toString() { - return "BuilderWithRecursiveGenericsWithSetterPrefix.Test(foo=" + this.getFoo() + ", bar=" + this.getBar() + ")"; - } - } -} diff --git a/test/transform/resource/after-delombok/BuilderWithToBuilder.java b/test/transform/resource/after-delombok/BuilderWithToBuilder.java index 4d5e64cc..396bcdb6 100644 --- a/test/transform/resource/after-delombok/BuilderWithToBuilder.java +++ b/test/transform/resource/after-delombok/BuilderWithToBuilder.java @@ -28,34 +28,34 @@ class BuilderWithToBuilder<T> { BuilderWithToBuilderBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderWithToBuilderBuilder<T> one(final String one) { + public BuilderWithToBuilder.BuilderWithToBuilderBuilder<T> one(final String one) { this.one = one; return this; } @java.lang.SuppressWarnings("all") - public BuilderWithToBuilderBuilder<T> two(final String two) { + public BuilderWithToBuilder.BuilderWithToBuilderBuilder<T> two(final String two) { this.two = two; return this; } @java.lang.SuppressWarnings("all") - public BuilderWithToBuilderBuilder<T> foo(final T foo) { + public BuilderWithToBuilder.BuilderWithToBuilderBuilder<T> foo(final T foo) { this.foo = foo; return this; } @java.lang.SuppressWarnings("all") - public BuilderWithToBuilderBuilder<T> bar(final T bar) { + public BuilderWithToBuilder.BuilderWithToBuilderBuilder<T> bar(final T bar) { if (this.bars == null) this.bars = new java.util.ArrayList<T>(); this.bars.add(bar); return this; } @java.lang.SuppressWarnings("all") - public BuilderWithToBuilderBuilder<T> bars(final java.util.Collection<? extends T> bars) { + public BuilderWithToBuilder.BuilderWithToBuilderBuilder<T> bars(final java.util.Collection<? extends T> bars) { if (this.bars == null) this.bars = new java.util.ArrayList<T>(); this.bars.addAll(bars); return this; } @java.lang.SuppressWarnings("all") - public BuilderWithToBuilderBuilder<T> clearBars() { + public BuilderWithToBuilder.BuilderWithToBuilderBuilder<T> clearBars() { if (this.bars != null) this.bars.clear(); return this; } @@ -81,12 +81,12 @@ class BuilderWithToBuilder<T> { } } @java.lang.SuppressWarnings("all") - public static <T> BuilderWithToBuilderBuilder<T> builder() { - return new BuilderWithToBuilderBuilder<T>(); + public static <T> BuilderWithToBuilder.BuilderWithToBuilderBuilder<T> builder() { + return new BuilderWithToBuilder.BuilderWithToBuilderBuilder<T>(); } @java.lang.SuppressWarnings("all") - public BuilderWithToBuilderBuilder<T> toBuilder() { - final BuilderWithToBuilderBuilder<T> builder = new BuilderWithToBuilderBuilder<T>().one(this.mOne).two(this.mTwo).foo(BuilderWithToBuilder.<T>rrr(this)); + public BuilderWithToBuilder.BuilderWithToBuilderBuilder<T> toBuilder() { + final BuilderWithToBuilder.BuilderWithToBuilderBuilder<T> builder = new BuilderWithToBuilder.BuilderWithToBuilderBuilder<T>().one(this.mOne).two(this.mTwo).foo(BuilderWithToBuilder.<T>rrr(this)); if (this.bars != null) builder.bars(this.bars); return builder; } @@ -111,17 +111,17 @@ class ConstructorWithToBuilder<T> { ConstructorWithToBuilderBuilder() { } @java.lang.SuppressWarnings("all") - public ConstructorWithToBuilderBuilder<T> mOne(final String mOne) { + public ConstructorWithToBuilder.ConstructorWithToBuilderBuilder<T> mOne(final String mOne) { this.mOne = mOne; return this; } @java.lang.SuppressWarnings("all") - public ConstructorWithToBuilderBuilder<T> baz(final T baz) { + public ConstructorWithToBuilder.ConstructorWithToBuilderBuilder<T> baz(final T baz) { this.baz = baz; return this; } @java.lang.SuppressWarnings("all") - public ConstructorWithToBuilderBuilder<T> bars(final com.google.common.collect.ImmutableList<T> bars) { + public ConstructorWithToBuilder.ConstructorWithToBuilderBuilder<T> bars(final com.google.common.collect.ImmutableList<T> bars) { this.bars = bars; return this; } @@ -136,11 +136,11 @@ class ConstructorWithToBuilder<T> { } } @java.lang.SuppressWarnings("all") - public static <T> ConstructorWithToBuilderBuilder<T> builder() { - return new ConstructorWithToBuilderBuilder<T>(); + public static <T> ConstructorWithToBuilder.ConstructorWithToBuilderBuilder<T> builder() { + return new ConstructorWithToBuilder.ConstructorWithToBuilderBuilder<T>(); } @java.lang.SuppressWarnings("all") - public ConstructorWithToBuilderBuilder<T> toBuilder() { - return new ConstructorWithToBuilderBuilder<T>().mOne(this.mOne).baz(this.foo).bars(this.bars); + public ConstructorWithToBuilder.ConstructorWithToBuilderBuilder<T> toBuilder() { + return new ConstructorWithToBuilder.ConstructorWithToBuilderBuilder<T>().mOne(this.mOne).baz(this.foo).bars(this.bars); } }
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/BuilderWithToBuilderWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithToBuilderWithSetterPrefix.java deleted file mode 100644 index 322c667c..00000000 --- a/test/transform/resource/after-delombok/BuilderWithToBuilderWithSetterPrefix.java +++ /dev/null @@ -1,146 +0,0 @@ -import java.util.List; -class BuilderWithToBuilderWithSetterPrefix<T> { - private String mOne; - private String mTwo; - private T foo; - private List<T> bars; - public static <K> K rrr(BuilderWithToBuilderWithSetterPrefix<K> x) { - return x.foo; - } - @java.lang.SuppressWarnings("all") - BuilderWithToBuilderWithSetterPrefix(final String one, final String two, final T foo, final List<T> bars) { - this.mOne = one; - this.mTwo = two; - this.foo = foo; - this.bars = bars; - } - @java.lang.SuppressWarnings("all") - public static class BuilderWithToBuilderWithSetterPrefixBuilder<T> { - @java.lang.SuppressWarnings("all") - private String one; - @java.lang.SuppressWarnings("all") - private String two; - @java.lang.SuppressWarnings("all") - private T foo; - @java.lang.SuppressWarnings("all") - private java.util.ArrayList<T> bars; - @java.lang.SuppressWarnings("all") - BuilderWithToBuilderWithSetterPrefixBuilder() { - } - @java.lang.SuppressWarnings("all") - public BuilderWithToBuilderWithSetterPrefixBuilder<T> withOne(final String one) { - this.one = one; - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderWithToBuilderWithSetterPrefixBuilder<T> withTwo(final String two) { - this.two = two; - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderWithToBuilderWithSetterPrefixBuilder<T> withFoo(final T foo) { - this.foo = foo; - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderWithToBuilderWithSetterPrefixBuilder<T> withBar(final T bar) { - if (this.bars == null) this.bars = new java.util.ArrayList<T>(); - this.bars.add(bar); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderWithToBuilderWithSetterPrefixBuilder<T> withBars(final java.util.Collection<? extends T> bars) { - if (this.bars == null) this.bars = new java.util.ArrayList<T>(); - this.bars.addAll(bars); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderWithToBuilderWithSetterPrefixBuilder<T> clearBars() { - if (this.bars != null) this.bars.clear(); - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderWithToBuilderWithSetterPrefix<T> build() { - java.util.List<T> bars; - switch (this.bars == null ? 0 : this.bars.size()) { - case 0: - bars = java.util.Collections.emptyList(); - break; - case 1: - bars = java.util.Collections.singletonList(this.bars.get(0)); - break; - default: - bars = java.util.Collections.unmodifiableList(new java.util.ArrayList<T>(this.bars)); - } - return new BuilderWithToBuilderWithSetterPrefix<T>(one, two, foo, bars); - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public java.lang.String toString() { - return "BuilderWithToBuilderWithSetterPrefix.BuilderWithToBuilderWithSetterPrefixBuilder(one=" + this.one + ", two=" + this.two + ", foo=" + this.foo + ", bars=" + this.bars + ")"; - } - } - @java.lang.SuppressWarnings("all") - public static <T> BuilderWithToBuilderWithSetterPrefixBuilder<T> builder() { - return new BuilderWithToBuilderWithSetterPrefixBuilder<T>(); - } - @java.lang.SuppressWarnings("all") - public BuilderWithToBuilderWithSetterPrefixBuilder<T> toBuilder() { - final BuilderWithToBuilderWithSetterPrefixBuilder<T> builder = new BuilderWithToBuilderWithSetterPrefixBuilder<T>().withOne(this.mOne).withTwo(this.mTwo).withFoo(BuilderWithToBuilderWithSetterPrefix.<T>rrr(this)); - if (this.bars != null) builder.withBars(this.bars); - return builder; - } -} -class ConstructorWithToBuilderWithSetterPrefix<T> { - private String mOne; - private String mTwo; - private T foo; - @lombok.Singular - private com.google.common.collect.ImmutableList<T> bars; - public ConstructorWithToBuilderWithSetterPrefix(String mOne, T baz, com.google.common.collect.ImmutableList<T> bars) { - } - @java.lang.SuppressWarnings("all") - public static class ConstructorWithToBuilderWithSetterPrefixBuilder<T> { - @java.lang.SuppressWarnings("all") - private String mOne; - @java.lang.SuppressWarnings("all") - private T baz; - @java.lang.SuppressWarnings("all") - private com.google.common.collect.ImmutableList<T> bars; - @java.lang.SuppressWarnings("all") - ConstructorWithToBuilderWithSetterPrefixBuilder() { - } - @java.lang.SuppressWarnings("all") - public ConstructorWithToBuilderWithSetterPrefixBuilder<T> withMOne(final String mOne) { - this.mOne = mOne; - return this; - } - @java.lang.SuppressWarnings("all") - public ConstructorWithToBuilderWithSetterPrefixBuilder<T> withBaz(final T baz) { - this.baz = baz; - return this; - } - @java.lang.SuppressWarnings("all") - public ConstructorWithToBuilderWithSetterPrefixBuilder<T> withBars(final com.google.common.collect.ImmutableList<T> bars) { - this.bars = bars; - return this; - } - @java.lang.SuppressWarnings("all") - public ConstructorWithToBuilderWithSetterPrefix<T> build() { - return new ConstructorWithToBuilderWithSetterPrefix<T>(mOne, baz, bars); - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public java.lang.String toString() { - return "ConstructorWithToBuilderWithSetterPrefix.ConstructorWithToBuilderWithSetterPrefixBuilder(mOne=" + this.mOne + ", baz=" + this.baz + ", bars=" + this.bars + ")"; - } - } - @java.lang.SuppressWarnings("all") - public static <T> ConstructorWithToBuilderWithSetterPrefixBuilder<T> builder() { - return new ConstructorWithToBuilderWithSetterPrefixBuilder<T>(); - } - @java.lang.SuppressWarnings("all") - public ConstructorWithToBuilderWithSetterPrefixBuilder<T> toBuilder() { - return new ConstructorWithToBuilderWithSetterPrefixBuilder<T>().withMOne(this.mOne).withBaz(this.foo).withBars(this.bars); - } -} diff --git a/test/transform/resource/after-delombok/BuilderWithTolerate.java b/test/transform/resource/after-delombok/BuilderWithTolerate.java index 6ec7c091..0d1e04f7 100644 --- a/test/transform/resource/after-delombok/BuilderWithTolerate.java +++ b/test/transform/resource/after-delombok/BuilderWithTolerate.java @@ -15,7 +15,7 @@ public class BuilderWithTolerate { BuilderWithTolerateBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderWithTolerateBuilder value(final int value) { + public BuilderWithTolerate.BuilderWithTolerateBuilder value(final int value) { this.value = value; return this; } @@ -34,7 +34,7 @@ public class BuilderWithTolerate { this.value = value; } @java.lang.SuppressWarnings("all") - public static BuilderWithTolerateBuilder builder() { - return new BuilderWithTolerateBuilder(); + public static BuilderWithTolerate.BuilderWithTolerateBuilder builder() { + return new BuilderWithTolerate.BuilderWithTolerateBuilder(); } } diff --git a/test/transform/resource/after-delombok/BuilderWithTolerateWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithTolerateWithSetterPrefix.java deleted file mode 100644 index 70394d09..00000000 --- a/test/transform/resource/after-delombok/BuilderWithTolerateWithSetterPrefix.java +++ /dev/null @@ -1,40 +0,0 @@ -import lombok.experimental.Tolerate; -public class BuilderWithTolerateWithSetterPrefix { - private final int value; - public static void main(String[] args) { - BuilderWithTolerateWithSetterPrefix.builder().withValue("42").build(); - } - public static class BuilderWithTolerateWithSetterPrefixBuilder { - @java.lang.SuppressWarnings("all") - private int value; - @Tolerate - public BuilderWithTolerateWithSetterPrefixBuilder withValue(String s) { - return this.withValue(Integer.parseInt(s)); - } - @java.lang.SuppressWarnings("all") - BuilderWithTolerateWithSetterPrefixBuilder() { - } - @java.lang.SuppressWarnings("all") - public BuilderWithTolerateWithSetterPrefixBuilder withValue(final int value) { - this.value = value; - return this; - } - @java.lang.SuppressWarnings("all") - public BuilderWithTolerateWithSetterPrefix build() { - return new BuilderWithTolerateWithSetterPrefix(value); - } - @java.lang.Override - @java.lang.SuppressWarnings("all") - public java.lang.String toString() { - return "BuilderWithTolerateWithSetterPrefix.BuilderWithTolerateWithSetterPrefixBuilder(value=" + this.value + ")"; - } - } - @java.lang.SuppressWarnings("all") - BuilderWithTolerateWithSetterPrefix(final int value) { - this.value = value; - } - @java.lang.SuppressWarnings("all") - public static BuilderWithTolerateWithSetterPrefixBuilder builder() { - return new BuilderWithTolerateWithSetterPrefixBuilder(); - } -} diff --git a/test/transform/resource/after-delombok/CheckerFrameworkBuilder.java b/test/transform/resource/after-delombok/CheckerFrameworkBuilder.java index d21ad044..6db2fb73 100644 --- a/test/transform/resource/after-delombok/CheckerFrameworkBuilder.java +++ b/test/transform/resource/after-delombok/CheckerFrameworkBuilder.java @@ -35,46 +35,46 @@ class CheckerFrameworkBuilder { } @org.checkerframework.checker.builder.qual.ReturnsReceiver @java.lang.SuppressWarnings("all") - public CheckerFrameworkBuilderBuilder x(@org.checkerframework.checker.builder.qual.NotCalledMethods("x") CheckerFrameworkBuilderBuilder this, final int x) { + public CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder x(@org.checkerframework.checker.builder.qual.NotCalledMethods("x") CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder this, final int x) { this.x$value = x; x$set = true; return this; } @org.checkerframework.checker.builder.qual.ReturnsReceiver @java.lang.SuppressWarnings("all") - public CheckerFrameworkBuilderBuilder y(@org.checkerframework.checker.builder.qual.NotCalledMethods("y") CheckerFrameworkBuilderBuilder this, final int y) { + public CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder y(@org.checkerframework.checker.builder.qual.NotCalledMethods("y") CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder this, final int y) { this.y = y; return this; } @org.checkerframework.checker.builder.qual.ReturnsReceiver @java.lang.SuppressWarnings("all") - public CheckerFrameworkBuilderBuilder z(@org.checkerframework.checker.builder.qual.NotCalledMethods("z") CheckerFrameworkBuilderBuilder this, final int z) { + public CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder z(@org.checkerframework.checker.builder.qual.NotCalledMethods("z") CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder this, final int z) { this.z = z; return this; } @org.checkerframework.checker.builder.qual.ReturnsReceiver @java.lang.SuppressWarnings("all") - public CheckerFrameworkBuilderBuilder name(final String name) { + public CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder name(final String name) { if (this.names == null) this.names = new java.util.ArrayList<String>(); this.names.add(name); return this; } @org.checkerframework.checker.builder.qual.ReturnsReceiver @java.lang.SuppressWarnings("all") - public CheckerFrameworkBuilderBuilder names(final java.util.Collection<? extends String> names) { + public CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder names(final java.util.Collection<? extends String> names) { if (this.names == null) this.names = new java.util.ArrayList<String>(); this.names.addAll(names); return this; } @org.checkerframework.checker.builder.qual.ReturnsReceiver @java.lang.SuppressWarnings("all") - public CheckerFrameworkBuilderBuilder clearNames() { + public CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder clearNames() { if (this.names != null) this.names.clear(); return this; } @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") - public CheckerFrameworkBuilder build(@org.checkerframework.checker.builder.qual.CalledMethods({"y", "z"}) CheckerFrameworkBuilderBuilder this) { + public CheckerFrameworkBuilder build(@org.checkerframework.checker.builder.qual.CalledMethods({"y", "z"}) CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder this) { java.util.List<String> names; switch (this.names == null ? 0 : this.names.size()) { case 0: @@ -100,7 +100,7 @@ class CheckerFrameworkBuilder { @org.checkerframework.common.aliasing.qual.Unique @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") - public static CheckerFrameworkBuilderBuilder builder() { - return new CheckerFrameworkBuilderBuilder(); + public static CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder builder() { + return new CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder(); } } diff --git a/test/transform/resource/after-delombok/CheckerFrameworkSuperBuilder.java b/test/transform/resource/after-delombok/CheckerFrameworkSuperBuilder.java index 40876369..31e8bdb5 100644 --- a/test/transform/resource/after-delombok/CheckerFrameworkSuperBuilder.java +++ b/test/transform/resource/after-delombok/CheckerFrameworkSuperBuilder.java @@ -11,7 +11,7 @@ class CheckerFrameworkSuperBuilder { return 5; } @java.lang.SuppressWarnings("all") - public static abstract class ParentBuilder<C extends Parent, B extends ParentBuilder<C, B>> { + public static abstract class ParentBuilder<C extends CheckerFrameworkSuperBuilder.Parent, B extends CheckerFrameworkSuperBuilder.Parent.ParentBuilder<C, B>> { @java.lang.SuppressWarnings("all") private boolean x$set; @java.lang.SuppressWarnings("all") @@ -28,23 +28,23 @@ class CheckerFrameworkSuperBuilder { protected abstract B self(); @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") - public abstract C build(@org.checkerframework.checker.builder.qual.CalledMethods({"y", "z"}) Parent this); + public abstract C build(@org.checkerframework.checker.builder.qual.CalledMethods({"y", "z"}) CheckerFrameworkSuperBuilder.Parent this); @org.checkerframework.checker.builder.qual.ReturnsReceiver @java.lang.SuppressWarnings("all") - public B x(@org.checkerframework.checker.builder.qual.NotCalledMethods("x") ParentBuilder this, final int x) { + public B x(@org.checkerframework.checker.builder.qual.NotCalledMethods("x") CheckerFrameworkSuperBuilder.Parent.ParentBuilder<C, B> this, final int x) { this.x$value = x; x$set = true; return self(); } @org.checkerframework.checker.builder.qual.ReturnsReceiver @java.lang.SuppressWarnings("all") - public B y(@org.checkerframework.checker.builder.qual.NotCalledMethods("y") ParentBuilder this, final int y) { + public B y(@org.checkerframework.checker.builder.qual.NotCalledMethods("y") CheckerFrameworkSuperBuilder.Parent.ParentBuilder<C, B> this, final int y) { this.y = y; return self(); } @org.checkerframework.checker.builder.qual.ReturnsReceiver @java.lang.SuppressWarnings("all") - public B z(@org.checkerframework.checker.builder.qual.NotCalledMethods("z") ParentBuilder this, final int z) { + public B z(@org.checkerframework.checker.builder.qual.NotCalledMethods("z") CheckerFrameworkSuperBuilder.Parent.ParentBuilder<C, B> this, final int z) { this.z = z; return self(); } @@ -76,7 +76,7 @@ class CheckerFrameworkSuperBuilder { } } @java.lang.SuppressWarnings("all") - private static final class ParentBuilderImpl extends ParentBuilder<Parent, ParentBuilderImpl> { + private static final class ParentBuilderImpl extends CheckerFrameworkSuperBuilder.Parent.ParentBuilder<CheckerFrameworkSuperBuilder.Parent, CheckerFrameworkSuperBuilder.Parent.ParentBuilderImpl> { @org.checkerframework.common.aliasing.qual.Unique @java.lang.SuppressWarnings("all") private ParentBuilderImpl() { @@ -85,21 +85,21 @@ class CheckerFrameworkSuperBuilder { @org.checkerframework.checker.builder.qual.ReturnsReceiver @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") - protected ParentBuilderImpl self() { + protected CheckerFrameworkSuperBuilder.Parent.ParentBuilderImpl self() { return this; } @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.Override @java.lang.SuppressWarnings("all") - public Parent build(@org.checkerframework.checker.builder.qual.CalledMethods({"y", "z"}) ParentBuilderImpl this) { - return new Parent(this); + public CheckerFrameworkSuperBuilder.Parent build(@org.checkerframework.checker.builder.qual.CalledMethods({"y", "z"}) CheckerFrameworkSuperBuilder.Parent.ParentBuilderImpl this) { + return new CheckerFrameworkSuperBuilder.Parent(this); } } @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") - protected Parent(final ParentBuilder<?, ?> b) { + protected Parent(final CheckerFrameworkSuperBuilder.Parent.ParentBuilder<?, ?> b) { if (b.x$set) this.x = b.x$value; - else this.x = Parent.$default$x(); + else this.x = CheckerFrameworkSuperBuilder.Parent.$default$x(); this.y = b.y; this.z = b.z; java.util.List<String> names; @@ -117,8 +117,8 @@ class CheckerFrameworkSuperBuilder { } @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") - public static ParentBuilder<?, ?> builder() { - return new ParentBuilderImpl(); + public static CheckerFrameworkSuperBuilder.Parent.ParentBuilder<?, ?> builder() { + return new CheckerFrameworkSuperBuilder.Parent.ParentBuilderImpl(); } } public static class Child extends Parent { @@ -129,7 +129,7 @@ class CheckerFrameworkSuperBuilder { return 1; } @java.lang.SuppressWarnings("all") - public static abstract class ChildBuilder<C extends Child, B extends ChildBuilder<C, B>> extends Parent.ParentBuilder<C, B> { + public static abstract class ChildBuilder<C extends CheckerFrameworkSuperBuilder.Child, B extends CheckerFrameworkSuperBuilder.Child.ChildBuilder<C, B>> extends Parent.ParentBuilder<C, B> { @java.lang.SuppressWarnings("all") private boolean a$set; @java.lang.SuppressWarnings("all") @@ -144,17 +144,17 @@ class CheckerFrameworkSuperBuilder { @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.Override @java.lang.SuppressWarnings("all") - public abstract C build(@org.checkerframework.checker.builder.qual.CalledMethods("b") Child this); + public abstract C build(@org.checkerframework.checker.builder.qual.CalledMethods("b") CheckerFrameworkSuperBuilder.Child this); @org.checkerframework.checker.builder.qual.ReturnsReceiver @java.lang.SuppressWarnings("all") - public B a(@org.checkerframework.checker.builder.qual.NotCalledMethods("a") ChildBuilder this, final int a) { + public B a(@org.checkerframework.checker.builder.qual.NotCalledMethods("a") CheckerFrameworkSuperBuilder.Child.ChildBuilder<C, B> this, final int a) { this.a$value = a; a$set = true; return self(); } @org.checkerframework.checker.builder.qual.ReturnsReceiver @java.lang.SuppressWarnings("all") - public B b(@org.checkerframework.checker.builder.qual.NotCalledMethods("b") ChildBuilder this, final int b) { + public B b(@org.checkerframework.checker.builder.qual.NotCalledMethods("b") CheckerFrameworkSuperBuilder.Child.ChildBuilder<C, B> this, final int b) { this.b = b; return self(); } @@ -166,7 +166,7 @@ class CheckerFrameworkSuperBuilder { } } @java.lang.SuppressWarnings("all") - private static final class ChildBuilderImpl extends ChildBuilder<Child, ChildBuilderImpl> { + private static final class ChildBuilderImpl extends CheckerFrameworkSuperBuilder.Child.ChildBuilder<CheckerFrameworkSuperBuilder.Child, CheckerFrameworkSuperBuilder.Child.ChildBuilderImpl> { @org.checkerframework.common.aliasing.qual.Unique @java.lang.SuppressWarnings("all") private ChildBuilderImpl() { @@ -175,28 +175,28 @@ class CheckerFrameworkSuperBuilder { @org.checkerframework.checker.builder.qual.ReturnsReceiver @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") - protected ChildBuilderImpl self() { + protected CheckerFrameworkSuperBuilder.Child.ChildBuilderImpl self() { return this; } @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.Override @java.lang.SuppressWarnings("all") - public Child build(@org.checkerframework.checker.builder.qual.CalledMethods("b") ChildBuilderImpl this) { - return new Child(this); + public CheckerFrameworkSuperBuilder.Child build(@org.checkerframework.checker.builder.qual.CalledMethods("b") CheckerFrameworkSuperBuilder.Child.ChildBuilderImpl this) { + return new CheckerFrameworkSuperBuilder.Child(this); } } @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") - protected Child(final ChildBuilder<?, ?> b) { + protected Child(final CheckerFrameworkSuperBuilder.Child.ChildBuilder<?, ?> b) { super(b); if (b.a$set) this.a = b.a$value; - else this.a = Child.$default$a(); + else this.a = CheckerFrameworkSuperBuilder.Child.$default$a(); this.b = b.b; } @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") - public static ChildBuilder<?, ?> builder() { - return new ChildBuilderImpl(); + public static CheckerFrameworkSuperBuilder.Child.ChildBuilder<?, ?> builder() { + return new CheckerFrameworkSuperBuilder.Child.ChildBuilderImpl(); } } }
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults.java b/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults.java index f37c68af..19acf170 100644 --- a/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults.java +++ b/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults.java @@ -17,13 +17,13 @@ final class ConstructorsWithBuilderDefaults { ConstructorsWithBuilderDefaultsBuilder() { } @java.lang.SuppressWarnings("all") - public ConstructorsWithBuilderDefaultsBuilder x(final int x) { + public ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder x(final int x) { this.x$value = x; x$set = true; return this; } @java.lang.SuppressWarnings("all") - public ConstructorsWithBuilderDefaultsBuilder y(final int y) { + public ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder y(final int y) { this.y = y; return this; } @@ -40,8 +40,8 @@ final class ConstructorsWithBuilderDefaults { } } @java.lang.SuppressWarnings("all") - public static ConstructorsWithBuilderDefaultsBuilder builder() { - return new ConstructorsWithBuilderDefaultsBuilder(); + public static ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder builder() { + return new ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder(); } @java.lang.SuppressWarnings("all") public int getX() { diff --git a/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults2.java b/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults2.java index 7816b0c8..17763f3f 100644 --- a/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults2.java +++ b/test/transform/resource/after-delombok/ConstructorsWithBuilderDefaults2.java @@ -34,19 +34,19 @@ final class ConstructorsWithBuilderDefaults<T> { ConstructorsWithBuilderDefaultsBuilder() { } @java.lang.SuppressWarnings("all") - public ConstructorsWithBuilderDefaultsBuilder<T> z(final java.util.List<T> z) { + public ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder<T> z(final java.util.List<T> z) { this.z$value = z; z$set = true; return this; } @java.lang.SuppressWarnings("all") - public ConstructorsWithBuilderDefaultsBuilder<T> x(final T x) { + public ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder<T> x(final T x) { this.x$value = x; x$set = true; return this; } @java.lang.SuppressWarnings("all") - public ConstructorsWithBuilderDefaultsBuilder<T> q(final T q) { + public ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder<T> q(final T q) { this.q = q; return this; } @@ -66,8 +66,8 @@ final class ConstructorsWithBuilderDefaults<T> { } } @java.lang.SuppressWarnings("all") - public static <T> ConstructorsWithBuilderDefaultsBuilder<T> builder() { - return new ConstructorsWithBuilderDefaultsBuilder<T>(); + public static <T> ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder<T> builder() { + return new ConstructorsWithBuilderDefaults.ConstructorsWithBuilderDefaultsBuilder<T>(); } @java.lang.SuppressWarnings("all") private ConstructorsWithBuilderDefaults() { diff --git a/test/transform/resource/after-delombok/JacksonJsonProperty.java b/test/transform/resource/after-delombok/JacksonJsonProperty.java index 16a8039e..500871b2 100644 --- a/test/transform/resource/after-delombok/JacksonJsonProperty.java +++ b/test/transform/resource/after-delombok/JacksonJsonProperty.java @@ -19,7 +19,7 @@ public class JacksonJsonProperty { @JsonProperty("kebab-case-prop") @JsonSetter(nulls = Nulls.SKIP) @java.lang.SuppressWarnings("all") - public JacksonJsonPropertyBuilder kebabCaseProp(final String kebabCaseProp) { + public JacksonJsonProperty.JacksonJsonPropertyBuilder kebabCaseProp(final String kebabCaseProp) { this.kebabCaseProp = kebabCaseProp; return this; } @@ -34,8 +34,8 @@ public class JacksonJsonProperty { } } @java.lang.SuppressWarnings("all") - public static JacksonJsonPropertyBuilder builder() { - return new JacksonJsonPropertyBuilder(); + public static JacksonJsonProperty.JacksonJsonPropertyBuilder builder() { + return new JacksonJsonProperty.JacksonJsonPropertyBuilder(); } @JsonProperty("kebab-case-prop") @JsonSetter(nulls = Nulls.SKIP) diff --git a/test/transform/resource/after-delombok/SuperBuilderAbstract.java b/test/transform/resource/after-delombok/SuperBuilderAbstract.java index d1e82c27..a5825bf4 100644 --- a/test/transform/resource/after-delombok/SuperBuilderAbstract.java +++ b/test/transform/resource/after-delombok/SuperBuilderAbstract.java @@ -2,7 +2,7 @@ public class SuperBuilderAbstract { public static class Parent {
int parentField;
@java.lang.SuppressWarnings("all")
- public static abstract class ParentBuilder<C extends Parent, B extends ParentBuilder<C, B>> {
+ public static abstract class ParentBuilder<C extends SuperBuilderAbstract.Parent, B extends SuperBuilderAbstract.Parent.ParentBuilder<C, B>> {
@java.lang.SuppressWarnings("all")
private int parentField;
@java.lang.SuppressWarnings("all")
@@ -21,34 +21,34 @@ public class SuperBuilderAbstract { }
}
@java.lang.SuppressWarnings("all")
- private static final class ParentBuilderImpl extends ParentBuilder<Parent, ParentBuilderImpl> {
+ private static final class ParentBuilderImpl extends SuperBuilderAbstract.Parent.ParentBuilder<SuperBuilderAbstract.Parent, SuperBuilderAbstract.Parent.ParentBuilderImpl> {
@java.lang.SuppressWarnings("all")
private ParentBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
- protected ParentBuilderImpl self() {
+ protected SuperBuilderAbstract.Parent.ParentBuilderImpl self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
- public Parent build() {
- return new Parent(this);
+ public SuperBuilderAbstract.Parent build() {
+ return new SuperBuilderAbstract.Parent(this);
}
}
@java.lang.SuppressWarnings("all")
- protected Parent(final ParentBuilder<?, ?> b) {
+ protected Parent(final SuperBuilderAbstract.Parent.ParentBuilder<?, ?> b) {
this.parentField = b.parentField;
}
@java.lang.SuppressWarnings("all")
- public static ParentBuilder<?, ?> builder() {
- return new ParentBuilderImpl();
+ public static SuperBuilderAbstract.Parent.ParentBuilder<?, ?> builder() {
+ return new SuperBuilderAbstract.Parent.ParentBuilderImpl();
}
}
public static abstract class Child extends Parent {
double childField;
@java.lang.SuppressWarnings("all")
- public static abstract class ChildBuilder<C extends Child, B extends ChildBuilder<C, B>> extends Parent.ParentBuilder<C, B> {
+ public static abstract class ChildBuilder<C extends SuperBuilderAbstract.Child, B extends SuperBuilderAbstract.Child.ChildBuilder<C, B>> extends Parent.ParentBuilder<C, B> {
@java.lang.SuppressWarnings("all")
private double childField;
@java.lang.Override
@@ -69,7 +69,7 @@ public class SuperBuilderAbstract { }
}
@java.lang.SuppressWarnings("all")
- protected Child(final ChildBuilder<?, ?> b) {
+ protected Child(final SuperBuilderAbstract.Child.ChildBuilder<?, ?> b) {
super(b);
this.childField = b.childField;
}
@@ -77,7 +77,7 @@ public class SuperBuilderAbstract { public static class GrandChild extends Child {
String grandChildField;
@java.lang.SuppressWarnings("all")
- public static abstract class GrandChildBuilder<C extends GrandChild, B extends GrandChildBuilder<C, B>> extends Child.ChildBuilder<C, B> {
+ public static abstract class GrandChildBuilder<C extends SuperBuilderAbstract.GrandChild, B extends SuperBuilderAbstract.GrandChild.GrandChildBuilder<C, B>> extends Child.ChildBuilder<C, B> {
@java.lang.SuppressWarnings("all")
private String grandChildField;
@java.lang.Override
@@ -98,29 +98,29 @@ public class SuperBuilderAbstract { }
}
@java.lang.SuppressWarnings("all")
- private static final class GrandChildBuilderImpl extends GrandChildBuilder<GrandChild, GrandChildBuilderImpl> {
+ private static final class GrandChildBuilderImpl extends SuperBuilderAbstract.GrandChild.GrandChildBuilder<SuperBuilderAbstract.GrandChild, SuperBuilderAbstract.GrandChild.GrandChildBuilderImpl> {
@java.lang.SuppressWarnings("all")
private GrandChildBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
- protected GrandChildBuilderImpl self() {
+ protected SuperBuilderAbstract.GrandChild.GrandChildBuilderImpl self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
- public GrandChild build() {
- return new GrandChild(this);
+ public SuperBuilderAbstract.GrandChild build() {
+ return new SuperBuilderAbstract.GrandChild(this);
}
}
@java.lang.SuppressWarnings("all")
- protected GrandChild(final GrandChildBuilder<?, ?> b) {
+ protected GrandChild(final SuperBuilderAbstract.GrandChild.GrandChildBuilder<?, ?> b) {
super(b);
this.grandChildField = b.grandChildField;
}
@java.lang.SuppressWarnings("all")
- public static GrandChildBuilder<?, ?> builder() {
- return new GrandChildBuilderImpl();
+ public static SuperBuilderAbstract.GrandChild.GrandChildBuilder<?, ?> builder() {
+ return new SuperBuilderAbstract.GrandChild.GrandChildBuilderImpl();
}
}
public static void test() {
diff --git a/test/transform/resource/after-delombok/SuperBuilderAbstractToBuilder.java b/test/transform/resource/after-delombok/SuperBuilderAbstractToBuilder.java index 096bd533..aef3976f 100644 --- a/test/transform/resource/after-delombok/SuperBuilderAbstractToBuilder.java +++ b/test/transform/resource/after-delombok/SuperBuilderAbstractToBuilder.java @@ -2,16 +2,16 @@ public class SuperBuilderAbstractToBuilder { public static class Parent {
int parentField;
@java.lang.SuppressWarnings("all")
- public static abstract class ParentBuilder<C extends Parent, B extends ParentBuilder<C, B>> {
+ public static abstract class ParentBuilder<C extends SuperBuilderAbstractToBuilder.Parent, B extends SuperBuilderAbstractToBuilder.Parent.ParentBuilder<C, B>> {
@java.lang.SuppressWarnings("all")
private int parentField;
@java.lang.SuppressWarnings("all")
protected B $fillValuesFrom(final C instance) {
- ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);
+ SuperBuilderAbstractToBuilder.Parent.ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);
return self();
}
@java.lang.SuppressWarnings("all")
- private static void $fillValuesFromInstanceIntoBuilder(final Parent instance, final ParentBuilder<?, ?> b) {
+ private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderAbstractToBuilder.Parent instance, final SuperBuilderAbstractToBuilder.Parent.ParentBuilder<?, ?> b) {
b.parentField(instance.parentField);
}
@java.lang.SuppressWarnings("all")
@@ -30,49 +30,49 @@ public class SuperBuilderAbstractToBuilder { }
}
@java.lang.SuppressWarnings("all")
- private static final class ParentBuilderImpl extends ParentBuilder<Parent, ParentBuilderImpl> {
+ private static final class ParentBuilderImpl extends SuperBuilderAbstractToBuilder.Parent.ParentBuilder<SuperBuilderAbstractToBuilder.Parent, SuperBuilderAbstractToBuilder.Parent.ParentBuilderImpl> {
@java.lang.SuppressWarnings("all")
private ParentBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
- protected ParentBuilderImpl self() {
+ protected SuperBuilderAbstractToBuilder.Parent.ParentBuilderImpl self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
- public Parent build() {
- return new Parent(this);
+ public SuperBuilderAbstractToBuilder.Parent build() {
+ return new SuperBuilderAbstractToBuilder.Parent(this);
}
}
@java.lang.SuppressWarnings("all")
- protected Parent(final ParentBuilder<?, ?> b) {
+ protected Parent(final SuperBuilderAbstractToBuilder.Parent.ParentBuilder<?, ?> b) {
this.parentField = b.parentField;
}
@java.lang.SuppressWarnings("all")
- public static ParentBuilder<?, ?> builder() {
- return new ParentBuilderImpl();
+ public static SuperBuilderAbstractToBuilder.Parent.ParentBuilder<?, ?> builder() {
+ return new SuperBuilderAbstractToBuilder.Parent.ParentBuilderImpl();
}
@java.lang.SuppressWarnings("all")
- public ParentBuilder<?, ?> toBuilder() {
- return new ParentBuilderImpl().$fillValuesFrom(this);
+ public SuperBuilderAbstractToBuilder.Parent.ParentBuilder<?, ?> toBuilder() {
+ return new SuperBuilderAbstractToBuilder.Parent.ParentBuilderImpl().$fillValuesFrom(this);
}
}
public static abstract class Child extends Parent {
double childField;
@java.lang.SuppressWarnings("all")
- public static abstract class ChildBuilder<C extends Child, B extends ChildBuilder<C, B>> extends Parent.ParentBuilder<C, B> {
+ public static abstract class ChildBuilder<C extends SuperBuilderAbstractToBuilder.Child, B extends SuperBuilderAbstractToBuilder.Child.ChildBuilder<C, B>> extends Parent.ParentBuilder<C, B> {
@java.lang.SuppressWarnings("all")
private double childField;
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected B $fillValuesFrom(final C instance) {
super.$fillValuesFrom(instance);
- ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);
+ SuperBuilderAbstractToBuilder.Child.ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);
return self();
}
@java.lang.SuppressWarnings("all")
- private static void $fillValuesFromInstanceIntoBuilder(final Child instance, final ChildBuilder<?, ?> b) {
+ private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderAbstractToBuilder.Child instance, final SuperBuilderAbstractToBuilder.Child.ChildBuilder<?, ?> b) {
b.childField(instance.childField);
}
@java.lang.Override
@@ -93,7 +93,7 @@ public class SuperBuilderAbstractToBuilder { }
}
@java.lang.SuppressWarnings("all")
- protected Child(final ChildBuilder<?, ?> b) {
+ protected Child(final SuperBuilderAbstractToBuilder.Child.ChildBuilder<?, ?> b) {
super(b);
this.childField = b.childField;
}
@@ -101,18 +101,18 @@ public class SuperBuilderAbstractToBuilder { public static class GrandChild extends Child {
String grandChildField;
@java.lang.SuppressWarnings("all")
- public static abstract class GrandChildBuilder<C extends GrandChild, B extends GrandChildBuilder<C, B>> extends Child.ChildBuilder<C, B> {
+ public static abstract class GrandChildBuilder<C extends SuperBuilderAbstractToBuilder.GrandChild, B extends SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder<C, B>> extends Child.ChildBuilder<C, B> {
@java.lang.SuppressWarnings("all")
private String grandChildField;
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected B $fillValuesFrom(final C instance) {
super.$fillValuesFrom(instance);
- GrandChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);
+ SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);
return self();
}
@java.lang.SuppressWarnings("all")
- private static void $fillValuesFromInstanceIntoBuilder(final GrandChild instance, final GrandChildBuilder<?, ?> b) {
+ private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderAbstractToBuilder.GrandChild instance, final SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder<?, ?> b) {
b.grandChildField(instance.grandChildField);
}
@java.lang.Override
@@ -133,33 +133,33 @@ public class SuperBuilderAbstractToBuilder { }
}
@java.lang.SuppressWarnings("all")
- private static final class GrandChildBuilderImpl extends GrandChildBuilder<GrandChild, GrandChildBuilderImpl> {
+ private static final class GrandChildBuilderImpl extends SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder<SuperBuilderAbstractToBuilder.GrandChild, SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilderImpl> {
@java.lang.SuppressWarnings("all")
private GrandChildBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
- protected GrandChildBuilderImpl self() {
+ protected SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilderImpl self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
- public GrandChild build() {
- return new GrandChild(this);
+ public SuperBuilderAbstractToBuilder.GrandChild build() {
+ return new SuperBuilderAbstractToBuilder.GrandChild(this);
}
}
@java.lang.SuppressWarnings("all")
- protected GrandChild(final GrandChildBuilder<?, ?> b) {
+ protected GrandChild(final SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder<?, ?> b) {
super(b);
this.grandChildField = b.grandChildField;
}
@java.lang.SuppressWarnings("all")
- public static GrandChildBuilder<?, ?> builder() {
- return new GrandChildBuilderImpl();
+ public static SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder<?, ?> builder() {
+ return new SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilderImpl();
}
@java.lang.SuppressWarnings("all")
- public GrandChildBuilder<?, ?> toBuilder() {
- return new GrandChildBuilderImpl().$fillValuesFrom(this);
+ public SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder<?, ?> toBuilder() {
+ return new SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilderImpl().$fillValuesFrom(this);
}
}
public static void test() {
diff --git a/test/transform/resource/after-delombok/SuperBuilderBasic.java b/test/transform/resource/after-delombok/SuperBuilderBasic.java index 18a98af3..ef8df1cc 100644 --- a/test/transform/resource/after-delombok/SuperBuilderBasic.java +++ b/test/transform/resource/after-delombok/SuperBuilderBasic.java @@ -4,7 +4,7 @@ public class SuperBuilderBasic { int field1;
List<String> items;
@java.lang.SuppressWarnings("all")
- public static abstract class ParentBuilder<C extends Parent, B extends ParentBuilder<C, B>> {
+ public static abstract class ParentBuilder<C extends SuperBuilderBasic.Parent, B extends SuperBuilderBasic.Parent.ParentBuilder<C, B>> {
@java.lang.SuppressWarnings("all")
private int field1;
@java.lang.SuppressWarnings("all")
@@ -42,23 +42,23 @@ public class SuperBuilderBasic { }
}
@java.lang.SuppressWarnings("all")
- private static final class ParentBuilderImpl extends ParentBuilder<Parent, ParentBuilderImpl> {
+ private static final class ParentBuilderImpl extends SuperBuilderBasic.Parent.ParentBuilder<SuperBuilderBasic.Parent, SuperBuilderBasic.Parent.ParentBuilderImpl> {
@java.lang.SuppressWarnings("all")
private ParentBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
- protected ParentBuilderImpl self() {
+ protected SuperBuilderBasic.Parent.ParentBuilderImpl self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
- public Parent build() {
- return new Parent(this);
+ public SuperBuilderBasic.Parent build() {
+ return new SuperBuilderBasic.Parent(this);
}
}
@java.lang.SuppressWarnings("all")
- protected Parent(final ParentBuilder<?, ?> b) {
+ protected Parent(final SuperBuilderBasic.Parent.ParentBuilder<?, ?> b) {
this.field1 = b.field1;
java.util.List<String> items;
switch (b.items == null ? 0 : b.items.size()) {
@@ -74,14 +74,14 @@ public class SuperBuilderBasic { this.items = items;
}
@java.lang.SuppressWarnings("all")
- public static ParentBuilder<?, ?> builder() {
- return new ParentBuilderImpl();
+ public static SuperBuilderBasic.Parent.ParentBuilder<?, ?> builder() {
+ return new SuperBuilderBasic.Parent.ParentBuilderImpl();
}
}
public static class Child extends Parent {
double field3;
@java.lang.SuppressWarnings("all")
- public static abstract class ChildBuilder<C extends Child, B extends ChildBuilder<C, B>> extends Parent.ParentBuilder<C, B> {
+ public static abstract class ChildBuilder<C extends SuperBuilderBasic.Child, B extends SuperBuilderBasic.Child.ChildBuilder<C, B>> extends Parent.ParentBuilder<C, B> {
@java.lang.SuppressWarnings("all")
private double field3;
@java.lang.Override
@@ -102,29 +102,29 @@ public class SuperBuilderBasic { }
}
@java.lang.SuppressWarnings("all")
- private static final class ChildBuilderImpl extends ChildBuilder<Child, ChildBuilderImpl> {
+ private static final class ChildBuilderImpl extends SuperBuilderBasic.Child.ChildBuilder<SuperBuilderBasic.Child, SuperBuilderBasic.Child.ChildBuilderImpl> {
@java.lang.SuppressWarnings("all")
private ChildBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
- protected ChildBuilderImpl self() {
+ protected SuperBuilderBasic.Child.ChildBuilderImpl self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
- public Child build() {
- return new Child(this);
+ public SuperBuilderBasic.Child build() {
+ return new SuperBuilderBasic.Child(this);
}
}
@java.lang.SuppressWarnings("all")
- protected Child(final ChildBuilder<?, ?> b) {
+ protected Child(final SuperBuilderBasic.Child.ChildBuilder<?, ?> b) {
super(b);
this.field3 = b.field3;
}
@java.lang.SuppressWarnings("all")
- public static ChildBuilder<?, ?> builder() {
- return new ChildBuilderImpl();
+ public static SuperBuilderBasic.Child.ChildBuilder<?, ?> builder() {
+ return new SuperBuilderBasic.Child.ChildBuilderImpl();
}
}
public static void test() {
diff --git a/test/transform/resource/after-delombok/SuperBuilderBasicToBuilder.java b/test/transform/resource/after-delombok/SuperBuilderBasicToBuilder.java index dc0b4e70..e9e8774a 100644 --- a/test/transform/resource/after-delombok/SuperBuilderBasicToBuilder.java +++ b/test/transform/resource/after-delombok/SuperBuilderBasicToBuilder.java @@ -13,7 +13,7 @@ public class SuperBuilderBasicToBuilder { return "staticMethod";
}
@java.lang.SuppressWarnings("all")
- public static abstract class ParentBuilder<C extends Parent, B extends ParentBuilder<C, B>> {
+ public static abstract class ParentBuilder<C extends SuperBuilderBasicToBuilder.Parent, B extends SuperBuilderBasicToBuilder.Parent.ParentBuilder<C, B>> {
@java.lang.SuppressWarnings("all")
private int field1;
@java.lang.SuppressWarnings("all")
@@ -26,15 +26,15 @@ public class SuperBuilderBasicToBuilder { private java.util.ArrayList<String> items;
@java.lang.SuppressWarnings("all")
protected B $fillValuesFrom(final C instance) {
- ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);
+ SuperBuilderBasicToBuilder.Parent.ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);
return self();
}
@java.lang.SuppressWarnings("all")
- private static void $fillValuesFromInstanceIntoBuilder(final Parent instance, final ParentBuilder<?, ?> b) {
+ private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderBasicToBuilder.Parent instance, final SuperBuilderBasicToBuilder.Parent.ParentBuilder<?, ?> b) {
b.field1(instance.field1);
b.obtainViaField(instance.field1);
b.obtainViaMethod(instance.method());
- b.obtainViaStaticMethod(Parent.staticMethod(instance));
+ b.obtainViaStaticMethod(SuperBuilderBasicToBuilder.Parent.staticMethod(instance));
b.items(instance.items == null ? java.util.Collections.emptyList() : instance.items);
}
@java.lang.SuppressWarnings("all")
@@ -85,23 +85,23 @@ public class SuperBuilderBasicToBuilder { }
}
@java.lang.SuppressWarnings("all")
- private static final class ParentBuilderImpl extends ParentBuilder<Parent, ParentBuilderImpl> {
+ private static final class ParentBuilderImpl extends SuperBuilderBasicToBuilder.Parent.ParentBuilder<SuperBuilderBasicToBuilder.Parent, SuperBuilderBasicToBuilder.Parent.ParentBuilderImpl> {
@java.lang.SuppressWarnings("all")
private ParentBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
- protected ParentBuilderImpl self() {
+ protected SuperBuilderBasicToBuilder.Parent.ParentBuilderImpl self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
- public Parent build() {
- return new Parent(this);
+ public SuperBuilderBasicToBuilder.Parent build() {
+ return new SuperBuilderBasicToBuilder.Parent(this);
}
}
@java.lang.SuppressWarnings("all")
- protected Parent(final ParentBuilder<?, ?> b) {
+ protected Parent(final SuperBuilderBasicToBuilder.Parent.ParentBuilder<?, ?> b) {
this.field1 = b.field1;
this.obtainViaField = b.obtainViaField;
this.obtainViaMethod = b.obtainViaMethod;
@@ -120,29 +120,29 @@ public class SuperBuilderBasicToBuilder { this.items = items;
}
@java.lang.SuppressWarnings("all")
- public static ParentBuilder<?, ?> builder() {
- return new ParentBuilderImpl();
+ public static SuperBuilderBasicToBuilder.Parent.ParentBuilder<?, ?> builder() {
+ return new SuperBuilderBasicToBuilder.Parent.ParentBuilderImpl();
}
@java.lang.SuppressWarnings("all")
- public ParentBuilder<?, ?> toBuilder() {
- return new ParentBuilderImpl().$fillValuesFrom(this);
+ public SuperBuilderBasicToBuilder.Parent.ParentBuilder<?, ?> toBuilder() {
+ return new SuperBuilderBasicToBuilder.Parent.ParentBuilderImpl().$fillValuesFrom(this);
}
}
public static class Child extends Parent {
private double field3;
@java.lang.SuppressWarnings("all")
- public static abstract class ChildBuilder<C extends Child, B extends ChildBuilder<C, B>> extends Parent.ParentBuilder<C, B> {
+ public static abstract class ChildBuilder<C extends SuperBuilderBasicToBuilder.Child, B extends SuperBuilderBasicToBuilder.Child.ChildBuilder<C, B>> extends Parent.ParentBuilder<C, B> {
@java.lang.SuppressWarnings("all")
private double field3;
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected B $fillValuesFrom(final C instance) {
super.$fillValuesFrom(instance);
- ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);
+ SuperBuilderBasicToBuilder.Child.ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);
return self();
}
@java.lang.SuppressWarnings("all")
- private static void $fillValuesFromInstanceIntoBuilder(final Child instance, final ChildBuilder<?, ?> b) {
+ private static void $fillValuesFromInstanceIntoBuilder(final SuperBuilderBasicToBuilder.Child instance, final SuperBuilderBasicToBuilder.Child.ChildBuilder<?, ?> b) {
b.field3(instance.field3);
}
@java.lang.Override
@@ -163,33 +163,33 @@ public class SuperBuilderBasicToBuilder { }
}
@java.lang.SuppressWarnings("all")
- private static final class ChildBuilderImpl extends ChildBuilder<Child, ChildBuilderImpl> {
+ private static final class ChildBuilderImpl extends SuperBuilderBasicToBuilder.Child.ChildBuilder<SuperBuilderBasicToBuilder.Child, SuperBuilderBasicToBuilder.Child.ChildBuilderImpl> {
@java.lang.SuppressWarnings("all")
private ChildBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
- protected ChildBuilderImpl self() {
+ protected SuperBuilderBasicToBuilder.Child.ChildBuilderImpl self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
- public Child build() {
- return new Child(this);
+ public SuperBuilderBasicToBuilder.Child build() {
+ return new SuperBuilderBasicToBuilder.Child(this);
}
}
@java.lang.SuppressWarnings("all")
- protected Child(final ChildBuilder<?, ?> b) {
+ protected Child(final SuperBuilderBasicToBuilder.Child.ChildBuilder<?, ?> b) {
super(b);
this.field3 = b.field3;
}
@java.lang.SuppressWarnings("all")
- public static ChildBuilder<?, ?> builder() {
- return new ChildBuilderImpl();
+ public static SuperBuilderBasicToBuilder.Child.ChildBuilder<?, ?> builder() {
+ return new SuperBuilderBasicToBuilder.Child.ChildBuilderImpl();
}
@java.lang.SuppressWarnings("all")
- public ChildBuilder<?, ?> toBuilder() {
- return new ChildBuilderImpl().$fillValuesFrom(this);
+ public SuperBuilderBasicToBuilder.Child.ChildBuilder<?, ?> toBuilder() {
+ return new SuperBuilderBasicToBuilder.Child.ChildBuilderImpl().$fillValuesFrom(this);
}
}
public static void test() {
diff --git a/test/transform/resource/after-delombok/SuperBuilderCustomized.java b/test/transform/resource/after-delombok/SuperBuilderCustomized.java index dcc2613f..e8f95407 100644 --- a/test/transform/resource/after-delombok/SuperBuilderCustomized.java +++ b/test/transform/resource/after-delombok/SuperBuilderCustomized.java @@ -25,28 +25,28 @@ public class SuperBuilderCustomized { }
int field1;
@java.lang.SuppressWarnings("all")
- private static final class ParentBuilderImpl extends ParentBuilder<Parent, ParentBuilderImpl> {
+ private static final class ParentBuilderImpl extends SuperBuilderCustomized.Parent.ParentBuilder<SuperBuilderCustomized.Parent, SuperBuilderCustomized.Parent.ParentBuilderImpl> {
@java.lang.SuppressWarnings("all")
private ParentBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
- protected ParentBuilderImpl self() {
+ protected SuperBuilderCustomized.Parent.ParentBuilderImpl self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
- public Parent build() {
- return new Parent(this);
+ public SuperBuilderCustomized.Parent build() {
+ return new SuperBuilderCustomized.Parent(this);
}
}
@java.lang.SuppressWarnings("all")
- protected Parent(final ParentBuilder<?, ?> b) {
+ protected Parent(final SuperBuilderCustomized.Parent.ParentBuilder<?, ?> b) {
this.field1 = b.field1;
}
@java.lang.SuppressWarnings("all")
- public static ParentBuilder<?, ?> builder() {
- return new ParentBuilderImpl();
+ public static SuperBuilderCustomized.Parent.ParentBuilder<?, ?> builder() {
+ return new SuperBuilderCustomized.Parent.ParentBuilderImpl();
}
}
public static class Child extends Parent {
@@ -61,7 +61,7 @@ public class SuperBuilderCustomized { }
@java.lang.Override
@java.lang.SuppressWarnings("all")
- protected ChildBuilderImpl self() {
+ protected SuperBuilderCustomized.Child.ChildBuilderImpl self() {
return this;
}
}
@@ -70,7 +70,7 @@ public class SuperBuilderCustomized { return new ChildBuilderImpl().field2(10.0);
}
@java.lang.SuppressWarnings("all")
- public static abstract class ChildBuilder<C extends Child, B extends ChildBuilder<C, B>> extends Parent.ParentBuilder<C, B> {
+ public static abstract class ChildBuilder<C extends SuperBuilderCustomized.Child, B extends SuperBuilderCustomized.Child.ChildBuilder<C, B>> extends Parent.ParentBuilder<C, B> {
@java.lang.SuppressWarnings("all")
private double field2;
@java.lang.Override
@@ -91,7 +91,7 @@ public class SuperBuilderCustomized { }
}
@java.lang.SuppressWarnings("all")
- protected Child(final ChildBuilder<?, ?> b) {
+ protected Child(final SuperBuilderCustomized.Child.ChildBuilder<?, ?> b) {
super(b);
this.field2 = b.field2;
}
diff --git a/test/transform/resource/after-delombok/SuperBuilderSingularAnnotatedTypes.java b/test/transform/resource/after-delombok/SuperBuilderSingularAnnotatedTypes.java index 61c2557c..12c61096 100644 --- a/test/transform/resource/after-delombok/SuperBuilderSingularAnnotatedTypes.java +++ b/test/transform/resource/after-delombok/SuperBuilderSingularAnnotatedTypes.java @@ -10,7 +10,7 @@ class SuperBuilderSingularAnnotatedTypes { private Set<@MyAnnotation @NonNull String> foos; private Map<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer> bars; @java.lang.SuppressWarnings("all") - public static abstract class SuperBuilderSingularAnnotatedTypesBuilder<C extends SuperBuilderSingularAnnotatedTypes, B extends SuperBuilderSingularAnnotatedTypesBuilder<C, B>> { + public static abstract class SuperBuilderSingularAnnotatedTypesBuilder<C extends SuperBuilderSingularAnnotatedTypes, B extends SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilder<C, B>> { @java.lang.SuppressWarnings("all") private java.util.ArrayList<@MyAnnotation @NonNull String> foos; @java.lang.SuppressWarnings("all") @@ -84,13 +84,13 @@ class SuperBuilderSingularAnnotatedTypes { } } @java.lang.SuppressWarnings("all") - private static final class SuperBuilderSingularAnnotatedTypesBuilderImpl extends SuperBuilderSingularAnnotatedTypesBuilder<SuperBuilderSingularAnnotatedTypes, SuperBuilderSingularAnnotatedTypesBuilderImpl> { + private static final class SuperBuilderSingularAnnotatedTypesBuilderImpl extends SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilder<SuperBuilderSingularAnnotatedTypes, SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilderImpl> { @java.lang.SuppressWarnings("all") private SuperBuilderSingularAnnotatedTypesBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") - protected SuperBuilderSingularAnnotatedTypesBuilderImpl self() { + protected SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilderImpl self() { return this; } @java.lang.Override @@ -100,7 +100,7 @@ class SuperBuilderSingularAnnotatedTypes { } } @java.lang.SuppressWarnings("all") - protected SuperBuilderSingularAnnotatedTypes(final SuperBuilderSingularAnnotatedTypesBuilder<?, ?> b) { + protected SuperBuilderSingularAnnotatedTypes(final SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilder<?, ?> b) { java.util.Set<@MyAnnotation @NonNull String> foos; switch (b.foos == null ? 0 : b.foos.size()) { case 0: @@ -131,7 +131,7 @@ class SuperBuilderSingularAnnotatedTypes { this.bars = bars; } @java.lang.SuppressWarnings("all") - public static SuperBuilderSingularAnnotatedTypesBuilder<?, ?> builder() { - return new SuperBuilderSingularAnnotatedTypesBuilderImpl(); + public static SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilder<?, ?> builder() { + return new SuperBuilderSingularAnnotatedTypes.SuperBuilderSingularAnnotatedTypesBuilderImpl(); } }
\ No newline at end of file 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<String> items;
@java.lang.SuppressWarnings("all")
- public static abstract class ParentBuilder<A, C extends Parent<A>, B extends ParentBuilder<A, C, B>> {
+ public static abstract class ParentBuilder<A, C extends SuperBuilderWithCustomBuilderMethod.Parent<A>, B extends SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder<A, C, B>> {
@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<A> extends ParentBuilder<A, Parent<A>, ParentBuilderImpl<A>> {
+ private static final class ParentBuilderImpl<A> extends SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder<A, SuperBuilderWithCustomBuilderMethod.Parent<A>, SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilderImpl<A>> {
@java.lang.SuppressWarnings("all")
private ParentBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
- protected ParentBuilderImpl<A> self() {
+ protected SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilderImpl<A> self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
- public Parent<A> build() {
- return new Parent<A>(this);
+ public SuperBuilderWithCustomBuilderMethod.Parent<A> build() {
+ return new SuperBuilderWithCustomBuilderMethod.Parent<A>(this);
}
}
@java.lang.SuppressWarnings("all")
- protected Parent(final ParentBuilder<A, ?, ?> b) {
+ protected Parent(final SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder<A, ?, ?> b) {
this.field1 = b.field1;
java.util.List<String> 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 <A> ParentBuilder<A, ?, ?> builder() {
- return new ParentBuilderImpl<A>();
+ public static <A> SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilder<A, ?, ?> builder() {
+ return new SuperBuilderWithCustomBuilderMethod.Parent.ParentBuilderImpl<A>();
}
}
public static class Child<A> extends Parent<A> {
@@ -84,7 +84,7 @@ public class SuperBuilderWithCustomBuilderMethod { return new ChildBuilderImpl<A>().item("default item");
}
@java.lang.SuppressWarnings("all")
- public static abstract class ChildBuilder<A, C extends Child<A>, B extends ChildBuilder<A, C, B>> extends Parent.ParentBuilder<A, C, B> {
+ public static abstract class ChildBuilder<A, C extends SuperBuilderWithCustomBuilderMethod.Child<A>, B extends SuperBuilderWithCustomBuilderMethod.Child.ChildBuilder<A, C, B>> extends Parent.ParentBuilder<A, C, B> {
@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<A> extends ChildBuilder<A, Child<A>, ChildBuilderImpl<A>> {
+ private static final class ChildBuilderImpl<A> extends SuperBuilderWithCustomBuilderMethod.Child.ChildBuilder<A, SuperBuilderWithCustomBuilderMethod.Child<A>, SuperBuilderWithCustomBuilderMethod.Child.ChildBuilderImpl<A>> {
@java.lang.SuppressWarnings("all")
private ChildBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
- protected ChildBuilderImpl<A> self() {
+ protected SuperBuilderWithCustomBuilderMethod.Child.ChildBuilderImpl<A> self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
- public Child<A> build() {
- return new Child<A>(this);
+ public SuperBuilderWithCustomBuilderMethod.Child<A> build() {
+ return new SuperBuilderWithCustomBuilderMethod.Child<A>(this);
}
}
@java.lang.SuppressWarnings("all")
- protected Child(final ChildBuilder<A, ?, ?> b) {
+ protected Child(final SuperBuilderWithCustomBuilderMethod.Child.ChildBuilder<A, ?, ?> b) {
super(b);
this.field3 = b.field3;
}
diff --git a/test/transform/resource/after-delombok/SuperBuilderWithDefaults.java b/test/transform/resource/after-delombok/SuperBuilderWithDefaults.java index 2ac3d1b7..ad56cea2 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithDefaults.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithDefaults.java @@ -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() {
diff --git a/test/transform/resource/after-delombok/SuperBuilderWithGenerics.java b/test/transform/resource/after-delombok/SuperBuilderWithGenerics.java index a1aeb971..2bac58f2 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithGenerics.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithGenerics.java @@ -4,7 +4,7 @@ public class SuperBuilderWithGenerics { A field1;
List<String> items;
@java.lang.SuppressWarnings("all")
- public static abstract class ParentBuilder<A, C extends Parent<A>, B extends ParentBuilder<A, C, B>> {
+ public static abstract class ParentBuilder<A, C extends SuperBuilderWithGenerics.Parent<A>, B extends SuperBuilderWithGenerics.Parent.ParentBuilder<A, C, B>> {
@java.lang.SuppressWarnings("all")
private A field1;
@java.lang.SuppressWarnings("all")
@@ -42,23 +42,23 @@ public class SuperBuilderWithGenerics { }
}
@java.lang.SuppressWarnings("all")
- private static final class ParentBuilderImpl<A> extends ParentBuilder<A, Parent<A>, ParentBuilderImpl<A>> {
+ private static final class ParentBuilderImpl<A> extends SuperBuilderWithGenerics.Parent.ParentBuilder<A, SuperBuilderWithGenerics.Parent<A>, SuperBuilderWithGenerics.Parent.ParentBuilderImpl<A>> {
@java.lang.SuppressWarnings("all")
private ParentBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
- protected ParentBuilderImpl<A> self() {
+ protected SuperBuilderWithGenerics.Parent.ParentBuilderImpl<A> self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
- public Parent<A> build() {
- return new Parent<A>(this);
+ public SuperBuilderWithGenerics.Parent<A> build() {
+ return new SuperBuilderWithGenerics.Parent<A>(this);
}
}
@java.lang.SuppressWarnings("all")
- protected Parent(final ParentBuilder<A, ?, ?> b) {
+ protected Parent(final SuperBuilderWithGenerics.Parent.ParentBuilder<A, ?, ?> b) {
this.field1 = b.field1;
java.util.List<String> items;
switch (b.items == null ? 0 : b.items.size()) {
@@ -74,14 +74,14 @@ public class SuperBuilderWithGenerics { this.items = items;
}
@java.lang.SuppressWarnings("all")
- public static <A> ParentBuilder<A, ?, ?> builder() {
- return new ParentBuilderImpl<A>();
+ public static <A> SuperBuilderWithGenerics.Parent.ParentBuilder<A, ?, ?> builder() {
+ return new SuperBuilderWithGenerics.Parent.ParentBuilderImpl<A>();
}
}
public static class Child<A> extends Parent<A> {
double field3;
@java.lang.SuppressWarnings("all")
- public static abstract class ChildBuilder<A, C extends Child<A>, B extends ChildBuilder<A, C, B>> extends Parent.ParentBuilder<A, C, B> {
+ public static abstract class ChildBuilder<A, C extends SuperBuilderWithGenerics.Child<A>, B extends SuperBuilderWithGenerics.Child.ChildBuilder<A, C, B>> extends Parent.ParentBuilder<A, C, B> {
@java.lang.SuppressWarnings("all")
private double field3;
@java.lang.Override
@@ -102,29 +102,29 @@ public class SuperBuilderWithGenerics { }
}
@java.lang.SuppressWarnings("all")
- private static final class ChildBuilderImpl<A> extends ChildBuilder<A, Child<A>, ChildBuilderImpl<A>> {
+ private static final class ChildBuilderImpl<A> extends SuperBuilderWithGenerics.Child.ChildBuilder<A, SuperBuilderWithGenerics.Child<A>, SuperBuilderWithGenerics.Child.ChildBuilderImpl<A>> {
@java.lang.SuppressWarnings("all")
private ChildBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
- protected ChildBuilderImpl<A> self() {
+ protected SuperBuilderWithGenerics.Child.ChildBuilderImpl<A> self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
- public Child<A> build() {
- return new Child<A>(this);
+ public SuperBuilderWithGenerics.Child<A> build() {
+ return new SuperBuilderWithGenerics.Child<A>(this);
}
}
@java.lang.SuppressWarnings("all")
- protected Child(final ChildBuilder<A, ?, ?> b) {
+ protected Child(final SuperBuilderWithGenerics.Child.ChildBuilder<A, ?, ?> b) {
super(b);
this.field3 = b.field3;
}
@java.lang.SuppressWarnings("all")
- public static <A> ChildBuilder<A, ?, ?> builder() {
- return new ChildBuilderImpl<A>();
+ public static <A> SuperBuilderWithGenerics.Child.ChildBuilder<A, ?, ?> builder() {
+ return new SuperBuilderWithGenerics.Child.ChildBuilderImpl<A>();
}
}
public static void test() {
diff --git a/test/transform/resource/after-delombok/SuperBuilderWithGenerics2.java b/test/transform/resource/after-delombok/SuperBuilderWithGenerics2.java index 6e9988f5..0f4a6c54 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithGenerics2.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithGenerics2.java @@ -4,7 +4,7 @@ public class SuperBuilderWithGenerics2 { A field1;
List<String> items;
@java.lang.SuppressWarnings("all")
- public static abstract class ParentBuilder<A, C extends Parent<A>, B extends ParentBuilder<A, C, B>> {
+ public static abstract class ParentBuilder<A, C extends SuperBuilderWithGenerics2.Parent<A>, B extends SuperBuilderWithGenerics2.Parent.ParentBuilder<A, C, B>> {
@java.lang.SuppressWarnings("all")
private A field1;
@java.lang.SuppressWarnings("all")
@@ -42,23 +42,23 @@ public class SuperBuilderWithGenerics2 { }
}
@java.lang.SuppressWarnings("all")
- private static final class ParentBuilderImpl<A> extends ParentBuilder<A, Parent<A>, ParentBuilderImpl<A>> {
+ private static final class ParentBuilderImpl<A> extends SuperBuilderWithGenerics2.Parent.ParentBuilder<A, SuperBuilderWithGenerics2.Parent<A>, SuperBuilderWithGenerics2.Parent.ParentBuilderImpl<A>> {
@java.lang.SuppressWarnings("all")
private ParentBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
- protected ParentBuilderImpl<A> self() {
+ protected SuperBuilderWithGenerics2.Parent.ParentBuilderImpl<A> self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
- public Parent<A> build() {
- return new Parent<A>(this);
+ public SuperBuilderWithGenerics2.Parent<A> build() {
+ return new SuperBuilderWithGenerics2.Parent<A>(this);
}
}
@java.lang.SuppressWarnings("all")
- protected Parent(final ParentBuilder<A, ?, ?> b) {
+ protected Parent(final SuperBuilderWithGenerics2.Parent.ParentBuilder<A, ?, ?> b) {
this.field1 = b.field1;
java.util.List<String> items;
switch (b.items == null ? 0 : b.items.size()) {
@@ -74,14 +74,14 @@ public class SuperBuilderWithGenerics2 { this.items = items;
}
@java.lang.SuppressWarnings("all")
- public static <A> ParentBuilder<A, ?, ?> builder() {
- return new ParentBuilderImpl<A>();
+ public static <A> SuperBuilderWithGenerics2.Parent.ParentBuilder<A, ?, ?> builder() {
+ return new SuperBuilderWithGenerics2.Parent.ParentBuilderImpl<A>();
}
}
public static class Child<A> extends Parent<String> {
A field3;
@java.lang.SuppressWarnings("all")
- public static abstract class ChildBuilder<A, C extends Child<A>, B extends ChildBuilder<A, C, B>> extends Parent.ParentBuilder<String, C, B> {
+ public static abstract class ChildBuilder<A, C extends SuperBuilderWithGenerics2.Child<A>, B extends SuperBuilderWithGenerics2.Child.ChildBuilder<A, C, B>> extends Parent.ParentBuilder<String, C, B> {
@java.lang.SuppressWarnings("all")
private A field3;
@java.lang.Override
@@ -102,29 +102,29 @@ public class SuperBuilderWithGenerics2 { }
}
@java.lang.SuppressWarnings("all")
- private static final class ChildBuilderImpl<A> extends ChildBuilder<A, Child<A>, ChildBuilderImpl<A>> {
+ private static final class ChildBuilderImpl<A> extends SuperBuilderWithGenerics2.Child.ChildBuilder<A, SuperBuilderWithGenerics2.Child<A>, SuperBuilderWithGenerics2.Child.ChildBuilderImpl<A>> {
@java.lang.SuppressWarnings("all")
private ChildBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
- protected ChildBuilderImpl<A> self() {
+ protected SuperBuilderWithGenerics2.Child.ChildBuilderImpl<A> self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
- public Child<A> build() {
- return new Child<A>(this);
+ public SuperBuilderWithGenerics2.Child<A> build() {
+ return new SuperBuilderWithGenerics2.Child<A>(this);
}
}
@java.lang.SuppressWarnings("all")
- protected Child(final ChildBuilder<A, ?, ?> b) {
+ protected Child(final SuperBuilderWithGenerics2.Child.ChildBuilder<A, ?, ?> b) {
super(b);
this.field3 = b.field3;
}
@java.lang.SuppressWarnings("all")
- public static <A> ChildBuilder<A, ?, ?> builder2() {
- return new ChildBuilderImpl<A>();
+ public static <A> SuperBuilderWithGenerics2.Child.ChildBuilder<A, ?, ?> builder2() {
+ return new SuperBuilderWithGenerics2.Child.ChildBuilderImpl<A>();
}
}
public static void test() {
diff --git a/test/transform/resource/after-delombok/SuperBuilderWithGenerics3.java b/test/transform/resource/after-delombok/SuperBuilderWithGenerics3.java index ac970796..b21f8fee 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithGenerics3.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithGenerics3.java @@ -3,7 +3,7 @@ public class SuperBuilderWithGenerics3 { public static class Parent<A> { private final String str; @java.lang.SuppressWarnings("all") - public static abstract class ParentBuilder<A, C extends Parent<A>, B extends ParentBuilder<A, C, B>> { + public static abstract class ParentBuilder<A, C extends SuperBuilderWithGenerics3.Parent<A>, B extends SuperBuilderWithGenerics3.Parent.ParentBuilder<A, C, B>> { @java.lang.SuppressWarnings("all") private String str; @java.lang.SuppressWarnings("all") @@ -22,28 +22,28 @@ public class SuperBuilderWithGenerics3 { } } @java.lang.SuppressWarnings("all") - private static final class ParentBuilderImpl<A> extends ParentBuilder<A, Parent<A>, ParentBuilderImpl<A>> { + private static final class ParentBuilderImpl<A> extends SuperBuilderWithGenerics3.Parent.ParentBuilder<A, SuperBuilderWithGenerics3.Parent<A>, SuperBuilderWithGenerics3.Parent.ParentBuilderImpl<A>> { @java.lang.SuppressWarnings("all") private ParentBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") - protected ParentBuilderImpl<A> self() { + protected SuperBuilderWithGenerics3.Parent.ParentBuilderImpl<A> self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") - public Parent<A> build() { - return new Parent<A>(this); + public SuperBuilderWithGenerics3.Parent<A> build() { + return new SuperBuilderWithGenerics3.Parent<A>(this); } } @java.lang.SuppressWarnings("all") - protected Parent(final ParentBuilder<A, ?, ?> b) { + protected Parent(final SuperBuilderWithGenerics3.Parent.ParentBuilder<A, ?, ?> b) { this.str = b.str; } @java.lang.SuppressWarnings("all") - public static <A> ParentBuilder<A, ?, ?> builder() { - return new ParentBuilderImpl<A>(); + public static <A> SuperBuilderWithGenerics3.Parent.ParentBuilder<A, ?, ?> builder() { + return new SuperBuilderWithGenerics3.Parent.ParentBuilderImpl<A>(); } } public static class Child extends Parent<Child.SomeInnerStaticClass> { @@ -51,7 +51,7 @@ public class SuperBuilderWithGenerics3 { } double field3; @java.lang.SuppressWarnings("all") - public static abstract class ChildBuilder<C extends Child, B extends ChildBuilder<C, B>> extends Parent.ParentBuilder<Child.SomeInnerStaticClass, C, B> { + public static abstract class ChildBuilder<C extends SuperBuilderWithGenerics3.Child, B extends SuperBuilderWithGenerics3.Child.ChildBuilder<C, B>> extends Parent.ParentBuilder<Child.SomeInnerStaticClass, C, B> { @java.lang.SuppressWarnings("all") private double field3; @java.lang.Override @@ -72,29 +72,29 @@ public class SuperBuilderWithGenerics3 { } } @java.lang.SuppressWarnings("all") - private static final class ChildBuilderImpl extends ChildBuilder<Child, ChildBuilderImpl> { + private static final class ChildBuilderImpl extends SuperBuilderWithGenerics3.Child.ChildBuilder<SuperBuilderWithGenerics3.Child, SuperBuilderWithGenerics3.Child.ChildBuilderImpl> { @java.lang.SuppressWarnings("all") private ChildBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") - protected ChildBuilderImpl self() { + protected SuperBuilderWithGenerics3.Child.ChildBuilderImpl self() { return this; } @java.lang.Override @java.lang.SuppressWarnings("all") - public Child build() { - return new Child(this); + public SuperBuilderWithGenerics3.Child build() { + return new SuperBuilderWithGenerics3.Child(this); } } @java.lang.SuppressWarnings("all") - protected Child(final ChildBuilder<?, ?> b) { + protected Child(final SuperBuilderWithGenerics3.Child.ChildBuilder<?, ?> b) { super(b); this.field3 = b.field3; } @java.lang.SuppressWarnings("all") - public static ChildBuilder<?, ?> builder() { - return new ChildBuilderImpl(); + public static SuperBuilderWithGenerics3.Child.ChildBuilder<?, ?> builder() { + return new SuperBuilderWithGenerics3.Child.ChildBuilderImpl(); } } }
\ No newline at end of file diff --git a/test/transform/resource/after-delombok/SuperBuilderWithGenericsAndToBuilder.java b/test/transform/resource/after-delombok/SuperBuilderWithGenericsAndToBuilder.java index af67e900..a6c44c7f 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithGenericsAndToBuilder.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithGenericsAndToBuilder.java @@ -4,7 +4,7 @@ public class SuperBuilderWithGenericsAndToBuilder { A field1;
Map<Integer, String> items;
@java.lang.SuppressWarnings("all")
- public static abstract class ParentBuilder<A, C extends Parent<A>, B extends ParentBuilder<A, C, B>> {
+ public static abstract class ParentBuilder<A, C extends SuperBuilderWithGenericsAndToBuilder.Parent<A>, B extends SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder<A, C, B>> {
@java.lang.SuppressWarnings("all")
private A field1;
@java.lang.SuppressWarnings("all")
@@ -13,11 +13,11 @@ public class SuperBuilderWithGenericsAndToBuilder { private java.util.ArrayList<String> items$value;
@java.lang.SuppressWarnings("all")
protected B $fillValuesFrom(final C instance) {
- ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);
+ SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);
return self();
}
@java.lang.SuppressWarnings("all")
- private static <A> void $fillValuesFromInstanceIntoBuilder(final Parent<A> instance, final ParentBuilder<A, ?, ?> b) {
+ private static <A> void $fillValuesFromInstanceIntoBuilder(final SuperBuilderWithGenericsAndToBuilder.Parent<A> instance, final SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder<A, ?, ?> b) {
b.field1(instance.field1);
b.items(instance.items == null ? java.util.Collections.emptyMap() : instance.items);
}
@@ -67,23 +67,23 @@ public class SuperBuilderWithGenericsAndToBuilder { }
}
@java.lang.SuppressWarnings("all")
- private static final class ParentBuilderImpl<A> extends ParentBuilder<A, Parent<A>, ParentBuilderImpl<A>> {
+ private static final class ParentBuilderImpl<A> extends SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder<A, SuperBuilderWithGenericsAndToBuilder.Parent<A>, SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilderImpl<A>> {
@java.lang.SuppressWarnings("all")
private ParentBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
- protected ParentBuilderImpl<A> self() {
+ protected SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilderImpl<A> self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
- public Parent<A> build() {
- return new Parent<A>(this);
+ public SuperBuilderWithGenericsAndToBuilder.Parent<A> build() {
+ return new SuperBuilderWithGenericsAndToBuilder.Parent<A>(this);
}
}
@java.lang.SuppressWarnings("all")
- protected Parent(final ParentBuilder<A, ?, ?> b) {
+ protected Parent(final SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder<A, ?, ?> b) {
this.field1 = b.field1;
java.util.Map<Integer, String> items;
switch (b.items$key == null ? 0 : b.items$key.size()) {
@@ -101,29 +101,29 @@ public class SuperBuilderWithGenericsAndToBuilder { this.items = items;
}
@java.lang.SuppressWarnings("all")
- public static <A> ParentBuilder<A, ?, ?> builder() {
- return new ParentBuilderImpl<A>();
+ public static <A> SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder<A, ?, ?> builder() {
+ return new SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilderImpl<A>();
}
@java.lang.SuppressWarnings("all")
- public ParentBuilder<A, ?, ?> toBuilder() {
- return new ParentBuilderImpl<A>().$fillValuesFrom(this);
+ public SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilder<A, ?, ?> toBuilder() {
+ return new SuperBuilderWithGenericsAndToBuilder.Parent.ParentBuilderImpl<A>().$fillValuesFrom(this);
}
}
public static class Child<A> extends Parent<A> {
double field3;
@java.lang.SuppressWarnings("all")
- public static abstract class ChildBuilder<A, C extends Child<A>, B extends ChildBuilder<A, C, B>> extends Parent.ParentBuilder<A, C, B> {
+ public static abstract class ChildBuilder<A, C extends SuperBuilderWithGenericsAndToBuilder.Child<A>, B extends SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder<A, C, B>> extends Parent.ParentBuilder<A, C, B> {
@java.lang.SuppressWarnings("all")
private double field3;
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected B $fillValuesFrom(final C instance) {
super.$fillValuesFrom(instance);
- ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);
+ SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);
return self();
}
@java.lang.SuppressWarnings("all")
- private static <A> void $fillValuesFromInstanceIntoBuilder(final Child<A> instance, final ChildBuilder<A, ?, ?> b) {
+ private static <A> void $fillValuesFromInstanceIntoBuilder(final SuperBuilderWithGenericsAndToBuilder.Child<A> instance, final SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder<A, ?, ?> b) {
b.field3(instance.field3);
}
@java.lang.Override
@@ -144,33 +144,33 @@ public class SuperBuilderWithGenericsAndToBuilder { }
}
@java.lang.SuppressWarnings("all")
- private static final class ChildBuilderImpl<A> extends ChildBuilder<A, Child<A>, ChildBuilderImpl<A>> {
+ private static final class ChildBuilderImpl<A> extends SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder<A, SuperBuilderWithGenericsAndToBuilder.Child<A>, SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilderImpl<A>> {
@java.lang.SuppressWarnings("all")
private ChildBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
- protected ChildBuilderImpl<A> self() {
+ protected SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilderImpl<A> self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
- public Child<A> build() {
- return new Child<A>(this);
+ public SuperBuilderWithGenericsAndToBuilder.Child<A> build() {
+ return new SuperBuilderWithGenericsAndToBuilder.Child<A>(this);
}
}
@java.lang.SuppressWarnings("all")
- protected Child(final ChildBuilder<A, ?, ?> b) {
+ protected Child(final SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder<A, ?, ?> b) {
super(b);
this.field3 = b.field3;
}
@java.lang.SuppressWarnings("all")
- public static <A> ChildBuilder<A, ?, ?> builder() {
- return new ChildBuilderImpl<A>();
+ public static <A> SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder<A, ?, ?> builder() {
+ return new SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilderImpl<A>();
}
@java.lang.SuppressWarnings("all")
- public ChildBuilder<A, ?, ?> toBuilder() {
- return new ChildBuilderImpl<A>().$fillValuesFrom(this);
+ public SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilder<A, ?, ?> toBuilder() {
+ return new SuperBuilderWithGenericsAndToBuilder.Child.ChildBuilderImpl<A>().$fillValuesFrom(this);
}
}
public static void test() {
diff --git a/test/transform/resource/after-delombok/SuperBuilderWithNonNull.java b/test/transform/resource/after-delombok/SuperBuilderWithNonNull.java index 52328780..7c9a5a13 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithNonNull.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithNonNull.java @@ -8,7 +8,7 @@ public class SuperBuilderWithNonNull { return "default";
}
@java.lang.SuppressWarnings("all")
- public static abstract class ParentBuilder<C extends Parent, B extends ParentBuilder<C, B>> {
+ public static abstract class ParentBuilder<C extends SuperBuilderWithNonNull.Parent, B extends SuperBuilderWithNonNull.Parent.ParentBuilder<C, B>> {
@java.lang.SuppressWarnings("all")
private boolean nonNullParentField$set;
@java.lang.SuppressWarnings("all")
@@ -33,39 +33,39 @@ public class SuperBuilderWithNonNull { }
}
@java.lang.SuppressWarnings("all")
- private static final class ParentBuilderImpl extends ParentBuilder<Parent, ParentBuilderImpl> {
+ private static final class ParentBuilderImpl extends SuperBuilderWithNonNull.Parent.ParentBuilder<SuperBuilderWithNonNull.Parent, SuperBuilderWithNonNull.Parent.ParentBuilderImpl> {
@java.lang.SuppressWarnings("all")
private ParentBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
- protected ParentBuilderImpl self() {
+ protected SuperBuilderWithNonNull.Parent.ParentBuilderImpl self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
- public Parent build() {
- return new Parent(this);
+ public SuperBuilderWithNonNull.Parent build() {
+ return new SuperBuilderWithNonNull.Parent(this);
}
}
@java.lang.SuppressWarnings("all")
- protected Parent(final ParentBuilder<?, ?> b) {
+ protected Parent(final SuperBuilderWithNonNull.Parent.ParentBuilder<?, ?> b) {
if (b.nonNullParentField$set) this.nonNullParentField = b.nonNullParentField$value;
- else this.nonNullParentField = Parent.$default$nonNullParentField();
+ else this.nonNullParentField = SuperBuilderWithNonNull.Parent.$default$nonNullParentField();
if (nonNullParentField == null) {
throw new java.lang.NullPointerException("nonNullParentField is marked non-null but is null");
}
}
@java.lang.SuppressWarnings("all")
- public static ParentBuilder<?, ?> builder() {
- return new ParentBuilderImpl();
+ public static SuperBuilderWithNonNull.Parent.ParentBuilder<?, ?> builder() {
+ return new SuperBuilderWithNonNull.Parent.ParentBuilderImpl();
}
}
public static class Child extends Parent {
@lombok.NonNull
String nonNullChildField;
@java.lang.SuppressWarnings("all")
- public static abstract class ChildBuilder<C extends Child, B extends ChildBuilder<C, B>> extends Parent.ParentBuilder<C, B> {
+ public static abstract class ChildBuilder<C extends SuperBuilderWithNonNull.Child, B extends SuperBuilderWithNonNull.Child.ChildBuilder<C, B>> extends Parent.ParentBuilder<C, B> {
@java.lang.SuppressWarnings("all")
private String nonNullChildField;
@java.lang.Override
@@ -89,23 +89,23 @@ public class SuperBuilderWithNonNull { }
}
@java.lang.SuppressWarnings("all")
- private static final class ChildBuilderImpl extends ChildBuilder<Child, ChildBuilderImpl> {
+ private static final class ChildBuilderImpl extends SuperBuilderWithNonNull.Child.ChildBuilder<SuperBuilderWithNonNull.Child, SuperBuilderWithNonNull.Child.ChildBuilderImpl> {
@java.lang.SuppressWarnings("all")
private ChildBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
- protected ChildBuilderImpl self() {
+ protected SuperBuilderWithNonNull.Child.ChildBuilderImpl self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
- public Child build() {
- return new Child(this);
+ public SuperBuilderWithNonNull.Child build() {
+ return new SuperBuilderWithNonNull.Child(this);
}
}
@java.lang.SuppressWarnings("all")
- protected Child(final ChildBuilder<?, ?> b) {
+ protected Child(final SuperBuilderWithNonNull.Child.ChildBuilder<?, ?> b) {
super(b);
this.nonNullChildField = b.nonNullChildField;
if (nonNullChildField == null) {
@@ -113,8 +113,8 @@ public class SuperBuilderWithNonNull { }
}
@java.lang.SuppressWarnings("all")
- public static ChildBuilder<?, ?> builder() {
- return new ChildBuilderImpl();
+ public static SuperBuilderWithNonNull.Child.ChildBuilder<?, ?> builder() {
+ return new SuperBuilderWithNonNull.Child.ChildBuilderImpl();
}
}
public static void test() {
diff --git a/test/transform/resource/after-delombok/SuperBuilderWithPrefixes.java b/test/transform/resource/after-delombok/SuperBuilderWithPrefixes.java index 2fb2dcca..15c8d9b9 100644 --- a/test/transform/resource/after-delombok/SuperBuilderWithPrefixes.java +++ b/test/transform/resource/after-delombok/SuperBuilderWithPrefixes.java @@ -3,7 +3,7 @@ class SuperBuilderWithPrefixes { int xOtherField; java.util.List<String> mItems; @java.lang.SuppressWarnings("all") - public static abstract class SuperBuilderWithPrefixesBuilder<C extends SuperBuilderWithPrefixes, B extends SuperBuilderWithPrefixesBuilder<C, B>> { + public static abstract class SuperBuilderWithPrefixesBuilder<C extends SuperBuilderWithPrefixes, B extends SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilder<C, B>> { @java.lang.SuppressWarnings("all") private int field; @java.lang.SuppressWarnings("all") @@ -48,13 +48,13 @@ class SuperBuilderWithPrefixes { } } @java.lang.SuppressWarnings("all") - private static final class SuperBuilderWithPrefixesBuilderImpl extends SuperBuilderWithPrefixesBuilder<SuperBuilderWithPrefixes, SuperBuilderWithPrefixesBuilderImpl> { + private static final class SuperBuilderWithPrefixesBuilderImpl extends SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilder<SuperBuilderWithPrefixes, SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilderImpl> { @java.lang.SuppressWarnings("all") private SuperBuilderWithPrefixesBuilderImpl() { } @java.lang.Override @java.lang.SuppressWarnings("all") - protected SuperBuilderWithPrefixesBuilderImpl self() { + protected SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilderImpl self() { return this; } @java.lang.Override @@ -64,7 +64,7 @@ class SuperBuilderWithPrefixes { } } @java.lang.SuppressWarnings("all") - protected SuperBuilderWithPrefixes(final SuperBuilderWithPrefixesBuilder<?, ?> b) { + protected SuperBuilderWithPrefixes(final SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilder<?, ?> b) { this.mField = b.field; this.xOtherField = b.otherField; java.util.List<String> items; @@ -81,7 +81,7 @@ class SuperBuilderWithPrefixes { this.mItems = items; } @java.lang.SuppressWarnings("all") - public static SuperBuilderWithPrefixesBuilder<?, ?> builder() { - return new SuperBuilderWithPrefixesBuilderImpl(); + public static SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilder<?, ?> builder() { + return new SuperBuilderWithPrefixes.SuperBuilderWithPrefixesBuilderImpl(); } }
\ No newline at end of file |