ecj @Builder @Singular support for j.u. sets and maps.

4 files changed, 304 insertions, 2 deletions

diff --git a/test/transform/resource/after-ecj/BuilderSingletonMaps.java b/test/transform/resource/after-ecj/BuilderSingletonMaps.java
new file mode 100644
index 00000000..ccd57193
--- /dev/null
+++ b/test/transform/resource/after-ecj/BuilderSingletonMaps.java
@@ -0,0 +1,177 @@
+import java.util.Map;
+import java.util.SortedMap;
+import lombok.Singular;
+@lombok.Builder class BuilderSingletonMaps<K, V> {
+  public static @java.lang.SuppressWarnings("all") class BuilderSingletonMapsBuilder<K, V> {
+    private java.util.ArrayList<K> women$key;
+    private java.util.ArrayList<V> women$value;
+    private java.util.ArrayList<K> men$key;
+    private java.util.ArrayList<Number> men$value;
+    private java.util.ArrayList<java.lang.Object> rawMap$key;
+    private java.util.ArrayList<java.lang.Object> rawMap$value;
+    private java.util.ArrayList<String> stringMap$key;
+    private java.util.ArrayList<V> stringMap$value;
+    @java.lang.SuppressWarnings("all") BuilderSingletonMapsBuilder() {
+      super();
+    }
+    public @java.lang.SuppressWarnings("all") BuilderSingletonMapsBuilder<K, V> woman(K womanKey, V womanValue) {
+      if ((this.women$key == null))
+          {
+            this.women$key = new java.util.ArrayList<K>();
+            this.women$value = new java.util.ArrayList<V>();
+          }
+      this.women$key.add(womanKey);
+      this.women$value.add(womanValue);
+      return this;
+    }
+    public @java.lang.SuppressWarnings("all") BuilderSingletonMapsBuilder<K, V> women(java.util.Map<? extends K, ? extends V> women) {
+      if ((this.women$key == null))
+          {
+            this.women$key = new java.util.ArrayList<K>();
+            this.women$value = new java.util.ArrayList<V>();
+          }
+      for (java.util.Map.Entry<? extends K, ? extends V> $lombokEntry : women.entrySet()) 
+        {
+          this.women$key.add($lombokEntry.getKey());
+          this.women$value.add($lombokEntry.getValue());
+        }
+      return this;
+    }
+    public @java.lang.SuppressWarnings("all") BuilderSingletonMapsBuilder<K, V> man(K manKey, Number manValue) {
+      if ((this.men$key == null))
+          {
+            this.men$key = new java.util.ArrayList<K>();
+            this.men$value = new java.util.ArrayList<Number>();
+          }
+      this.men$key.add(manKey);
+      this.men$value.add(manValue);
+      return this;
+    }
+    public @java.lang.SuppressWarnings("all") BuilderSingletonMapsBuilder<K, V> men(java.util.Map<? extends K, ? extends Number> men) {
+      if ((this.men$key == null))
+          {
+            this.men$key = new java.util.ArrayList<K>();
+            this.men$value = new java.util.ArrayList<Number>();
+          }
+      for (java.util.Map.Entry<? extends K, ? extends Number> $lombokEntry : men.entrySet()) 
+        {
+          this.men$key.add($lombokEntry.getKey());
+          this.men$value.add($lombokEntry.getValue());
+        }
+      return this;
+    }
+    public @java.lang.SuppressWarnings("all") BuilderSingletonMapsBuilder<K, V> rawMap(java.lang.Object rawMapKey, java.lang.Object rawMapValue) {
+      if ((this.rawMap$key == null))
+          {
+            this.rawMap$key = new java.util.ArrayList<java.lang.Object>();
+            this.rawMap$value = new java.util.ArrayList<java.lang.Object>();
+          }
+      this.rawMap$key.add(rawMapKey);
+      this.rawMap$value.add(rawMapValue);
+      return this;
+    }
+    public @java.lang.SuppressWarnings("all") BuilderSingletonMapsBuilder<K, V> rawMap(java.util.Map<?, ?> rawMap) {
+      if ((this.rawMap$key == null))
+          {
+            this.rawMap$key = new java.util.ArrayList<java.lang.Object>();
+            this.rawMap$value = new java.util.ArrayList<java.lang.Object>();
+          }
+      for (java.util.Map.Entry<?, ?> $lombokEntry : rawMap.entrySet()) 
+        {
+          this.rawMap$key.add($lombokEntry.getKey());
+          this.rawMap$value.add($lombokEntry.getValue());
+        }
+      return this;
+    }
+    public @java.lang.SuppressWarnings("all") BuilderSingletonMapsBuilder<K, V> stringMap(String stringMapKey, V stringMapValue) {
+      if ((this.stringMap$key == null))
+          {
+            this.stringMap$key = new java.util.ArrayList<String>();
+            this.stringMap$value = new java.util.ArrayList<V>();
+          }
+      this.stringMap$key.add(stringMapKey);
+      this.stringMap$value.add(stringMapValue);
+      return this;
+    }
+    public @java.lang.SuppressWarnings("all") BuilderSingletonMapsBuilder<K, V> stringMap(java.util.Map<? extends String, ? extends V> stringMap) {
+      if ((this.stringMap$key == null))
+          {
+            this.stringMap$key = new java.util.ArrayList<String>();
+            this.stringMap$value = new java.util.ArrayList<V>();
+          }
+      for (java.util.Map.Entry<? extends String, ? extends V> $lombokEntry : stringMap.entrySet()) 
+        {
+          this.stringMap$key.add($lombokEntry.getKey());
+          this.stringMap$value.add($lombokEntry.getValue());
+        }
+      return this;
+    }
+    public @java.lang.SuppressWarnings("all") BuilderSingletonMaps<K, V> build() {
+      java.util.Map<K, V> women;
+      switch (((this.women$key == null) ? 0 : this.women$key.size())) {
+      case 0 :
+          women = java.util.Collections.emptyMap();
+          break;
+      case 1 :
+          women = java.util.Collections.singletonMap(this.women$key.get(0), this.women$value.get(0));
+          break;
+      default :
+          women = new java.util.LinkedHashMap<K, V>(((this.women$key.size() < 0x40000000) ? ((1 + this.women$key.size()) + ((this.women$key.size() - 3) / 3)) : java.lang.Integer.MAX_VALUE));
+          for (int $i = 0;; ($i < this.women$key.size()); $i ++) 
+            women.put(this.women$key.get($i), this.women$value.get($i));
+          women = java.util.Collections.unmodifiableMap(women);
+      }
+      java.util.SortedMap<K, Number> men = new java.util.TreeMap<K, Number>();
+      if ((this.men$key != null))
+          for (int $i = 0;; ($i < ((this.men$key == null) ? 0 : this.men$key.size())); $i ++) 
+            men.put(this.men$key.get($i), this.men$value.get($i));
+      men = java.util.Collections.unmodifiableSortedMap(men);
+      java.util.Map<java.lang.Object, java.lang.Object> rawMap;
+      switch (((this.rawMap$key == null) ? 0 : this.rawMap$key.size())) {
+      case 0 :
+          rawMap = java.util.Collections.emptyMap();
+          break;
+      case 1 :
+          rawMap = java.util.Collections.singletonMap(this.rawMap$key.get(0), this.rawMap$value.get(0));
+          break;
+      default :
+          rawMap = new java.util.LinkedHashMap<java.lang.Object, java.lang.Object>(((this.rawMap$key.size() < 0x40000000) ? ((1 + this.rawMap$key.size()) + ((this.rawMap$key.size() - 3) / 3)) : java.lang.Integer.MAX_VALUE));
+          for (int $i = 0;; ($i < this.rawMap$key.size()); $i ++) 
+            rawMap.put(this.rawMap$key.get($i), this.rawMap$value.get($i));
+          rawMap = java.util.Collections.unmodifiableMap(rawMap);
+      }
+      java.util.Map<String, V> stringMap;
+      switch (((this.stringMap$key == null) ? 0 : this.stringMap$key.size())) {
+      case 0 :
+          stringMap = java.util.Collections.emptyMap();
+          break;
+      case 1 :
+          stringMap = java.util.Collections.singletonMap(this.stringMap$key.get(0), this.stringMap$value.get(0));
+          break;
+      default :
+          stringMap = new java.util.LinkedHashMap<String, V>(((this.stringMap$key.size() < 0x40000000) ? ((1 + this.stringMap$key.size()) + ((this.stringMap$key.size() - 3) / 3)) : java.lang.Integer.MAX_VALUE));
+          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<K, V>(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) + ")");
+    }
+  }
+  private @Singular Map<K, V> women;
+  private @Singular SortedMap<K, ? extends Number> men;
+  private @SuppressWarnings("all") @Singular("rawMap") Map rawMap;
+  private @Singular("stringMap") Map<String, V> stringMap;
+  @java.lang.SuppressWarnings("all") BuilderSingletonMaps(final Map<K, V> women, final SortedMap<K, ? extends Number> men, final Map rawMap, final Map<String, V> stringMap) {
+    super();
+    this.women = women;
+    this.men = men;
+    this.rawMap = rawMap;
+    this.stringMap = stringMap;
+  }
+  public static @java.lang.SuppressWarnings("all") <K, V>BuilderSingletonMapsBuilder<K, V> builder() {
+    return new BuilderSingletonMapsBuilder<K, V>();
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/BuilderSingletonSets.java b/test/transform/resource/after-ecj/BuilderSingletonSets.java
new file mode 100644
index 00000000..7b6f6425
--- /dev/null
+++ b/test/transform/resource/after-ecj/BuilderSingletonSets.java
@@ -0,0 +1,125 @@
+import java.util.Set;
+import java.util.SortedSet;
+import lombok.Singular;
+@lombok.Builder class BuilderSingletonSets<T> {
+  public static @java.lang.SuppressWarnings("all") class BuilderSingletonSetsBuilder<T> {
+    private java.util.ArrayList<T> dangerMice;
+    private java.util.ArrayList<Number> octopodes;
+    private java.util.ArrayList<java.lang.Object> rawSet;
+    private java.util.ArrayList<String> stringSet;
+    @java.lang.SuppressWarnings("all") BuilderSingletonSetsBuilder() {
+      super();
+    }
+    public @java.lang.SuppressWarnings("all") BuilderSingletonSetsBuilder<T> dangerMouse(T dangerMouse) {
+      if ((this.dangerMice == null))
+          this.dangerMice = new java.util.ArrayList<T>();
+      this.dangerMice.add(dangerMouse);
+      return this;
+    }
+    public @java.lang.SuppressWarnings("all") BuilderSingletonSetsBuilder<T> dangerMice(java.util.Collection<? extends T> dangerMice) {
+      if ((this.dangerMice == null))
+          this.dangerMice = new java.util.ArrayList<T>();
+      this.dangerMice.addAll(dangerMice);
+      return this;
+    }
+    public @java.lang.SuppressWarnings("all") BuilderSingletonSetsBuilder<T> octopus(Number octopus) {
+      if ((this.octopodes == null))
+          this.octopodes = new java.util.ArrayList<Number>();
+      this.octopodes.add(octopus);
+      return this;
+    }
+    public @java.lang.SuppressWarnings("all") BuilderSingletonSetsBuilder<T> octopodes(java.util.Collection<? extends Number> octopodes) {
+      if ((this.octopodes == null))
+          this.octopodes = new java.util.ArrayList<Number>();
+      this.octopodes.addAll(octopodes);
+      return this;
+    }
+    public @java.lang.SuppressWarnings("all") BuilderSingletonSetsBuilder<T> rawSet(java.lang.Object rawSet) {
+      if ((this.rawSet == null))
+          this.rawSet = new java.util.ArrayList<java.lang.Object>();
+      this.rawSet.add(rawSet);
+      return this;
+    }
+    public @java.lang.SuppressWarnings("all") BuilderSingletonSetsBuilder<T> rawSet(java.util.Collection<?> rawSet) {
+      if ((this.rawSet == null))
+          this.rawSet = new java.util.ArrayList<java.lang.Object>();
+      this.rawSet.addAll(rawSet);
+      return this;
+    }
+    public @java.lang.SuppressWarnings("all") BuilderSingletonSetsBuilder<T> stringSet(String stringSet) {
+      if ((this.stringSet == null))
+          this.stringSet = new java.util.ArrayList<String>();
+      this.stringSet.add(stringSet);
+      return this;
+    }
+    public @java.lang.SuppressWarnings("all") BuilderSingletonSetsBuilder<T> stringSet(java.util.Collection<? extends String> stringSet) {
+      if ((this.stringSet == null))
+          this.stringSet = new java.util.ArrayList<String>();
+      this.stringSet.addAll(stringSet);
+      return this;
+    }
+    public @java.lang.SuppressWarnings("all") BuilderSingletonSets<T> build() {
+      java.util.Set<T> dangerMice;
+      switch (((this.dangerMice == null) ? 0 : this.dangerMice.size())) {
+      case 0 :
+          dangerMice = java.util.Collections.emptySet();
+          break;
+      case 1 :
+          dangerMice = java.util.Collections.singleton(this.dangerMice.get(0));
+          break;
+      default :
+          dangerMice = new java.util.LinkedHashSet<T>(((this.dangerMice.size() < 0x40000000) ? ((1 + this.dangerMice.size()) + ((this.dangerMice.size() - 3) / 3)) : java.lang.Integer.MAX_VALUE));
+          dangerMice.addAll(this.dangerMice);
+          dangerMice = java.util.Collections.unmodifiableSet(dangerMice);
+      }
+      java.util.SortedSet<Number> octopodes = new java.util.TreeSet<Number>();
+      if ((this.octopodes != null))
+          octopodes.addAll(this.octopodes);
+      octopodes = java.util.Collections.unmodifiableSortedSet(octopodes);
+      java.util.Set<java.lang.Object> rawSet;
+      switch (((this.rawSet == null) ? 0 : this.rawSet.size())) {
+      case 0 :
+          rawSet = java.util.Collections.emptySet();
+          break;
+      case 1 :
+          rawSet = java.util.Collections.singleton(this.rawSet.get(0));
+          break;
+      default :
+          rawSet = new java.util.LinkedHashSet<java.lang.Object>(((this.rawSet.size() < 0x40000000) ? ((1 + this.rawSet.size()) + ((this.rawSet.size() - 3) / 3)) : java.lang.Integer.MAX_VALUE));
+          rawSet.addAll(this.rawSet);
+          rawSet = java.util.Collections.unmodifiableSet(rawSet);
+      }
+      java.util.Set<String> stringSet;
+      switch (((this.stringSet == null) ? 0 : this.stringSet.size())) {
+      case 0 :
+          stringSet = java.util.Collections.emptySet();
+          break;
+      case 1 :
+          stringSet = java.util.Collections.singleton(this.stringSet.get(0));
+          break;
+      default :
+          stringSet = new java.util.LinkedHashSet<String>(((this.stringSet.size() < 0x40000000) ? ((1 + this.stringSet.size()) + ((this.stringSet.size() - 3) / 3)) : java.lang.Integer.MAX_VALUE));
+          stringSet.addAll(this.stringSet);
+          stringSet = java.util.Collections.unmodifiableSet(stringSet);
+      }
+      return new BuilderSingletonSets<T>(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) + ")");
+    }
+  }
+  private @Singular Set<T> dangerMice;
+  private @Singular SortedSet<? extends Number> octopodes;
+  private @SuppressWarnings("all") @Singular("rawSet") Set rawSet;
+  private @Singular("stringSet") Set<String> stringSet;
+  @java.lang.SuppressWarnings("all") BuilderSingletonSets(final Set<T> dangerMice, final SortedSet<? extends Number> octopodes, final Set rawSet, final Set<String> stringSet) {
+    super();
+    this.dangerMice = dangerMice;
+    this.octopodes = octopodes;
+    this.rawSet = rawSet;
+    this.stringSet = stringSet;
+  }
+  public static @java.lang.SuppressWarnings("all") <T>BuilderSingletonSetsBuilder<T> builder() {
+    return new BuilderSingletonSetsBuilder<T>();
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/BuilderSingletonMaps.java b/test/transform/resource/before/BuilderSingletonMaps.java
index 00928e73..92750c0a 100644
--- a/test/transform/resource/before/BuilderSingletonMaps.java
+++ b/test/transform/resource/before/BuilderSingletonMaps.java
@@ -7,6 +7,6 @@ import lombok.Singular;
 class BuilderSingletonMaps<K, V> {
 	@Singular private Map<K, V> women;
 	@Singular private SortedMap<K, ? extends Number> men;
-	@Singular("rawMap") private Map rawMap;
+	@SuppressWarnings("all") @Singular("rawMap") private Map rawMap;
 	@Singular("stringMap") private Map<String, V> stringMap;
 }
diff --git a/test/transform/resource/before/BuilderSingletonSets.java b/test/transform/resource/before/BuilderSingletonSets.java
index a9f12913..42cac0dc 100644
--- a/test/transform/resource/before/BuilderSingletonSets.java
+++ b/test/transform/resource/before/BuilderSingletonSets.java
@@ -7,6 +7,6 @@ import lombok.Singular;
 class BuilderSingletonSets<T> {
 	@Singular private Set<T> dangerMice;
 	@Singular private SortedSet<? extends Number> octopodes;
-	@Singular("rawSet") private Set rawSet;
+	@SuppressWarnings("all") @Singular("rawSet") private Set rawSet;
 	@Singular("stringSet") private Set<String> stringSet;
 }