From 36287f2ff9ed2f809f8c1c76155919417ad04d3c Mon Sep 17 00:00:00 2001 From: Caleb Brinkman Date: Thu, 12 Sep 2019 11:27:08 -0500 Subject: Duplicate builder tests with setter prefix --- ...BuilderWithNoBuilderMethodWithSetterPrefix.java | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 test/transform/resource/after-delombok/BuilderWithNoBuilderMethodWithSetterPrefix.java (limited to 'test/transform/resource/after-delombok/BuilderWithNoBuilderMethodWithSetterPrefix.java') diff --git a/test/transform/resource/after-delombok/BuilderWithNoBuilderMethodWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithNoBuilderMethodWithSetterPrefix.java new file mode 100644 index 00000000..ec0ccb28 --- /dev/null +++ b/test/transform/resource/after-delombok/BuilderWithNoBuilderMethodWithSetterPrefix.java @@ -0,0 +1,33 @@ +class BuilderWithNoBuilderMethod { + private String a = ""; + @java.lang.SuppressWarnings("all") + BuilderWithNoBuilderMethod(final String a) { + this.a = a; + } + @java.lang.SuppressWarnings("all") + public static class BuilderWithNoBuilderMethodBuilder { + @java.lang.SuppressWarnings("all") + private String a; + @java.lang.SuppressWarnings("all") + BuilderWithNoBuilderMethodBuilder() { + } + @java.lang.SuppressWarnings("all") + public BuilderWithNoBuilderMethodBuilder withA(final String a) { + this.a = a; + return this; + } + @java.lang.SuppressWarnings("all") + public BuilderWithNoBuilderMethod build() { + return new BuilderWithNoBuilderMethod(a); + } + @java.lang.Override + @java.lang.SuppressWarnings("all") + public java.lang.String toString() { + return "BuilderWithNoBuilderMethod.BuilderWithNoBuilderMethodBuilder(a=" + this.a + ")"; + } + } + @java.lang.SuppressWarnings("all") + public BuilderWithNoBuilderMethodBuilder toBuilder() { + return new BuilderWithNoBuilderMethodBuilder().withA(this.a); + } +} -- cgit From 8b30eee6042c40ad0c815f5c67c86c9bf15f0dbb Mon Sep 17 00:00:00 2001 From: abrinkman94 Date: Thu, 12 Sep 2019 12:32:12 -0500 Subject: Adjusted test classes to include WithSetterPrefix. --- .../BuilderSimpleWithSetterPrefix.java | 20 +++---- ...lderSingularAnnotatedTypesWithSetterPrefix.java | 28 +++++----- ...lderSingularGuavaListsSetsWithSetterPrefix.java | 46 ++++++++-------- .../BuilderSingularListsWithSetterPrefix.java | 34 ++++++------ .../BuilderSingularMapsWithSetterPrefix.java | 38 ++++++------- .../BuilderSingularNoAutoWithSetterPrefix.java | 34 ++++++------ ...derSingularRedirectToGuavaWithSetterPrefix.java | 36 ++++++------ ...rSingularToBuilderWithNullWithSetterPrefix.java | 30 +++++----- ...WildcardListsWithToBuilderWithSetterPrefix.java | 34 ++++++------ ...uilderSingularWithPrefixesWithSetterPrefix.java | 24 ++++---- .../BuilderTypeAnnosWithSetterPrefix.java | 20 +++---- .../BuilderValueDataWithSetterPrefix.java | 50 ++++++++--------- .../BuilderWithAccessorsWithSetterPrefix.java | 26 ++++----- .../BuilderWithBadNamesWithSetterPrefix.java | 22 ++++---- .../BuilderWithDeprecatedWithSetterPrefix.java | 34 ++++++------ ...erWithExistingBuilderClassWithSetterPrefix.java | 22 ++++---- ...BuilderWithNoBuilderMethodWithSetterPrefix.java | 20 +++---- .../BuilderWithNonNullWithSetterPrefix.java | 20 +++---- ...ilderWithRecursiveGenericsWithSetterPrefix.java | 10 ++-- .../BuilderWithToBuilderWithSetterPrefix.java | 64 +++++++++++----------- .../BuilderWithTolerateWithSetterPrefix.java | 24 ++++---- 21 files changed, 318 insertions(+), 318 deletions(-) (limited to 'test/transform/resource/after-delombok/BuilderWithNoBuilderMethodWithSetterPrefix.java') diff --git a/test/transform/resource/after-delombok/BuilderSimpleWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSimpleWithSetterPrefix.java index c29d2a16..b10ad619 100644 --- a/test/transform/resource/after-delombok/BuilderSimpleWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderSimpleWithSetterPrefix.java @@ -1,34 +1,34 @@ import java.util.List; -class BuilderWithPrefix { +class BuilderSimpleWithSetterPrefix { private int unprefixed; @java.lang.SuppressWarnings("all") - BuilderWithPrefix(final int unprefixed) { + BuilderSimpleWithSetterPrefix(final int unprefixed) { this.unprefixed = unprefixed; } @java.lang.SuppressWarnings("all") - protected static class BuilderWithPrefixBuilder { + protected static class BuilderSimpleWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") private int unprefixed; @java.lang.SuppressWarnings("all") - BuilderWithPrefixBuilder() { + BuilderSimpelWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderWithPrefixBuilder withUnprefixed(final int unprefixed) { + public BuilderSimpleWithSetterPrefixBuilder withUnprefixed(final int unprefixed) { this.unprefixed = unprefixed; return this; } @java.lang.SuppressWarnings("all") - public BuilderWithPrefix build() { - return new BuilderWithPrefix(unprefixed); + public BuilderSimpleWithSetterPrefix build() { + return new BuilderSimpleWithSetterPrefix(unprefixed); } @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "BuilderWithPrefix.BuilderWithPrefixBuilder(unprefixed=" + this.unprefixed + ")"; + return "BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder(unprefixed=" + this.unprefixed + ")"; } } @java.lang.SuppressWarnings("all") - protected static BuilderWithPrefixBuilder builder() { - return new BuilderWithPrefixBuilder(); + protected static BuilderSimpleWithSetterPrefixBuilder builder() { + return new BuilderSimpleWithSetterPrefixBuilder(); } } diff --git a/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypesWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypesWithSetterPrefix.java index 2d535e65..c90e3233 100644 --- a/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypesWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderSingularAnnotatedTypesWithSetterPrefix.java @@ -6,16 +6,16 @@ import lombok.NonNull; @Target(ElementType.TYPE_USE) @interface MyAnnotation { } -class BuilderSingularAnnotatedTypes { +class BuilderSingularAnnotatedTypesWithSetterPrefix { private Set<@MyAnnotation @NonNull String> foos; private Map<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer> bars; @java.lang.SuppressWarnings("all") - BuilderSingularAnnotatedTypes(final Set<@MyAnnotation @NonNull String> foos, final Map<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer> bars) { + BuilderSingularAnnotatedTypesWithSetterPrefix(final Set<@MyAnnotation @NonNull String> foos, final Map<@MyAnnotation @NonNull String, @MyAnnotation @NonNull Integer> bars) { this.foos = foos; this.bars = bars; } @java.lang.SuppressWarnings("all") - public static class BuilderSingularAnnotatedTypesBuilder { + public static class BuilderSingularAnnotatedTypesWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") private java.util.ArrayList<@MyAnnotation @NonNull String> foos; @java.lang.SuppressWarnings("all") @@ -23,10 +23,10 @@ class BuilderSingularAnnotatedTypes { @java.lang.SuppressWarnings("all") private java.util.ArrayList<@MyAnnotation @NonNull Integer> bars$value; @java.lang.SuppressWarnings("all") - BuilderSingularAnnotatedTypesBuilder() { + BuilderSingularAnnotatedTypesWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderSingularAnnotatedTypesBuilder withFoo(@MyAnnotation @NonNull final String foo) { + public 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 BuilderSingularAnnotatedTypes { return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularAnnotatedTypesBuilder withFoos(final java.util.Collection foos) { + public BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withFoos(final java.util.Collection foos) { if (this.foos == null) this.foos = new java.util.ArrayList<@MyAnnotation @NonNull String>(); this.foos.addAll(foos); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularAnnotatedTypesBuilder clearFoos() { + public BuilderSingularAnnotatedTypesWithSetterPrefixBuilder clearFoos() { if (this.foos != null) this.foos.clear(); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularAnnotatedTypesBuilder withBar(@MyAnnotation @NonNull final String barKey, @MyAnnotation @NonNull final Integer barValue) { + public 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 BuilderSingularAnnotatedTypes { return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularAnnotatedTypesBuilder withBars(final java.util.Map bars) { + public BuilderSingularAnnotatedTypesWithSetterPrefixBuilder withBars(final java.util.Map bars) { if (this.bars$key == null) { this.bars$key = new java.util.ArrayList<@MyAnnotation @NonNull String>(); this.bars$value = new java.util.ArrayList<@MyAnnotation @NonNull Integer>(); @@ -74,7 +74,7 @@ class BuilderSingularAnnotatedTypes { return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularAnnotatedTypesBuilder clearBars() { + public BuilderSingularAnnotatedTypesWithSetterPrefixBuilder clearBars() { if (this.bars$key != null) { this.bars$key.clear(); this.bars$value.clear(); @@ -82,7 +82,7 @@ class BuilderSingularAnnotatedTypes { return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularAnnotatedTypes build() { + public BuilderSingularAnnotatedTypesWithSetterPrefix build() { java.util.Set<@MyAnnotation @NonNull String> foos; switch (this.foos == null ? 0 : this.foos.size()) { case 0: @@ -109,16 +109,16 @@ class BuilderSingularAnnotatedTypes { for (int $i = 0; $i < this.bars$key.size(); $i++) bars.put(this.bars$key.get($i), (@MyAnnotation @NonNull Integer) this.bars$value.get($i)); bars = java.util.Collections.unmodifiableMap(bars); } - return new BuilderSingularAnnotatedTypes(foos, bars); + return new BuilderSingularAnnotatedTypesWithSetterPrefix(foos, bars); } @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "BuilderSingularAnnotatedTypes.BuilderSingularAnnotatedTypesBuilder(foos=" + this.foos + ", bars$key=" + this.bars$key + ", bars$value=" + this.bars$value + ")"; + return "BuilderSingularAnnotatedTypesWithSetterPrefix.BuilderSingularAnnotatedTypesWithSetterPrefixBuilder(foos=" + this.foos + ", bars$key=" + this.bars$key + ", bars$value=" + this.bars$value + ")"; } } @java.lang.SuppressWarnings("all") - public static BuilderSingularAnnotatedTypesBuilder builder() { + public static BuilderSingularAnnotatedTypesWithSetterPrefixBuilder builder() { return new BuilderSingularAnnotatedTypesBuilder(); } } diff --git a/test/transform/resource/after-delombok/BuilderSingularGuavaListsSetsWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularGuavaListsSetsWithSetterPrefix.java index 0e9e6dfd..792a873e 100644 --- a/test/transform/resource/after-delombok/BuilderSingularGuavaListsSetsWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderSingularGuavaListsSetsWithSetterPrefix.java @@ -3,7 +3,7 @@ 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 BuilderSingularGuavaListsSets { +class BuilderSingularGuavaListsSetsWithSetterPrefix { private ImmutableList cards; private ImmutableCollection frogs; @SuppressWarnings("all") @@ -11,7 +11,7 @@ class BuilderSingularGuavaListsSets { private ImmutableSortedSet passes; private ImmutableTable users; @java.lang.SuppressWarnings("all") - BuilderSingularGuavaListsSets(final ImmutableList cards, final ImmutableCollection frogs, final ImmutableSet rawSet, final ImmutableSortedSet passes, final ImmutableTable users) { + BuilderSingularGuavaListsSetsWithSetterPrefix(final ImmutableList cards, final ImmutableCollection frogs, final ImmutableSet rawSet, final ImmutableSortedSet passes, final ImmutableTable users) { this.cards = cards; this.frogs = frogs; this.rawSet = rawSet; @@ -19,7 +19,7 @@ class BuilderSingularGuavaListsSets { this.users = users; } @java.lang.SuppressWarnings("all") - public static class BuilderSingularGuavaListsSetsBuilder { + public static class BuilderSingularGuavaListsSetsWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") private com.google.common.collect.ImmutableList.Builder cards; @java.lang.SuppressWarnings("all") @@ -34,107 +34,107 @@ class BuilderSingularGuavaListsSets { BuilderSingularGuavaListsSetsBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsBuilder withCard(final T card) { + public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder withCard(final T card) { if (this.cards == null) this.cards = com.google.common.collect.ImmutableList.builder(); this.cards.add(card); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsBuilder withCards(final java.lang.Iterable cards) { + public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder withCards(final java.lang.Iterable cards) { if (this.cards == null) this.cards = com.google.common.collect.ImmutableList.builder(); this.cards.addAll(cards); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsBuilder clearCards() { + public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder clearCards() { this.cards = null; return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsBuilder withFrog(final Number frog) { + public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder withFrog(final Number frog) { if (this.frogs == null) this.frogs = com.google.common.collect.ImmutableList.builder(); this.frogs.add(frog); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsBuilder withFrogs(final java.lang.Iterable frogs) { + public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder withFrogs(final java.lang.Iterable frogs) { if (this.frogs == null) this.frogs = com.google.common.collect.ImmutableList.builder(); this.frogs.addAll(frogs); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsBuilder clearFrogs() { + public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder clearFrogs() { this.frogs = null; return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsBuilder withRawSet(final java.lang.Object rawSet) { + public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder withRawSet(final java.lang.Object rawSet) { if (this.rawSet == null) this.rawSet = com.google.common.collect.ImmutableSet.builder(); this.rawSet.add(rawSet); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsBuilder withRawSet(final java.lang.Iterable rawSet) { + public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder withRawSet(final java.lang.Iterable rawSet) { if (this.rawSet == null) this.rawSet = com.google.common.collect.ImmutableSet.builder(); this.rawSet.addAll(rawSet); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsBuilder clearRawSet() { + public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder clearRawSet() { this.rawSet = null; return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsBuilder withPass(final String pass) { + public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder withPass(final String pass) { if (this.passes == null) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder(); this.passes.add(pass); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsBuilder withPasses(final java.lang.Iterable passes) { + public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder withPasses(final java.lang.Iterable passes) { if (this.passes == null) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder(); this.passes.addAll(passes); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsBuilder clearPasses() { + public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder clearPasses() { this.passes = null; return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsBuilder withUser(final Number rowKey, final Number columnKey, final String value) { + public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder withUser(final Number rowKey, final Number columnKey, final String value) { if (this.users == null) this.users = com.google.common.collect.ImmutableTable.builder(); this.users.put(rowKey, columnKey, value); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsBuilder withUsers(final com.google.common.collect.Table users) { + public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder withUsers(final com.google.common.collect.Table users) { if (this.users == null) this.users = com.google.common.collect.ImmutableTable.builder(); this.users.putAll(users); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSetsBuilder clearUsers() { + public BuilderSingularGuavaListsSetsWithSetterPrefixBuilder clearUsers() { this.users = null; return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularGuavaListsSets build() { + public BuilderSingularGuavaListsSetsWithSetterPrefix build() { com.google.common.collect.ImmutableList cards = this.cards == null ? com.google.common.collect.ImmutableList.of() : this.cards.build(); com.google.common.collect.ImmutableCollection frogs = this.frogs == null ? com.google.common.collect.ImmutableList.of() : this.frogs.build(); com.google.common.collect.ImmutableSet rawSet = this.rawSet == null ? com.google.common.collect.ImmutableSet.of() : this.rawSet.build(); com.google.common.collect.ImmutableSortedSet passes = this.passes == null ? com.google.common.collect.ImmutableSortedSet.of() : this.passes.build(); com.google.common.collect.ImmutableTable users = this.users == null ? com.google.common.collect.ImmutableTable.of() : this.users.build(); - return new BuilderSingularGuavaListsSets(cards, frogs, rawSet, passes, users); + return new BuilderSingularGuavaListsSetsWithSetterPrefix(cards, frogs, rawSet, passes, users); } @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder(cards=" + this.cards + ", frogs=" + this.frogs + ", rawSet=" + this.rawSet + ", passes=" + this.passes + ", users=" + this.users + ")"; + return "BuilderSingularGuavaListsSetsWithSetterPrefix.BuilderSingularGuavaListsSetsWithSetterPrefixBuilder(cards=" + this.cards + ", frogs=" + this.frogs + ", rawSet=" + this.rawSet + ", passes=" + this.passes + ", users=" + this.users + ")"; } } @java.lang.SuppressWarnings("all") - public static BuilderSingularGuavaListsSetsBuilder builder() { - return new BuilderSingularGuavaListsSetsBuilder(); + public static BuilderSingularGuavaListsSetsWithSetterPrefixBuilder builder() { + return new BuilderSingularGuavaListsSetsWithSetterPrefixBuilder(); } } diff --git a/test/transform/resource/after-delombok/BuilderSingularListsWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularListsWithSetterPrefix.java index 1fd58406..029ecda7 100644 --- a/test/transform/resource/after-delombok/BuilderSingularListsWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderSingularListsWithSetterPrefix.java @@ -1,18 +1,18 @@ import java.util.List; import java.util.Collection; -class BuilderSingularLists { +class BuilderSingularListsWithSetterPrefix { private List children; private Collection scarves; @SuppressWarnings("all") private List rawList; @java.lang.SuppressWarnings("all") - BuilderSingularLists(final List children, final Collection scarves, final List rawList) { + BuilderSingularListsWithSetterPrefix(final List children, final Collection scarves, final List rawList) { this.children = children; this.scarves = scarves; this.rawList = rawList; } @java.lang.SuppressWarnings("all") - public static class BuilderSingularListsBuilder { + public static class BuilderSingularListsWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") private java.util.ArrayList children; @java.lang.SuppressWarnings("all") @@ -23,58 +23,58 @@ class BuilderSingularLists { BuilderSingularListsBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderSingularListsBuilder withChild(final T child) { + public BuilderSingularListsWithSetterPrefixBuilder withChild(final T child) { if (this.children == null) this.children = new java.util.ArrayList(); this.children.add(child); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularListsBuilder withChildren(final java.util.Collection children) { + public BuilderSingularListsWithSetterPrefixBuilder withChildren(final java.util.Collection children) { if (this.children == null) this.children = new java.util.ArrayList(); this.children.addAll(children); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularListsBuilder clearChildren() { + public BuilderSingularListsWithSetterPrefixBuilder clearChildren() { if (this.children != null) this.children.clear(); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularListsBuilder withScarf(final Number scarf) { + public BuilderSingularListsWithSetterPrefixBuilder withScarf(final Number scarf) { if (this.scarves == null) this.scarves = new java.util.ArrayList(); this.scarves.add(scarf); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularListsBuilder withScarves(final java.util.Collection scarves) { + public BuilderSingularListsWithSetterPrefixBuilder withScarves(final java.util.Collection scarves) { if (this.scarves == null) this.scarves = new java.util.ArrayList(); this.scarves.addAll(scarves); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularListsBuilder clearScarves() { + public BuilderSingularListsWithSetterPrefixBuilder clearScarves() { if (this.scarves != null) this.scarves.clear(); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularListsBuilder withRawList(final java.lang.Object rawList) { + public BuilderSingularListsWithSetterPrefixBuilder withRawList(final java.lang.Object rawList) { if (this.rawList == null) this.rawList = new java.util.ArrayList(); this.rawList.add(rawList); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularListsBuilder withRawList(final java.util.Collection rawList) { + public BuilderSingularListsWithSetterPrefixBuilder withRawList(final java.util.Collection rawList) { if (this.rawList == null) this.rawList = new java.util.ArrayList(); this.rawList.addAll(rawList); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularListsBuilder clearRawList() { + public BuilderSingularListsWithSetterPrefixBuilder clearRawList() { if (this.rawList != null) this.rawList.clear(); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularLists build() { + public BuilderSingularListsWithSetterPrefix build() { java.util.List children; switch (this.children == null ? 0 : this.children.size()) { case 0: @@ -108,16 +108,16 @@ class BuilderSingularLists { default: rawList = java.util.Collections.unmodifiableList(new java.util.ArrayList(this.rawList)); } - return new BuilderSingularLists(children, scarves, rawList); + return new BuilderSingularListsWithSetterPrefix(children, scarves, rawList); } @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "BuilderSingularLists.BuilderSingularListsBuilder(children=" + this.children + ", scarves=" + this.scarves + ", rawList=" + this.rawList + ")"; + return "BuilderSingularListsWithSetterPrefix.BuilderSingularListsWithSetterPrefixBuilder(children=" + this.children + ", scarves=" + this.scarves + ", rawList=" + this.rawList + ")"; } } @java.lang.SuppressWarnings("all") - public static BuilderSingularListsBuilder builder() { - return new BuilderSingularListsBuilder(); + public static BuilderSingularListsWithSetterPrefixBuilder builder() { + return new BuilderSingularListsWithSetterPrefixBuilder(); } } diff --git a/test/transform/resource/after-delombok/BuilderSingularMapsWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularMapsWithSetterPrefix.java index 4b250994..361a9f09 100644 --- a/test/transform/resource/after-delombok/BuilderSingularMapsWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderSingularMapsWithSetterPrefix.java @@ -1,6 +1,6 @@ import java.util.Map; import java.util.SortedMap; -class BuilderSingularMaps { +class BuilderSingularMapsWithSetterPrefix { private Map women; private SortedMap men; @SuppressWarnings("all") @@ -14,7 +14,7 @@ class BuilderSingularMaps { this.stringMap = stringMap; } @SuppressWarnings("all") - public static class BuilderSingularMapsBuilder { + public static class BuilderSingularMapsWithSetterPrefixBuilder { @SuppressWarnings("all") private java.util.ArrayList women$key; @SuppressWarnings("all") @@ -35,7 +35,7 @@ class BuilderSingularMaps { BuilderSingularMapsBuilder() { } @SuppressWarnings("all") - public BuilderSingularMapsBuilder withWoman(K womanKey, V womanValue) { + public BuilderSingularMapsWithSetterPrefixBuilder withWoman(K womanKey, V womanValue) { if (this.women$key == null) { this.women$key = new java.util.ArrayList(); this.women$value = new java.util.ArrayList(); @@ -45,7 +45,7 @@ class BuilderSingularMaps { return this; } @SuppressWarnings("all") - public BuilderSingularMapsBuilder withWomen(java.util.Map women) { + public BuilderSingularMapsWithSetterPrefixBuilder withWomen(java.util.Map women) { if (this.women$key == null) { this.women$key = new java.util.ArrayList(); this.women$value = new java.util.ArrayList(); @@ -57,7 +57,7 @@ class BuilderSingularMaps { return this; } @SuppressWarnings("all") - public BuilderSingularMapsBuilder clearWomen() { + public BuilderSingularMapsWithSetterPrefixBuilder clearWomen() { if (this.women$key != null) { this.women$key.clear(); this.women$value.clear(); @@ -65,7 +65,7 @@ class BuilderSingularMaps { return this; } @SuppressWarnings("all") - public BuilderSingularMapsBuilder withMan(K manKey, Number manValue) { + public BuilderSingularMapsWithSetterPrefixBuilder withMan(K manKey, Number manValue) { if (this.men$key == null) { this.men$key = new java.util.ArrayList(); this.men$value = new java.util.ArrayList(); @@ -75,7 +75,7 @@ class BuilderSingularMaps { return this; } @SuppressWarnings("all") - public BuilderSingularMapsBuilder withMen(java.util.Map men) { + public BuilderSingularMapsWithSetterPrefixBuilder withMen(java.util.Map men) { if (this.men$key == null) { this.men$key = new java.util.ArrayList(); this.men$value = new java.util.ArrayList(); @@ -87,7 +87,7 @@ class BuilderSingularMaps { return this; } @SuppressWarnings("all") - public BuilderSingularMapsBuilder clearMen() { + public BuilderSingularMapsWithSetterPrefixBuilder clearMen() { if (this.men$key != null) { this.men$key.clear(); this.men$value.clear(); @@ -95,7 +95,7 @@ class BuilderSingularMaps { return this; } @SuppressWarnings("all") - public BuilderSingularMapsBuilder withRawMan(Object rawMapKey, Object rawMapValue) { + public BuilderSingularMapsWithSetterPrefixBuilder withRawMan(Object rawMapKey, Object rawMapValue) { if (this.rawMap$key == null) { this.rawMap$key = new java.util.ArrayList(); this.rawMap$value = new java.util.ArrayList(); @@ -105,7 +105,7 @@ class BuilderSingularMaps { return this; } @SuppressWarnings("all") - public BuilderSingularMapsBuilder withRawMap(java.util.Map rawMap) { + public BuilderSingularMapsWithSetterPrefixBuilder withRawMap(java.util.Map rawMap) { if (this.rawMap$key == null) { this.rawMap$key = new java.util.ArrayList(); this.rawMap$value = new java.util.ArrayList(); @@ -117,7 +117,7 @@ class BuilderSingularMaps { return this; } @SuppressWarnings("all") - public BuilderSingularMapsBuilder clearRawMap() { + public BuilderSingularMapsWithSetterPrefixBuilder clearRawMap() { if (this.rawMap$key != null) { this.rawMap$key.clear(); this.rawMap$value.clear(); @@ -125,7 +125,7 @@ class BuilderSingularMaps { return this; } @SuppressWarnings("all") - public BuilderSingularMapsBuilder stringMap(String stringMapKey, V stringMapValue) { + public BuilderSingularMapsWithSetterPrefixBuilder stringMap(String stringMapKey, V stringMapValue) { if (this.stringMap$key == null) { this.stringMap$key = new java.util.ArrayList(); this.stringMap$value = new java.util.ArrayList(); @@ -135,7 +135,7 @@ class BuilderSingularMaps { return this; } @SuppressWarnings("all") - public BuilderSingularMapsBuilder stringMap(java.util.Map stringMap) { + public BuilderSingularMapsWithSetterPrefixBuilder stringMap(java.util.Map stringMap) { if (this.stringMap$key == null) { this.stringMap$key = new java.util.ArrayList(); this.stringMap$value = new java.util.ArrayList(); @@ -147,7 +147,7 @@ class BuilderSingularMaps { return this; } @SuppressWarnings("all") - public BuilderSingularMapsBuilder clearStringMap() { + public BuilderSingularMapsWithSetterPrefixBuilder clearStringMap() { if (this.stringMap$key != null) { this.stringMap$key.clear(); this.stringMap$value.clear(); @@ -155,7 +155,7 @@ class BuilderSingularMaps { return this; } @SuppressWarnings("all") - public BuilderSingularMaps build() { + public BuilderSingularMapsWithSetterPrefix build() { java.util.Map women; switch (this.women$key == null ? 0 : this.women$key.size()) { case 0: @@ -198,16 +198,16 @@ class BuilderSingularMaps { for (int $i = 0; $i < this.stringMap$key.size(); $i++) stringMap.put(this.stringMap$key.get($i), (V) this.stringMap$value.get($i)); stringMap = java.util.Collections.unmodifiableMap(stringMap); } - return new BuilderSingularMaps(women, men, rawMap, stringMap); + return new BuilderSingularMapsWithSetterPrefix(women, men, rawMap, stringMap); } @Override @SuppressWarnings("all") public String toString() { - return "BuilderSingularMaps.BuilderSingularMapsBuilder(women$key=" + this.women$key + ", women$value=" + this.women$value + ", men$key=" + this.men$key + ", men$value=" + this.men$value + ", rawMap$key=" + this.rawMap$key + ", rawMap$value=" + this.rawMap$value + ", stringMap$key=" + this.stringMap$key + ", stringMap$value=" + this.stringMap$value + ")"; + return "BuilderSingularMapsWithSetterPrefix.BuilderSingularMapsWithSetterPrefixBuilder(women$key=" + this.women$key + ", women$value=" + this.women$value + ", men$key=" + this.men$key + ", men$value=" + this.men$value + ", rawMap$key=" + this.rawMap$key + ", rawMap$value=" + this.rawMap$value + ", stringMap$key=" + this.stringMap$key + ", stringMap$value=" + this.stringMap$value + ")"; } } @SuppressWarnings("all") - public static BuilderSingularMapsBuilder builder() { - return new BuilderSingularMapsBuilder(); + public static BuilderSingularMapsWithSetterPrefixBuilder builder() { + return new BuilderSingularMapsWithSetterPrefixBuilder(); } } diff --git a/test/transform/resource/after-delombok/BuilderSingularNoAutoWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularNoAutoWithSetterPrefix.java index 453b9d74..6a22152b 100644 --- a/test/transform/resource/after-delombok/BuilderSingularNoAutoWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderSingularNoAutoWithSetterPrefix.java @@ -1,16 +1,16 @@ import java.util.List; -class BuilderSingularNoAuto { +class BuilderSingularNoAutoWithSetterPrefix { private List things; private List widgets; private List items; @java.lang.SuppressWarnings("all") - BuilderSingularNoAuto(final List things, final List widgets, final List items) { + BuilderSingularNoAutoWithSetterPrefix(final List things, final List widgets, final List items) { this.things = things; this.widgets = widgets; this.items = items; } @java.lang.SuppressWarnings("all") - public static class BuilderSingularNoAutoBuilder { + public static class BuilderSingularNoAutoWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") private java.util.ArrayList things; @java.lang.SuppressWarnings("all") @@ -21,58 +21,58 @@ class BuilderSingularNoAuto { BuilderSingularNoAutoBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderSingularNoAutoBuilder withThings(final String things) { + public BuilderSingularNoAutoWithSetterPrefixBuilder withThings(final String things) { if (this.things == null) this.things = new java.util.ArrayList(); this.things.add(things); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularNoAutoBuilder withThings(final java.util.Collection things) { + public BuilderSingularNoAutoWithSetterPrefixBuilder withThings(final java.util.Collection things) { if (this.things == null) this.things = new java.util.ArrayList(); this.things.addAll(things); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularNoAutoBuilder clearThings() { + public BuilderSingularNoAutoWithSetterPrefixBuilder clearThings() { if (this.things != null) this.things.clear(); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularNoAutoBuilder withWidget(final String widget) { + public BuilderSingularNoAutoWithSetterPrefixBuilder withWidget(final String widget) { if (this.widgets == null) this.widgets = new java.util.ArrayList(); this.widgets.add(widget); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularNoAutoBuilder withWidgets(final java.util.Collection widgets) { + public BuilderSingularNoAutoWithSetterPrefixBuilder withWidgets(final java.util.Collection widgets) { if (this.widgets == null) this.widgets = new java.util.ArrayList(); this.widgets.addAll(widgets); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularNoAutoBuilder clearWidgets() { + public BuilderSingularNoAutoWithSetterPrefixBuilder clearWidgets() { if (this.widgets != null) this.widgets.clear(); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularNoAutoBuilder withItems(final String items) { + public BuilderSingularNoAutoWithSetterPrefixBuilder withItems(final String items) { if (this.items == null) this.items = new java.util.ArrayList(); this.items.add(items); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularNoAutoBuilder withItems(final java.util.Collection items) { + public BuilderSingularNoAutoWithSetterPrefixBuilder withItems(final java.util.Collection items) { if (this.items == null) this.items = new java.util.ArrayList(); this.items.addAll(items); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularNoAutoBuilder clearItems() { + public BuilderSingularNoAutoWithSetterPrefixBuilder clearItems() { if (this.items != null) this.items.clear(); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularNoAuto build() { + public BuilderSingularNoAutoWithSetterPrefix build() { java.util.List things; switch (this.things == null ? 0 : this.things.size()) { case 0: @@ -106,16 +106,16 @@ class BuilderSingularNoAuto { default: items = java.util.Collections.unmodifiableList(new java.util.ArrayList(this.items)); } - return new BuilderSingularNoAuto(things, widgets, items); + return new BuilderSingularNoAutoWithSetterPrefix(things, widgets, items); } @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "BuilderSingularNoAuto.BuilderSingularNoAutoBuilder(things=" + this.things + ", widgets=" + this.widgets + ", items=" + this.items + ")"; + return "BuilderSingularNoAutoWithSetterPrefix.BuilderSingularNoAutoWithSetterPrefixBuilder(things=" + this.things + ", widgets=" + this.widgets + ", items=" + this.items + ")"; } } @java.lang.SuppressWarnings("all") - public static BuilderSingularNoAutoBuilder builder() { - return new BuilderSingularNoAutoBuilder(); + public static BuilderSingularNoAutoWithSetterPrefixBuilder builder() { + return new BuilderSingularNoAutoWithSetterPrefixBuilder(); } } diff --git a/test/transform/resource/after-delombok/BuilderSingularRedirectToGuavaWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularRedirectToGuavaWithSetterPrefix.java index 4b1b3d70..b0fe8135 100644 --- a/test/transform/resource/after-delombok/BuilderSingularRedirectToGuavaWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderSingularRedirectToGuavaWithSetterPrefix.java @@ -1,18 +1,18 @@ import java.util.Set; import java.util.NavigableMap; import java.util.Collection; -class BuilderSingularRedirectToGuava { +class BuilderSingularRedirectToGuavaWithSetterPrefix { private Set dangerMice; private NavigableMap things; private Collection> doohickeys; @java.lang.SuppressWarnings("all") - BuilderSingularRedirectToGuava(final Set dangerMice, final NavigableMap things, final Collection> doohickeys) { + BuilderSingularRedirectToGuavaWithSetterPrefix(final Set dangerMice, final NavigableMap things, final Collection> doohickeys) { this.dangerMice = dangerMice; this.things = things; this.doohickeys = doohickeys; } @java.lang.SuppressWarnings("all") - public static class BuilderSingularRedirectToGuavaBuilder { + public static class BuilderSingularRedirectToGuavaWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") private com.google.common.collect.ImmutableSet.Builder dangerMice; @java.lang.SuppressWarnings("all") @@ -20,74 +20,74 @@ class BuilderSingularRedirectToGuava { @java.lang.SuppressWarnings("all") private com.google.common.collect.ImmutableList.Builder> doohickeys; @java.lang.SuppressWarnings("all") - BuilderSingularRedirectToGuavaBuilder() { + BuilderSingularRedirectToGuavaWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderSingularRedirectToGuavaBuilder withDangerMouse(final String dangerMouse) { + 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 BuilderSingularRedirectToGuavaBuilder withDangerMice(final java.lang.Iterable dangerMice) { + public BuilderSingularRedirectToGuavaWithSetterPrefixBuilder withDangerMice(final java.lang.Iterable 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 BuilderSingularRedirectToGuavaWithSetterPrefixBuilder clearDangerMice() { this.dangerMice = null; return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularRedirectToGuavaBuilder withThing(final Integer key, final Number value) { + 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 BuilderSingularRedirectToGuavaBuilder withThings(final java.util.Map things) { + public BuilderSingularRedirectToGuavaWithSetterPrefixBuilder withThings(final java.util.Map 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 BuilderSingularRedirectToGuavaWithSetterPrefixBuilder clearThings() { this.things = null; return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularRedirectToGuavaBuilder withDoohickey(final Class doohickey) { + 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 BuilderSingularRedirectToGuavaBuilder withDoohickeys(final java.lang.Iterable> doohickeys) { + public BuilderSingularRedirectToGuavaWithSetterPrefixBuilder withDoohickeys(final java.lang.Iterable> 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 BuilderSingularRedirectToGuavaWithSetterPrefixBuilder clearDoohickeys() { this.doohickeys = null; return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularRedirectToGuava build() { + public BuilderSingularRedirectToGuavaWithSetterPrefix build() { java.util.Set dangerMice = this.dangerMice == null ? com.google.common.collect.ImmutableSet.of() : this.dangerMice.build(); java.util.NavigableMap things = this.things == null ? com.google.common.collect.ImmutableSortedMap.of() : this.things.build(); java.util.Collection> doohickeys = this.doohickeys == null ? com.google.common.collect.ImmutableList.>of() : this.doohickeys.build(); - return new BuilderSingularRedirectToGuava(dangerMice, things, doohickeys); + return new BuilderSingularRedirectToGuavaWithSetterPrefix(dangerMice, things, doohickeys); } @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder(dangerMice=" + this.dangerMice + ", things=" + this.things + ", doohickeys=" + this.doohickeys + ")"; + return "BuilderSingularRedirectToGuavaWithSetterPrefix.BuilderSingularRedirectToGuavaWithSetterPrefixBuilder(dangerMice=" + this.dangerMice + ", things=" + this.things + ", doohickeys=" + this.doohickeys + ")"; } } @java.lang.SuppressWarnings("all") - public static BuilderSingularRedirectToGuavaBuilder builder() { - return new BuilderSingularRedirectToGuavaBuilder(); + public static BuilderSingularRedirectToGuavaWithSetterPrefixBuilder builder() { + return new BuilderSingularRedirectToGuavaWithSetterPrefixBuilder(); } } diff --git a/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNullWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNullWithSetterPrefix.java index 83e58e1d..043cf25c 100644 --- a/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNullWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderSingularToBuilderWithNullWithSetterPrefix.java @@ -1,38 +1,38 @@ -class BuilderSingularToBuilderWithNull { +class BuilderSingularToBuilderWithNullWithSetterPrefix { private java.util.List elems; public static void test() { - new BuilderSingularToBuilderWithNull(null).toBuilder(); + new BuilderSingularToBuilderWithNullWithSetterPrefix(null).toBuilder(); } @java.lang.SuppressWarnings("all") - BuilderSingularToBuilderWithNull(final java.util.List elems) { + BuilderSingularToBuilderWithNullWithSetterPrefix(final java.util.List elems) { this.elems = elems; } @java.lang.SuppressWarnings("all") - public static class BuilderSingularToBuilderWithNullBuilder { + public static class BuilderSingularToBuilderWithNullWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") private java.util.ArrayList elems; @java.lang.SuppressWarnings("all") - BuilderSingularToBuilderWithNullBuilder() { + BuilderSingularToBuilderWithNullWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderSingularToBuilderWithNullBuilder withElem(final String elem) { + public BuilderSingularToBuilderWithNullWithSetterPrefixBuilder withElem(final String elem) { if (this.elems == null) this.elems = new java.util.ArrayList(); this.elems.add(elem); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularToBuilderWithNullBuilder withElems(final java.util.Collection elems) { + public BuilderSingularToBuilderWithNullWithSetterPrefixBuilder withElems(final java.util.Collection elems) { if (this.elems == null) this.elems = new java.util.ArrayList(); this.elems.addAll(elems); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularToBuilderWithNullBuilder clearElems() { + public BuilderSingularToBuilderWithNullWithSetterPrefixBuilder clearElems() { if (this.elems != null) this.elems.clear(); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularToBuilderWithNull build() { + public BuilderSingularToBuilderWithNullWithSetterPrefix build() { java.util.List elems; switch (this.elems == null ? 0 : this.elems.size()) { case 0: @@ -44,21 +44,21 @@ class BuilderSingularToBuilderWithNull { default: elems = java.util.Collections.unmodifiableList(new java.util.ArrayList(this.elems)); } - return new BuilderSingularToBuilderWithNull(elems); + return new BuilderSingularToBuilderWithNullWithSetterPrefix(elems); } @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "BuilderSingularToBuilderWithNull.BuilderSingularToBuilderWithNullBuilder(elems=" + this.elems + ")"; + return "BuilderSingularToBuilderWithNullWithSetterPrefix.BuilderSingularToBuilderWithNullWithSetterPrefixBuilder(elems=" + this.elems + ")"; } } @java.lang.SuppressWarnings("all") - public static BuilderSingularToBuilderWithNullBuilder builder() { - return new BuilderSingularToBuilderWithNullBuilder(); + public static BuilderSingularToBuilderWithNullWithSetterPrefixBuilder builder() { + return new BuilderSingularToBuilderWithNullWithSetterPrefixBuilder(); } @java.lang.SuppressWarnings("all") - public BuilderSingularToBuilderWithNullBuilder toBuilder() { - final BuilderSingularToBuilderWithNullBuilder builder = new BuilderSingularToBuilderWithNullBuilder(); + public BuilderSingularToBuilderWithNullWithSetterPrefixBuilder toBuilder() { + final BuilderSingularToBuilderWithNullWithSetterPrefixBuilder builder = new BuilderSingularToBuilderWithNullWithSetterPrefixBuilder(); if (this.elems != null) builder.elems(this.elems); return builder; } diff --git a/test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java index 583d4df0..c061a726 100644 --- a/test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java @@ -1,58 +1,58 @@ import java.util.List; import java.util.Collection; -class BuilderSingularWildcardListsWithToBuilder { +class BuilderSingularWildcardListsWithToBuilderWithSetterPrefix { private List objects; private Collection numbers; @java.lang.SuppressWarnings("all") - BuilderSingularWildcardListsWithToBuilder(final List objects, final Collection numbers) { + BuilderSingularWildcardListsWithToBuilderWithSetterPrefix(final List objects, final Collection numbers) { this.objects = objects; this.numbers = numbers; } @java.lang.SuppressWarnings("all") - public static class BuilderSingularWildcardListsWithToBuilderBuilder { + public static class BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") private java.util.ArrayList objects; @java.lang.SuppressWarnings("all") private java.util.ArrayList numbers; @java.lang.SuppressWarnings("all") - BuilderSingularWildcardListsWithToBuilderBuilder() { + BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderSingularWildcardListsWithToBuilderBuilder withObject(final java.lang.Object object) { + public BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder withObject(final java.lang.Object object) { if (this.objects == null) this.objects = new java.util.ArrayList(); this.objects.add(object); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularWildcardListsWithToBuilderBuilder withObjects(final java.util.Collection objects) { + public BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder withObjects(final java.util.Collection objects) { if (this.objects == null) this.objects = new java.util.ArrayList(); this.objects.addAll(objects); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularWildcardListsWithToBuilderBuilder clearObjects() { + public BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder clearObjects() { if (this.objects != null) this.objects.clear(); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularWildcardListsWithToBuilderBuilder withNumber(final Number number) { + public BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder withNumber(final Number number) { if (this.numbers == null) this.numbers = new java.util.ArrayList(); this.numbers.add(number); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularWildcardListsWithToBuilderBuilder withNumbers(final java.util.Collection numbers) { + public BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder withNumbers(final java.util.Collection numbers) { if (this.numbers == null) this.numbers = new java.util.ArrayList(); this.numbers.addAll(numbers); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularWildcardListsWithToBuilderBuilder clearNumbers() { + public BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder clearNumbers() { if (this.numbers != null) this.numbers.clear(); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularWildcardListsWithToBuilder build() { + public BuilderSingularWildcardListsWithToBuilderWithSetterPrefix build() { java.util.List objects; switch (this.objects == null ? 0 : this.objects.size()) { case 0: @@ -75,21 +75,21 @@ class BuilderSingularWildcardListsWithToBuilder { default: numbers = java.util.Collections.unmodifiableList(new java.util.ArrayList(this.numbers)); } - return new BuilderSingularWildcardListsWithToBuilder(objects, numbers); + return new BuilderSingularWildcardListsWithToBuilderWithSetterPrefix(objects, numbers); } @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "BuilderSingularWildcardListsWithToBuilder.BuilderSingularWildcardListsWithToBuilderBuilder(objects=" + this.objects + ", numbers=" + this.numbers + ")"; + return "BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder(objects=" + this.objects + ", numbers=" + this.numbers + ")"; } } @java.lang.SuppressWarnings("all") - public static BuilderSingularWildcardListsWithToBuilderBuilder builder() { - return new BuilderSingularWildcardListsWithToBuilderBuilder(); + public static BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder builder() { + return new BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder(); } @java.lang.SuppressWarnings("all") - public BuilderSingularWildcardListsWithToBuilderBuilder toBuilder() { - final BuilderSingularWildcardListsWithToBuilderBuilder builder = new BuilderSingularWildcardListsWithToBuilderBuilder(); + public BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder toBuilder() { + final BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder builder = new BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder(); 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/BuilderSingularWithPrefixesWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularWithPrefixesWithSetterPrefix.java index 216cd01f..2f163caf 100644 --- a/test/transform/resource/after-delombok/BuilderSingularWithPrefixesWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderSingularWithPrefixesWithSetterPrefix.java @@ -1,35 +1,35 @@ -class BuilderSingularWithPrefixes { +class BuilderSingularWithPrefixesWithSetterPrefix { private java.util.List _elems; @java.lang.SuppressWarnings("all") - BuilderSingularWithPrefixes(final java.util.List elems) { + BuilderSingularWithPrefixesWithSetterPrefix(final java.util.List elems) { this._elems = elems; } @java.lang.SuppressWarnings("all") - public static class BuilderSingularWithPrefixesBuilder { + public static class BuilderSingularWithPrefixesWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") private java.util.ArrayList elems; @java.lang.SuppressWarnings("all") - BuilderSingularWithPrefixesBuilder() { + BuilderSingularWithPrefixesWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderSingularWithPrefixesBuilder withElem(final String elem) { + public BuilderSingularWithPrefixesWithSetterPrefixBuilder withElem(final String elem) { if (this.elems == null) this.elems = new java.util.ArrayList(); this.elems.add(elem); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularWithPrefixesBuilder withElems(final java.util.Collection elems) { + public BuilderSingularWithPrefixesWithSetterPrefixBuilder withElems(final java.util.Collection elems) { if (this.elems == null) this.elems = new java.util.ArrayList(); this.elems.addAll(elems); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularWithPrefixesBuilder clearElems() { + public BuilderSingularWithPrefixesWithSetterPrefixBuilder clearElems() { if (this.elems != null) this.elems.clear(); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingularWithPrefixes build() { + public BuilderSingularWithPrefixesWithSetterPrefix build() { java.util.List elems; switch (this.elems == null ? 0 : this.elems.size()) { case 0: @@ -41,16 +41,16 @@ class BuilderSingularWithPrefixes { default: elems = java.util.Collections.unmodifiableList(new java.util.ArrayList(this.elems)); } - return new BuilderSingularWithPrefixes(elems); + return new BuilderSingularWithPrefixesWithSetterPrefix(elems); } @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "BuilderSingularWithPrefixes.BuilderSingularWithPrefixesBuilder(elems=" + this.elems + ")"; + return "BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder(elems=" + this.elems + ")"; } } @java.lang.SuppressWarnings("all") - public static BuilderSingularWithPrefixesBuilder builder() { - return new BuilderSingularWithPrefixesBuilder(); + public static BuilderSingularWithPrefixesWithSetterPrefixBuilder builder() { + return new BuilderSingularWithPrefixesWithSetterPrefixBuilder(); } } diff --git a/test/transform/resource/after-delombok/BuilderTypeAnnosWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderTypeAnnosWithSetterPrefix.java index b8bb81b7..0d4f8059 100644 --- a/test/transform/resource/after-delombok/BuilderTypeAnnosWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderTypeAnnosWithSetterPrefix.java @@ -7,39 +7,39 @@ import java.util.List; @Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER}) @interface TB { } -class BuilderTypeAnnos { +class BuilderTypeAnnosWithSetterPrefix { @TA @TB private List foo; @java.lang.SuppressWarnings("all") - BuilderTypeAnnos(@TA final List foo) { + BuilderTypeAnnosWithSetterPrefix(@TA final List foo) { this.foo = foo; } @java.lang.SuppressWarnings("all") - public static class BuilderTypeAnnosBuilder { + public static class BuilderTypeAnnosWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") private List foo; @java.lang.SuppressWarnings("all") - BuilderTypeAnnosBuilder() { + BuilderTypeAnnosWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderTypeAnnosBuilder withFoo(@TA final List foo) { + public BuilderTypeAnnosWithSetterPrefixBuilder withFoo(@TA final List foo) { this.foo = foo; return this; } @java.lang.SuppressWarnings("all") - public BuilderTypeAnnos build() { - return new BuilderTypeAnnos(foo); + public BuilderTypeAnnosWithSetterPrefix build() { + return new BuilderTypeAnnosWithSetterPrefix(foo); } @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "BuilderTypeAnnos.BuilderTypeAnnosBuilder(foo=" + this.foo + ")"; + return "BuilderTypeAnnosWithSetterPrefix.BuilderTypeAnnosWithSetterPrefixBuilder(foo=" + this.foo + ")"; } } @java.lang.SuppressWarnings("all") - public static BuilderTypeAnnosBuilder builder() { - return new BuilderTypeAnnosBuilder(); + public static BuilderTypeAnnosWithSetterPrefixBuilder builder() { + return new BuilderTypeAnnosWithSetterPrefixBuilder(); } } diff --git a/test/transform/resource/after-delombok/BuilderValueDataWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderValueDataWithSetterPrefix.java index e1c107da..87905208 100644 --- a/test/transform/resource/after-delombok/BuilderValueDataWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderValueDataWithSetterPrefix.java @@ -1,27 +1,27 @@ import java.util.List; -final class BuilderAndValue { +final class BuilderAndValueWithSetterPrefix { private final int zero = 0; @java.lang.SuppressWarnings("all") - BuilderAndValue() { + BuilderAndValueWithSetterPrefix() { } @java.lang.SuppressWarnings("all") - public static class BuilderAndValueBuilder { + public static class BuilderAndValueWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") - BuilderAndValueBuilder() { + BuilderAndValueWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderAndValue build() { - return new BuilderAndValue(); + public BuilderAndValueWithSetterPrefix build() { + return new BuilderAndValueWithSetterPrefix(); } @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "BuilderAndValue.BuilderAndValueBuilder()"; + return "BuilderAndValueWithSetterPrefix.BuilderAndValueWithSetterPrefixBuilder()"; } } @java.lang.SuppressWarnings("all") - public static BuilderAndValueBuilder builder() { - return new BuilderAndValueBuilder(); + public static BuilderAndValueWithSetterPrefixBuilder builder() { + return new BuilderAndValueWithSetterPrefixBuilder(); } @java.lang.SuppressWarnings("all") public int getZero() { @@ -31,8 +31,8 @@ final class BuilderAndValue { @java.lang.SuppressWarnings("all") public boolean equals(final java.lang.Object o) { if (o == this) return true; - if (!(o instanceof BuilderAndValue)) return false; - final BuilderAndValue other = (BuilderAndValue) o; + if (!(o instanceof BuilderAndValueWithSetterPrefix)) return false; + final BuilderAndValueWithSetterPrefix other = (BuilderAndValueWithSetterPrefix) o; if (this.getZero() != other.getZero()) return false; return true; } @@ -47,33 +47,33 @@ final class BuilderAndValue { @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "BuilderAndValue(zero=" + this.getZero() + ")"; + return "BuilderAndValueWithSetterPrefix(zero=" + this.getZero() + ")"; } } -class BuilderAndData { +class BuilderAndDataWithSetterPrefix { private final int zero = 0; @java.lang.SuppressWarnings("all") - BuilderAndData() { + BuilderAndDataWithSetterPrefix() { } @java.lang.SuppressWarnings("all") - public static class BuilderAndDataBuilder { + public static class BuilderAndDataWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") - BuilderAndDataBuilder() { + BuilderAndDataWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderAndData build() { - return new BuilderAndData(); + public BuilderAndDataWithSetterPrefix build() { + return new BuilderAndDataWithSetterPrefix(); } @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "BuilderAndData.BuilderAndDataBuilder()"; + return "BuilderAndDataWithSetterPrefix.BuilderAndDataWithSetterPrefixBuilder()"; } } @java.lang.SuppressWarnings("all") - public static BuilderAndDataBuilder builder() { - return new BuilderAndDataBuilder(); + public static BuilderAndDataWithSetterPrefixBuilder builder() { + return new BuilderAndDataWithSetterPrefixBuilder(); } @java.lang.SuppressWarnings("all") public int getZero() { @@ -83,15 +83,15 @@ class BuilderAndData { @java.lang.SuppressWarnings("all") public boolean equals(final java.lang.Object o) { if (o == this) return true; - if (!(o instanceof BuilderAndData)) return false; - final BuilderAndData other = (BuilderAndData) o; + if (!(o instanceof BuilderAndDataWithSetterPrefix)) return false; + final BuilderAndDataWithSetterPrefix other = (BuilderAndDataWithSetterPrefix) o; if (!other.canEqual((java.lang.Object) this)) return false; if (this.getZero() != other.getZero()) return false; return true; } @java.lang.SuppressWarnings("all") protected boolean canEqual(final java.lang.Object other) { - return other instanceof BuilderAndData; + return other instanceof BuilderAndDataWithSetterPrefix; } @java.lang.Override @java.lang.SuppressWarnings("all") @@ -104,6 +104,6 @@ class BuilderAndData { @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "BuilderAndData(zero=" + this.getZero() + ")"; + return "BuilderAndDataWithSetterPrefix(zero=" + this.getZero() + ")"; } } diff --git a/test/transform/resource/after-delombok/BuilderWithAccessorsWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithAccessorsWithSetterPrefix.java index d8e075b8..be581c47 100644 --- a/test/transform/resource/after-delombok/BuilderWithAccessorsWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderWithAccessorsWithSetterPrefix.java @@ -1,17 +1,17 @@ -class BuilderWithAccessors { +class BuilderWithAccessorsWithSetterPrefix { private final int plower; private final int pUpper; private int _foo; private int __bar; @java.lang.SuppressWarnings("all") - BuilderWithAccessors(final int plower, final int upper, final int foo, final int _bar) { + 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 BuilderWithAccessorsBuilder { + public static class BuilderWithAccessorsWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") private int plower; @java.lang.SuppressWarnings("all") @@ -21,40 +21,40 @@ class BuilderWithAccessors { @java.lang.SuppressWarnings("all") private int _bar; @java.lang.SuppressWarnings("all") - BuilderWithAccessorsBuilder() { + BuilderWithAccessorsWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderWithAccessorsBuilder withPlower(final int plower) { + public BuilderWithAccessorsWithSetterPrefixBuilder withPlower(final int plower) { this.plower = plower; return this; } @java.lang.SuppressWarnings("all") - public BuilderWithAccessorsBuilder withUpper(final int upper) { + public BuilderWithAccessorsWithSetterPrefixBuilder withUpper(final int upper) { this.upper = upper; return this; } @java.lang.SuppressWarnings("all") - public BuilderWithAccessorsBuilder withFoo(final int foo) { + public BuilderWithAccessorsWithSetterPrefixBuilder withFoo(final int foo) { this.foo = foo; return this; } @java.lang.SuppressWarnings("all") - public BuilderWithAccessorsBuilder with_Bar(final int _bar) { + public BuilderWithAccessorsWithSetterPrefixBuilder with_Bar(final int _bar) { this._bar = _bar; return this; } @java.lang.SuppressWarnings("all") - public BuilderWithAccessors build() { - return new BuilderWithAccessors(plower, upper, foo, _bar); + public BuilderWithAccessorsWithSetterPrefix build() { + return new BuilderWithAccessorsWithSetterPrefix(plower, upper, foo, _bar); } @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "BuilderWithAccessors.BuilderWithAccessorsBuilder(plower=" + this.plower + ", upper=" + this.upper + ", foo=" + this.foo + ", _bar=" + this._bar + ")"; + return "BuilderWithAccessorsWithSetterPrefix.BuilderWithAccessorsWithSetterPrefixBuilder(plower=" + this.plower + ", upper=" + this.upper + ", foo=" + this.foo + ", _bar=" + this._bar + ")"; } } @java.lang.SuppressWarnings("all") - public static BuilderWithAccessorsBuilder builder() { - return new BuilderWithAccessorsBuilder(); + public static BuilderWithAccessorsWithSetterPrefixBuilder builder() { + return new BuilderWithAccessorsWithSetterPrefixBuilder(); } } diff --git a/test/transform/resource/after-delombok/BuilderWithBadNamesWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithBadNamesWithSetterPrefix.java index d19bf947..be7a78c7 100644 --- a/test/transform/resource/after-delombok/BuilderWithBadNamesWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderWithBadNamesWithSetterPrefix.java @@ -1,42 +1,42 @@ -public class BuilderWithBadNames { +public class BuilderWithBadNamesWithSetterPrefix { String build; String toString; @java.lang.SuppressWarnings("all") - BuilderWithBadNames(final String build, final String toString) { + BuilderWithBadNamesWithSetterPrefix(final String build, final String toString) { this.build = build; this.toString = toString; } @java.lang.SuppressWarnings("all") - public static class BuilderWithBadNamesBuilder { + public static class BuilderWithBadNamesWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") private String build; @java.lang.SuppressWarnings("all") private String toString; @java.lang.SuppressWarnings("all") - BuilderWithBadNamesBuilder() { + BuilderWithBadNamesWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderWithBadNamesBuilder withBuild(final String build) { + public BuilderWithBadNamesWithSetterPrefixBuilder withBuild(final String build) { this.build = build; return this; } @java.lang.SuppressWarnings("all") - public BuilderWithBadNamesBuilder withToString(final String toString) { + public BuilderWithBadNamesWithSetterPrefixBuilder withToString(final String toString) { this.toString = toString; return this; } @java.lang.SuppressWarnings("all") - public BuilderWithBadNames build() { - return new BuilderWithBadNames(build, toString); + public BuilderWithBadNamesWithSetterPrefix build() { + return new BuilderWithBadNamesWithSetterPrefix(build, toString); } @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "BuilderWithBadNames.BuilderWithBadNamesBuilder(build=" + this.build + ", toString=" + this.toString + ")"; + return "BuilderWithBadNamesWithSetterPrefix.BuilderWithBadNamesWithSetterPrefixBuilder(build=" + this.build + ", toString=" + this.toString + ")"; } } @java.lang.SuppressWarnings("all") - public static BuilderWithBadNamesBuilder builder() { - return new BuilderWithBadNamesBuilder(); + public static BuilderWithBadNamesWithSetterPrefixBuilder builder() { + return new BuilderWithBadNamesWithSetterPrefixBuilder(); } } diff --git a/test/transform/resource/after-delombok/BuilderWithDeprecatedWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithDeprecatedWithSetterPrefix.java index 2045c1a5..5f6f2c32 100644 --- a/test/transform/resource/after-delombok/BuilderWithDeprecatedWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderWithDeprecatedWithSetterPrefix.java @@ -1,5 +1,5 @@ import com.google.common.collect.ImmutableList; -public class BuilderWithDeprecated { +public class BuilderWithDeprecatedWithSetterPrefix { /** * @deprecated since always */ @@ -11,14 +11,14 @@ public class BuilderWithDeprecated { @Deprecated ImmutableList numbers; @java.lang.SuppressWarnings("all") - BuilderWithDeprecated(final String dep1, final int dep2, final java.util.List strings, final ImmutableList numbers) { + BuilderWithDeprecatedWithSetterPrefix(final String dep1, final int dep2, final java.util.List strings, final ImmutableList numbers) { this.dep1 = dep1; this.dep2 = dep2; this.strings = strings; this.numbers = numbers; } @java.lang.SuppressWarnings("all") - public static class BuilderWithDeprecatedBuilder { + public static class BuilderWithDeprecatedWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") private String dep1; @java.lang.SuppressWarnings("all") @@ -28,65 +28,65 @@ public class BuilderWithDeprecated { @java.lang.SuppressWarnings("all") private com.google.common.collect.ImmutableList.Builder numbers; @java.lang.SuppressWarnings("all") - BuilderWithDeprecatedBuilder() { + BuilderWithDeprecatedWithSetterPrefixBuilder() { } /** * @deprecated since always */ @java.lang.Deprecated @java.lang.SuppressWarnings("all") - public BuilderWithDeprecatedBuilder withDep1(final String dep1) { + public BuilderWithDeprecatedWithSetterPrefixBuilder withDep1(final String dep1) { this.dep1 = dep1; return this; } @java.lang.Deprecated @java.lang.SuppressWarnings("all") - public BuilderWithDeprecatedBuilder withDep2(final int dep2) { + public BuilderWithDeprecatedWithSetterPrefixBuilder withDep2(final int dep2) { this.dep2 = dep2; return this; } @java.lang.Deprecated @java.lang.SuppressWarnings("all") - public BuilderWithDeprecatedBuilder withString(final String string) { + public BuilderWithDeprecatedWithSetterPrefixBuilder withString(final String string) { if (this.strings == null) this.strings = new java.util.ArrayList(); this.strings.add(string); return this; } @java.lang.Deprecated @java.lang.SuppressWarnings("all") - public BuilderWithDeprecatedBuilder withStrings(final java.util.Collection strings) { + public BuilderWithDeprecatedWithSetterPrefixBuilder withStrings(final java.util.Collection strings) { if (this.strings == null) this.strings = new java.util.ArrayList(); this.strings.addAll(strings); return this; } @java.lang.Deprecated @java.lang.SuppressWarnings("all") - public BuilderWithDeprecatedBuilder clearStrings() { + public BuilderWithDeprecatedWithSetterPrefixBuilder clearStrings() { if (this.strings != null) this.strings.clear(); return this; } @java.lang.Deprecated @java.lang.SuppressWarnings("all") - public BuilderWithDeprecatedBuilder withNumber(final Integer number) { + 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 BuilderWithDeprecatedBuilder withNumbers(final java.lang.Iterable numbers) { + public BuilderWithDeprecatedWithSetterPrefixBuilder withNumbers(final java.lang.Iterable 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 BuilderWithDeprecatedWithSetterPrefixBuilder clearNumbers() { this.numbers = null; return this; } @java.lang.SuppressWarnings("all") - public BuilderWithDeprecated build() { + public BuilderWithDeprecatedWithSetterPrefix build() { java.util.List strings; switch (this.strings == null ? 0 : this.strings.size()) { case 0: @@ -99,16 +99,16 @@ public class BuilderWithDeprecated { strings = java.util.Collections.unmodifiableList(new java.util.ArrayList(this.strings)); } com.google.common.collect.ImmutableList numbers = this.numbers == null ? com.google.common.collect.ImmutableList.of() : this.numbers.build(); - return new BuilderWithDeprecated(dep1, dep2, strings, numbers); + return new BuilderWithDeprecatedWithSetterPrefix(dep1, dep2, strings, numbers); } @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "BuilderWithDeprecated.BuilderWithDeprecatedBuilder(dep1=" + this.dep1 + ", dep2=" + this.dep2 + ", strings=" + this.strings + ", numbers=" + this.numbers + ")"; + return "BuilderWithDeprecatedWithSetterPrefix.BuilderWithDeprecatedWithSetterPrefixBuilder(dep1=" + this.dep1 + ", dep2=" + this.dep2 + ", strings=" + this.strings + ", numbers=" + this.numbers + ")"; } } @java.lang.SuppressWarnings("all") - public static BuilderWithDeprecatedBuilder builder() { - return new BuilderWithDeprecatedBuilder(); + public static BuilderWithDeprecatedWithSetterPrefixBuilder builder() { + return new BuilderWithDeprecatedWithSetterPrefixBuilder(); } } diff --git a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java index fd9504c2..95f89c9d 100644 --- a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java @@ -1,8 +1,8 @@ -class BuilderWithExistingBuilderClass { - public static BuilderWithExistingBuilderClass staticMethod(Z arg1, boolean arg2, String arg3) { +class BuilderWithExistingBuilderClassWithSetterPrefix { + public static BuilderWithExistingBuilderClassWithSetterPrefix staticMethod(Z arg1, boolean arg2, String arg3) { return null; } - public static class BuilderWithExistingBuilderClassBuilder { + public static class BuilderWithExistingBuilderClassWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") private boolean arg2; @java.lang.SuppressWarnings("all") @@ -11,30 +11,30 @@ class BuilderWithExistingBuilderClass { public void withArg2(boolean arg) { } @java.lang.SuppressWarnings("all") - BuilderWithExistingBuilderClassBuilder() { + BuilderWithExistingBuilderClassWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderWithExistingBuilderClassBuilder withArg1(final Z arg1) { + public BuilderWithExistingBuilderClassWithSetterPrefixBuilder withArg1(final Z arg1) { this.arg1 = arg1; return this; } @java.lang.SuppressWarnings("all") - public BuilderWithExistingBuilderClassBuilder withArg3(final String arg3) { + public BuilderWithExistingBuilderClassWithSetterPrefixBuilder withArg3(final String arg3) { this.arg3 = arg3; return this; } @java.lang.SuppressWarnings("all") - public BuilderWithExistingBuilderClass build() { - return BuilderWithExistingBuilderClass.staticMethod(arg1, arg2, arg3); + public BuilderWithExistingBuilderClassWithSetterPrefix build() { + return BuilderWithExistingBuilderClassWithSetterPrefix.staticMethod(arg1, arg2, arg3); } @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder(arg1=" + this.arg1 + ", arg2=" + this.arg2 + ", arg3=" + this.arg3 + ")"; + return "BuilderWithExistingBuilderClassWithSetterPrefix.BuilderWithExistingBuilderClassWithSetterPrefixBuilder(arg1=" + this.arg1 + ", arg2=" + this.arg2 + ", arg3=" + this.arg3 + ")"; } } @java.lang.SuppressWarnings("all") - public static BuilderWithExistingBuilderClassBuilder builder() { - return new BuilderWithExistingBuilderClassBuilder(); + public static BuilderWithExistingBuilderClassWithSetterPrefixBuilder builder() { + return new BuilderWithExistingBuilderClassWithSetterPrefixBuilder(); } } diff --git a/test/transform/resource/after-delombok/BuilderWithNoBuilderMethodWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithNoBuilderMethodWithSetterPrefix.java index ec0ccb28..0f478ed1 100644 --- a/test/transform/resource/after-delombok/BuilderWithNoBuilderMethodWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderWithNoBuilderMethodWithSetterPrefix.java @@ -1,33 +1,33 @@ -class BuilderWithNoBuilderMethod { +class BuilderWithNoBuilderMethodWithSetterPrefix { private String a = ""; @java.lang.SuppressWarnings("all") - BuilderWithNoBuilderMethod(final String a) { + BuilderWithNoBuilderMethodWithSetterPrefix(final String a) { this.a = a; } @java.lang.SuppressWarnings("all") - public static class BuilderWithNoBuilderMethodBuilder { + public static class BuilderWithNoBuilderMethodWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") private String a; @java.lang.SuppressWarnings("all") - BuilderWithNoBuilderMethodBuilder() { + BuilderWithNoBuilderMethodWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderWithNoBuilderMethodBuilder withA(final String a) { + public BuilderWithNoBuilderMethodWithSetterPrefixBuilder withA(final String a) { this.a = a; return this; } @java.lang.SuppressWarnings("all") - public BuilderWithNoBuilderMethod build() { - return new BuilderWithNoBuilderMethod(a); + public BuilderWithNoBuilderMethodWithSetterPrefix build() { + return new BuilderWithNoBuilderMethodWithSetterPrefix(a); } @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "BuilderWithNoBuilderMethod.BuilderWithNoBuilderMethodBuilder(a=" + this.a + ")"; + return "BuilderWithNoBuilderMethodWithSetterPrefix.BuilderWithNoBuilderMethodWithSetterPrefixBuilder(a=" + this.a + ")"; } } @java.lang.SuppressWarnings("all") - public BuilderWithNoBuilderMethodBuilder toBuilder() { - return new BuilderWithNoBuilderMethodBuilder().withA(this.a); + public BuilderWithNoBuilderMethodWithSetterPrefixBuilder toBuilder() { + return new BuilderWithNoBuilderMethodWithSetterPrefixBuilder().withA(this.a); } } diff --git a/test/transform/resource/after-delombok/BuilderWithNonNullWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithNonNullWithSetterPrefix.java index 29f1b792..49be1717 100644 --- a/test/transform/resource/after-delombok/BuilderWithNonNullWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderWithNonNullWithSetterPrefix.java @@ -1,22 +1,22 @@ -class BuilderWithNonNull { +class BuilderWithNonNullWithSetterPrefix { @lombok.NonNull private final String id; @java.lang.SuppressWarnings("all") - BuilderWithNonNull(@lombok.NonNull final String id) { + BuilderWithNonNullWithSetterPrefix(@lombok.NonNull final String id) { if (id == null) { throw new java.lang.NullPointerException("id is marked non-null but is null"); } this.id = id; } @java.lang.SuppressWarnings("all") - public static class BuilderWithNonNullBuilder { + public static class BuilderWithNonNullWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") private String id; @java.lang.SuppressWarnings("all") - BuilderWithNonNullBuilder() { + BuilderWithNonNullWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderWithNonNullBuilder withId(@lombok.NonNull final String id) { + public BuilderWithNonNullWithSetterPrefixBuilder withId(@lombok.NonNull final String id) { if (id == null) { throw new java.lang.NullPointerException("id is marked non-null but is null"); } @@ -24,17 +24,17 @@ class BuilderWithNonNull { return this; } @java.lang.SuppressWarnings("all") - public BuilderWithNonNull build() { - return new BuilderWithNonNull(id); + public BuilderWithNonNullWithSetterPrefix build() { + return new BuilderWithNonNullWithSetterPrefix(id); } @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "BuilderWithNonNull.BuilderWithNonNullBuilder(id=" + this.id + ")"; + return "BuilderWithNonNullWithSetterPrefix.BuilderWithNonNullWithSetterPrefixBuilder(id=" + this.id + ")"; } } @java.lang.SuppressWarnings("all") - public static BuilderWithNonNullBuilder builder() { - return new BuilderWithNonNullBuilder(); + public static BuilderWithNonNullWithSetterPrefixBuilder builder() { + return new BuilderWithNonNullWithSetterPrefixBuilder(); } } diff --git a/test/transform/resource/after-delombok/BuilderWithRecursiveGenericsWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithRecursiveGenericsWithSetterPrefix.java index d0ca7c05..04494ff9 100644 --- a/test/transform/resource/after-delombok/BuilderWithRecursiveGenericsWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderWithRecursiveGenericsWithSetterPrefix.java @@ -1,5 +1,5 @@ import java.util.Set; -public class BuilderWithRecursiveGenerics { +public class BuilderWithRecursiveGenericsWithSetterPrefix { interface Inter> { } public static final class Test, Quz extends Inter> { @@ -36,7 +36,7 @@ public class BuilderWithRecursiveGenerics { @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "BuilderWithRecursiveGenerics.Test.TestBuilder(foo=" + this.foo + ", bar=" + this.bar + ")"; + return "BuilderWithRecursiveGenericsWithSetterPrefix.Test.TestBuilder(foo=" + this.foo + ", bar=" + this.bar + ")"; } } @java.lang.SuppressWarnings("all") @@ -55,8 +55,8 @@ public class BuilderWithRecursiveGenerics { @java.lang.SuppressWarnings("all") public boolean equals(final java.lang.Object o) { if (o == this) return true; - if (!(o instanceof BuilderWithRecursiveGenerics.Test)) return false; - final BuilderWithRecursiveGenerics.Test other = (BuilderWithRecursiveGenerics.Test) o; + 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; @@ -79,7 +79,7 @@ public class BuilderWithRecursiveGenerics { @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "BuilderWithRecursiveGenerics.Test(foo=" + this.getFoo() + ", bar=" + this.getBar() + ")"; + return "BuilderWithRecursiveGenericsWithSetterPrefix.Test(foo=" + this.getFoo() + ", bar=" + this.getBar() + ")"; } } } diff --git a/test/transform/resource/after-delombok/BuilderWithToBuilderWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithToBuilderWithSetterPrefix.java index ac8264d3..322c667c 100644 --- a/test/transform/resource/after-delombok/BuilderWithToBuilderWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderWithToBuilderWithSetterPrefix.java @@ -1,21 +1,21 @@ import java.util.List; -class BuilderWithToBuilder { +class BuilderWithToBuilderWithSetterPrefix { private String mOne; private String mTwo; private T foo; private List bars; - public static K rrr(BuilderWithToBuilder x) { + public static K rrr(BuilderWithToBuilderWithSetterPrefix x) { return x.foo; } @java.lang.SuppressWarnings("all") - BuilderWithToBuilder(final String one, final String two, final T foo, final List bars) { + BuilderWithToBuilderWithSetterPrefix(final String one, final String two, final T foo, final List bars) { this.mOne = one; this.mTwo = two; this.foo = foo; this.bars = bars; } @java.lang.SuppressWarnings("all") - public static class BuilderWithToBuilderBuilder { + public static class BuilderWithToBuilderWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") private String one; @java.lang.SuppressWarnings("all") @@ -25,42 +25,42 @@ class BuilderWithToBuilder { @java.lang.SuppressWarnings("all") private java.util.ArrayList bars; @java.lang.SuppressWarnings("all") - BuilderWithToBuilderBuilder() { + BuilderWithToBuilderWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderWithToBuilderBuilder withOne(final String one) { + public BuilderWithToBuilderWithSetterPrefixBuilder withOne(final String one) { this.one = one; return this; } @java.lang.SuppressWarnings("all") - public BuilderWithToBuilderBuilder withTwo(final String two) { + public BuilderWithToBuilderWithSetterPrefixBuilder withTwo(final String two) { this.two = two; return this; } @java.lang.SuppressWarnings("all") - public BuilderWithToBuilderBuilder withFoo(final T foo) { + public BuilderWithToBuilderWithSetterPrefixBuilder withFoo(final T foo) { this.foo = foo; return this; } @java.lang.SuppressWarnings("all") - public BuilderWithToBuilderBuilder withBar(final T bar) { + public BuilderWithToBuilderWithSetterPrefixBuilder withBar(final T bar) { if (this.bars == null) this.bars = new java.util.ArrayList(); this.bars.add(bar); return this; } @java.lang.SuppressWarnings("all") - public BuilderWithToBuilderBuilder withBars(final java.util.Collection bars) { + public BuilderWithToBuilderWithSetterPrefixBuilder withBars(final java.util.Collection bars) { if (this.bars == null) this.bars = new java.util.ArrayList(); this.bars.addAll(bars); return this; } @java.lang.SuppressWarnings("all") - public BuilderWithToBuilderBuilder clearBars() { + public BuilderWithToBuilderWithSetterPrefixBuilder clearBars() { if (this.bars != null) this.bars.clear(); return this; } @java.lang.SuppressWarnings("all") - public BuilderWithToBuilder build() { + public BuilderWithToBuilderWithSetterPrefix build() { java.util.List bars; switch (this.bars == null ? 0 : this.bars.size()) { case 0: @@ -72,35 +72,35 @@ class BuilderWithToBuilder { default: bars = java.util.Collections.unmodifiableList(new java.util.ArrayList(this.bars)); } - return new BuilderWithToBuilder(one, two, foo, bars); + return new BuilderWithToBuilderWithSetterPrefix(one, two, foo, bars); } @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "BuilderWithToBuilder.BuilderWithToBuilderBuilder(one=" + this.one + ", two=" + this.two + ", foo=" + this.foo + ", bars=" + this.bars + ")"; + return "BuilderWithToBuilderWithSetterPrefix.BuilderWithToBuilderWithSetterPrefixBuilder(one=" + this.one + ", two=" + this.two + ", foo=" + this.foo + ", bars=" + this.bars + ")"; } } @java.lang.SuppressWarnings("all") - public static BuilderWithToBuilderBuilder builder() { - return new BuilderWithToBuilderBuilder(); + public static BuilderWithToBuilderWithSetterPrefixBuilder builder() { + return new BuilderWithToBuilderWithSetterPrefixBuilder(); } @java.lang.SuppressWarnings("all") - public BuilderWithToBuilderBuilder toBuilder() { - final BuilderWithToBuilderBuilder builder = new BuilderWithToBuilderBuilder().withOne(this.mOne).withTwo(this.mTwo).withFoo(BuilderWithToBuilder.rrr(this)); + public BuilderWithToBuilderWithSetterPrefixBuilder toBuilder() { + final BuilderWithToBuilderWithSetterPrefixBuilder builder = new BuilderWithToBuilderWithSetterPrefixBuilder().withOne(this.mOne).withTwo(this.mTwo).withFoo(BuilderWithToBuilderWithSetterPrefix.rrr(this)); if (this.bars != null) builder.withBars(this.bars); return builder; } } -class ConstructorWithToBuilder { +class ConstructorWithToBuilderWithSetterPrefix { private String mOne; private String mTwo; private T foo; @lombok.Singular private com.google.common.collect.ImmutableList bars; - public ConstructorWithToBuilder(String mOne, T baz, com.google.common.collect.ImmutableList bars) { + public ConstructorWithToBuilderWithSetterPrefix(String mOne, T baz, com.google.common.collect.ImmutableList bars) { } @java.lang.SuppressWarnings("all") - public static class ConstructorWithToBuilderBuilder { + public static class ConstructorWithToBuilderWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") private String mOne; @java.lang.SuppressWarnings("all") @@ -108,39 +108,39 @@ class ConstructorWithToBuilder { @java.lang.SuppressWarnings("all") private com.google.common.collect.ImmutableList bars; @java.lang.SuppressWarnings("all") - ConstructorWithToBuilderBuilder() { + ConstructorWithToBuilderWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") - public ConstructorWithToBuilderBuilder withMOne(final String mOne) { + public ConstructorWithToBuilderWithSetterPrefixBuilder withMOne(final String mOne) { this.mOne = mOne; return this; } @java.lang.SuppressWarnings("all") - public ConstructorWithToBuilderBuilder withBaz(final T baz) { + public ConstructorWithToBuilderWithSetterPrefixBuilder withBaz(final T baz) { this.baz = baz; return this; } @java.lang.SuppressWarnings("all") - public ConstructorWithToBuilderBuilder withBars(final com.google.common.collect.ImmutableList bars) { + public ConstructorWithToBuilderWithSetterPrefixBuilder withBars(final com.google.common.collect.ImmutableList bars) { this.bars = bars; return this; } @java.lang.SuppressWarnings("all") - public ConstructorWithToBuilder build() { - return new ConstructorWithToBuilder(mOne, baz, bars); + public ConstructorWithToBuilderWithSetterPrefix build() { + return new ConstructorWithToBuilderWithSetterPrefix(mOne, baz, bars); } @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "ConstructorWithToBuilder.ConstructorWithToBuilderBuilder(mOne=" + this.mOne + ", baz=" + this.baz + ", bars=" + this.bars + ")"; + return "ConstructorWithToBuilderWithSetterPrefix.ConstructorWithToBuilderWithSetterPrefixBuilder(mOne=" + this.mOne + ", baz=" + this.baz + ", bars=" + this.bars + ")"; } } @java.lang.SuppressWarnings("all") - public static ConstructorWithToBuilderBuilder builder() { - return new ConstructorWithToBuilderBuilder(); + public static ConstructorWithToBuilderWithSetterPrefixBuilder builder() { + return new ConstructorWithToBuilderWithSetterPrefixBuilder(); } @java.lang.SuppressWarnings("all") - public ConstructorWithToBuilderBuilder toBuilder() { - return new ConstructorWithToBuilderBuilder().withMOne(this.mOne).withBaz(this.foo).withBars(this.bars); + public ConstructorWithToBuilderWithSetterPrefixBuilder toBuilder() { + return new ConstructorWithToBuilderWithSetterPrefixBuilder().withMOne(this.mOne).withBaz(this.foo).withBars(this.bars); } } diff --git a/test/transform/resource/after-delombok/BuilderWithTolerateWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithTolerateWithSetterPrefix.java index a3ae2c6d..70394d09 100644 --- a/test/transform/resource/after-delombok/BuilderWithTolerateWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderWithTolerateWithSetterPrefix.java @@ -1,40 +1,40 @@ import lombok.experimental.Tolerate; -public class BuilderWithTolerate { +public class BuilderWithTolerateWithSetterPrefix { private final int value; public static void main(String[] args) { - BuilderWithTolerate.builder().withValue("42").build(); + BuilderWithTolerateWithSetterPrefix.builder().withValue("42").build(); } - public static class BuilderWithTolerateBuilder { + public static class BuilderWithTolerateWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") private int value; @Tolerate - public BuilderWithTolerateBuilder withValue(String s) { + public BuilderWithTolerateWithSetterPrefixBuilder withValue(String s) { return this.withValue(Integer.parseInt(s)); } @java.lang.SuppressWarnings("all") - BuilderWithTolerateBuilder() { + BuilderWithTolerateWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderWithTolerateBuilder withValue(final int value) { + public BuilderWithTolerateWithSetterPrefixBuilder withValue(final int value) { this.value = value; return this; } @java.lang.SuppressWarnings("all") - public BuilderWithTolerate build() { - return new BuilderWithTolerate(value); + public BuilderWithTolerateWithSetterPrefix build() { + return new BuilderWithTolerateWithSetterPrefix(value); } @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "BuilderWithTolerate.BuilderWithTolerateBuilder(value=" + this.value + ")"; + return "BuilderWithTolerateWithSetterPrefix.BuilderWithTolerateWithSetterPrefixBuilder(value=" + this.value + ")"; } } @java.lang.SuppressWarnings("all") - BuilderWithTolerate(final int value) { + BuilderWithTolerateWithSetterPrefix(final int value) { this.value = value; } @java.lang.SuppressWarnings("all") - public static BuilderWithTolerateBuilder builder() { - return new BuilderWithTolerateBuilder(); + public static BuilderWithTolerateWithSetterPrefixBuilder builder() { + return new BuilderWithTolerateWithSetterPrefixBuilder(); } } -- cgit From ffb299730e8f378748c4594988ec568812bf895b Mon Sep 17 00:00:00 2001 From: Caleb Brinkman Date: Thu, 19 Sep 2019 16:05:17 -0500 Subject: Fix more broken tests --- .../BuilderSingularMapsWithSetterPrefix.java | 6 +++--- ...ularWildcardListsWithToBuilderWithSetterPrefix.java | 1 + .../BuilderWithAccessorsWithSetterPrefix.java | 2 +- ...uilderWithExistingBuilderClassWithSetterPrefix.java | 4 ++-- .../BuilderWithNoBuilderMethodWithSetterPrefix.java | 1 + .../BuilderWithToBuilderWithSetterPrefix.java | 1 + .../after-ecj/BuilderSimpleWithSetterPrefix.java | 4 ++-- ...ilderSingularToBuilderWithNullWithSetterPrefix.java | 2 +- ...ularWildcardListsWithToBuilderWithSetterPrefix.java | 2 +- .../BuilderSingularWithPrefixesWithSetterPrefix.java | 18 +++++++++--------- .../after-ecj/BuilderValueDataWithSetterPrefix.java | 2 +- .../BuilderWithAccessorsWithSetterPrefix.java | 2 +- ...uilderWithExistingBuilderClassWithSetterPrefix.java | 2 +- ...uilderWithExistingBuilderClassWithSetterPrefix.java | 2 +- .../BuilderWithNoBuilderMethodWithSetterPrefix.java | 4 ++-- ...BuilderSingularNoAutoWithSetterPrefix.java.messages | 2 ++ 16 files changed, 30 insertions(+), 25 deletions(-) create mode 100644 test/transform/resource/messages-ecj/BuilderSingularNoAutoWithSetterPrefix.java.messages (limited to 'test/transform/resource/after-delombok/BuilderWithNoBuilderMethodWithSetterPrefix.java') diff --git a/test/transform/resource/after-delombok/BuilderSingularMapsWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularMapsWithSetterPrefix.java index 352a0723..a4afb8a8 100644 --- a/test/transform/resource/after-delombok/BuilderSingularMapsWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderSingularMapsWithSetterPrefix.java @@ -95,7 +95,7 @@ class BuilderSingularMapsWithSetterPrefix { return this; } @SuppressWarnings("all") - public BuilderSingularMapsWithSetterPrefixBuilder withRawMan(Object rawMapKey, Object rawMapValue) { + public BuilderSingularMapsWithSetterPrefixBuilder withRawMap(Object rawMapKey, Object rawMapValue) { if (this.rawMap$key == null) { this.rawMap$key = new java.util.ArrayList(); this.rawMap$value = new java.util.ArrayList(); @@ -125,7 +125,7 @@ class BuilderSingularMapsWithSetterPrefix { return this; } @SuppressWarnings("all") - public BuilderSingularMapsWithSetterPrefixBuilder stringMap(String stringMapKey, V stringMapValue) { + public BuilderSingularMapsWithSetterPrefixBuilder withStringMap(String stringMapKey, V stringMapValue) { if (this.stringMap$key == null) { this.stringMap$key = new java.util.ArrayList(); this.stringMap$value = new java.util.ArrayList(); @@ -135,7 +135,7 @@ class BuilderSingularMapsWithSetterPrefix { return this; } @SuppressWarnings("all") - public BuilderSingularMapsWithSetterPrefixBuilder stringMap(java.util.Map stringMap) { + public BuilderSingularMapsWithSetterPrefixBuilder withStringMap(java.util.Map stringMap) { if (this.stringMap$key == null) { this.stringMap$key = new java.util.ArrayList(); this.stringMap$value = new java.util.ArrayList(); diff --git a/test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java index 367f0ac1..8e849f44 100644 --- a/test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java @@ -1,5 +1,6 @@ import java.util.List; import java.util.Collection; +@Builder(toBuilder = true, setterPrefix = "with") class BuilderSingularWildcardListsWithToBuilderWithSetterPrefix { private List objects; private Collection numbers; diff --git a/test/transform/resource/after-delombok/BuilderWithAccessorsWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithAccessorsWithSetterPrefix.java index be581c47..45a79fdc 100644 --- a/test/transform/resource/after-delombok/BuilderWithAccessorsWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderWithAccessorsWithSetterPrefix.java @@ -39,7 +39,7 @@ class BuilderWithAccessorsWithSetterPrefix { return this; } @java.lang.SuppressWarnings("all") - public BuilderWithAccessorsWithSetterPrefixBuilder with_Bar(final int _bar) { + public BuilderWithAccessorsWithSetterPrefixBuilder with_bar(final int _bar) { this._bar = _bar; return this; } diff --git a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java index 95f89c9d..9b7b0c95 100644 --- a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java @@ -2,7 +2,7 @@ class BuilderWithExistingBuilderClassWithSetterPrefix { public static BuilderWithExistingBuilderClassWithSetterPrefix staticMethod(Z arg1, boolean arg2, String arg3) { return null; } - public static class BuilderWithExistingBuilderClassWithSetterPrefixBuilder { + public static class BuilderWithExistingBuilderClassBuilderWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") private boolean arg2; @java.lang.SuppressWarnings("all") @@ -11,7 +11,7 @@ class BuilderWithExistingBuilderClassWithSetterPrefix { public void withArg2(boolean arg) { } @java.lang.SuppressWarnings("all") - BuilderWithExistingBuilderClassWithSetterPrefixBuilder() { + BuilderWithExistingBuilderClassBuilderWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") public BuilderWithExistingBuilderClassWithSetterPrefixBuilder withArg1(final Z arg1) { diff --git a/test/transform/resource/after-delombok/BuilderWithNoBuilderMethodWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithNoBuilderMethodWithSetterPrefix.java index 0f478ed1..2381dcbe 100644 --- a/test/transform/resource/after-delombok/BuilderWithNoBuilderMethodWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderWithNoBuilderMethodWithSetterPrefix.java @@ -1,3 +1,4 @@ +import lombok.Builder class BuilderWithNoBuilderMethodWithSetterPrefix { private String a = ""; @java.lang.SuppressWarnings("all") diff --git a/test/transform/resource/after-delombok/BuilderWithToBuilderWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithToBuilderWithSetterPrefix.java index 322c667c..091aed4d 100644 --- a/test/transform/resource/after-delombok/BuilderWithToBuilderWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderWithToBuilderWithSetterPrefix.java @@ -1,4 +1,5 @@ import java.util.List; +import lombok.Builder; class BuilderWithToBuilderWithSetterPrefix { private String mOne; private String mTwo; diff --git a/test/transform/resource/after-ecj/BuilderSimpleWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderSimpleWithSetterPrefix.java index ad3485c6..110774e2 100644 --- a/test/transform/resource/after-ecj/BuilderSimpleWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/BuilderSimpleWithSetterPrefix.java @@ -1,8 +1,8 @@ import java.util.List; @lombok.Builder(access = lombok.AccessLevel.PROTECTED,setterPrefix = "with") class BuilderSimpleWithSetterPrefix { - protected static @java.lang.SuppressWarnings("all") class BuilderSimpleWithSetterPrefix { + protected static @java.lang.SuppressWarnings("all") class BuilderSimpleWithSetterPrefixBuilder { private @java.lang.SuppressWarnings("all") int unprefixed; - @java.lang.SuppressWarnings("all") BuilderWithPrefixBuilder() { + @java.lang.SuppressWarnings("all") BuilderSimpleWithSetterPrefixBuilder() { super(); } public @java.lang.SuppressWarnings("all") BuilderWithPrefixBuilder withUnprefixed(final int unprefixed) { diff --git a/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNullWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNullWithSetterPrefix.java index 8728867d..ef2d02a1 100644 --- a/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNullWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNullWithSetterPrefix.java @@ -1,5 +1,5 @@ import lombok.Singular; -@lombok.Builder(toBuilder = true, setterPrefix = "with") class BuilderSingularToBuilderWithNullWithSetterPrefix { +@lombok.Builder(toBuilder = true,setterPrefix = "with") class BuilderSingularToBuilderWithNullWithSetterPrefix { public static @java.lang.SuppressWarnings("all") class BuilderSingularToBuilderWithNullWithSetterPrefixBuilder { private @java.lang.SuppressWarnings("all") java.util.ArrayList elems; @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullWithSetterPrefixBuilder() { diff --git a/test/transform/resource/after-ecj/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java index fe451d78..bbb10087 100644 --- a/test/transform/resource/after-ecj/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java @@ -1,7 +1,7 @@ import java.util.List; import java.util.Collection; import lombok.Singular; -@lombok.Builder(toBuilder = true, setterPrefix = "with") class BuilderSingularWildcardListsWithToBuilderWithSetterPrefix { +@lombok.Builder(toBuilder = true,setterPrefix = "with") class BuilderSingularWildcardListsWithToBuilderWithSetterPrefix { public static @java.lang.SuppressWarnings("all") class BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder { private @java.lang.SuppressWarnings("all") java.util.ArrayList objects; private @java.lang.SuppressWarnings("all") java.util.ArrayList numbers; diff --git a/test/transform/resource/after-ecj/BuilderSingularWithPrefixesWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderSingularWithPrefixesWithSetterPrefix.java index 88f64f34..920803cc 100644 --- a/test/transform/resource/after-ecj/BuilderSingularWithPrefixesWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/BuilderSingularWithPrefixesWithSetterPrefix.java @@ -1,23 +1,23 @@ import lombok.Singular; -@lombok.Builder(setterPrefix = "with") @lombok.experimental.Accessors(prefix = "_") class BuilderSingularWithPrefixesWithSetterPrefixes { - public static @java.lang.SuppressWarnings("all") class BuilderSingularWithPrefixesWithSetterPrefixesBuilder { +@lombok.Builder(setterPrefix = "with") @lombok.experimental.Accessors(prefix = "_") class BuilderSingularWithPrefixesWithSetterPrefix { + public static @java.lang.SuppressWarnings("all") class BuilderSingularWithPrefixesWithSetterPrefixBuilder { private @java.lang.SuppressWarnings("all") java.util.ArrayList elems; - @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefixesBuilder() { + @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefixBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefixesBuilder withElem(final String elem) { + public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefixBuilder withElem(final String elem) { if ((this.elems == null)) this.elems = new java.util.ArrayList(); this.elems.add(elem); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefixesBuilder withElems(final java.util.Collection elems) { + public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefixBuilder withElems(final java.util.Collection elems) { if ((this.elems == null)) this.elems = new java.util.ArrayList(); this.elems.addAll(elems); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefixesBuilder clearElems() { + public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefixBuilder clearElems() { if ((this.elems != null)) this.elems.clear(); return this; @@ -37,7 +37,7 @@ import lombok.Singular; return new BuilderSingularWithPrefixesWithSetterPrefixes(elems); } public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { - return (("BuilderSingularWithPrefixesWithSetterPrefixes.BuilderSingularWithPrefixesWithSetterPrefixesBuilder(elems=" + this.elems) + ")"); + return (("BuilderSingularWithPrefixesWithSetterPrefixes.BuilderSingularWithPrefixesWithSetterPrefixBuilder(elems=" + this.elems) + ")"); } } private @Singular java.util.List _elems; @@ -45,7 +45,7 @@ import lombok.Singular; super(); this._elems = elems; } - public static @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefixesBuilder builder() { - return new BuilderSingularWithPrefixesWithSetterPrefixesBuilder(); + public static @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefixBuilder builder() { + return new BuilderSingularWithPrefixesWithSetterPrefixBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderValueDataWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderValueDataWithSetterPrefix.java index 679591a4..065c93fe 100644 --- a/test/transform/resource/after-ecj/BuilderValueDataWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/BuilderValueDataWithSetterPrefix.java @@ -41,7 +41,7 @@ final @lombok.Builder(setterPrefix = "with") @lombok.Value class BuilderAndValue return (("BuilderAndValueWithSetterPrefix(zero=" + this.getZero()) + ")"); } } -@lombok.Builder @lombok.Data class BuilderAndDataWithSetterPrefix { +@lombok.Builder(setterPrefix = "with") @lombok.Data class BuilderAndDataWithSetterPrefix { public static @java.lang.SuppressWarnings("all") class BuilderAndDataWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") BuilderAndDataWithSetterPrefixBuilder() { super(); diff --git a/test/transform/resource/after-ecj/BuilderWithAccessorsWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderWithAccessorsWithSetterPrefix.java index 5894a4a2..d9c10e5b 100644 --- a/test/transform/resource/after-ecj/BuilderWithAccessorsWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/BuilderWithAccessorsWithSetterPrefix.java @@ -19,7 +19,7 @@ this.foo = foo; return this; } - public @java.lang.SuppressWarnings("all") BuilderWithAccessorsWithSetterPrefixBuilder with_Bar(final int _bar) { + public @java.lang.SuppressWarnings("all") BuilderWithAccessorsWithSetterPrefixBuilder with_bar(final int _bar) { this._bar = _bar; return this; } diff --git a/test/transform/resource/after-ecj/BuilderWithExistingBuilderClassWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderWithExistingBuilderClassWithSetterPrefix.java index 8da2f012..b14c120f 100644 --- a/test/transform/resource/after-ecj/BuilderWithExistingBuilderClassWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/BuilderWithExistingBuilderClassWithSetterPrefix.java @@ -1,6 +1,6 @@ import lombok.Builder; class BuilderWithExistingBuilderClassWithSetterPrefix { - public static class BuilderWithExistingBuilderClassWithSetterPrefixBuilder { + public static class BuilderWithExistingBuilderClassBuilderWithSetterPrefixBuilder { private @java.lang.SuppressWarnings("all") boolean arg2; private @java.lang.SuppressWarnings("all") String arg3; private Z arg1; diff --git a/test/transform/resource/before/BuilderWithExistingBuilderClassWithSetterPrefix.java b/test/transform/resource/before/BuilderWithExistingBuilderClassWithSetterPrefix.java index cb699295..99c3ccc6 100644 --- a/test/transform/resource/before/BuilderWithExistingBuilderClassWithSetterPrefix.java +++ b/test/transform/resource/before/BuilderWithExistingBuilderClassWithSetterPrefix.java @@ -6,7 +6,7 @@ class BuilderWithExistingBuilderClassWithSetterPrefix { return null; } - public static class BuilderWithExistingBuilderClassBuilderWithSetterPrefix { + public static class BuilderWithExistingBuilderClassBuilderWithSetterPrefixBuilder { private Z arg1; public void withArg2(boolean arg) { diff --git a/test/transform/resource/before/BuilderWithNoBuilderMethodWithSetterPrefix.java b/test/transform/resource/before/BuilderWithNoBuilderMethodWithSetterPrefix.java index b787e303..6fddd748 100644 --- a/test/transform/resource/before/BuilderWithNoBuilderMethodWithSetterPrefix.java +++ b/test/transform/resource/before/BuilderWithNoBuilderMethodWithSetterPrefix.java @@ -1,5 +1,5 @@ -import lombok.Builder(setterPrefix = "with"); -@Builder(toBuilder = true, builderMethodName = "", setterPrefix = "with") +import lombok.Builder +@Builder(toBuilder = true, builderMethodName = "",setterPrefix = "with") class BuilderWithNoBuilderMethodWithSetterPrefix { private String a = ""; } diff --git a/test/transform/resource/messages-ecj/BuilderSingularNoAutoWithSetterPrefix.java.messages b/test/transform/resource/messages-ecj/BuilderSingularNoAutoWithSetterPrefix.java.messages new file mode 100644 index 00000000..8719789b --- /dev/null +++ b/test/transform/resource/messages-ecj/BuilderSingularNoAutoWithSetterPrefix.java.messages @@ -0,0 +1,2 @@ +8 The singular must be specified explicitly (e.g. @Singular("task")) because auto singularization is disabled. +10 The singular must be specified explicitly (e.g. @Singular("task")) because auto singularization is disabled. -- cgit From 666defaff365d9841d5136063fc6f9e6ee5c0403 Mon Sep 17 00:00:00 2001 From: Caleb Brinkman Date: Fri, 25 Oct 2019 15:38:07 -0500 Subject: Fix up some more tests and copy-paste errors --- .../lombok/eclipse/handlers/HandleBuilder.java | 15 ++++++++--- ...WildcardListsWithToBuilderWithSetterPrefix.java | 1 - ...erWithExistingBuilderClassWithSetterPrefix.java | 4 +-- ...BuilderWithNoBuilderMethodWithSetterPrefix.java | 1 - .../BuilderWithToBuilderWithSetterPrefix.java | 1 - .../after-ecj/BuilderSimpleWithSetterPrefix.java | 10 ++++---- .../BuilderSingularSetsWithSetterPrefix.java | 16 ++++++------ ...uilderSingularWithPrefixesWithSetterPrefix.java | 8 +++--- ...erWithExistingBuilderClassWithSetterPrefix.java | 2 +- ...ilderWithRecursiveGenericsWithSetterPrefix.java | 2 +- .../BuilderWithToBuilderWithSetterPrefix.java | 29 +++++++++++----------- ...BuilderWithNoBuilderMethodWithSetterPrefix.java | 2 +- .../BuilderWithToBuilderWithSetterPrefix.java | 4 +-- .../BuilderWithTolerateWithSetterPrefix.java | 2 +- 14 files changed, 51 insertions(+), 46 deletions(-) (limited to 'test/transform/resource/after-delombok/BuilderWithNoBuilderMethodWithSetterPrefix.java') diff --git a/src/core/lombok/eclipse/handlers/HandleBuilder.java b/src/core/lombok/eclipse/handlers/HandleBuilder.java index ec2be523..017cde17 100755 --- a/src/core/lombok/eclipse/handlers/HandleBuilder.java +++ b/src/core/lombok/eclipse/handlers/HandleBuilder.java @@ -539,7 +539,7 @@ public class HandleBuilder extends EclipseAnnotationHandler { tps[i].name = typeArgsForToBuilder.get(i); } } - MethodDeclaration md = generateToBuilderMethod(cfv, toBuilderMethodName, builderClassName, tdParent, tps, builderFields, fluent, ast, accessForOuters); + MethodDeclaration md = generateToBuilderMethod(cfv, toBuilderMethodName, builderClassName, tdParent, tps, builderFields, fluent, ast, accessForOuters, builderInstance.setterPrefix()); if (md != null) injectMethod(tdParent, md); } @@ -552,7 +552,7 @@ public class HandleBuilder extends EclipseAnnotationHandler { } private static final char[] BUILDER_TEMP_VAR = {'b', 'u', 'i', 'l', 'd', 'e', 'r'}; - private MethodDeclaration generateToBuilderMethod(CheckerFrameworkVersion cfv, String methodName, String builderClassName, EclipseNode type, TypeParameter[] typeParams, List builderFields, boolean fluent, ASTNode source, AccessLevel access) { + private MethodDeclaration generateToBuilderMethod(CheckerFrameworkVersion cfv, String methodName, String builderClassName, EclipseNode type, TypeParameter[] typeParams, List builderFields, boolean fluent, ASTNode source, AccessLevel access, String prefix) { int pS = source.sourceStart, pE = source.sourceEnd; long p = (long) pS << 32 | pE; @@ -567,7 +567,14 @@ public class HandleBuilder extends EclipseAnnotationHandler { Expression receiver = invoke; List statements = null; for (BuilderFieldData bfd : builderFields) { - char[] setterName = fluent ? bfd.name : HandlerUtil.buildAccessorName("set", new String(bfd.name)).toCharArray(); + String setterPrefix = prefix.isEmpty() ? "set" : prefix; + //char[] setterName = fluent ? bfd.name : HandlerUtil.buildAccessorName("set", new String(bfd.name)).toCharArray(); + String setterName; + if(fluent) { + setterName = prefix.isEmpty() ? new String(bfd.name) : HandlerUtil.buildAccessorName(setterPrefix, new String(bfd.name)); + } else { + setterName = HandlerUtil.buildAccessorName(setterPrefix, new String(bfd.name)); + } MessageSend ms = new MessageSend(); Expression[] tgt = new Expression[bfd.singularData == null ? 1 : 2]; @@ -600,7 +607,7 @@ public class HandleBuilder extends EclipseAnnotationHandler { } } - ms.selector = setterName; + ms.selector = setterName.toCharArray(); if (bfd.singularData == null) { ms.arguments = tgt; ms.receiver = receiver; diff --git a/test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java index 8e849f44..367f0ac1 100644 --- a/test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java @@ -1,6 +1,5 @@ import java.util.List; import java.util.Collection; -@Builder(toBuilder = true, setterPrefix = "with") class BuilderSingularWildcardListsWithToBuilderWithSetterPrefix { private List objects; private Collection numbers; diff --git a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java index 9b7b0c95..95f89c9d 100644 --- a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java @@ -2,7 +2,7 @@ class BuilderWithExistingBuilderClassWithSetterPrefix { public static BuilderWithExistingBuilderClassWithSetterPrefix staticMethod(Z arg1, boolean arg2, String arg3) { return null; } - public static class BuilderWithExistingBuilderClassBuilderWithSetterPrefixBuilder { + public static class BuilderWithExistingBuilderClassWithSetterPrefixBuilder { @java.lang.SuppressWarnings("all") private boolean arg2; @java.lang.SuppressWarnings("all") @@ -11,7 +11,7 @@ class BuilderWithExistingBuilderClassWithSetterPrefix { public void withArg2(boolean arg) { } @java.lang.SuppressWarnings("all") - BuilderWithExistingBuilderClassBuilderWithSetterPrefixBuilder() { + BuilderWithExistingBuilderClassWithSetterPrefixBuilder() { } @java.lang.SuppressWarnings("all") public BuilderWithExistingBuilderClassWithSetterPrefixBuilder withArg1(final Z arg1) { diff --git a/test/transform/resource/after-delombok/BuilderWithNoBuilderMethodWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithNoBuilderMethodWithSetterPrefix.java index 2381dcbe..0f478ed1 100644 --- a/test/transform/resource/after-delombok/BuilderWithNoBuilderMethodWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderWithNoBuilderMethodWithSetterPrefix.java @@ -1,4 +1,3 @@ -import lombok.Builder class BuilderWithNoBuilderMethodWithSetterPrefix { private String a = ""; @java.lang.SuppressWarnings("all") diff --git a/test/transform/resource/after-delombok/BuilderWithToBuilderWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithToBuilderWithSetterPrefix.java index 091aed4d..322c667c 100644 --- a/test/transform/resource/after-delombok/BuilderWithToBuilderWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderWithToBuilderWithSetterPrefix.java @@ -1,5 +1,4 @@ import java.util.List; -import lombok.Builder; class BuilderWithToBuilderWithSetterPrefix { private String mOne; private String mTwo; diff --git a/test/transform/resource/after-ecj/BuilderSimpleWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderSimpleWithSetterPrefix.java index 110774e2..993c66da 100644 --- a/test/transform/resource/after-ecj/BuilderSimpleWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/BuilderSimpleWithSetterPrefix.java @@ -5,19 +5,19 @@ import java.util.List; @java.lang.SuppressWarnings("all") BuilderSimpleWithSetterPrefixBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderWithPrefixBuilder withUnprefixed(final int unprefixed) { + public @java.lang.SuppressWarnings("all") BuilderSimpleWithSetterPrefixBuilder withUnprefixed(final int unprefixed) { this.unprefixed = unprefixed; return this; } - public @java.lang.SuppressWarnings("all") BuilderWithPrefix build() { - return new BuilderWithPrefix(unprefixed); + public @java.lang.SuppressWarnings("all") BuilderSimpleWithSetterPrefix build() { + return new BuilderSimpleWithSetterPrefix(unprefixed); } public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { - return (("BuilderWithPrefix.BuilderWithPrefixBuilder(unprefixed=" + this.unprefixed) + ")"); + return (("BuilderSimpleWithSetterPrefix.BuilderSimpleWithSetterPrefixBuilder(unprefixed=" + this.unprefixed) + ")"); } } private int unprefixed; - @java.lang.SuppressWarnings("all") BuilderSimpleWithSetterPrefixBuilder(final int unprefixed) { + @java.lang.SuppressWarnings("all") BuilderSimpleWithSetterPrefix(final int unprefixed) { super(); this.unprefixed = unprefixed; } diff --git a/test/transform/resource/after-ecj/BuilderSingularSetsWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderSingularSetsWithSetterPrefix.java index cb5041a7..905e9190 100644 --- a/test/transform/resource/after-ecj/BuilderSingularSetsWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/BuilderSingularSetsWithSetterPrefix.java @@ -10,13 +10,13 @@ import lombok.Singular; @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefixBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefixBuilder dangerMouse(final T dangerMouse) { + public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefixBuilder withDangerMouse(final T dangerMouse) { if ((this.dangerMice == null)) this.dangerMice = new java.util.ArrayList(); this.dangerMice.add(dangerMouse); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefixBuilder dangerMice(final java.util.Collection dangerMice) { + public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefixBuilder withDangerMice(final java.util.Collection dangerMice) { if ((this.dangerMice == null)) this.dangerMice = new java.util.ArrayList(); this.dangerMice.addAll(dangerMice); @@ -27,13 +27,13 @@ import lombok.Singular; this.dangerMice.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefixBuilder octopus(final Number octopus) { + public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefixBuilder withOctopus(final Number octopus) { if ((this.octopodes == null)) this.octopodes = new java.util.ArrayList(); this.octopodes.add(octopus); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefixBuilder octopodes(final java.util.Collection octopodes) { + public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefixBuilder withOctopodes(final java.util.Collection octopodes) { if ((this.octopodes == null)) this.octopodes = new java.util.ArrayList(); this.octopodes.addAll(octopodes); @@ -44,13 +44,13 @@ import lombok.Singular; this.octopodes.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefixBuilder rawSet(final java.lang.Object rawSet) { + public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefixBuilder withRawSet(final java.lang.Object rawSet) { if ((this.rawSet == null)) this.rawSet = new java.util.ArrayList(); this.rawSet.add(rawSet); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefixBuilder rawSet(final java.util.Collection rawSet) { + public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefixBuilder withRawSet(final java.util.Collection rawSet) { if ((this.rawSet == null)) this.rawSet = new java.util.ArrayList(); this.rawSet.addAll(rawSet); @@ -61,13 +61,13 @@ import lombok.Singular; this.rawSet.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefixBuilder stringSet(final String stringSet) { + public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefixBuilder withStringSet(final String stringSet) { if ((this.stringSet == null)) this.stringSet = new java.util.ArrayList(); this.stringSet.add(stringSet); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefixBuilder stringSet(final java.util.Collection stringSet) { + public @java.lang.SuppressWarnings("all") BuilderSingularSetsWithSetterPrefixBuilder withStringSet(final java.util.Collection stringSet) { if ((this.stringSet == null)) this.stringSet = new java.util.ArrayList(); this.stringSet.addAll(stringSet); diff --git a/test/transform/resource/after-ecj/BuilderSingularWithPrefixesWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderSingularWithPrefixesWithSetterPrefix.java index 920803cc..f3218f27 100644 --- a/test/transform/resource/after-ecj/BuilderSingularWithPrefixesWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/BuilderSingularWithPrefixesWithSetterPrefix.java @@ -22,7 +22,7 @@ import lombok.Singular; this.elems.clear(); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefixes build() { + public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefix build() { java.util.List elems; switch (((this.elems == null) ? 0 : this.elems.size())) { case 0 : @@ -34,14 +34,14 @@ import lombok.Singular; default : elems = java.util.Collections.unmodifiableList(new java.util.ArrayList(this.elems)); } - return new BuilderSingularWithPrefixesWithSetterPrefixes(elems); + return new BuilderSingularWithPrefixesWithSetterPrefix(elems); } public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { - return (("BuilderSingularWithPrefixesWithSetterPrefixes.BuilderSingularWithPrefixesWithSetterPrefixBuilder(elems=" + this.elems) + ")"); + return (("BuilderSingularWithPrefixesWithSetterPrefix.BuilderSingularWithPrefixesWithSetterPrefixBuilder(elems=" + this.elems) + ")"); } } private @Singular java.util.List _elems; - @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefixes(final java.util.List elems) { + @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefix(final java.util.List elems) { super(); this._elems = elems; } diff --git a/test/transform/resource/after-ecj/BuilderWithExistingBuilderClassWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderWithExistingBuilderClassWithSetterPrefix.java index b14c120f..8da2f012 100644 --- a/test/transform/resource/after-ecj/BuilderWithExistingBuilderClassWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/BuilderWithExistingBuilderClassWithSetterPrefix.java @@ -1,6 +1,6 @@ import lombok.Builder; class BuilderWithExistingBuilderClassWithSetterPrefix { - public static class BuilderWithExistingBuilderClassBuilderWithSetterPrefixBuilder { + public static class BuilderWithExistingBuilderClassWithSetterPrefixBuilder { private @java.lang.SuppressWarnings("all") boolean arg2; private @java.lang.SuppressWarnings("all") String arg3; private Z arg1; diff --git a/test/transform/resource/after-ecj/BuilderWithRecursiveGenericsWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderWithRecursiveGenericsWithSetterPrefix.java index 2ce25b0a..7c5b191d 100644 --- a/test/transform/resource/after-ecj/BuilderWithRecursiveGenericsWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/BuilderWithRecursiveGenericsWithSetterPrefix.java @@ -4,7 +4,7 @@ import lombok.Value; public class BuilderWithRecursiveGenericsWithSetterPrefix { interface Inter> { } - public static final @Builder(setterPrefix = "with(setterPrefix = "with")") @Value class Test, Quz extends Inter> { + public static final @Builder(setterPrefix = "with") @Value class Test, Quz extends Inter> { public static @java.lang.SuppressWarnings("all") class TestBuilder, Quz extends Inter> { private @java.lang.SuppressWarnings("all") Foo foo; private @java.lang.SuppressWarnings("all") Bar bar; diff --git a/test/transform/resource/after-ecj/BuilderWithToBuilderWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderWithToBuilderWithSetterPrefix.java index c33315a4..6f3906d9 100644 --- a/test/transform/resource/after-ecj/BuilderWithToBuilderWithSetterPrefix.java +++ b/test/transform/resource/after-ecj/BuilderWithToBuilderWithSetterPrefix.java @@ -80,44 +80,45 @@ import lombok.Builder; return builder; } } -@lombok.experimental.Accessors(prefix = "m") class ConstructorWithToBuilder { - public static @java.lang.SuppressWarnings("all") class ConstructorWithToBuilderBuilder { + +@lombok.experimental.Accessors(prefix = "m") class ConstructorWithToBuilderWithSetterPrefix { + public static @java.lang.SuppressWarnings("all") class ConstructorWithToBuilderWithSetterPrefixBuilder { private @java.lang.SuppressWarnings("all") String mOne; private @java.lang.SuppressWarnings("all") T baz; private @java.lang.SuppressWarnings("all") com.google.common.collect.ImmutableList bars; - @java.lang.SuppressWarnings("all") ConstructorWithToBuilderBuilder() { + @java.lang.SuppressWarnings("all") ConstructorWithToBuilderWithSetterPrefixBuilder() { super(); } - public @java.lang.SuppressWarnings("all") ConstructorWithToBuilderBuilder withMOne(final String mOne) { + public @java.lang.SuppressWarnings("all") ConstructorWithToBuilderWithSetterPrefixBuilder withMOne(final String mOne) { this.mOne = mOne; return this; } - public @java.lang.SuppressWarnings("all") ConstructorWithToBuilderBuilder withBaz(final T baz) { + public @java.lang.SuppressWarnings("all") ConstructorWithToBuilderWithSetterPrefixBuilder withBaz(final T baz) { this.baz = baz; return this; } - public @java.lang.SuppressWarnings("all") ConstructorWithToBuilderBuilder withBars(final com.google.common.collect.ImmutableList bars) { + public @java.lang.SuppressWarnings("all") ConstructorWithToBuilderWithSetterPrefixBuilder withBars(final com.google.common.collect.ImmutableList bars) { this.bars = bars; return this; } - public @java.lang.SuppressWarnings("all") ConstructorWithToBuilder build() { - return new ConstructorWithToBuilder(mOne, baz, bars); + public @java.lang.SuppressWarnings("all") ConstructorWithToBuilderWithSetterPrefix build() { + return new ConstructorWithToBuilderWithSetterPrefix(mOne, baz, bars); } public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { - return (((((("ConstructorWithToBuilder.ConstructorWithToBuilderBuilder(mOne=" + this.mOne) + ", baz=") + this.baz) + ", bars=") + this.bars) + ")"); + return (((((("ConstructorWithToBuilderWithSetterPrefix.ConstructorWithToBuilderWithSetterPrefixBuilder(mOne=" + this.mOne) + ", baz=") + this.baz) + ", bars=") + this.bars) + ")"); } } private String mOne; private String mTwo; private T foo; private @lombok.Singular com.google.common.collect.ImmutableList bars; - public @Builder(toBuilder = true) ConstructorWithToBuilder(String mOne, @Builder.ObtainVia(field = "foo") T baz, com.google.common.collect.ImmutableList bars) { + public @Builder(toBuilder = true,setterPrefix = "with") ConstructorWithToBuilderWithSetterPrefix(String mOne, @Builder.ObtainVia(field = "foo") T baz, com.google.common.collect.ImmutableList bars) { super(); } - public static @java.lang.SuppressWarnings("all") ConstructorWithToBuilderBuilder builder() { - return new ConstructorWithToBuilderBuilder(); + public static @java.lang.SuppressWarnings("all") ConstructorWithToBuilderWithSetterPrefixBuilder builder() { + return new ConstructorWithToBuilderWithSetterPrefixBuilder(); } - public @java.lang.SuppressWarnings("all") ConstructorWithToBuilderBuilder toBuilder() { - return new ConstructorWithToBuilderBuilder().withMOne(this.mOne).withBaz(this.foo).withBars(this.bars); + public @java.lang.SuppressWarnings("all") ConstructorWithToBuilderWithSetterPrefixBuilder toBuilder() { + return new ConstructorWithToBuilderWithSetterPrefixBuilder().withMOne(this.mOne).withBaz(this.foo).withBars(this.bars); } } diff --git a/test/transform/resource/before/BuilderWithNoBuilderMethodWithSetterPrefix.java b/test/transform/resource/before/BuilderWithNoBuilderMethodWithSetterPrefix.java index 6fddd748..80197dd3 100644 --- a/test/transform/resource/before/BuilderWithNoBuilderMethodWithSetterPrefix.java +++ b/test/transform/resource/before/BuilderWithNoBuilderMethodWithSetterPrefix.java @@ -1,4 +1,4 @@ -import lombok.Builder +import lombok.Builder; @Builder(toBuilder = true, builderMethodName = "",setterPrefix = "with") class BuilderWithNoBuilderMethodWithSetterPrefix { private String a = ""; diff --git a/test/transform/resource/before/BuilderWithToBuilderWithSetterPrefix.java b/test/transform/resource/before/BuilderWithToBuilderWithSetterPrefix.java index b33211e9..3b442b8d 100644 --- a/test/transform/resource/before/BuilderWithToBuilderWithSetterPrefix.java +++ b/test/transform/resource/before/BuilderWithToBuilderWithSetterPrefix.java @@ -5,7 +5,7 @@ class BuilderWithToBuilderWithSetterPrefix { private String mOne, mTwo; @Builder.ObtainVia(method = "rrr", isStatic = true) private T foo; @lombok.Singular private List bars; - public static K rrr(BuilderWithToBuilder x) { + public static K rrr(BuilderWithToBuilderWithSetterPrefix x) { return x.foo; } } @@ -15,6 +15,6 @@ class ConstructorWithToBuilderWithSetterPrefix { private T foo; @lombok.Singular private com.google.common.collect.ImmutableList bars; @Builder(toBuilder = true, setterPrefix = "with") - public ConstructorWithToBuilder(String mOne, @Builder.ObtainVia(field = "foo") T baz, com.google.common.collect.ImmutableList bars) { + public ConstructorWithToBuilderWithSetterPrefix(String mOne, @Builder.ObtainVia(field = "foo") T baz, com.google.common.collect.ImmutableList bars) { } } diff --git a/test/transform/resource/before/BuilderWithTolerateWithSetterPrefix.java b/test/transform/resource/before/BuilderWithTolerateWithSetterPrefix.java index fa7c0298..5c77e177 100644 --- a/test/transform/resource/before/BuilderWithTolerateWithSetterPrefix.java +++ b/test/transform/resource/before/BuilderWithTolerateWithSetterPrefix.java @@ -12,7 +12,7 @@ public class BuilderWithTolerateWithSetterPrefix { public static class BuilderWithTolerateWithSetterPrefixBuilder { @Tolerate public BuilderWithTolerateWithSetterPrefixBuilder withValue(String s) { - return this.value(Integer.parseInt(s)); + return this.withValue(Integer.parseInt(s)); } } } -- cgit