diff --git a/test/transform/resource/after-delombok/BuilderSingletonGuavaListsSets.java b/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java similarity index 67% rename from test/transform/resource/after-delombok/BuilderSingletonGuavaListsSets.java rename to test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java index 4503f2bb..3fc969ef 100644 --- a/test/transform/resource/after-delombok/BuilderSingletonGuavaListsSets.java +++ b/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java @@ -2,92 +2,92 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedSet; -class BuilderSingletonGuavaListsSets { +class BuilderSingularGuavaListsSets { private ImmutableList cards; private ImmutableCollection frogs; @SuppressWarnings("all") private ImmutableSet rawSet; private ImmutableSortedSet passes; @java.lang.SuppressWarnings("all") - BuilderSingletonGuavaListsSets(final ImmutableList cards, final ImmutableCollection frogs, final ImmutableSet rawSet, final ImmutableSortedSet passes) { + BuilderSingularGuavaListsSets(final ImmutableList cards, final ImmutableCollection frogs, final ImmutableSet rawSet, final ImmutableSortedSet passes) { this.cards = cards; this.frogs = frogs; this.rawSet = rawSet; this.passes = passes; } @java.lang.SuppressWarnings("all") - public static class BuilderSingletonGuavaListsSetsBuilder { + public static class BuilderSingularGuavaListsSetsBuilder { private com.google.common.collect.ImmutableList.Builder cards; private com.google.common.collect.ImmutableList.Builder frogs; private com.google.common.collect.ImmutableSet.Builder rawSet; private com.google.common.collect.ImmutableSortedSet.Builder passes; @java.lang.SuppressWarnings("all") - BuilderSingletonGuavaListsSetsBuilder() { + BuilderSingularGuavaListsSetsBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderSingletonGuavaListsSetsBuilder card(final T card) { + public BuilderSingularGuavaListsSetsBuilder card(final T card) { if (this.cards == null) this.cards = com.google.common.collect.ImmutableList.builder(); this.cards.add(card); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonGuavaListsSetsBuilder cards(final java.lang.Iterable cards) { + public BuilderSingularGuavaListsSetsBuilder cards(final java.lang.Iterable cards) { if (this.cards == null) this.cards = com.google.common.collect.ImmutableList.builder(); this.cards.addAll(cards); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonGuavaListsSetsBuilder frog(final Number frog) { + public BuilderSingularGuavaListsSetsBuilder frog(final Number frog) { if (this.frogs == null) this.frogs = com.google.common.collect.ImmutableList.builder(); this.frogs.add(frog); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonGuavaListsSetsBuilder frogs(final java.lang.Iterable frogs) { + public BuilderSingularGuavaListsSetsBuilder frogs(final java.lang.Iterable frogs) { if (this.frogs == null) this.frogs = com.google.common.collect.ImmutableList.builder(); this.frogs.addAll(frogs); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonGuavaListsSetsBuilder rawSet(final java.lang.Object rawSet) { + public BuilderSingularGuavaListsSetsBuilder rawSet(final java.lang.Object rawSet) { if (this.rawSet == null) this.rawSet = com.google.common.collect.ImmutableSet.builder(); this.rawSet.add(rawSet); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonGuavaListsSetsBuilder rawSet(final java.lang.Iterable rawSet) { + public BuilderSingularGuavaListsSetsBuilder rawSet(final java.lang.Iterable rawSet) { if (this.rawSet == null) this.rawSet = com.google.common.collect.ImmutableSet.builder(); this.rawSet.addAll(rawSet); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonGuavaListsSetsBuilder pass(final String pass) { + public BuilderSingularGuavaListsSetsBuilder pass(final String pass) { if (this.passes == null) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder(); this.passes.add(pass); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonGuavaListsSetsBuilder passes(final java.lang.Iterable passes) { + public BuilderSingularGuavaListsSetsBuilder passes(final java.lang.Iterable passes) { if (this.passes == null) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder(); this.passes.addAll(passes); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonGuavaListsSets build() { + public BuilderSingularGuavaListsSets 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(); - return new BuilderSingletonGuavaListsSets(cards, frogs, rawSet, passes); + return new BuilderSingularGuavaListsSets(cards, frogs, rawSet, passes); } @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "BuilderSingletonGuavaListsSets.BuilderSingletonGuavaListsSetsBuilder(cards=" + this.cards + ", frogs=" + this.frogs + ", rawSet=" + this.rawSet + ", passes=" + this.passes + ")"; + return "BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder(cards=" + this.cards + ", frogs=" + this.frogs + ", rawSet=" + this.rawSet + ", passes=" + this.passes + ")"; } } @java.lang.SuppressWarnings("all") - public static BuilderSingletonGuavaListsSetsBuilder builder() { - return new BuilderSingletonGuavaListsSetsBuilder(); + public static BuilderSingularGuavaListsSetsBuilder builder() { + return new BuilderSingularGuavaListsSetsBuilder(); } } \ No newline at end of file diff --git a/test/transform/resource/after-delombok/BuilderSingletonGuavaMaps.java b/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java similarity index 65% rename from test/transform/resource/after-delombok/BuilderSingletonGuavaMaps.java rename to test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java index ff39da32..c55dff28 100644 --- a/test/transform/resource/after-delombok/BuilderSingletonGuavaMaps.java +++ b/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java @@ -1,76 +1,76 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableBiMap; import com.google.common.collect.ImmutableSortedMap; -class BuilderSingletonGuavaMaps { +class BuilderSingularGuavaMaps { private ImmutableMap battleaxes; private ImmutableSortedMap vertices; @SuppressWarnings("all") private ImmutableBiMap rawMap; @java.lang.SuppressWarnings("all") - BuilderSingletonGuavaMaps(final ImmutableMap battleaxes, final ImmutableSortedMap vertices, final ImmutableBiMap rawMap) { + BuilderSingularGuavaMaps(final ImmutableMap battleaxes, final ImmutableSortedMap vertices, final ImmutableBiMap rawMap) { this.battleaxes = battleaxes; this.vertices = vertices; this.rawMap = rawMap; } @java.lang.SuppressWarnings("all") - public static class BuilderSingletonGuavaMapsBuilder { + public static class BuilderSingularGuavaMapsBuilder { private com.google.common.collect.ImmutableMap.Builder battleaxes; private com.google.common.collect.ImmutableSortedMap.Builder vertices; private com.google.common.collect.ImmutableBiMap.Builder rawMap; @java.lang.SuppressWarnings("all") - BuilderSingletonGuavaMapsBuilder() { + BuilderSingularGuavaMapsBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderSingletonGuavaMapsBuilder battleaxe(final K battleaxe$key, final V battleaxe$value) { + public BuilderSingularGuavaMapsBuilder battleaxe(final K battleaxe$key, final V battleaxe$value) { if (this.battleaxes == null) this.battleaxes = com.google.common.collect.ImmutableMap.builder(); this.battleaxes.put(battleaxe$key, battleaxe$value); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonGuavaMapsBuilder battleaxes(final java.util.Map battleaxes) { + public BuilderSingularGuavaMapsBuilder battleaxes(final java.util.Map battleaxes) { if (this.battleaxes == null) this.battleaxes = com.google.common.collect.ImmutableMap.builder(); this.battleaxes.putAll(battleaxes); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonGuavaMapsBuilder vertex(final Integer vertex$key, final V vertex$value) { + public BuilderSingularGuavaMapsBuilder vertex(final Integer vertex$key, final V vertex$value) { if (this.vertices == null) this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.vertices.put(vertex$key, vertex$value); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonGuavaMapsBuilder vertices(final java.util.Map vertices) { + public BuilderSingularGuavaMapsBuilder vertices(final java.util.Map vertices) { if (this.vertices == null) this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.vertices.putAll(vertices); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonGuavaMapsBuilder rawMap(final java.lang.Object rawMap$key, final java.lang.Object rawMap$value) { + public BuilderSingularGuavaMapsBuilder rawMap(final java.lang.Object rawMap$key, final java.lang.Object rawMap$value) { if (this.rawMap == null) this.rawMap = com.google.common.collect.ImmutableBiMap.builder(); this.rawMap.put(rawMap$key, rawMap$value); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonGuavaMapsBuilder rawMap(final java.util.Map rawMap) { + public BuilderSingularGuavaMapsBuilder rawMap(final java.util.Map rawMap) { if (this.rawMap == null) this.rawMap = com.google.common.collect.ImmutableBiMap.builder(); this.rawMap.putAll(rawMap); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonGuavaMaps build() { + public BuilderSingularGuavaMaps build() { com.google.common.collect.ImmutableMap battleaxes = this.battleaxes == null ? com.google.common.collect.ImmutableMap.of() : this.battleaxes.build(); com.google.common.collect.ImmutableSortedMap vertices = this.vertices == null ? com.google.common.collect.ImmutableSortedMap.of() : this.vertices.build(); com.google.common.collect.ImmutableBiMap rawMap = this.rawMap == null ? com.google.common.collect.ImmutableBiMap.of() : this.rawMap.build(); - return new BuilderSingletonGuavaMaps(battleaxes, vertices, rawMap); + return new BuilderSingularGuavaMaps(battleaxes, vertices, rawMap); } @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "BuilderSingletonGuavaMaps.BuilderSingletonGuavaMapsBuilder(battleaxes=" + this.battleaxes + ", vertices=" + this.vertices + ", rawMap=" + this.rawMap + ")"; + return "BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder(battleaxes=" + this.battleaxes + ", vertices=" + this.vertices + ", rawMap=" + this.rawMap + ")"; } } @java.lang.SuppressWarnings("all") - public static BuilderSingletonGuavaMapsBuilder builder() { - return new BuilderSingletonGuavaMapsBuilder(); + public static BuilderSingularGuavaMapsBuilder builder() { + return new BuilderSingularGuavaMapsBuilder(); } } \ No newline at end of file diff --git a/test/transform/resource/after-delombok/BuilderSingletonLists.java b/test/transform/resource/after-delombok/BuilderSingularLists.java similarity index 73% rename from test/transform/resource/after-delombok/BuilderSingletonLists.java rename to test/transform/resource/after-delombok/BuilderSingularLists.java index 1c93f40a..aa5382c1 100644 --- a/test/transform/resource/after-delombok/BuilderSingletonLists.java +++ b/test/transform/resource/after-delombok/BuilderSingularLists.java @@ -1,62 +1,62 @@ import java.util.List; import java.util.Collection; -class BuilderSingletonLists { +class BuilderSingularLists { private List children; private Collection scarves; @SuppressWarnings("all") private List rawList; @java.lang.SuppressWarnings("all") - BuilderSingletonLists(final List children, final Collection scarves, final List rawList) { + BuilderSingularLists(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 BuilderSingletonListsBuilder { + public static class BuilderSingularListsBuilder { private java.util.ArrayList children; private java.util.ArrayList scarves; private java.util.ArrayList rawList; @java.lang.SuppressWarnings("all") - BuilderSingletonListsBuilder() { + BuilderSingularListsBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderSingletonListsBuilder child(final T child) { + public BuilderSingularListsBuilder child(final T child) { if (this.children == null) this.children = new java.util.ArrayList(); this.children.add(child); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonListsBuilder children(final java.util.Collection children) { + public BuilderSingularListsBuilder children(final java.util.Collection children) { if (this.children == null) this.children = new java.util.ArrayList(); this.children.addAll(children); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonListsBuilder scarf(final Number scarf) { + public BuilderSingularListsBuilder scarf(final Number scarf) { if (this.scarves == null) this.scarves = new java.util.ArrayList(); this.scarves.add(scarf); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonListsBuilder scarves(final java.util.Collection scarves) { + public BuilderSingularListsBuilder scarves(final java.util.Collection scarves) { if (this.scarves == null) this.scarves = new java.util.ArrayList(); this.scarves.addAll(scarves); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonListsBuilder rawList(final java.lang.Object rawList) { + public BuilderSingularListsBuilder rawList(final java.lang.Object rawList) { if (this.rawList == null) this.rawList = new java.util.ArrayList(); this.rawList.add(rawList); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonListsBuilder rawList(final java.util.Collection rawList) { + public BuilderSingularListsBuilder rawList(final java.util.Collection rawList) { if (this.rawList == null) this.rawList = new java.util.ArrayList(); this.rawList.addAll(rawList); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonLists build() { + public BuilderSingularLists build() { java.util.List children; switch (this.children == null ? 0 : this.children.size()) { case 0: @@ -96,16 +96,16 @@ class BuilderSingletonLists { rawList.addAll(this.rawList); rawList = java.util.Collections.unmodifiableList(rawList); } - return new BuilderSingletonLists(children, scarves, rawList); + return new BuilderSingularLists(children, scarves, rawList); } @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "BuilderSingletonLists.BuilderSingletonListsBuilder(children=" + this.children + ", scarves=" + this.scarves + ", rawList=" + this.rawList + ")"; + return "BuilderSingularLists.BuilderSingularListsBuilder(children=" + this.children + ", scarves=" + this.scarves + ", rawList=" + this.rawList + ")"; } } @java.lang.SuppressWarnings("all") - public static BuilderSingletonListsBuilder builder() { - return new BuilderSingletonListsBuilder(); + public static BuilderSingularListsBuilder builder() { + return new BuilderSingularListsBuilder(); } } diff --git a/test/transform/resource/after-delombok/BuilderSingletonMaps.java b/test/transform/resource/after-delombok/BuilderSingularMaps.java similarity index 78% rename from test/transform/resource/after-delombok/BuilderSingletonMaps.java rename to test/transform/resource/after-delombok/BuilderSingularMaps.java index a6474975..640ddb94 100644 --- a/test/transform/resource/after-delombok/BuilderSingletonMaps.java +++ b/test/transform/resource/after-delombok/BuilderSingularMaps.java @@ -1,20 +1,20 @@ import java.util.Map; import java.util.SortedMap; -class BuilderSingletonMaps { +class BuilderSingularMaps { private Map women; private SortedMap men; @SuppressWarnings("all") private Map rawMap; private Map stringMap; @java.lang.SuppressWarnings("all") - BuilderSingletonMaps(final Map women, final SortedMap men, final Map rawMap, final Map stringMap) { + BuilderSingularMaps(final Map women, final SortedMap men, final Map rawMap, final Map stringMap) { this.women = women; this.men = men; this.rawMap = rawMap; this.stringMap = stringMap; } @java.lang.SuppressWarnings("all") - public static class BuilderSingletonMapsBuilder { + public static class BuilderSingularMapsBuilder { private java.util.ArrayList women$key; private java.util.ArrayList women$value; private java.util.ArrayList men$key; @@ -24,10 +24,10 @@ class BuilderSingletonMaps { private java.util.ArrayList stringMap$key; private java.util.ArrayList stringMap$value; @java.lang.SuppressWarnings("all") - BuilderSingletonMapsBuilder() { + BuilderSingularMapsBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderSingletonMapsBuilder woman(final K womanKey, final V womanValue) { + public BuilderSingularMapsBuilder woman(final K womanKey, final V womanValue) { if (this.women$key == null) { this.women$key = new java.util.ArrayList(); this.women$value = new java.util.ArrayList(); @@ -37,7 +37,7 @@ class BuilderSingletonMaps { return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonMapsBuilder women(final java.util.Map women) { + public BuilderSingularMapsBuilder women(final java.util.Map women) { if (this.women$key == null) { this.women$key = new java.util.ArrayList(); this.women$value = new java.util.ArrayList(); @@ -49,7 +49,7 @@ class BuilderSingletonMaps { return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonMapsBuilder man(final K manKey, final Number manValue) { + public BuilderSingularMapsBuilder man(final K manKey, final Number manValue) { if (this.men$key == null) { this.men$key = new java.util.ArrayList(); this.men$value = new java.util.ArrayList(); @@ -59,7 +59,7 @@ class BuilderSingletonMaps { return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonMapsBuilder men(final java.util.Map men) { + public BuilderSingularMapsBuilder men(final java.util.Map men) { if (this.men$key == null) { this.men$key = new java.util.ArrayList(); this.men$value = new java.util.ArrayList(); @@ -71,7 +71,7 @@ class BuilderSingletonMaps { return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonMapsBuilder rawMap(final java.lang.Object rawMapKey, final java.lang.Object rawMapValue) { + public BuilderSingularMapsBuilder rawMap(final java.lang.Object rawMapKey, final java.lang.Object rawMapValue) { if (this.rawMap$key == null) { this.rawMap$key = new java.util.ArrayList(); this.rawMap$value = new java.util.ArrayList(); @@ -81,7 +81,7 @@ class BuilderSingletonMaps { return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonMapsBuilder rawMap(final java.util.Map rawMap) { + public BuilderSingularMapsBuilder rawMap(final java.util.Map rawMap) { if (this.rawMap$key == null) { this.rawMap$key = new java.util.ArrayList(); this.rawMap$value = new java.util.ArrayList(); @@ -93,7 +93,7 @@ class BuilderSingletonMaps { return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonMapsBuilder stringMap(final String stringMapKey, final V stringMapValue) { + public BuilderSingularMapsBuilder stringMap(final String stringMapKey, final V stringMapValue) { if (this.stringMap$key == null) { this.stringMap$key = new java.util.ArrayList(); this.stringMap$value = new java.util.ArrayList(); @@ -103,7 +103,7 @@ class BuilderSingletonMaps { return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonMapsBuilder stringMap(final java.util.Map stringMap) { + public BuilderSingularMapsBuilder stringMap(final java.util.Map stringMap) { if (this.stringMap$key == null) { this.stringMap$key = new java.util.ArrayList(); this.stringMap$value = new java.util.ArrayList(); @@ -115,7 +115,7 @@ class BuilderSingletonMaps { return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonMaps build() { + public BuilderSingularMaps build() { java.util.Map women; switch (this.women$key == null ? 0 : this.women$key.size()) { case 0: @@ -158,16 +158,16 @@ class BuilderSingletonMaps { for (int $i = 0; $i < this.stringMap$key.size(); $i++) stringMap.put(this.stringMap$key.get($i), this.stringMap$value.get($i)); stringMap = java.util.Collections.unmodifiableMap(stringMap); } - return new BuilderSingletonMaps(women, men, rawMap, stringMap); + return new BuilderSingularMaps(women, men, rawMap, stringMap); } @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "BuilderSingletonMaps.BuilderSingletonMapsBuilder(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 "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 + ")"; } } @java.lang.SuppressWarnings("all") - public static BuilderSingletonMapsBuilder builder() { - return new BuilderSingletonMapsBuilder(); + public static BuilderSingularMapsBuilder builder() { + return new BuilderSingularMapsBuilder(); } } diff --git a/test/transform/resource/after-delombok/BuilderSingletonRedirectToGuava.java b/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java similarity index 64% rename from test/transform/resource/after-delombok/BuilderSingletonRedirectToGuava.java rename to test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java index a2d230a1..84dc9a26 100644 --- a/test/transform/resource/after-delombok/BuilderSingletonRedirectToGuava.java +++ b/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java @@ -1,75 +1,75 @@ import java.util.Set; import java.util.NavigableMap; import java.util.Collection; -class BuilderSingletonRedirectToGuava { +class BuilderSingularRedirectToGuava { private Set dangerMice; private NavigableMap things; private Collection> doohickeys; @java.lang.SuppressWarnings("all") - BuilderSingletonRedirectToGuava(final Set dangerMice, final NavigableMap things, final Collection> doohickeys) { + BuilderSingularRedirectToGuava(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 BuilderSingletonRedirectToGuavaBuilder { + public static class BuilderSingularRedirectToGuavaBuilder { private com.google.common.collect.ImmutableSet.Builder dangerMice; private com.google.common.collect.ImmutableSortedMap.Builder things; private com.google.common.collect.ImmutableList.Builder> doohickeys; @java.lang.SuppressWarnings("all") - BuilderSingletonRedirectToGuavaBuilder() { + BuilderSingularRedirectToGuavaBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderSingletonRedirectToGuavaBuilder dangerMouse(final String dangerMouse) { + public BuilderSingularRedirectToGuavaBuilder dangerMouse(final String dangerMouse) { if (this.dangerMice == null) this.dangerMice = com.google.common.collect.ImmutableSet.builder(); this.dangerMice.add(dangerMouse); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonRedirectToGuavaBuilder dangerMice(final java.lang.Iterable dangerMice) { + public BuilderSingularRedirectToGuavaBuilder dangerMice(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 BuilderSingletonRedirectToGuavaBuilder thing(final Integer thing$key, final Number thing$value) { + public BuilderSingularRedirectToGuavaBuilder thing(final Integer thing$key, final Number thing$value) { if (this.things == null) this.things = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.things.put(thing$key, thing$value); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonRedirectToGuavaBuilder things(final java.util.Map things) { + public BuilderSingularRedirectToGuavaBuilder things(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 BuilderSingletonRedirectToGuavaBuilder doohickey(final Class doohickey) { + public BuilderSingularRedirectToGuavaBuilder doohickey(final Class doohickey) { if (this.doohickeys == null) this.doohickeys = com.google.common.collect.ImmutableList.builder(); this.doohickeys.add(doohickey); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonRedirectToGuavaBuilder doohickeys(final java.lang.Iterable> doohickeys) { + public BuilderSingularRedirectToGuavaBuilder doohickeys(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 BuilderSingletonRedirectToGuava build() { + public BuilderSingularRedirectToGuava 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 BuilderSingletonRedirectToGuava(dangerMice, things, doohickeys); + return new BuilderSingularRedirectToGuava(dangerMice, things, doohickeys); } @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "BuilderSingletonRedirectToGuava.BuilderSingletonRedirectToGuavaBuilder(dangerMice=" + this.dangerMice + ", things=" + this.things + ", doohickeys=" + this.doohickeys + ")"; + return "BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder(dangerMice=" + this.dangerMice + ", things=" + this.things + ", doohickeys=" + this.doohickeys + ")"; } } @java.lang.SuppressWarnings("all") - public static BuilderSingletonRedirectToGuavaBuilder builder() { - return new BuilderSingletonRedirectToGuavaBuilder(); + public static BuilderSingularRedirectToGuavaBuilder builder() { + return new BuilderSingularRedirectToGuavaBuilder(); } } \ No newline at end of file diff --git a/test/transform/resource/after-delombok/BuilderSingletonSets.java b/test/transform/resource/after-delombok/BuilderSingularSets.java similarity index 74% rename from test/transform/resource/after-delombok/BuilderSingletonSets.java rename to test/transform/resource/after-delombok/BuilderSingularSets.java index c57331a5..d75c0fbf 100644 --- a/test/transform/resource/after-delombok/BuilderSingletonSets.java +++ b/test/transform/resource/after-delombok/BuilderSingularSets.java @@ -1,77 +1,77 @@ import java.util.Set; import java.util.SortedSet; -class BuilderSingletonSets { +class BuilderSingularSets { private Set dangerMice; private SortedSet octopodes; @SuppressWarnings("all") private Set rawSet; private Set stringSet; @java.lang.SuppressWarnings("all") - BuilderSingletonSets(final Set dangerMice, final SortedSet octopodes, final Set rawSet, final Set stringSet) { + BuilderSingularSets(final Set dangerMice, final SortedSet octopodes, final Set rawSet, final Set stringSet) { this.dangerMice = dangerMice; this.octopodes = octopodes; this.rawSet = rawSet; this.stringSet = stringSet; } @java.lang.SuppressWarnings("all") - public static class BuilderSingletonSetsBuilder { + public static class BuilderSingularSetsBuilder { private java.util.ArrayList dangerMice; private java.util.ArrayList octopodes; private java.util.ArrayList rawSet; private java.util.ArrayList stringSet; @java.lang.SuppressWarnings("all") - BuilderSingletonSetsBuilder() { + BuilderSingularSetsBuilder() { } @java.lang.SuppressWarnings("all") - public BuilderSingletonSetsBuilder dangerMouse(final T dangerMouse) { + public BuilderSingularSetsBuilder dangerMouse(final T dangerMouse) { if (this.dangerMice == null) this.dangerMice = new java.util.ArrayList(); this.dangerMice.add(dangerMouse); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonSetsBuilder dangerMice(final java.util.Collection dangerMice) { + public BuilderSingularSetsBuilder dangerMice(final java.util.Collection dangerMice) { if (this.dangerMice == null) this.dangerMice = new java.util.ArrayList(); this.dangerMice.addAll(dangerMice); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonSetsBuilder octopus(final Number octopus) { + public BuilderSingularSetsBuilder octopus(final Number octopus) { if (this.octopodes == null) this.octopodes = new java.util.ArrayList(); this.octopodes.add(octopus); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonSetsBuilder octopodes(final java.util.Collection octopodes) { + public BuilderSingularSetsBuilder octopodes(final java.util.Collection octopodes) { if (this.octopodes == null) this.octopodes = new java.util.ArrayList(); this.octopodes.addAll(octopodes); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonSetsBuilder rawSet(final java.lang.Object rawSet) { + public BuilderSingularSetsBuilder rawSet(final java.lang.Object rawSet) { if (this.rawSet == null) this.rawSet = new java.util.ArrayList(); this.rawSet.add(rawSet); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonSetsBuilder rawSet(final java.util.Collection rawSet) { + public BuilderSingularSetsBuilder rawSet(final java.util.Collection rawSet) { if (this.rawSet == null) this.rawSet = new java.util.ArrayList(); this.rawSet.addAll(rawSet); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonSetsBuilder stringSet(final String stringSet) { + public BuilderSingularSetsBuilder stringSet(final String stringSet) { if (this.stringSet == null) this.stringSet = new java.util.ArrayList(); this.stringSet.add(stringSet); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonSetsBuilder stringSet(final java.util.Collection stringSet) { + public BuilderSingularSetsBuilder stringSet(final java.util.Collection stringSet) { if (this.stringSet == null) this.stringSet = new java.util.ArrayList(); this.stringSet.addAll(stringSet); return this; } @java.lang.SuppressWarnings("all") - public BuilderSingletonSets build() { + public BuilderSingularSets build() { java.util.Set dangerMice; switch (this.dangerMice == null ? 0 : this.dangerMice.size()) { case 0: @@ -114,16 +114,16 @@ class BuilderSingletonSets { stringSet.addAll(this.stringSet); stringSet = java.util.Collections.unmodifiableSet(stringSet); } - return new BuilderSingletonSets(dangerMice, octopodes, rawSet, stringSet); + return new BuilderSingularSets(dangerMice, octopodes, rawSet, stringSet); } @java.lang.Override @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "BuilderSingletonSets.BuilderSingletonSetsBuilder(dangerMice=" + this.dangerMice + ", octopodes=" + this.octopodes + ", rawSet=" + this.rawSet + ", stringSet=" + this.stringSet + ")"; + return "BuilderSingularSets.BuilderSingularSetsBuilder(dangerMice=" + this.dangerMice + ", octopodes=" + this.octopodes + ", rawSet=" + this.rawSet + ", stringSet=" + this.stringSet + ")"; } } @java.lang.SuppressWarnings("all") - public static BuilderSingletonSetsBuilder builder() { - return new BuilderSingletonSetsBuilder(); + public static BuilderSingularSetsBuilder builder() { + return new BuilderSingularSetsBuilder(); } } \ No newline at end of file diff --git a/test/transform/resource/after-ecj/BuilderSingletonGuavaListsSets.java b/test/transform/resource/after-ecj/BuilderSingularGuavaListsSets.java similarity index 62% rename from test/transform/resource/after-ecj/BuilderSingletonGuavaListsSets.java rename to test/transform/resource/after-ecj/BuilderSingularGuavaListsSets.java index d14cb049..f95ce1ea 100644 --- a/test/transform/resource/after-ecj/BuilderSingletonGuavaListsSets.java +++ b/test/transform/resource/after-ecj/BuilderSingularGuavaListsSets.java @@ -3,86 +3,86 @@ import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedSet; import lombok.Singular; -@lombok.Builder class BuilderSingletonGuavaListsSets { - public static @java.lang.SuppressWarnings("all") class BuilderSingletonGuavaListsSetsBuilder { +@lombok.Builder class BuilderSingularGuavaListsSets { + public static @java.lang.SuppressWarnings("all") class BuilderSingularGuavaListsSetsBuilder { private com.google.common.collect.ImmutableList.Builder cards; private com.google.common.collect.ImmutableList.Builder frogs; private com.google.common.collect.ImmutableSet.Builder rawSet; private com.google.common.collect.ImmutableSortedSet.Builder passes; - @java.lang.SuppressWarnings("all") BuilderSingletonGuavaListsSetsBuilder() { + @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingletonGuavaListsSetsBuilder card(T card) { + public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder card(T card) { if ((this.cards == null)) this.cards = com.google.common.collect.ImmutableList.builder(); this.cards.add(card); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonGuavaListsSetsBuilder cards(java.lang.Iterable cards) { + public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder cards(java.lang.Iterable cards) { if ((this.cards == null)) this.cards = com.google.common.collect.ImmutableList.builder(); this.cards.addAll(cards); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonGuavaListsSetsBuilder frog(Number frog) { + public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder frog(Number frog) { if ((this.frogs == null)) this.frogs = com.google.common.collect.ImmutableList.builder(); this.frogs.add(frog); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonGuavaListsSetsBuilder frogs(java.lang.Iterable frogs) { + public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder frogs(java.lang.Iterable frogs) { if ((this.frogs == null)) this.frogs = com.google.common.collect.ImmutableList.builder(); this.frogs.addAll(frogs); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonGuavaListsSetsBuilder rawSet(java.lang.Object rawSet) { + public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder rawSet(java.lang.Object rawSet) { if ((this.rawSet == null)) this.rawSet = com.google.common.collect.ImmutableSet.builder(); this.rawSet.add(rawSet); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonGuavaListsSetsBuilder rawSet(java.lang.Iterable rawSet) { + public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder rawSet(java.lang.Iterable rawSet) { if ((this.rawSet == null)) this.rawSet = com.google.common.collect.ImmutableSet.builder(); this.rawSet.addAll(rawSet); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonGuavaListsSetsBuilder pass(String pass) { + public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder pass(String pass) { if ((this.passes == null)) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder(); this.passes.add(pass); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonGuavaListsSetsBuilder passes(java.lang.Iterable passes) { + public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder passes(java.lang.Iterable passes) { if ((this.passes == null)) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder(); this.passes.addAll(passes); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonGuavaListsSets build() { + public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets 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()); - return new BuilderSingletonGuavaListsSets(cards, frogs, rawSet, passes); + return new BuilderSingularGuavaListsSets(cards, frogs, rawSet, passes); } public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { - return (((((((("BuilderSingletonGuavaListsSets.BuilderSingletonGuavaListsSetsBuilder(cards=" + this.cards) + ", frogs=") + this.frogs) + ", rawSet=") + this.rawSet) + ", passes=") + this.passes) + ")"); + return (((((((("BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder(cards=" + this.cards) + ", frogs=") + this.frogs) + ", rawSet=") + this.rawSet) + ", passes=") + this.passes) + ")"); } } private @Singular ImmutableList cards; private @Singular ImmutableCollection frogs; private @SuppressWarnings("all") @Singular("rawSet") ImmutableSet rawSet; private @Singular ImmutableSortedSet passes; - @java.lang.SuppressWarnings("all") BuilderSingletonGuavaListsSets(final ImmutableList cards, final ImmutableCollection frogs, final ImmutableSet rawSet, final ImmutableSortedSet passes) { + @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets(final ImmutableList cards, final ImmutableCollection frogs, final ImmutableSet rawSet, final ImmutableSortedSet passes) { super(); this.cards = cards; this.frogs = frogs; this.rawSet = rawSet; this.passes = passes; } - public static @java.lang.SuppressWarnings("all") BuilderSingletonGuavaListsSetsBuilder builder() { - return new BuilderSingletonGuavaListsSetsBuilder(); + public static @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder builder() { + return new BuilderSingularGuavaListsSetsBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderSingletonGuavaMaps.java b/test/transform/resource/after-ecj/BuilderSingularGuavaMaps.java similarity index 61% rename from test/transform/resource/after-ecj/BuilderSingletonGuavaMaps.java rename to test/transform/resource/after-ecj/BuilderSingularGuavaMaps.java index 33788df9..64f287bf 100644 --- a/test/transform/resource/after-ecj/BuilderSingletonGuavaMaps.java +++ b/test/transform/resource/after-ecj/BuilderSingularGuavaMaps.java @@ -2,70 +2,70 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableBiMap; import com.google.common.collect.ImmutableSortedMap; import lombok.Singular; -@lombok.Builder class BuilderSingletonGuavaMaps { - public static @java.lang.SuppressWarnings("all") class BuilderSingletonGuavaMapsBuilder { +@lombok.Builder class BuilderSingularGuavaMaps { + public static @java.lang.SuppressWarnings("all") class BuilderSingularGuavaMapsBuilder { private com.google.common.collect.ImmutableMap.Builder battleaxes; private com.google.common.collect.ImmutableSortedMap.Builder vertices; private com.google.common.collect.ImmutableBiMap.Builder rawMap; - @java.lang.SuppressWarnings("all") BuilderSingletonGuavaMapsBuilder() { + @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingletonGuavaMapsBuilder battleaxe(K battleaxe$key, V battleaxe$value) { + public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder battleaxe(K battleaxe$key, V battleaxe$value) { if ((this.battleaxes == null)) this.battleaxes = com.google.common.collect.ImmutableMap.builder(); this.battleaxes.put(battleaxe$key, battleaxe$value); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonGuavaMapsBuilder battleaxes(java.util.Map battleaxes) { + public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder battleaxes(java.util.Map battleaxes) { if ((this.battleaxes == null)) this.battleaxes = com.google.common.collect.ImmutableMap.builder(); this.battleaxes.putAll(battleaxes); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonGuavaMapsBuilder vertex(Integer vertex$key, V vertex$value) { + public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder vertex(Integer vertex$key, V vertex$value) { if ((this.vertices == null)) this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.vertices.put(vertex$key, vertex$value); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonGuavaMapsBuilder vertices(java.util.Map vertices) { + public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder vertices(java.util.Map vertices) { if ((this.vertices == null)) this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.vertices.putAll(vertices); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonGuavaMapsBuilder rawMap(java.lang.Object rawMap$key, java.lang.Object rawMap$value) { + public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder rawMap(java.lang.Object rawMap$key, java.lang.Object rawMap$value) { if ((this.rawMap == null)) this.rawMap = com.google.common.collect.ImmutableBiMap.builder(); this.rawMap.put(rawMap$key, rawMap$value); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonGuavaMapsBuilder rawMap(java.util.Map rawMap) { + public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder rawMap(java.util.Map rawMap) { if ((this.rawMap == null)) this.rawMap = com.google.common.collect.ImmutableBiMap.builder(); this.rawMap.putAll(rawMap); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonGuavaMaps build() { + public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps build() { com.google.common.collect.ImmutableMap battleaxes = ((this.battleaxes == null) ? com.google.common.collect.ImmutableMap.of() : this.battleaxes.build()); com.google.common.collect.ImmutableSortedMap vertices = ((this.vertices == null) ? com.google.common.collect.ImmutableSortedMap.of() : this.vertices.build()); com.google.common.collect.ImmutableBiMap rawMap = ((this.rawMap == null) ? com.google.common.collect.ImmutableBiMap.of() : this.rawMap.build()); - return new BuilderSingletonGuavaMaps(battleaxes, vertices, rawMap); + return new BuilderSingularGuavaMaps(battleaxes, vertices, rawMap); } public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { - return (((((("BuilderSingletonGuavaMaps.BuilderSingletonGuavaMapsBuilder(battleaxes=" + this.battleaxes) + ", vertices=") + this.vertices) + ", rawMap=") + this.rawMap) + ")"); + return (((((("BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder(battleaxes=" + this.battleaxes) + ", vertices=") + this.vertices) + ", rawMap=") + this.rawMap) + ")"); } } private @Singular ImmutableMap battleaxes; private @Singular ImmutableSortedMap vertices; private @SuppressWarnings("all") @Singular("rawMap") ImmutableBiMap rawMap; - @java.lang.SuppressWarnings("all") BuilderSingletonGuavaMaps(final ImmutableMap battleaxes, final ImmutableSortedMap vertices, final ImmutableBiMap rawMap) { + @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps(final ImmutableMap battleaxes, final ImmutableSortedMap vertices, final ImmutableBiMap rawMap) { super(); this.battleaxes = battleaxes; this.vertices = vertices; this.rawMap = rawMap; } - public static @java.lang.SuppressWarnings("all") BuilderSingletonGuavaMapsBuilder builder() { - return new BuilderSingletonGuavaMapsBuilder(); + public static @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder builder() { + return new BuilderSingularGuavaMapsBuilder(); } } diff --git a/test/transform/resource/after-ecj/BuilderSingletonLists.java b/test/transform/resource/after-ecj/BuilderSingularLists.java similarity index 69% rename from test/transform/resource/after-ecj/BuilderSingletonLists.java rename to test/transform/resource/after-ecj/BuilderSingularLists.java index 05f6e6e9..c0a3ef9a 100644 --- a/test/transform/resource/after-ecj/BuilderSingletonLists.java +++ b/test/transform/resource/after-ecj/BuilderSingularLists.java @@ -2,51 +2,51 @@ import java.util.List; import java.util.Collection; import lombok.Singular; -@lombok.Builder class BuilderSingletonLists { - public static @java.lang.SuppressWarnings("all") class BuilderSingletonListsBuilder { +@lombok.Builder class BuilderSingularLists { + public static @java.lang.SuppressWarnings("all") class BuilderSingularListsBuilder { private java.util.ArrayList children; private java.util.ArrayList scarves; private java.util.ArrayList rawList; - @java.lang.SuppressWarnings("all") BuilderSingletonListsBuilder() { + @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingletonListsBuilder child(T child) { + public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder child(T child) { if ((this.children == null)) this.children = new java.util.ArrayList(); this.children.add(child); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonListsBuilder children(java.util.Collection children) { + public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder children(java.util.Collection children) { if ((this.children == null)) this.children = new java.util.ArrayList(); this.children.addAll(children); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonListsBuilder scarf(Number scarf) { + public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder scarf(Number scarf) { if ((this.scarves == null)) this.scarves = new java.util.ArrayList(); this.scarves.add(scarf); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonListsBuilder scarves(java.util.Collection scarves) { + public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder scarves(java.util.Collection scarves) { if ((this.scarves == null)) this.scarves = new java.util.ArrayList(); this.scarves.addAll(scarves); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonListsBuilder rawList(java.lang.Object rawList) { + public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder rawList(java.lang.Object rawList) { if ((this.rawList == null)) this.rawList = new java.util.ArrayList(); this.rawList.add(rawList); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonListsBuilder rawList(java.util.Collection rawList) { + public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder rawList(java.util.Collection rawList) { if ((this.rawList == null)) this.rawList = new java.util.ArrayList(); this.rawList.addAll(rawList); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonLists build() { + public @java.lang.SuppressWarnings("all") BuilderSingularLists build() { java.util.List children; switch (((this.children == null) ? 0 : this.children.size())) { case 0 : @@ -86,22 +86,22 @@ import lombok.Singular; rawList.addAll(this.rawList); rawList = java.util.Collections.unmodifiableList(rawList); } - return new BuilderSingletonLists(children, scarves, rawList); + return new BuilderSingularLists(children, scarves, rawList); } public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { - return (((((("BuilderSingletonLists.BuilderSingletonListsBuilder(children=" + this.children) + ", scarves=") + this.scarves) + ", rawList=") + this.rawList) + ")"); + return (((((("BuilderSingularLists.BuilderSingularListsBuilder(children=" + this.children) + ", scarves=") + this.scarves) + ", rawList=") + this.rawList) + ")"); } } private @Singular List children; private @Singular Collection scarves; private @SuppressWarnings("all") @Singular("rawList") List rawList; - @java.lang.SuppressWarnings("all") BuilderSingletonLists(final List children, final Collection scarves, final List rawList) { + @java.lang.SuppressWarnings("all") BuilderSingularLists(final List children, final Collection scarves, final List rawList) { super(); this.children = children; this.scarves = scarves; this.rawList = rawList; } - public static @java.lang.SuppressWarnings("all") BuilderSingletonListsBuilder builder() { - return new BuilderSingletonListsBuilder(); + public static @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder builder() { + return new BuilderSingularListsBuilder(); } } \ No newline at end of file diff --git a/test/transform/resource/after-ecj/BuilderSingletonMaps.java b/test/transform/resource/after-ecj/BuilderSingularMaps.java similarity index 77% rename from test/transform/resource/after-ecj/BuilderSingletonMaps.java rename to test/transform/resource/after-ecj/BuilderSingularMaps.java index ccd57193..0ce5a0a9 100644 --- a/test/transform/resource/after-ecj/BuilderSingletonMaps.java +++ b/test/transform/resource/after-ecj/BuilderSingularMaps.java @@ -1,8 +1,8 @@ import java.util.Map; import java.util.SortedMap; import lombok.Singular; -@lombok.Builder class BuilderSingletonMaps { - public static @java.lang.SuppressWarnings("all") class BuilderSingletonMapsBuilder { +@lombok.Builder class BuilderSingularMaps { + public static @java.lang.SuppressWarnings("all") class BuilderSingularMapsBuilder { private java.util.ArrayList women$key; private java.util.ArrayList women$value; private java.util.ArrayList men$key; @@ -11,10 +11,10 @@ import lombok.Singular; private java.util.ArrayList rawMap$value; private java.util.ArrayList stringMap$key; private java.util.ArrayList stringMap$value; - @java.lang.SuppressWarnings("all") BuilderSingletonMapsBuilder() { + @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingletonMapsBuilder woman(K womanKey, V womanValue) { + public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder woman(K womanKey, V womanValue) { if ((this.women$key == null)) { this.women$key = new java.util.ArrayList(); @@ -24,7 +24,7 @@ import lombok.Singular; this.women$value.add(womanValue); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonMapsBuilder women(java.util.Map women) { + public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder women(java.util.Map women) { if ((this.women$key == null)) { this.women$key = new java.util.ArrayList(); @@ -37,7 +37,7 @@ import lombok.Singular; } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonMapsBuilder man(K manKey, Number manValue) { + public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder man(K manKey, Number manValue) { if ((this.men$key == null)) { this.men$key = new java.util.ArrayList(); @@ -47,7 +47,7 @@ import lombok.Singular; this.men$value.add(manValue); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonMapsBuilder men(java.util.Map men) { + public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder men(java.util.Map men) { if ((this.men$key == null)) { this.men$key = new java.util.ArrayList(); @@ -60,7 +60,7 @@ import lombok.Singular; } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonMapsBuilder rawMap(java.lang.Object rawMapKey, java.lang.Object rawMapValue) { + public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder rawMap(java.lang.Object rawMapKey, java.lang.Object rawMapValue) { if ((this.rawMap$key == null)) { this.rawMap$key = new java.util.ArrayList(); @@ -70,7 +70,7 @@ import lombok.Singular; this.rawMap$value.add(rawMapValue); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonMapsBuilder rawMap(java.util.Map rawMap) { + public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder rawMap(java.util.Map rawMap) { if ((this.rawMap$key == null)) { this.rawMap$key = new java.util.ArrayList(); @@ -83,7 +83,7 @@ import lombok.Singular; } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonMapsBuilder stringMap(String stringMapKey, V stringMapValue) { + public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder stringMap(String stringMapKey, V stringMapValue) { if ((this.stringMap$key == null)) { this.stringMap$key = new java.util.ArrayList(); @@ -93,7 +93,7 @@ import lombok.Singular; this.stringMap$value.add(stringMapValue); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonMapsBuilder stringMap(java.util.Map stringMap) { + public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder stringMap(java.util.Map stringMap) { if ((this.stringMap$key == null)) { this.stringMap$key = new java.util.ArrayList(); @@ -106,7 +106,7 @@ import lombok.Singular; } return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonMaps build() { + public @java.lang.SuppressWarnings("all") BuilderSingularMaps build() { java.util.Map women; switch (((this.women$key == null) ? 0 : this.women$key.size())) { case 0 : @@ -154,24 +154,24 @@ import lombok.Singular; stringMap.put(this.stringMap$key.get($i), this.stringMap$value.get($i)); stringMap = java.util.Collections.unmodifiableMap(stringMap); } - return new BuilderSingletonMaps(women, men, rawMap, stringMap); + return new BuilderSingularMaps(women, men, rawMap, stringMap); } public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { - return (((((((((((((((("BuilderSingletonMaps.BuilderSingletonMapsBuilder(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 (((((((((((((((("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) + ")"); } } private @Singular Map women; private @Singular SortedMap men; private @SuppressWarnings("all") @Singular("rawMap") Map rawMap; private @Singular("stringMap") Map stringMap; - @java.lang.SuppressWarnings("all") BuilderSingletonMaps(final Map women, final SortedMap men, final Map rawMap, final Map stringMap) { + @java.lang.SuppressWarnings("all") BuilderSingularMaps(final Map women, final SortedMap men, final Map rawMap, final Map stringMap) { super(); this.women = women; this.men = men; this.rawMap = rawMap; this.stringMap = stringMap; } - public static @java.lang.SuppressWarnings("all") BuilderSingletonMapsBuilder builder() { - return new BuilderSingletonMapsBuilder(); + public static @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder builder() { + return new BuilderSingularMapsBuilder(); } } \ No newline at end of file diff --git a/test/transform/resource/after-ecj/BuilderSingletonRedirectToGuava.java b/test/transform/resource/after-ecj/BuilderSingularRedirectToGuava.java similarity index 58% rename from test/transform/resource/after-ecj/BuilderSingletonRedirectToGuava.java rename to test/transform/resource/after-ecj/BuilderSingularRedirectToGuava.java index ce8fab10..eeff550b 100644 --- a/test/transform/resource/after-ecj/BuilderSingletonRedirectToGuava.java +++ b/test/transform/resource/after-ecj/BuilderSingularRedirectToGuava.java @@ -2,70 +2,70 @@ import java.util.Set; import java.util.NavigableMap; import java.util.Collection; import lombok.Singular; -@lombok.Builder class BuilderSingletonRedirectToGuava { - public static @java.lang.SuppressWarnings("all") class BuilderSingletonRedirectToGuavaBuilder { +@lombok.Builder class BuilderSingularRedirectToGuava { + public static @java.lang.SuppressWarnings("all") class BuilderSingularRedirectToGuavaBuilder { private com.google.common.collect.ImmutableSet.Builder dangerMice; private com.google.common.collect.ImmutableSortedMap.Builder things; private com.google.common.collect.ImmutableList.Builder> doohickeys; - @java.lang.SuppressWarnings("all") BuilderSingletonRedirectToGuavaBuilder() { + @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingletonRedirectToGuavaBuilder dangerMouse(String dangerMouse) { + public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder dangerMouse(String dangerMouse) { if ((this.dangerMice == null)) this.dangerMice = com.google.common.collect.ImmutableSet.builder(); this.dangerMice.add(dangerMouse); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonRedirectToGuavaBuilder dangerMice(java.lang.Iterable dangerMice) { + public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder dangerMice(java.lang.Iterable dangerMice) { if ((this.dangerMice == null)) this.dangerMice = com.google.common.collect.ImmutableSet.builder(); this.dangerMice.addAll(dangerMice); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonRedirectToGuavaBuilder thing(Integer thing$key, Number thing$value) { + public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder thing(Integer thing$key, Number thing$value) { if ((this.things == null)) this.things = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.things.put(thing$key, thing$value); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonRedirectToGuavaBuilder things(java.util.Map things) { + public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder things(java.util.Map things) { if ((this.things == null)) this.things = com.google.common.collect.ImmutableSortedMap.naturalOrder(); this.things.putAll(things); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonRedirectToGuavaBuilder doohickey(Class doohickey) { + public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder doohickey(Class doohickey) { if ((this.doohickeys == null)) this.doohickeys = com.google.common.collect.ImmutableList.builder(); this.doohickeys.add(doohickey); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonRedirectToGuavaBuilder doohickeys(java.lang.Iterable> doohickeys) { + public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder doohickeys(java.lang.Iterable> doohickeys) { if ((this.doohickeys == null)) this.doohickeys = com.google.common.collect.ImmutableList.builder(); this.doohickeys.addAll(doohickeys); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonRedirectToGuava build() { + public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuava 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 BuilderSingletonRedirectToGuava(dangerMice, things, doohickeys); + return new BuilderSingularRedirectToGuava(dangerMice, things, doohickeys); } public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { - return (((((("BuilderSingletonRedirectToGuava.BuilderSingletonRedirectToGuavaBuilder(dangerMice=" + this.dangerMice) + ", things=") + this.things) + ", doohickeys=") + this.doohickeys) + ")"); + return (((((("BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder(dangerMice=" + this.dangerMice) + ", things=") + this.things) + ", doohickeys=") + this.doohickeys) + ")"); } } private @Singular Set dangerMice; private @Singular NavigableMap things; private @Singular Collection> doohickeys; - @java.lang.SuppressWarnings("all") BuilderSingletonRedirectToGuava(final Set dangerMice, final NavigableMap things, final Collection> doohickeys) { + @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuava(final Set dangerMice, final NavigableMap things, final Collection> doohickeys) { super(); this.dangerMice = dangerMice; this.things = things; this.doohickeys = doohickeys; } - public static @java.lang.SuppressWarnings("all") BuilderSingletonRedirectToGuavaBuilder builder() { - return new BuilderSingletonRedirectToGuavaBuilder(); + public static @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder builder() { + return new BuilderSingularRedirectToGuavaBuilder(); } } \ No newline at end of file diff --git a/test/transform/resource/after-ecj/BuilderSingletonSets.java b/test/transform/resource/after-ecj/BuilderSingularSets.java similarity index 71% rename from test/transform/resource/after-ecj/BuilderSingletonSets.java rename to test/transform/resource/after-ecj/BuilderSingularSets.java index 7b6f6425..5d2fcc59 100644 --- a/test/transform/resource/after-ecj/BuilderSingletonSets.java +++ b/test/transform/resource/after-ecj/BuilderSingularSets.java @@ -1,64 +1,64 @@ import java.util.Set; import java.util.SortedSet; import lombok.Singular; -@lombok.Builder class BuilderSingletonSets { - public static @java.lang.SuppressWarnings("all") class BuilderSingletonSetsBuilder { +@lombok.Builder class BuilderSingularSets { + public static @java.lang.SuppressWarnings("all") class BuilderSingularSetsBuilder { private java.util.ArrayList dangerMice; private java.util.ArrayList octopodes; private java.util.ArrayList rawSet; private java.util.ArrayList stringSet; - @java.lang.SuppressWarnings("all") BuilderSingletonSetsBuilder() { + @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder() { super(); } - public @java.lang.SuppressWarnings("all") BuilderSingletonSetsBuilder dangerMouse(T dangerMouse) { + public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder dangerMouse(T dangerMouse) { if ((this.dangerMice == null)) this.dangerMice = new java.util.ArrayList(); this.dangerMice.add(dangerMouse); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonSetsBuilder dangerMice(java.util.Collection dangerMice) { + public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder dangerMice(java.util.Collection dangerMice) { if ((this.dangerMice == null)) this.dangerMice = new java.util.ArrayList(); this.dangerMice.addAll(dangerMice); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonSetsBuilder octopus(Number octopus) { + public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder octopus(Number octopus) { if ((this.octopodes == null)) this.octopodes = new java.util.ArrayList(); this.octopodes.add(octopus); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonSetsBuilder octopodes(java.util.Collection octopodes) { + public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder octopodes(java.util.Collection octopodes) { if ((this.octopodes == null)) this.octopodes = new java.util.ArrayList(); this.octopodes.addAll(octopodes); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonSetsBuilder rawSet(java.lang.Object rawSet) { + public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder rawSet(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") BuilderSingletonSetsBuilder rawSet(java.util.Collection rawSet) { + public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder rawSet(java.util.Collection rawSet) { if ((this.rawSet == null)) this.rawSet = new java.util.ArrayList(); this.rawSet.addAll(rawSet); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonSetsBuilder stringSet(String stringSet) { + public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder stringSet(String stringSet) { if ((this.stringSet == null)) this.stringSet = new java.util.ArrayList(); this.stringSet.add(stringSet); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonSetsBuilder stringSet(java.util.Collection stringSet) { + public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder stringSet(java.util.Collection stringSet) { if ((this.stringSet == null)) this.stringSet = new java.util.ArrayList(); this.stringSet.addAll(stringSet); return this; } - public @java.lang.SuppressWarnings("all") BuilderSingletonSets build() { + public @java.lang.SuppressWarnings("all") BuilderSingularSets build() { java.util.Set dangerMice; switch (((this.dangerMice == null) ? 0 : this.dangerMice.size())) { case 0 : @@ -102,24 +102,24 @@ import lombok.Singular; stringSet.addAll(this.stringSet); stringSet = java.util.Collections.unmodifiableSet(stringSet); } - return new BuilderSingletonSets(dangerMice, octopodes, rawSet, stringSet); + return new BuilderSingularSets(dangerMice, octopodes, rawSet, stringSet); } public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { - return (((((((("BuilderSingletonSets.BuilderSingletonSetsBuilder(dangerMice=" + this.dangerMice) + ", octopodes=") + this.octopodes) + ", rawSet=") + this.rawSet) + ", stringSet=") + this.stringSet) + ")"); + return (((((((("BuilderSingularSets.BuilderSingularSetsBuilder(dangerMice=" + this.dangerMice) + ", octopodes=") + this.octopodes) + ", rawSet=") + this.rawSet) + ", stringSet=") + this.stringSet) + ")"); } } private @Singular Set dangerMice; private @Singular SortedSet octopodes; private @SuppressWarnings("all") @Singular("rawSet") Set rawSet; private @Singular("stringSet") Set stringSet; - @java.lang.SuppressWarnings("all") BuilderSingletonSets(final Set dangerMice, final SortedSet octopodes, final Set rawSet, final Set stringSet) { + @java.lang.SuppressWarnings("all") BuilderSingularSets(final Set dangerMice, final SortedSet octopodes, final Set rawSet, final Set stringSet) { super(); this.dangerMice = dangerMice; this.octopodes = octopodes; this.rawSet = rawSet; this.stringSet = stringSet; } - public static @java.lang.SuppressWarnings("all") BuilderSingletonSetsBuilder builder() { - return new BuilderSingletonSetsBuilder(); + public static @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder builder() { + return new BuilderSingularSetsBuilder(); } } \ No newline at end of file diff --git a/test/transform/resource/before/BuilderSingletonGuavaListsSets.java b/test/transform/resource/before/BuilderSingularGuavaListsSets.java similarity index 91% rename from test/transform/resource/before/BuilderSingletonGuavaListsSets.java rename to test/transform/resource/before/BuilderSingularGuavaListsSets.java index e94d84b6..995c00e8 100644 --- a/test/transform/resource/before/BuilderSingletonGuavaListsSets.java +++ b/test/transform/resource/before/BuilderSingularGuavaListsSets.java @@ -6,7 +6,7 @@ import com.google.common.collect.ImmutableSortedSet; import lombok.Singular; @lombok.Builder -class BuilderSingletonGuavaListsSets { +class BuilderSingularGuavaListsSets { @Singular private ImmutableList cards; @Singular private ImmutableCollection frogs; @SuppressWarnings("all") @Singular("rawSet") private ImmutableSet rawSet; diff --git a/test/transform/resource/before/BuilderSingletonGuavaMaps.java b/test/transform/resource/before/BuilderSingularGuavaMaps.java similarity index 90% rename from test/transform/resource/before/BuilderSingletonGuavaMaps.java rename to test/transform/resource/before/BuilderSingularGuavaMaps.java index 1ff00c5b..64a53570 100644 --- a/test/transform/resource/before/BuilderSingletonGuavaMaps.java +++ b/test/transform/resource/before/BuilderSingularGuavaMaps.java @@ -5,7 +5,7 @@ import com.google.common.collect.ImmutableSortedMap; import lombok.Singular; @lombok.Builder -class BuilderSingletonGuavaMaps { +class BuilderSingularGuavaMaps { @Singular private ImmutableMap battleaxes; @Singular private ImmutableSortedMap vertices; @SuppressWarnings("all") @Singular("rawMap") private ImmutableBiMap rawMap; diff --git a/test/transform/resource/before/BuilderSingletonLists.java b/test/transform/resource/before/BuilderSingularLists.java similarity index 88% rename from test/transform/resource/before/BuilderSingletonLists.java rename to test/transform/resource/before/BuilderSingularLists.java index ed57a5a8..93fced8e 100644 --- a/test/transform/resource/before/BuilderSingletonLists.java +++ b/test/transform/resource/before/BuilderSingularLists.java @@ -4,7 +4,7 @@ import java.util.Collection; import lombok.Singular; @lombok.Builder -class BuilderSingletonLists { +class BuilderSingularLists { @Singular private List children; @Singular private Collection scarves; @SuppressWarnings("all") @Singular("rawList") private List rawList; diff --git a/test/transform/resource/before/BuilderSingletonMaps.java b/test/transform/resource/before/BuilderSingularMaps.java similarity index 89% rename from test/transform/resource/before/BuilderSingletonMaps.java rename to test/transform/resource/before/BuilderSingularMaps.java index 92750c0a..e17f74fc 100644 --- a/test/transform/resource/before/BuilderSingletonMaps.java +++ b/test/transform/resource/before/BuilderSingularMaps.java @@ -4,7 +4,7 @@ import java.util.SortedMap; import lombok.Singular; @lombok.Builder -class BuilderSingletonMaps { +class BuilderSingularMaps { @Singular private Map women; @Singular private SortedMap men; @SuppressWarnings("all") @Singular("rawMap") private Map rawMap; diff --git a/test/transform/resource/before/BuilderSingletonRedirectToGuava.java b/test/transform/resource/before/BuilderSingularRedirectToGuava.java similarity index 88% rename from test/transform/resource/before/BuilderSingletonRedirectToGuava.java rename to test/transform/resource/before/BuilderSingularRedirectToGuava.java index 0429f0ed..7e1e2c23 100644 --- a/test/transform/resource/before/BuilderSingletonRedirectToGuava.java +++ b/test/transform/resource/before/BuilderSingularRedirectToGuava.java @@ -6,7 +6,7 @@ import java.util.Collection; import lombok.Singular; @lombok.Builder -class BuilderSingletonRedirectToGuava { +class BuilderSingularRedirectToGuava { @Singular private Set dangerMice; @Singular private NavigableMap things; @Singular private Collection> doohickeys; diff --git a/test/transform/resource/before/BuilderSingletonSets.java b/test/transform/resource/before/BuilderSingularSets.java similarity index 90% rename from test/transform/resource/before/BuilderSingletonSets.java rename to test/transform/resource/before/BuilderSingularSets.java index 42cac0dc..68c4510a 100644 --- a/test/transform/resource/before/BuilderSingletonSets.java +++ b/test/transform/resource/before/BuilderSingularSets.java @@ -4,7 +4,7 @@ import java.util.SortedSet; import lombok.Singular; @lombok.Builder -class BuilderSingletonSets { +class BuilderSingularSets { @Singular private Set dangerMice; @Singular private SortedSet octopodes; @SuppressWarnings("all") @Singular("rawSet") private Set rawSet;