updates tests to reflect that fields in builders now get gen/suppress annotations.

24 files changed, 115 insertions, 57 deletions

diff --git a/test/transform/resource/after-delombok/BuilderChainAndFluent.java b/test/transform/resource/after-delombok/BuilderChainAndFluent.java
index 244df7db..dd3a347a 100644
--- a/test/transform/resource/after-delombok/BuilderChainAndFluent.java
+++ b/test/transform/resource/after-delombok/BuilderChainAndFluent.java
@@ -8,6 +8,8 @@ class BuilderChainAndFluent {
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
 	public static class BuilderChainAndFluentBuilder {
+		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		private int yes;
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
diff --git a/test/transform/resource/after-delombok/BuilderComplex.java b/test/transform/resource/after-delombok/BuilderComplex.java
index 21ff89cb..76e0add1 100644
--- a/test/transform/resource/after-delombok/BuilderComplex.java
+++ b/test/transform/resource/after-delombok/BuilderComplex.java
@@ -5,9 +5,17 @@ class BuilderComplex {
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
 	public static class VoidBuilder<T extends Number> {
+		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		private T number;
+		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		private int arg2;
+		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		private String arg3;
+		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		private BuilderComplex selfRef;
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
diff --git a/test/transform/resource/after-delombok/BuilderSimple.java b/test/transform/resource/after-delombok/BuilderSimple.java
index f1b6b3bc..a12ad047 100644
--- a/test/transform/resource/after-delombok/BuilderSimple.java
+++ b/test/transform/resource/after-delombok/BuilderSimple.java
@@ -13,7 +13,11 @@ class BuilderSimple<T> {
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
 	public static class BuilderSimpleBuilder<T> {
+		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		private int yes;
+		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		private List<T> also;
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
diff --git a/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java b/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java
index 21659de1..f8e0579d 100644
--- a/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java
+++ b/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java
@@ -19,9 +19,17 @@ class BuilderSingularGuavaListsSets<T> {
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
 	public static class BuilderSingularGuavaListsSetsBuilder<T> {
+		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		private com.google.common.collect.ImmutableList.Builder<T> cards;
+		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		private com.google.common.collect.ImmutableList.Builder<Number> frogs;
+		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		private com.google.common.collect.ImmutableSet.Builder<java.lang.Object> rawSet;
+		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		private com.google.common.collect.ImmutableSortedSet.Builder<String> passes;
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
diff --git a/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java b/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java
index fe5c65d2..0cb0001b 100644
--- a/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java
+++ b/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java
@@ -16,8 +16,14 @@ class BuilderSingularGuavaMaps<K, V> {
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
 	public static class BuilderSingularGuavaMapsBuilder<K, V> {
+		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		private com.google.common.collect.ImmutableMap.Builder<K, V> battleaxes;
+		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		private com.google.common.collect.ImmutableSortedMap.Builder<Integer, V> vertices;
+		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		private com.google.common.collect.ImmutableBiMap.Builder<java.lang.Object, java.lang.Object> rawMap;
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
diff --git a/test/transform/resource/after-delombok/BuilderSingularLists.java b/test/transform/resource/after-delombok/BuilderSingularLists.java
index d33b8674..f58934d4 100644
--- a/test/transform/resource/after-delombok/BuilderSingularLists.java
+++ b/test/transform/resource/after-delombok/BuilderSingularLists.java
@@ -15,8 +15,14 @@ class BuilderSingularLists<T> {
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
 	public static class BuilderSingularListsBuilder<T> {
+		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		private java.util.ArrayList<T> children;
+		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		private java.util.ArrayList<Number> scarves;
+		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		private java.util.ArrayList<java.lang.Object> rawList;
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
diff --git a/test/transform/resource/after-delombok/BuilderSingularMaps.java b/test/transform/resource/after-delombok/BuilderSingularMaps.java
index 753abfec..212ece26 100644
--- a/test/transform/resource/after-delombok/BuilderSingularMaps.java
+++ b/test/transform/resource/after-delombok/BuilderSingularMaps.java
@@ -15,13 +15,21 @@ class BuilderSingularMaps<K, V> {
 	}
 	@SuppressWarnings("all")
 	public static class BuilderSingularMapsBuilder<K, V> {
+		@SuppressWarnings("all")
 		private java.util.ArrayList<K> women$key;
+		@SuppressWarnings("all")
 		private java.util.ArrayList<V> women$value;
+		@SuppressWarnings("all")
 		private java.util.ArrayList<K> men$key;
+		@SuppressWarnings("all")
 		private java.util.ArrayList<Number> men$value;
+		@SuppressWarnings("all")
 		private java.util.ArrayList<Object> rawMap$key;
+		@SuppressWarnings("all")
 		private java.util.ArrayList<Object> rawMap$value;
+		@SuppressWarnings("all")
 		private java.util.ArrayList<String> stringMap$key;
+		@SuppressWarnings("all")
 		private java.util.ArrayList<V> stringMap$value;
 		@SuppressWarnings("all")
 		BuilderSingularMapsBuilder() {
diff --git a/test/transform/resource/after-delombok/BuilderSingularNoAutosingularize.java b/test/transform/resource/after-delombok/BuilderSingularNoAutosingularize.java
index ca985275..8a1d4ef2 100644
--- a/test/transform/resource/after-delombok/BuilderSingularNoAutosingularize.java
+++ b/test/transform/resource/after-delombok/BuilderSingularNoAutosingularize.java
@@ -13,8 +13,14 @@ class BuilderSingularNoAutosingularize {
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
 	public static class BuilderSingularNoAutosingularizeBuilder {
+		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		private java.util.ArrayList<String> things;
+		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		private java.util.ArrayList<String> widgets;
+		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		private java.util.ArrayList<String> items;
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
diff --git a/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java b/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java
index 27ed2535..0dd40c9f 100644
--- a/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java
+++ b/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java
@@ -15,8 +15,14 @@ class BuilderSingularRedirectToGuava {
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
 	public static class BuilderSingularRedirectToGuavaBuilder {
+		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		private com.google.common.collect.ImmutableSet.Builder<String> dangerMice;
+		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		private com.google.common.collect.ImmutableSortedMap.Builder<Integer, Number> things;
+		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		private com.google.common.collect.ImmutableList.Builder<Class<?>> doohickeys;
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
diff --git a/test/transform/resource/after-delombok/BuilderSingularSets.java b/test/transform/resource/after-delombok/BuilderSingularSets.java
index 8e410897..70372b99 100644
--- a/test/transform/resource/after-delombok/BuilderSingularSets.java
+++ b/test/transform/resource/after-delombok/BuilderSingularSets.java
@@ -17,9 +17,17 @@ class BuilderSingularSets<T> {
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
 	public static class BuilderSingularSetsBuilder<T> {
+		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		private java.util.ArrayList<T> dangerMice;
+		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		private java.util.ArrayList<Number> octopodes;
+		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		private java.util.ArrayList<java.lang.Object> rawSet;
+		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		private java.util.ArrayList<String> stringSet;
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
diff --git a/test/transform/resource/after-delombok/BuilderWithAccessors.java b/test/transform/resource/after-delombok/BuilderWithAccessors.java
index 74914453..df02c1f1 100644
--- a/test/transform/resource/after-delombok/BuilderWithAccessors.java
+++ b/test/transform/resource/after-delombok/BuilderWithAccessors.java
@@ -14,57 +14,51 @@ class BuilderWithAccessors {
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
 	public static class BuilderWithAccessorsBuilder {
+		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		private int plower;
+		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		private int upper;
+		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		private int foo;
+		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		private int _bar;
-		
 		@java.lang.SuppressWarnings("all")
-		
 		@javax.annotation.Generated("lombok")
 		BuilderWithAccessorsBuilder() {
-			
 		}
-		
 		@java.lang.SuppressWarnings("all")
-		
 		@javax.annotation.Generated("lombok")
 		public BuilderWithAccessorsBuilder plower(final int plower) {
 			this.plower = plower;
 			return this;
 		}
-		
 		@java.lang.SuppressWarnings("all")
-		
 		@javax.annotation.Generated("lombok")
 		public BuilderWithAccessorsBuilder upper(final int upper) {
 			this.upper = upper;
 			return this;
 		}
-		
 		@java.lang.SuppressWarnings("all")
-		
 		@javax.annotation.Generated("lombok")
 		public BuilderWithAccessorsBuilder foo(final int foo) {
 			this.foo = foo;
 			return this;
 		}
-		
 		@java.lang.SuppressWarnings("all")
-		
 		@javax.annotation.Generated("lombok")
 		public BuilderWithAccessorsBuilder _bar(final int _bar) {
 			this._bar = _bar;
 			return this;
 		}
-		
 		@java.lang.SuppressWarnings("all")
-		
 		@javax.annotation.Generated("lombok")
 		public BuilderWithAccessors build() {
 			return new BuilderWithAccessors(plower, upper, foo, _bar);
 		}
-		
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
@@ -72,9 +66,7 @@ class BuilderWithAccessors {
 			return "BuilderWithAccessors.BuilderWithAccessorsBuilder(plower=" + this.plower + ", upper=" + this.upper + ", foo=" + this.foo + ", _bar=" + this._bar + ")";
 		}
 	}
-	
 	@java.lang.SuppressWarnings("all")
-	
 	@javax.annotation.Generated("lombok")
 	public static BuilderWithAccessorsBuilder builder() {
 		return new BuilderWithAccessorsBuilder();
diff --git a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java
index 38d0eb2c..fc1cdbb3 100644
--- a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java
+++ b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java
@@ -3,7 +3,11 @@ class BuilderWithExistingBuilderClass<T, K extends Number> {
 		return null;
 	}
 	public static class BuilderWithExistingBuilderClassBuilder<Z extends Number> {
+		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		private boolean arg2;
+		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		private String arg3;
 		private Z arg1;
 		public void arg2(boolean arg) {
diff --git a/test/transform/resource/after-ecj/BuilderChainAndFluent.java b/test/transform/resource/after-ecj/BuilderChainAndFluent.java
index 888c6239..1554cf44 100644
--- a/test/transform/resource/after-ecj/BuilderChainAndFluent.java
+++ b/test/transform/resource/after-ecj/BuilderChainAndFluent.java
@@ -1,6 +1,6 @@
 @lombok.experimental.Builder(fluent = false,chain = false) class BuilderChainAndFluent {
   public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderChainAndFluentBuilder {
-    private int yes;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int yes;
     @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderChainAndFluentBuilder() {
       super();
     }
diff --git a/test/transform/resource/after-ecj/BuilderComplex.java b/test/transform/resource/after-ecj/BuilderComplex.java
index d7546879..c63ad8e6 100644
--- a/test/transform/resource/after-ecj/BuilderComplex.java
+++ b/test/transform/resource/after-ecj/BuilderComplex.java
@@ -2,10 +2,10 @@ import java.util.List;
 import lombok.experimental.Builder;
 class BuilderComplex {
   public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class VoidBuilder<T extends Number> {
-    private T number;
-    private int arg2;
-    private String arg3;
-    private BuilderComplex selfRef;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") T number;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int arg2;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String arg3;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderComplex selfRef;
     @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") VoidBuilder() {
       super();
     }
diff --git a/test/transform/resource/after-ecj/BuilderSimple.java b/test/transform/resource/after-ecj/BuilderSimple.java
index 41240a94..c2b4fe87 100644
--- a/test/transform/resource/after-ecj/BuilderSimple.java
+++ b/test/transform/resource/after-ecj/BuilderSimple.java
@@ -1,8 +1,8 @@
 import java.util.List;
 @lombok.experimental.Builder class BuilderSimple<T> {
   public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderSimpleBuilder<T> {
-    private int yes;
-    private List<T> also;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int yes;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") List<T> also;
     @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSimpleBuilder() {
       super();
     }
diff --git a/test/transform/resource/after-ecj/BuilderSingularGuavaListsSets.java b/test/transform/resource/after-ecj/BuilderSingularGuavaListsSets.java
index 0a04da34..e7aa7835 100644
--- a/test/transform/resource/after-ecj/BuilderSingularGuavaListsSets.java
+++ b/test/transform/resource/after-ecj/BuilderSingularGuavaListsSets.java
@@ -5,10 +5,10 @@ import com.google.common.collect.ImmutableSortedSet;
 import lombok.Singular;
 @lombok.Builder class BuilderSingularGuavaListsSets<T> {
   public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderSingularGuavaListsSetsBuilder<T> {
-    private com.google.common.collect.ImmutableList.Builder<T> cards;
-    private com.google.common.collect.ImmutableList.Builder<Number> frogs;
-    private com.google.common.collect.ImmutableSet.Builder<java.lang.Object> rawSet;
-    private com.google.common.collect.ImmutableSortedSet.Builder<String> passes;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableList.Builder<T> cards;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableList.Builder<Number> frogs;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableSet.Builder<java.lang.Object> rawSet;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableSortedSet.Builder<String> passes;
     @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder() {
       super();
     }
diff --git a/test/transform/resource/after-ecj/BuilderSingularGuavaMaps.java b/test/transform/resource/after-ecj/BuilderSingularGuavaMaps.java
index 3696c794..d4dfc18a 100644
--- a/test/transform/resource/after-ecj/BuilderSingularGuavaMaps.java
+++ b/test/transform/resource/after-ecj/BuilderSingularGuavaMaps.java
@@ -4,9 +4,9 @@ import com.google.common.collect.ImmutableSortedMap;
 import lombok.Singular;
 @lombok.Builder class BuilderSingularGuavaMaps<K, V> {
   public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderSingularGuavaMapsBuilder<K, V> {
-    private com.google.common.collect.ImmutableMap.Builder<K, V> battleaxes;
-    private com.google.common.collect.ImmutableSortedMap.Builder<Integer, V> vertices;
-    private com.google.common.collect.ImmutableBiMap.Builder<java.lang.Object, java.lang.Object> rawMap;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableMap.Builder<K, V> battleaxes;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableSortedMap.Builder<Integer, V> vertices;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableBiMap.Builder<java.lang.Object, java.lang.Object> rawMap;
     @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder() {
       super();
     }
diff --git a/test/transform/resource/after-ecj/BuilderSingularLists.java b/test/transform/resource/after-ecj/BuilderSingularLists.java
index bbba29f4..c66fcf1b 100644
--- a/test/transform/resource/after-ecj/BuilderSingularLists.java
+++ b/test/transform/resource/after-ecj/BuilderSingularLists.java
@@ -4,9 +4,9 @@ import java.util.Collection;
 import lombok.Singular;
 @lombok.Builder class BuilderSingularLists<T> {
   public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderSingularListsBuilder<T> {
-    private java.util.ArrayList<T> children;
-    private java.util.ArrayList<Number> scarves;
-    private java.util.ArrayList<java.lang.Object> rawList;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<T> children;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<Number> scarves;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<java.lang.Object> rawList;
     @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularListsBuilder() {
       super();
     }
diff --git a/test/transform/resource/after-ecj/BuilderSingularMaps.java b/test/transform/resource/after-ecj/BuilderSingularMaps.java
index c439cd2a..8a2e14eb 100644
--- a/test/transform/resource/after-ecj/BuilderSingularMaps.java
+++ b/test/transform/resource/after-ecj/BuilderSingularMaps.java
@@ -3,14 +3,14 @@ import java.util.SortedMap;
 import lombok.Singular;
 @lombok.Builder class BuilderSingularMaps<K, V> {
   public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderSingularMapsBuilder<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;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<K> women$key;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<V> women$value;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<K> men$key;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<Number> men$value;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<java.lang.Object> rawMap$key;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<java.lang.Object> rawMap$value;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<String> stringMap$key;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<V> stringMap$value;
     @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder() {
       super();
     }
diff --git a/test/transform/resource/after-ecj/BuilderSingularNoAutosingularize.java b/test/transform/resource/after-ecj/BuilderSingularNoAutosingularize.java
index 47d91593..0e0594e4 100644
--- a/test/transform/resource/after-ecj/BuilderSingularNoAutosingularize.java
+++ b/test/transform/resource/after-ecj/BuilderSingularNoAutosingularize.java
@@ -2,9 +2,9 @@ import java.util.List;
 import lombok.Singular;
 @lombok.Builder class BuilderSingularNoAutosingularize {
   public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderSingularNoAutosingularizeBuilder {
-    private java.util.ArrayList<String> things;
-    private java.util.ArrayList<String> widgets;
-    private java.util.ArrayList<String> items;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<String> things;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<String> widgets;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<String> items;
     @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutosingularizeBuilder() {
       super();
     }
diff --git a/test/transform/resource/after-ecj/BuilderSingularRedirectToGuava.java b/test/transform/resource/after-ecj/BuilderSingularRedirectToGuava.java
index 01ccecb4..6e18d8ee 100644
--- a/test/transform/resource/after-ecj/BuilderSingularRedirectToGuava.java
+++ b/test/transform/resource/after-ecj/BuilderSingularRedirectToGuava.java
@@ -4,9 +4,9 @@ import java.util.Collection;
 import lombok.Singular;
 @lombok.Builder class BuilderSingularRedirectToGuava {
   public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderSingularRedirectToGuavaBuilder {
-    private com.google.common.collect.ImmutableSet.Builder<String> dangerMice;
-    private com.google.common.collect.ImmutableSortedMap.Builder<Integer, Number> things;
-    private com.google.common.collect.ImmutableList.Builder<Class<?>> doohickeys;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableSet.Builder<String> dangerMice;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableSortedMap.Builder<Integer, Number> things;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") com.google.common.collect.ImmutableList.Builder<Class<?>> doohickeys;
     @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder() {
       super();
     }
diff --git a/test/transform/resource/after-ecj/BuilderSingularSets.java b/test/transform/resource/after-ecj/BuilderSingularSets.java
index 749d8439..819de534 100644
--- a/test/transform/resource/after-ecj/BuilderSingularSets.java
+++ b/test/transform/resource/after-ecj/BuilderSingularSets.java
@@ -3,10 +3,10 @@ import java.util.SortedSet;
 import lombok.Singular;
 @lombok.Builder class BuilderSingularSets<T> {
   public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderSingularSetsBuilder<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;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<T> dangerMice;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<Number> octopodes;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<java.lang.Object> rawSet;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.util.ArrayList<String> stringSet;
     @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder() {
       super();
     }
diff --git a/test/transform/resource/after-ecj/BuilderWithAccessors.java b/test/transform/resource/after-ecj/BuilderWithAccessors.java
index b90ba937..4221ea7c 100644
--- a/test/transform/resource/after-ecj/BuilderWithAccessors.java
+++ b/test/transform/resource/after-ecj/BuilderWithAccessors.java
@@ -1,9 +1,9 @@
 @lombok.experimental.Builder @lombok.experimental.Accessors(prefix = {"p", "_"}) class BuilderWithAccessors {
   public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderWithAccessorsBuilder {
-    private int plower;
-    private int upper;
-    private int foo;
-    private int _bar;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int plower;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int upper;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int foo;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int _bar;
     @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithAccessorsBuilder() {
       super();
     }
diff --git a/test/transform/resource/after-ecj/BuilderWithExistingBuilderClass.java b/test/transform/resource/after-ecj/BuilderWithExistingBuilderClass.java
index 9ddbda7b..1c23e0ee 100644
--- a/test/transform/resource/after-ecj/BuilderWithExistingBuilderClass.java
+++ b/test/transform/resource/after-ecj/BuilderWithExistingBuilderClass.java
@@ -1,8 +1,8 @@
 import lombok.Builder;
 class BuilderWithExistingBuilderClass<T, K extends Number> {
   public static class BuilderWithExistingBuilderClassBuilder<Z extends Number> {
-    private boolean arg2;
-    private String arg3;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean arg2;
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String arg3;
     private Z arg1;
     public void arg2(boolean arg) {
     }