[i623] added eclipse code for generating @javax.annotation.Generated, and refactored java impl to reduce DRY violations. -f pretty now includes skipping generation of this annotation, and updated ALL the test cases.

186 files changed, 1124 insertions, 557 deletions

diff --git a/test/transform/resource/after-delombok/Accessors.java b/test/transform/resource/after-delombok/Accessors.java
index 0d15fe43..3346bacb 100644
--- a/test/transform/resource/after-delombok/Accessors.java
+++ b/test/transform/resource/after-delombok/Accessors.java
@@ -1,10 +1,12 @@
 class AccessorsFluent {
 	private String fieldName = "";
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public String fieldName() {
 		return this.fieldName;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public AccessorsFluent fieldName(final String fieldName) {
 		this.fieldName = fieldName;
 		return this;
@@ -14,14 +16,17 @@ class AccessorsFluentOnClass {
 	private String fieldName = "";
 	private String otherFieldWithOverride = "";
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public String fieldName() {
 		return this.fieldName;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public String getOtherFieldWithOverride() {
 		return this.otherFieldWithOverride;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public AccessorsFluentOnClass fieldName(final String fieldName) {
 		this.fieldName = fieldName;
 		return this;
@@ -30,6 +35,7 @@ class AccessorsFluentOnClass {
 class AccessorsChain {
 	private boolean isRunning;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public AccessorsChain setRunning(final boolean isRunning) {
 		this.isRunning = isRunning;
 		return this;
@@ -39,6 +45,7 @@ class AccessorsPrefix {
 	private String fieldName;
 	private String fActualField;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void setActualField(final String fActualField) {
 		this.fActualField = fActualField;
 	}
@@ -47,10 +54,12 @@ class AccessorsPrefix2 {
 	private String fieldName;
 	private String fActualField;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void setFieldName(final String fieldName) {
 		this.fieldName = fieldName;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void setActualField(final String fActualField) {
 		this.fActualField = fActualField;
 	}
@@ -62,11 +71,13 @@ class AccessorsPrefix3 {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "AccessorsPrefix3(fName=" + this.getName() + ")";
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof AccessorsPrefix3)) return false;
@@ -78,11 +89,13 @@ class AccessorsPrefix3 {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof AccessorsPrefix3;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -94,6 +107,7 @@ class AccessorsPrefix3 {
 class AccessorsFluentGenerics<T extends Number> {
 	private String name;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public AccessorsFluentGenerics<T> name(final String name) {
 		this.name = name;
 		return this;
@@ -102,6 +116,7 @@ class AccessorsFluentGenerics<T extends Number> {
 class AccessorsFluentNoChaining {
 	private String name;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void name(final String name) {
 		this.name = name;
 	}
@@ -109,6 +124,7 @@ class AccessorsFluentNoChaining {
 class AccessorsFluentStatic<T extends Number> {
 	private static String name;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public static void name(final String name) {
 		AccessorsFluentStatic.name = name;
 	}
diff --git a/test/transform/resource/after-delombok/AccessorsConfiguration.java b/test/transform/resource/after-delombok/AccessorsConfiguration.java
index fd60b152..84a686c8 100644
--- a/test/transform/resource/after-delombok/AccessorsConfiguration.java
+++ b/test/transform/resource/after-delombok/AccessorsConfiguration.java
@@ -1,10 +1,12 @@
 class AccessorsConfiguration {
 	private String m_FieldName = "";
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public String fieldName() {
 		return this.m_FieldName;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void fieldName(final String m_FieldName) {
 		this.m_FieldName = m_FieldName;
 	}
@@ -12,6 +14,7 @@ class AccessorsConfiguration {
 class AccessorsConfiguration2 {
 	private String m_FieldName = "";
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void setM_FieldName(final String m_FieldName) {
 		this.m_FieldName = m_FieldName;
 	}
@@ -19,6 +22,7 @@ class AccessorsConfiguration2 {
 class AccessorsConfiguration3 {
 	private String fFieldName = "";
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public AccessorsConfiguration3 setFieldName(final String fFieldName) {
 		this.fFieldName = fFieldName;
 		return this;
diff --git a/test/transform/resource/after-delombok/BuilderChainAndFluent.java b/test/transform/resource/after-delombok/BuilderChainAndFluent.java
index d4975bff..244df7db 100644
--- a/test/transform/resource/after-delombok/BuilderChainAndFluent.java
+++ b/test/transform/resource/after-delombok/BuilderChainAndFluent.java
@@ -1,30 +1,37 @@
 class BuilderChainAndFluent {
 	private final int yes;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	BuilderChainAndFluent(final int yes) {
 		this.yes = yes;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public static class BuilderChainAndFluentBuilder {
 		private int yes;
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		BuilderChainAndFluentBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public void setYes(final int yes) {
 			this.yes = yes;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderChainAndFluent build() {
 			return new BuilderChainAndFluent(yes);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "BuilderChainAndFluent.BuilderChainAndFluentBuilder(yes=" + this.yes + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public static BuilderChainAndFluentBuilder builder() {
 		return new BuilderChainAndFluentBuilder();
 	}
diff --git a/test/transform/resource/after-delombok/BuilderComplex.java b/test/transform/resource/after-delombok/BuilderComplex.java
index 3c97f92a..21ff89cb 100644
--- a/test/transform/resource/after-delombok/BuilderComplex.java
+++ b/test/transform/resource/after-delombok/BuilderComplex.java
@@ -3,45 +3,54 @@ class BuilderComplex {
 	private static <T extends Number> void testVoidWithGenerics(T number, int arg2, String arg3, BuilderComplex selfRef) {
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public static class VoidBuilder<T extends Number> {
 		private T number;
 		private int arg2;
 		private String arg3;
 		private BuilderComplex selfRef;
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		VoidBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public VoidBuilder<T> number(final T number) {
 			this.number = number;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public VoidBuilder<T> arg2(final int arg2) {
 			this.arg2 = arg2;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public VoidBuilder<T> arg3(final String arg3) {
 			this.arg3 = arg3;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public VoidBuilder<T> selfRef(final BuilderComplex selfRef) {
 			this.selfRef = selfRef;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public void execute() {
 			BuilderComplex.<T>testVoidWithGenerics(number, arg2, arg3, selfRef);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "BuilderComplex.VoidBuilder(number=" + this.number + ", arg2=" + this.arg2 + ", arg3=" + this.arg3 + ", selfRef=" + this.selfRef + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public static <T extends Number> VoidBuilder<T> builder() {
 		return new VoidBuilder<T>();
 	}
diff --git a/test/transform/resource/after-delombok/BuilderSimple.java b/test/transform/resource/after-delombok/BuilderSimple.java
index 11c0e58c..f1b6b3bc 100644
--- a/test/transform/resource/after-delombok/BuilderSimple.java
+++ b/test/transform/resource/after-delombok/BuilderSimple.java
@@ -5,38 +5,46 @@ class BuilderSimple<T> {
 	private List<T> also;
 	private int $butNotMe;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	BuilderSimple(final int yes, final List<T> also) {
 		this.yes = yes;
 		this.also = also;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public static class BuilderSimpleBuilder<T> {
 		private int yes;
 		private List<T> also;
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		BuilderSimpleBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSimpleBuilder<T> yes(final int yes) {
 			this.yes = yes;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSimpleBuilder<T> also(final List<T> also) {
 			this.also = also;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSimple<T> build() {
 			return new BuilderSimple<T>(yes, also);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "BuilderSimple.BuilderSimpleBuilder(yes=" + this.yes + ", also=" + this.also + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public static <T> BuilderSimpleBuilder<T> builder() {
 		return new BuilderSimpleBuilder<T>();
 	}
diff --git a/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java b/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java
index 5b9d620c..21659de1 100644
--- a/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java
+++ b/test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java
@@ -9,6 +9,7 @@ class BuilderSingularGuavaListsSets<T> {
 	private ImmutableSet rawSet;
 	private ImmutableSortedSet<String> passes;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	BuilderSingularGuavaListsSets(final ImmutableList<T> cards, final ImmutableCollection<? extends Number> frogs, final ImmutableSet rawSet, final ImmutableSortedSet<String> passes) {
 		this.cards = cards;
 		this.frogs = frogs;
@@ -16,63 +17,74 @@ class BuilderSingularGuavaListsSets<T> {
 		this.passes = passes;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public static 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;
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		BuilderSingularGuavaListsSetsBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaListsSetsBuilder<T> card(final T card) {
 			if (this.cards == null) this.cards = com.google.common.collect.ImmutableList.builder();
 			this.cards.add(card);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaListsSetsBuilder<T> cards(final java.lang.Iterable<? extends T> cards) {
 			if (this.cards == null) this.cards = com.google.common.collect.ImmutableList.builder();
 			this.cards.addAll(cards);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaListsSetsBuilder<T> frog(final Number frog) {
 			if (this.frogs == null) this.frogs = com.google.common.collect.ImmutableList.builder();
 			this.frogs.add(frog);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaListsSetsBuilder<T> frogs(final java.lang.Iterable<? extends Number> frogs) {
 			if (this.frogs == null) this.frogs = com.google.common.collect.ImmutableList.builder();
 			this.frogs.addAll(frogs);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaListsSetsBuilder<T> rawSet(final java.lang.Object rawSet) {
 			if (this.rawSet == null) this.rawSet = com.google.common.collect.ImmutableSet.builder();
 			this.rawSet.add(rawSet);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaListsSetsBuilder<T> rawSet(final java.lang.Iterable<?> rawSet) {
 			if (this.rawSet == null) this.rawSet = com.google.common.collect.ImmutableSet.builder();
 			this.rawSet.addAll(rawSet);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaListsSetsBuilder<T> pass(final String pass) {
 			if (this.passes == null) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder();
 			this.passes.add(pass);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaListsSetsBuilder<T> passes(final java.lang.Iterable<? extends String> passes) {
 			if (this.passes == null) this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder();
 			this.passes.addAll(passes);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaListsSets<T> build() {
 			com.google.common.collect.ImmutableList<T> cards = this.cards == null ? com.google.common.collect.ImmutableList.<T>of() : this.cards.build();
 			com.google.common.collect.ImmutableCollection<Number> frogs = this.frogs == null ? com.google.common.collect.ImmutableList.<Number>of() : this.frogs.build();
@@ -82,11 +94,13 @@ class BuilderSingularGuavaListsSets<T> {
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder(cards=" + this.cards + ", frogs=" + this.frogs + ", rawSet=" + this.rawSet + ", passes=" + this.passes + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public static <T> BuilderSingularGuavaListsSetsBuilder<T> builder() {
 		return new BuilderSingularGuavaListsSetsBuilder<T>();
 	}
diff --git a/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java b/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java
index ab250e3c..fe5c65d2 100644
--- a/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java
+++ b/test/transform/resource/after-delombok/BuilderSingularGuavaMaps.java
@@ -7,56 +7,66 @@ class BuilderSingularGuavaMaps<K, V> {
 	@SuppressWarnings("all")
 	private ImmutableBiMap rawMap;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	BuilderSingularGuavaMaps(final ImmutableMap<K, V> battleaxes, final ImmutableSortedMap<Integer, ? extends V> vertices, final ImmutableBiMap rawMap) {
 		this.battleaxes = battleaxes;
 		this.vertices = vertices;
 		this.rawMap = rawMap;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public static 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;
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		BuilderSingularGuavaMapsBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaMapsBuilder<K, V> 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")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaMapsBuilder<K, V> battleaxes(final java.util.Map<? extends K, ? extends V> battleaxes) {
 			if (this.battleaxes == null) this.battleaxes = com.google.common.collect.ImmutableMap.builder();
 			this.battleaxes.putAll(battleaxes);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaMapsBuilder<K, V> 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")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaMapsBuilder<K, V> vertices(final java.util.Map<? extends Integer, ? extends V> vertices) {
 			if (this.vertices == null) this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder();
 			this.vertices.putAll(vertices);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaMapsBuilder<K, V> 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")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaMapsBuilder<K, V> rawMap(final java.util.Map<?, ?> rawMap) {
 			if (this.rawMap == null) this.rawMap = com.google.common.collect.ImmutableBiMap.builder();
 			this.rawMap.putAll(rawMap);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularGuavaMaps<K, V> build() {
 			com.google.common.collect.ImmutableMap<K, V> battleaxes = this.battleaxes == null ? com.google.common.collect.ImmutableMap.<K, V>of() : this.battleaxes.build();
 			com.google.common.collect.ImmutableSortedMap<Integer, V> vertices = this.vertices == null ? com.google.common.collect.ImmutableSortedMap.<Integer, V>of() : this.vertices.build();
@@ -65,11 +75,13 @@ class BuilderSingularGuavaMaps<K, V> {
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder(battleaxes=" + this.battleaxes + ", vertices=" + this.vertices + ", rawMap=" + this.rawMap + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public static <K, V> BuilderSingularGuavaMapsBuilder<K, V> builder() {
 		return new BuilderSingularGuavaMapsBuilder<K, V>();
 	}
diff --git a/test/transform/resource/after-delombok/BuilderSingularLists.java b/test/transform/resource/after-delombok/BuilderSingularLists.java
index 0d074e92..d33b8674 100644
--- a/test/transform/resource/after-delombok/BuilderSingularLists.java
+++ b/test/transform/resource/after-delombok/BuilderSingularLists.java
@@ -6,56 +6,66 @@ class BuilderSingularLists<T> {
 	@SuppressWarnings("all")
 	private List rawList;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	BuilderSingularLists(final List<T> children, final Collection<? extends Number> scarves, final List rawList) {
 		this.children = children;
 		this.scarves = scarves;
 		this.rawList = rawList;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public static class BuilderSingularListsBuilder<T> {
 		private java.util.ArrayList<T> children;
 		private java.util.ArrayList<Number> scarves;
 		private java.util.ArrayList<java.lang.Object> rawList;
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		BuilderSingularListsBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularListsBuilder<T> child(final T child) {
 			if (this.children == null) this.children = new java.util.ArrayList<T>();
 			this.children.add(child);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularListsBuilder<T> children(final java.util.Collection<? extends T> children) {
 			if (this.children == null) this.children = new java.util.ArrayList<T>();
 			this.children.addAll(children);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularListsBuilder<T> scarf(final Number scarf) {
 			if (this.scarves == null) this.scarves = new java.util.ArrayList<Number>();
 			this.scarves.add(scarf);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularListsBuilder<T> scarves(final java.util.Collection<? extends Number> scarves) {
 			if (this.scarves == null) this.scarves = new java.util.ArrayList<Number>();
 			this.scarves.addAll(scarves);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularListsBuilder<T> rawList(final java.lang.Object rawList) {
 			if (this.rawList == null) this.rawList = new java.util.ArrayList<java.lang.Object>();
 			this.rawList.add(rawList);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularListsBuilder<T> rawList(final java.util.Collection<?> rawList) {
 			if (this.rawList == null) this.rawList = new java.util.ArrayList<java.lang.Object>();
 			this.rawList.addAll(rawList);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularLists<T> build() {
 			java.util.List<T> children;
 			switch (this.children == null ? 0 : this.children.size()) {
@@ -94,11 +104,13 @@ class BuilderSingularLists<T> {
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "BuilderSingularLists.BuilderSingularListsBuilder(children=" + this.children + ", scarves=" + this.scarves + ", rawList=" + this.rawList + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public static <T> BuilderSingularListsBuilder<T> builder() {
 		return new BuilderSingularListsBuilder<T>();
 	}
diff --git a/test/transform/resource/after-delombok/BuilderSingularMaps.java b/test/transform/resource/after-delombok/BuilderSingularMaps.java
index 640ddb94..49f555b5 100644
--- a/test/transform/resource/after-delombok/BuilderSingularMaps.java
+++ b/test/transform/resource/after-delombok/BuilderSingularMaps.java
@@ -7,6 +7,7 @@ class BuilderSingularMaps<K, V> {
 	private Map rawMap;
 	private Map<String, V> stringMap;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	BuilderSingularMaps(final Map<K, V> women, final SortedMap<K, ? extends Number> men, final Map rawMap, final Map<String, V> stringMap) {
 		this.women = women;
 		this.men = men;
@@ -14,6 +15,7 @@ class BuilderSingularMaps<K, V> {
 		this.stringMap = stringMap;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public static class BuilderSingularMapsBuilder<K, V> {
 		private java.util.ArrayList<K> women$key;
 		private java.util.ArrayList<V> women$value;
@@ -24,9 +26,11 @@ class BuilderSingularMaps<K, V> {
 		private java.util.ArrayList<String> stringMap$key;
 		private java.util.ArrayList<V> stringMap$value;
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		BuilderSingularMapsBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularMapsBuilder<K, V> woman(final K womanKey, final V womanValue) {
 			if (this.women$key == null) {
 				this.women$key = new java.util.ArrayList<K>();
@@ -37,6 +41,7 @@ class BuilderSingularMaps<K, V> {
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularMapsBuilder<K, V> women(final java.util.Map<? extends K, ? extends V> women) {
 			if (this.women$key == null) {
 				this.women$key = new java.util.ArrayList<K>();
@@ -49,6 +54,7 @@ class BuilderSingularMaps<K, V> {
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularMapsBuilder<K, V> man(final K manKey, final Number manValue) {
 			if (this.men$key == null) {
 				this.men$key = new java.util.ArrayList<K>();
@@ -59,6 +65,7 @@ class BuilderSingularMaps<K, V> {
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularMapsBuilder<K, V> men(final java.util.Map<? extends K, ? extends Number> men) {
 			if (this.men$key == null) {
 				this.men$key = new java.util.ArrayList<K>();
@@ -71,6 +78,7 @@ class BuilderSingularMaps<K, V> {
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularMapsBuilder<K, V> rawMap(final java.lang.Object rawMapKey, final java.lang.Object rawMapValue) {
 			if (this.rawMap$key == null) {
 				this.rawMap$key = new java.util.ArrayList<java.lang.Object>();
@@ -81,6 +89,7 @@ class BuilderSingularMaps<K, V> {
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularMapsBuilder<K, V> rawMap(final java.util.Map<?, ?> rawMap) {
 			if (this.rawMap$key == null) {
 				this.rawMap$key = new java.util.ArrayList<java.lang.Object>();
@@ -93,6 +102,7 @@ class BuilderSingularMaps<K, V> {
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularMapsBuilder<K, V> stringMap(final String stringMapKey, final V stringMapValue) {
 			if (this.stringMap$key == null) {
 				this.stringMap$key = new java.util.ArrayList<String>();
@@ -103,6 +113,7 @@ class BuilderSingularMaps<K, V> {
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularMapsBuilder<K, V> stringMap(final java.util.Map<? extends String, ? extends V> stringMap) {
 			if (this.stringMap$key == null) {
 				this.stringMap$key = new java.util.ArrayList<String>();
@@ -115,6 +126,7 @@ class BuilderSingularMaps<K, V> {
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularMaps<K, V> build() {
 			java.util.Map<K, V> women;
 			switch (this.women$key == null ? 0 : this.women$key.size()) {
@@ -162,11 +174,13 @@ class BuilderSingularMaps<K, V> {
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "BuilderSingularMaps.BuilderSingularMapsBuilder(women$key=" + this.women$key + ", women$value=" + this.women$value + ", men$key=" + this.men$key + ", men$value=" + this.men$value + ", rawMap$key=" + this.rawMap$key + ", rawMap$value=" + this.rawMap$value + ", stringMap$key=" + this.stringMap$key + ", stringMap$value=" + this.stringMap$value + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public static <K, V> BuilderSingularMapsBuilder<K, V> builder() {
 		return new BuilderSingularMapsBuilder<K, V>();
 	}
diff --git a/test/transform/resource/after-delombok/BuilderSingularNoAutosingularize.java b/test/transform/resource/after-delombok/BuilderSingularNoAutosingularize.java
index 5f985e16..ca985275 100644
--- a/test/transform/resource/after-delombok/BuilderSingularNoAutosingularize.java
+++ b/test/transform/resource/after-delombok/BuilderSingularNoAutosingularize.java
@@ -4,56 +4,66 @@ class BuilderSingularNoAutosingularize {
 	private List<String> widgets;
 	private List<String> items;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	BuilderSingularNoAutosingularize(final List<String> things, final List<String> widgets, final List<String> items) {
 		this.things = things;
 		this.widgets = widgets;
 		this.items = items;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public static class BuilderSingularNoAutosingularizeBuilder {
 		private java.util.ArrayList<String> things;
 		private java.util.ArrayList<String> widgets;
 		private java.util.ArrayList<String> items;
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		BuilderSingularNoAutosingularizeBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularNoAutosingularizeBuilder things(final String things) {
 			if (this.things == null) this.things = new java.util.ArrayList<String>();
 			this.things.add(things);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularNoAutosingularizeBuilder things(final java.util.Collection<? extends String> things) {
 			if (this.things == null) this.things = new java.util.ArrayList<String>();
 			this.things.addAll(things);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularNoAutosingularizeBuilder widget(final String widget) {
 			if (this.widgets == null) this.widgets = new java.util.ArrayList<String>();
 			this.widgets.add(widget);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularNoAutosingularizeBuilder widgets(final java.util.Collection<? extends String> widgets) {
 			if (this.widgets == null) this.widgets = new java.util.ArrayList<String>();
 			this.widgets.addAll(widgets);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularNoAutosingularizeBuilder items(final String items) {
 			if (this.items == null) this.items = new java.util.ArrayList<String>();
 			this.items.add(items);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularNoAutosingularizeBuilder items(final java.util.Collection<? extends String> items) {
 			if (this.items == null) this.items = new java.util.ArrayList<String>();
 			this.items.addAll(items);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularNoAutosingularize build() {
 			java.util.List<String> things;
 			switch (this.things == null ? 0 : this.things.size()) {
@@ -92,11 +102,13 @@ class BuilderSingularNoAutosingularize {
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "BuilderSingularNoAutosingularize.BuilderSingularNoAutosingularizeBuilder(things=" + this.things + ", widgets=" + this.widgets + ", items=" + this.items + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public static BuilderSingularNoAutosingularizeBuilder builder() {
 		return new BuilderSingularNoAutosingularizeBuilder();
 	}
diff --git a/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java b/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java
index 9c5ad25e..27ed2535 100644
--- a/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java
+++ b/test/transform/resource/after-delombok/BuilderSingularRedirectToGuava.java
@@ -6,56 +6,66 @@ class BuilderSingularRedirectToGuava {
 	private NavigableMap<Integer, Number> things;
 	private Collection<Class<?>> doohickeys;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	BuilderSingularRedirectToGuava(final Set<String> dangerMice, final NavigableMap<Integer, Number> things, final Collection<Class<?>> doohickeys) {
 		this.dangerMice = dangerMice;
 		this.things = things;
 		this.doohickeys = doohickeys;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public static 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;
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		BuilderSingularRedirectToGuavaBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		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")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularRedirectToGuavaBuilder dangerMice(final java.lang.Iterable<? extends String> dangerMice) {
 			if (this.dangerMice == null) this.dangerMice = com.google.common.collect.ImmutableSet.builder();
 			this.dangerMice.addAll(dangerMice);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		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")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularRedirectToGuavaBuilder things(final java.util.Map<? extends Integer, ? extends Number> things) {
 			if (this.things == null) this.things = com.google.common.collect.ImmutableSortedMap.naturalOrder();
 			this.things.putAll(things);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		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")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularRedirectToGuavaBuilder doohickeys(final java.lang.Iterable<? extends Class<?>> doohickeys) {
 			if (this.doohickeys == null) this.doohickeys = com.google.common.collect.ImmutableList.builder();
 			this.doohickeys.addAll(doohickeys);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularRedirectToGuava build() {
 			java.util.Set<String> dangerMice = this.dangerMice == null ? com.google.common.collect.ImmutableSet.<String>of() : this.dangerMice.build();
 			java.util.NavigableMap<Integer, Number> things = this.things == null ? com.google.common.collect.ImmutableSortedMap.<Integer, Number>of() : this.things.build();
@@ -64,11 +74,13 @@ class BuilderSingularRedirectToGuava {
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder(dangerMice=" + this.dangerMice + ", things=" + this.things + ", doohickeys=" + this.doohickeys + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public static BuilderSingularRedirectToGuavaBuilder builder() {
 		return new BuilderSingularRedirectToGuavaBuilder();
 	}
diff --git a/test/transform/resource/after-delombok/BuilderSingularSets.java b/test/transform/resource/after-delombok/BuilderSingularSets.java
index d75c0fbf..8e410897 100644
--- a/test/transform/resource/after-delombok/BuilderSingularSets.java
+++ b/test/transform/resource/after-delombok/BuilderSingularSets.java
@@ -7,6 +7,7 @@ class BuilderSingularSets<T> {
 	private Set rawSet;
 	private Set<String> stringSet;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	BuilderSingularSets(final Set<T> dangerMice, final SortedSet<? extends Number> octopodes, final Set rawSet, final Set<String> stringSet) {
 		this.dangerMice = dangerMice;
 		this.octopodes = octopodes;
@@ -14,63 +15,74 @@ class BuilderSingularSets<T> {
 		this.stringSet = stringSet;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public static 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;
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		BuilderSingularSetsBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularSetsBuilder<T> dangerMouse(final T dangerMouse) {
 			if (this.dangerMice == null) this.dangerMice = new java.util.ArrayList<T>();
 			this.dangerMice.add(dangerMouse);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularSetsBuilder<T> dangerMice(final java.util.Collection<? extends T> dangerMice) {
 			if (this.dangerMice == null) this.dangerMice = new java.util.ArrayList<T>();
 			this.dangerMice.addAll(dangerMice);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularSetsBuilder<T> octopus(final Number octopus) {
 			if (this.octopodes == null) this.octopodes = new java.util.ArrayList<Number>();
 			this.octopodes.add(octopus);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularSetsBuilder<T> octopodes(final java.util.Collection<? extends Number> octopodes) {
 			if (this.octopodes == null) this.octopodes = new java.util.ArrayList<Number>();
 			this.octopodes.addAll(octopodes);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularSetsBuilder<T> rawSet(final java.lang.Object rawSet) {
 			if (this.rawSet == null) this.rawSet = new java.util.ArrayList<java.lang.Object>();
 			this.rawSet.add(rawSet);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularSetsBuilder<T> rawSet(final java.util.Collection<?> rawSet) {
 			if (this.rawSet == null) this.rawSet = new java.util.ArrayList<java.lang.Object>();
 			this.rawSet.addAll(rawSet);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularSetsBuilder<T> stringSet(final String stringSet) {
 			if (this.stringSet == null) this.stringSet = new java.util.ArrayList<String>();
 			this.stringSet.add(stringSet);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularSetsBuilder<T> stringSet(final java.util.Collection<? extends String> stringSet) {
 			if (this.stringSet == null) this.stringSet = new java.util.ArrayList<String>();
 			this.stringSet.addAll(stringSet);
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderSingularSets<T> build() {
 			java.util.Set<T> dangerMice;
 			switch (this.dangerMice == null ? 0 : this.dangerMice.size()) {
@@ -118,11 +130,13 @@ class BuilderSingularSets<T> {
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "BuilderSingularSets.BuilderSingularSetsBuilder(dangerMice=" + this.dangerMice + ", octopodes=" + this.octopodes + ", rawSet=" + this.rawSet + ", stringSet=" + this.stringSet + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public static <T> BuilderSingularSetsBuilder<T> builder() {
 		return new BuilderSingularSetsBuilder<T>();
 	}
diff --git a/test/transform/resource/after-delombok/BuilderWithAccessors.java b/test/transform/resource/after-delombok/BuilderWithAccessors.java
index 503c33be..74914453 100644
--- a/test/transform/resource/after-delombok/BuilderWithAccessors.java
+++ b/test/transform/resource/after-delombok/BuilderWithAccessors.java
@@ -4,6 +4,7 @@ class BuilderWithAccessors {
 	private int _foo;
 	private int __bar;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	BuilderWithAccessors(final int plower, final int upper, final int foo, final int _bar) {
 		this.plower = plower;
 		this.pUpper = upper;
@@ -11,6 +12,7 @@ class BuilderWithAccessors {
 		this.__bar = _bar;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public static class BuilderWithAccessorsBuilder {
 		private int plower;
 		private int upper;
@@ -18,47 +20,62 @@ class BuilderWithAccessors {
 		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")
 		public java.lang.String toString() {
 			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 1d40dbfa..38d0eb2c 100644
--- a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java
+++ b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java
@@ -9,29 +9,35 @@ class BuilderWithExistingBuilderClass<T, K extends Number> {
 		public void arg2(boolean arg) {
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		BuilderWithExistingBuilderClassBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderWithExistingBuilderClassBuilder<Z> arg1(final Z arg1) {
 			this.arg1 = arg1;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderWithExistingBuilderClassBuilder<Z> arg3(final String arg3) {
 			this.arg3 = arg3;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public BuilderWithExistingBuilderClass build() {
 			return BuilderWithExistingBuilderClass.<Z>staticMethod(arg1, arg2, arg3);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder(arg1=" + this.arg1 + ", arg2=" + this.arg2 + ", arg3=" + this.arg3 + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public static <Z extends Number> BuilderWithExistingBuilderClassBuilder<Z> builder() {
 		return new BuilderWithExistingBuilderClassBuilder<Z>();
 	}
diff --git a/test/transform/resource/after-delombok/ClassNamedAfterGetter.java b/test/transform/resource/after-delombok/ClassNamedAfterGetter.java
index 769aaf7c..793ec097 100644
--- a/test/transform/resource/after-delombok/ClassNamedAfterGetter.java
+++ b/test/transform/resource/after-delombok/ClassNamedAfterGetter.java
@@ -1,6 +1,7 @@
 class GetFoo {
 	private int foo;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getFoo() {
 		return this.foo;
 	}
diff --git a/test/transform/resource/after-delombok/CommentsInterspersed.java b/test/transform/resource/after-delombok/CommentsInterspersed.java
index 833f2ce0..a1da2c3d 100644
--- a/test/transform/resource/after-delombok/CommentsInterspersed.java
+++ b/test/transform/resource/after-delombok/CommentsInterspersed.java
@@ -12,6 +12,7 @@ public class CommentsInterspersed {
 		javascript;
 	}-*/
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public String getTest() {
 		return this.test;
 	}
diff --git a/test/transform/resource/after-delombok/ConflictingStaticConstructorNames.java b/test/transform/resource/after-delombok/ConflictingStaticConstructorNames.java
index ae0c46bc..a47fa244 100644
--- a/test/transform/resource/after-delombok/ConflictingStaticConstructorNames.java
+++ b/test/transform/resource/after-delombok/ConflictingStaticConstructorNames.java
@@ -1,6 +1,7 @@
 class ConflictingStaticConstructorNames {
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof ConflictingStaticConstructorNames)) return false;
@@ -9,21 +10,25 @@ class ConflictingStaticConstructorNames {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof ConflictingStaticConstructorNames;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		int result = 1;
 		return result;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "ConflictingStaticConstructorNames()";
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public ConflictingStaticConstructorNames() {
 	}
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/Constructors.java b/test/transform/resource/after-delombok/Constructors.java
index 4ffdc62b..466ae9ee 100644
--- a/test/transform/resource/after-delombok/Constructors.java
+++ b/test/transform/resource/after-delombok/Constructors.java
@@ -3,6 +3,7 @@ class RequiredArgsConstructor1 {
 	String name;
 	@java.beans.ConstructorProperties({"x"})
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public RequiredArgsConstructor1(final int x) {
 		this.x = x;
 	}
@@ -12,6 +13,7 @@ class RequiredArgsConstructorAccess {
 	String name;
 	@java.beans.ConstructorProperties({"x"})
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	protected RequiredArgsConstructorAccess(final int x) {
 		this.x = x;
 	}
@@ -20,10 +22,12 @@ class RequiredArgsConstructorStaticName {
 	final int x;
 	String name;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private RequiredArgsConstructorStaticName(final int x) {
 		this.x = x;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public static RequiredArgsConstructorStaticName staticname(final int x) {
 		return new RequiredArgsConstructorStaticName(x);
 	}
@@ -34,6 +38,7 @@ class RequiredArgsConstructorWithAnnotations {
 	@java.beans.ConstructorProperties({"x"})
 	@Deprecated
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public RequiredArgsConstructorWithAnnotations(final int x) {
 		this.x = x;
 	}
@@ -43,6 +48,7 @@ class AllArgsConstructor1 {
 	String name;
 	@java.beans.ConstructorProperties({"x", "name"})
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public AllArgsConstructor1(final int x, final String name) {
 		this.x = x;
 		this.name = name;
@@ -52,6 +58,7 @@ class NoArgsConstructor1 {
 	int x;
 	String name;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public NoArgsConstructor1() {
 	}
 }
@@ -59,10 +66,12 @@ class RequiredArgsConstructorStaticNameGenerics<T extends Number> {
 	final T x;
 	String name;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private RequiredArgsConstructorStaticNameGenerics(final T x) {
 		this.x = x;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public static <T extends Number> RequiredArgsConstructorStaticNameGenerics<T> of(final T x) {
 		return new RequiredArgsConstructorStaticNameGenerics<T>(x);
 	}
@@ -71,10 +80,12 @@ class RequiredArgsConstructorStaticNameGenerics2<T extends Number> {
 	final Class<T> x;
 	String name;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private RequiredArgsConstructorStaticNameGenerics2(final Class<T> x) {
 		this.x = x;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public static <T extends Number> RequiredArgsConstructorStaticNameGenerics2<T> of(final Class<T> x) {
 		return new RequiredArgsConstructorStaticNameGenerics2<T>(x);
 	}
@@ -82,6 +93,7 @@ class RequiredArgsConstructorStaticNameGenerics2<T extends Number> {
 class AllArgsConstructorPackageAccess {
 	final String x;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	AllArgsConstructorPackageAccess(final String x) {
 		this.x = x;
 	}
diff --git a/test/transform/resource/after-delombok/ConstructorsConfiguration.java b/test/transform/resource/after-delombok/ConstructorsConfiguration.java
index 5bec3ae3..effc51b8 100644
--- a/test/transform/resource/after-delombok/ConstructorsConfiguration.java
+++ b/test/transform/resource/after-delombok/ConstructorsConfiguration.java
@@ -1,6 +1,7 @@
 class ConstructorsConfiguration {
 	int x;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public ConstructorsConfiguration(final int x) {
 		this.x = x;
 	}
@@ -9,6 +10,7 @@ class ConstructorsConfigurationExplicit {
 	int x;
 	@java.beans.ConstructorProperties({"x"})
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public ConstructorsConfigurationExplicit(final int x) {
 		this.x = x;
 	}
diff --git a/test/transform/resource/after-delombok/ConstructorsWithAccessors.java b/test/transform/resource/after-delombok/ConstructorsWithAccessors.java
index 9937c7ee..43c0ea66 100644
--- a/test/transform/resource/after-delombok/ConstructorsWithAccessors.java
+++ b/test/transform/resource/after-delombok/ConstructorsWithAccessors.java
@@ -6,6 +6,7 @@ class ConstructorsWithAccessors {
 
 	@java.beans.ConstructorProperties({"plower", "upper", "huh", "_huh2"})
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public ConstructorsWithAccessors(final int plower, final int upper, final int huh, final int _huh2) {
 		this.plower = plower;
 		this.pUpper = upper;
diff --git a/test/transform/resource/after-delombok/DataConfiguration.java b/test/transform/resource/after-delombok/DataConfiguration.java
index 230083ec..b83204b8 100644
--- a/test/transform/resource/after-delombok/DataConfiguration.java
+++ b/test/transform/resource/after-delombok/DataConfiguration.java
@@ -1,15 +1,18 @@
 class DataConfiguration {
 	final int x;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public DataConfiguration(final int x) {
 		this.x = x;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getX() {
 		return this.x;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof DataConfiguration)) return false;
@@ -19,11 +22,13 @@ class DataConfiguration {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof DataConfiguration;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -32,6 +37,7 @@ class DataConfiguration {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "DataConfiguration(x=" + this.getX() + ")";
 	}
diff --git a/test/transform/resource/after-delombok/DataExtended.java b/test/transform/resource/after-delombok/DataExtended.java
index 6a5e7fa2..25180429 100644
--- a/test/transform/resource/after-delombok/DataExtended.java
+++ b/test/transform/resource/after-delombok/DataExtended.java
@@ -1,18 +1,22 @@
 class DataExtended {
 	int x;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public DataExtended() {
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getX() {
 		return this.x;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void setX(final int x) {
 		this.x = x;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof DataExtended)) return false;
@@ -22,11 +26,13 @@ class DataExtended {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof DataExtended;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -35,6 +41,7 @@ class DataExtended {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "DataExtended(x=" + this.x + ")";
 	}
diff --git a/test/transform/resource/after-delombok/DataIgnore.java b/test/transform/resource/after-delombok/DataIgnore.java
index 922de01b..0d40a5a8 100644
--- a/test/transform/resource/after-delombok/DataIgnore.java
+++ b/test/transform/resource/after-delombok/DataIgnore.java
@@ -3,15 +3,18 @@ class DataIgnore {
 	String $name;
 	@java.beans.ConstructorProperties({"x"})
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public DataIgnore(final int x) {
 		this.x = x;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getX() {
 		return this.x;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof DataIgnore)) return false;
@@ -21,11 +24,13 @@ class DataIgnore {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof DataIgnore;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -34,6 +39,7 @@ class DataIgnore {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "DataIgnore(x=" + this.getX() + ")";
 	}
diff --git a/test/transform/resource/after-delombok/DataOnEnum.java b/test/transform/resource/after-delombok/DataOnEnum.java
index 5cfe8823..b3cd7967 100644
--- a/test/transform/resource/after-delombok/DataOnEnum.java
+++ b/test/transform/resource/after-delombok/DataOnEnum.java
@@ -2,15 +2,18 @@ public enum DataOnEnum {
 	A("hello");
 	private final String someField;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public String getSomeField() {
 		return this.someField;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "DataOnEnum(someField=" + this.getSomeField() + ")";
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private DataOnEnum(final String someField) {
 		this.someField = someField;
 	}
diff --git a/test/transform/resource/after-delombok/DataOnLocalClass.java b/test/transform/resource/after-delombok/DataOnLocalClass.java
index 5d73e584..57f04bf3 100644
--- a/test/transform/resource/after-delombok/DataOnLocalClass.java
+++ b/test/transform/resource/after-delombok/DataOnLocalClass.java
@@ -4,23 +4,28 @@ class DataOnLocalClass1 {
 			final int x;
 			String name;
 			@java.lang.SuppressWarnings("all")
+			@javax.annotation.Generated("lombok")
 			public Local(final int x) {
 				this.x = x;
 			}
 			@java.lang.SuppressWarnings("all")
+			@javax.annotation.Generated("lombok")
 			public int getX() {
 				return this.x;
 			}
 			@java.lang.SuppressWarnings("all")
+			@javax.annotation.Generated("lombok")
 			public String getName() {
 				return this.name;
 			}
 			@java.lang.SuppressWarnings("all")
+			@javax.annotation.Generated("lombok")
 			public void setName(final String name) {
 				this.name = name;
 			}
 			@java.lang.Override
 			@java.lang.SuppressWarnings("all")
+			@javax.annotation.Generated("lombok")
 			public boolean equals(final java.lang.Object o) {
 				if (o == this) return true;
 				if (!(o instanceof Local)) return false;
@@ -33,11 +38,13 @@ class DataOnLocalClass1 {
 				return true;
 			}
 			@java.lang.SuppressWarnings("all")
+			@javax.annotation.Generated("lombok")
 			protected boolean canEqual(final java.lang.Object other) {
 				return other instanceof Local;
 			}
 			@java.lang.Override
 			@java.lang.SuppressWarnings("all")
+			@javax.annotation.Generated("lombok")
 			public int hashCode() {
 				final int PRIME = 59;
 				int result = 1;
@@ -48,6 +55,7 @@ class DataOnLocalClass1 {
 			}
 			@java.lang.Override
 			@java.lang.SuppressWarnings("all")
+			@javax.annotation.Generated("lombok")
 			public java.lang.String toString() {
 				return "Local(x=" + this.getX() + ", name=" + this.getName() + ")";
 			}
@@ -62,6 +70,7 @@ class DataOnLocalClass2 {
 				@lombok.NonNull
 				String name;
 				@java.lang.SuppressWarnings("all")
+				@javax.annotation.Generated("lombok")
 				public InnerLocal(@lombok.NonNull final String name) {
 					if (name == null) {
 						throw new java.lang.NullPointerException("name");
@@ -70,10 +79,12 @@ class DataOnLocalClass2 {
 				}
 				@lombok.NonNull
 				@java.lang.SuppressWarnings("all")
+				@javax.annotation.Generated("lombok")
 				public String getName() {
 					return this.name;
 				}
 				@java.lang.SuppressWarnings("all")
+				@javax.annotation.Generated("lombok")
 				public void setName(@lombok.NonNull final String name) {
 					if (name == null) {
 						throw new java.lang.NullPointerException("name");
@@ -82,6 +93,7 @@ class DataOnLocalClass2 {
 				}
 				@java.lang.Override
 				@java.lang.SuppressWarnings("all")
+				@javax.annotation.Generated("lombok")
 				public boolean equals(final java.lang.Object o) {
 					if (o == this) return true;
 					if (!(o instanceof Local.InnerLocal)) return false;
@@ -93,11 +105,13 @@ class DataOnLocalClass2 {
 					return true;
 				}
 				@java.lang.SuppressWarnings("all")
+				@javax.annotation.Generated("lombok")
 				protected boolean canEqual(final java.lang.Object other) {
 					return other instanceof Local.InnerLocal;
 				}
 				@java.lang.Override
 				@java.lang.SuppressWarnings("all")
+				@javax.annotation.Generated("lombok")
 				public int hashCode() {
 					final int PRIME = 59;
 					int result = 1;
@@ -107,20 +121,24 @@ class DataOnLocalClass2 {
 				}
 				@java.lang.Override
 				@java.lang.SuppressWarnings("all")
+				@javax.annotation.Generated("lombok")
 				public java.lang.String toString() {
 					return "Local.InnerLocal(name=" + this.getName() + ")";
 				}
 			}
 			@java.lang.SuppressWarnings("all")
+			@javax.annotation.Generated("lombok")
 			public Local(final int x) {
 				this.x = x;
 			}
 			@java.lang.SuppressWarnings("all")
+			@javax.annotation.Generated("lombok")
 			public int getX() {
 				return this.x;
 			}
 			@java.lang.Override
 			@java.lang.SuppressWarnings("all")
+			@javax.annotation.Generated("lombok")
 			public boolean equals(final java.lang.Object o) {
 				if (o == this) return true;
 				if (!(o instanceof Local)) return false;
@@ -130,11 +148,13 @@ class DataOnLocalClass2 {
 				return true;
 			}
 			@java.lang.SuppressWarnings("all")
+			@javax.annotation.Generated("lombok")
 			protected boolean canEqual(final java.lang.Object other) {
 				return other instanceof Local;
 			}
 			@java.lang.Override
 			@java.lang.SuppressWarnings("all")
+			@javax.annotation.Generated("lombok")
 			public int hashCode() {
 				final int PRIME = 59;
 				int result = 1;
@@ -143,6 +163,7 @@ class DataOnLocalClass2 {
 			}
 			@java.lang.Override
 			@java.lang.SuppressWarnings("all")
+			@javax.annotation.Generated("lombok")
 			public java.lang.String toString() {
 				return "Local(x=" + this.getX() + ")";
 			}
diff --git a/test/transform/resource/after-delombok/DataPlain.java b/test/transform/resource/after-delombok/DataPlain.java
index 8988dc6f..4ddb9414 100644
--- a/test/transform/resource/after-delombok/DataPlain.java
+++ b/test/transform/resource/after-delombok/DataPlain.java
@@ -3,23 +3,28 @@ class Data1 {
 	String name;
 	@java.beans.ConstructorProperties({"x"})
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public Data1(final int x) {
 		this.x = x;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getX() {
 		return this.x;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public String getName() {
 		return this.name;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void setName(final String name) {
 		this.name = name;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof Data1)) return false;
@@ -32,11 +37,13 @@ class Data1 {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof Data1;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -47,6 +54,7 @@ class Data1 {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "Data1(x=" + this.getX() + ", name=" + this.getName() + ")";
 	}
@@ -56,23 +64,28 @@ class Data2 {
 	String name;
 	@java.beans.ConstructorProperties({"x"})
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public Data2(final int x) {
 		this.x = x;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getX() {
 		return this.x;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public String getName() {
 		return this.name;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void setName(final String name) {
 		this.name = name;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof Data2)) return false;
@@ -85,11 +98,13 @@ class Data2 {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof Data2;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -100,6 +115,7 @@ class Data2 {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "Data2(x=" + this.getX() + ", name=" + this.getName() + ")";
 	}
@@ -109,23 +125,28 @@ final class Data3 {
 	String name;
 	@java.beans.ConstructorProperties({"x"})
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public Data3(final int x) {
 		this.x = x;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getX() {
 		return this.x;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public String getName() {
 		return this.name;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void setName(final String name) {
 		this.name = name;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof Data3)) return false;
@@ -138,6 +159,7 @@ final class Data3 {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -148,6 +170,7 @@ final class Data3 {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "Data3(x=" + this.getX() + ", name=" + this.getName() + ")";
 	}
@@ -157,20 +180,24 @@ final class Data4 extends java.util.Timer {
 	Data4() {
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getX() {
 		return this.x;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void setX(final int x) {
 		this.x = x;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "Data4(x=" + this.getX() + ")";
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof Data4)) return false;
@@ -181,11 +208,13 @@ final class Data4 extends java.util.Timer {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof Data4;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -196,10 +225,12 @@ final class Data4 extends java.util.Timer {
 }
 class Data5 {
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public Data5() {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof Data5)) return false;
@@ -208,27 +239,32 @@ class Data5 {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof Data5;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		int result = 1;
 		return result;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "Data5()";
 	}
 }
 final class Data6 {
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public Data6() {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof Data6)) return false;
@@ -236,12 +272,14 @@ final class Data6 {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		int result = 1;
 		return result;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "Data6()";
 	}
diff --git a/test/transform/resource/after-delombok/DataWithGetter.java b/test/transform/resource/after-delombok/DataWithGetter.java
index 91f392ec..232f783b 100644
--- a/test/transform/resource/after-delombok/DataWithGetter.java
+++ b/test/transform/resource/after-delombok/DataWithGetter.java
@@ -4,19 +4,23 @@ class DataWithGetter {
 	private final String z;
 	@java.beans.ConstructorProperties({"z"})
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public DataWithGetter(final String z) {
 		this.z = z;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void setX(final int x) {
 		this.x = x;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void setY(final int y) {
 		this.y = y;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof DataWithGetter)) return false;
@@ -30,11 +34,13 @@ class DataWithGetter {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof DataWithGetter;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -46,18 +52,22 @@ class DataWithGetter {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "DataWithGetter(x=" + this.getX() + ", y=" + this.getY() + ", z=" + this.getZ() + ")";
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getX() {
 		return this.x;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getY() {
 		return this.y;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public String getZ() {
 		return this.z;
 	}
diff --git a/test/transform/resource/after-delombok/DataWithGetterNone.java b/test/transform/resource/after-delombok/DataWithGetterNone.java
index 5986ee9f..9e1fb60a 100644
--- a/test/transform/resource/after-delombok/DataWithGetterNone.java
+++ b/test/transform/resource/after-delombok/DataWithGetterNone.java
@@ -4,19 +4,23 @@ class DataWithGetterNone {
 	private final String z;
 	@java.beans.ConstructorProperties({"z"})
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public DataWithGetterNone(final String z) {
 		this.z = z;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void setX(final int x) {
 		this.x = x;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void setY(final int y) {
 		this.y = y;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof DataWithGetterNone)) return false;
@@ -30,11 +34,13 @@ class DataWithGetterNone {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof DataWithGetterNone;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -46,6 +52,7 @@ class DataWithGetterNone {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "DataWithGetterNone(x=" + this.x + ", y=" + this.y + ", z=" + this.z + ")";
 	}
diff --git a/test/transform/resource/after-delombok/DelegateOnGetter.java b/test/transform/resource/after-delombok/DelegateOnGetter.java
index e8d01a49..5b5090e9 100644
--- a/test/transform/resource/after-delombok/DelegateOnGetter.java
+++ b/test/transform/resource/after-delombok/DelegateOnGetter.java
@@ -5,6 +5,7 @@ class DelegateOnGetter {
 		int getInt();
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public Bar getBar() {
 		java.lang.Object value = this.bar.get();
 		if (value == null) {
@@ -26,10 +27,12 @@ class DelegateOnGetter {
 		return (Bar)(value == this.bar ? null : value);
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void setList(final java.util.ArrayList<java.lang.String> list) {
 		this.getBar().setList(list);
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getInt() {
 		return this.getBar().getInt();
 	}
diff --git a/test/transform/resource/after-delombok/DelegateOnGetterNone.java b/test/transform/resource/after-delombok/DelegateOnGetterNone.java
index 9f9411f4..c4de4f88 100644
--- a/test/transform/resource/after-delombok/DelegateOnGetterNone.java
+++ b/test/transform/resource/after-delombok/DelegateOnGetterNone.java
@@ -5,10 +5,12 @@ class DelegateOnGetterNone {
 		int getInt();
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void setList(final java.util.ArrayList<java.lang.String> list) {
 		this.bar.setList(list);
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getInt() {
 		return this.bar.getInt();
 	}
diff --git a/test/transform/resource/after-delombok/DelegateOnMethods.java b/test/transform/resource/after-delombok/DelegateOnMethods.java
index b900f140..5082d961 100644
--- a/test/transform/resource/after-delombok/DelegateOnMethods.java
+++ b/test/transform/resource/after-delombok/DelegateOnMethods.java
@@ -6,6 +6,8 @@ abstract class DelegateOnMethods {
 	}
 	
 	@java.lang.SuppressWarnings("all")
+	
+	@javax.annotation.Generated("lombok")
 	public void bar(final java.util.ArrayList<java.lang.String> list) {
 		this.getBar().bar(list);
 	}
diff --git a/test/transform/resource/after-delombok/DelegateTypesAndExcludes.java b/test/transform/resource/after-delombok/DelegateTypesAndExcludes.java
index 3f6f555d..00a157f1 100644
--- a/test/transform/resource/after-delombok/DelegateTypesAndExcludes.java
+++ b/test/transform/resource/after-delombok/DelegateTypesAndExcludes.java
@@ -24,11 +24,15 @@ class DelegatePlain {
 	}
 
 	@java.lang.SuppressWarnings("all")
+
+	@javax.annotation.Generated("lombok")
 	public void bar(final java.util.ArrayList<java.lang.String> list) {
 		this.bar.bar(list);
 	}
 
 	@java.lang.SuppressWarnings("all")
+
+	@javax.annotation.Generated("lombok")
 	public void foo() {
 		this.foo.foo();
 	}
diff --git a/test/transform/resource/after-delombok/DelegateWithDeprecated.java b/test/transform/resource/after-delombok/DelegateWithDeprecated.java
index f7bd1e6d..6a7651db 100644
--- a/test/transform/resource/after-delombok/DelegateWithDeprecated.java
+++ b/test/transform/resource/after-delombok/DelegateWithDeprecated.java
@@ -11,15 +11,18 @@ class DelegateWithDeprecated {
 	}
 	@java.lang.Deprecated
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void deprecatedAnnotation() {
 		this.bar.deprecatedAnnotation();
 	}
 	@java.lang.Deprecated
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void deprecatedComment() {
 		this.bar.deprecatedComment();
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void notDeprecated() {
 		this.bar.notDeprecated();
 	}
diff --git a/test/transform/resource/after-delombok/EncodingUsAscii.java b/test/transform/resource/after-delombok/EncodingUsAscii.java
index a9e6b1a5..4d2b169f 100644
--- a/test/transform/resource/after-delombok/EncodingUsAscii.java
+++ b/test/transform/resource/after-delombok/EncodingUsAscii.java
@@ -3,6 +3,7 @@ class EncodingUsAscii {
 	String foo\u0e51\u0e51 = "\016\t\b ";
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "EncodingUsAscii(foo\u0e51\u0e51=" + this.foo\u0e51\u0e51 + ")";
 	}
diff --git a/test/transform/resource/after-delombok/EncodingUtf8.java b/test/transform/resource/after-delombok/EncodingUtf8.java
index 9ae3e30a..b1a7dcd3 100644
--- a/test/transform/resource/after-delombok/EncodingUtf8.java
+++ b/test/transform/resource/after-delombok/EncodingUtf8.java
@@ -2,6 +2,7 @@ class EncodingUtf8 {
 	String foo๑๑ = "\016\t\b ";
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "EncodingUtf8(foo๑๑=" + this.foo๑๑ + ")";
 	}
diff --git a/test/transform/resource/after-delombok/EqualsAndHashCode.java b/test/transform/resource/after-delombok/EqualsAndHashCode.java
index 02ca2c42..a15b71b0 100644
--- a/test/transform/resource/after-delombok/EqualsAndHashCode.java
+++ b/test/transform/resource/after-delombok/EqualsAndHashCode.java
@@ -6,6 +6,7 @@ class EqualsAndHashCode {
 	String b;
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof EqualsAndHashCode)) return false;
@@ -23,11 +24,13 @@ class EqualsAndHashCode {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof EqualsAndHashCode;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -49,6 +52,7 @@ final class EqualsAndHashCode2 {
 	boolean b;
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof EqualsAndHashCode2)) return false;
@@ -62,6 +66,7 @@ final class EqualsAndHashCode2 {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -78,6 +83,7 @@ final class EqualsAndHashCode2 {
 final class EqualsAndHashCode3 extends EqualsAndHashCode {
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof EqualsAndHashCode3)) return false;
@@ -86,11 +92,13 @@ final class EqualsAndHashCode3 extends EqualsAndHashCode {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof EqualsAndHashCode3;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		int result = 1;
 		return result;
@@ -99,6 +107,7 @@ final class EqualsAndHashCode3 extends EqualsAndHashCode {
 class EqualsAndHashCode4 extends EqualsAndHashCode {
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof EqualsAndHashCode4)) return false;
@@ -108,11 +117,13 @@ class EqualsAndHashCode4 extends EqualsAndHashCode {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof EqualsAndHashCode4;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeWithExistingMethods.java b/test/transform/resource/after-delombok/EqualsAndHashCodeWithExistingMethods.java
index ac189f42..5c9316b4 100644
--- a/test/transform/resource/after-delombok/EqualsAndHashCodeWithExistingMethods.java
+++ b/test/transform/resource/after-delombok/EqualsAndHashCodeWithExistingMethods.java
@@ -17,6 +17,7 @@ final class EqualsAndHashCodeWithExistingMethods3 extends EqualsAndHashCodeWithE
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof EqualsAndHashCodeWithExistingMethods3)) return false;
@@ -28,6 +29,7 @@ final class EqualsAndHashCodeWithExistingMethods3 extends EqualsAndHashCodeWithE
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeWithOnParam.java b/test/transform/resource/after-delombok/EqualsAndHashCodeWithOnParam.java
index d8d8b025..733959b0 100644
--- a/test/transform/resource/after-delombok/EqualsAndHashCodeWithOnParam.java
+++ b/test/transform/resource/after-delombok/EqualsAndHashCodeWithOnParam.java
@@ -9,6 +9,7 @@ class EqualsAndHashCodeWithOnParam {
 	String b;
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean equals(@Nullable final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof EqualsAndHashCodeWithOnParam)) return false;
@@ -26,11 +27,13 @@ class EqualsAndHashCodeWithOnParam {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(@Nullable final java.lang.Object other) {
 		return other instanceof EqualsAndHashCodeWithOnParam;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeWithSomeExistingMethods.java b/test/transform/resource/after-delombok/EqualsAndHashCodeWithSomeExistingMethods.java
index 37eeb8df..44f61eb4 100644
--- a/test/transform/resource/after-delombok/EqualsAndHashCodeWithSomeExistingMethods.java
+++ b/test/transform/resource/after-delombok/EqualsAndHashCodeWithSomeExistingMethods.java
@@ -6,11 +6,13 @@ class EqualsAndHashCodeWithSomeExistingMethods {
 		return 42;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public EqualsAndHashCodeWithSomeExistingMethods() {
 		
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "EqualsAndHashCodeWithSomeExistingMethods(x=" + this.x + ")";
 	}
@@ -21,10 +23,12 @@ class EqualsAndHashCodeWithSomeExistingMethods2 {
 		return false;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public EqualsAndHashCodeWithSomeExistingMethods2() {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof EqualsAndHashCodeWithSomeExistingMethods2)) return false;
@@ -35,6 +39,7 @@ class EqualsAndHashCodeWithSomeExistingMethods2 {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -43,6 +48,7 @@ class EqualsAndHashCodeWithSomeExistingMethods2 {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "EqualsAndHashCodeWithSomeExistingMethods2(x=" + this.x + ")";
 	}
@@ -56,10 +62,12 @@ class EqualsAndHashCodeWithAllExistingMethods {
 		return false;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public EqualsAndHashCodeWithAllExistingMethods() {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "EqualsAndHashCodeWithAllExistingMethods(x=" + this.x + ")";
 	}
@@ -67,11 +75,13 @@ class EqualsAndHashCodeWithAllExistingMethods {
 class EqualsAndHashCodeWithNoExistingMethods {
 	int x;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public EqualsAndHashCodeWithNoExistingMethods() {
 		
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof EqualsAndHashCodeWithNoExistingMethods)) return false;
@@ -81,11 +91,13 @@ class EqualsAndHashCodeWithNoExistingMethods {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof EqualsAndHashCodeWithNoExistingMethods;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -94,6 +106,7 @@ class EqualsAndHashCodeWithNoExistingMethods {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "EqualsAndHashCodeWithNoExistingMethods(x=" + this.x + ")";
 	}
diff --git a/test/transform/resource/after-delombok/GetterAccessLevel.java b/test/transform/resource/after-delombok/GetterAccessLevel.java
index 6d977d87..217c77a9 100644
--- a/test/transform/resource/after-delombok/GetterAccessLevel.java
+++ b/test/transform/resource/after-delombok/GetterAccessLevel.java
@@ -11,38 +11,47 @@ class GetterAccessLevel {
 	String publicString;
 	String value;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private boolean isPrivate() {
 		return this.isPrivate;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	boolean isPackage() {
 		return this.isPackage;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	protected boolean isProtected() {
 		return this.isProtected;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean isPublic() {
 		return this.isPublic;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private String getPrivateString() {
 		return this.privateString;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	String getPackageString() {
 		return this.packageString;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	protected String getProtectedString() {
 		return this.protectedString;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public String getPublicString() {
 		return this.publicString;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public String getValue() {
 		return this.value;
 	}
diff --git a/test/transform/resource/after-delombok/GetterAlreadyExists.java b/test/transform/resource/after-delombok/GetterAlreadyExists.java
index 8389ae31..a45df1a9 100644
--- a/test/transform/resource/after-delombok/GetterAlreadyExists.java
+++ b/test/transform/resource/after-delombok/GetterAlreadyExists.java
@@ -4,6 +4,7 @@ class Getter1 {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean isFoo() {
 		return this.foo;
 	}
@@ -26,6 +27,7 @@ class Getter4 {
 		return null;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public String getFoo() {
 		return this.foo;
 	}
@@ -36,6 +38,7 @@ class Getter5 {
 		return null;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public String getFoo() {
 		return this.foo;
 	}
@@ -52,6 +55,7 @@ class Getter7 {
 		return false;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public String getFoo() {
 		return this.foo;
 	}
@@ -62,6 +66,7 @@ class Getter8 {
 		return false;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public String getFoo() {
 		return this.foo;
 	}
@@ -78,6 +83,7 @@ class Getter10 {
 		return false;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean isFoo() {
 		return this.foo;
 	}
@@ -100,6 +106,7 @@ class Getter13 {
 		return false;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public String getFoo() {
 		return this.foo;
 	}
@@ -110,6 +117,7 @@ class Getter14 {
 		return false;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public String getFoo() {
 		return this.foo;
 	}
@@ -126,6 +134,7 @@ class Getter16 {
 		return "";
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public String getFoo() {
 		return this.foo;
 	}
@@ -136,6 +145,7 @@ class Getter17 {
 		return "";
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public String getFoo() {
 		return this.foo;
 	}
diff --git a/test/transform/resource/after-delombok/GetterBoolean.java b/test/transform/resource/after-delombok/GetterBoolean.java
index 42b4319d..49b52483 100644
--- a/test/transform/resource/after-delombok/GetterBoolean.java
+++ b/test/transform/resource/after-delombok/GetterBoolean.java
@@ -3,14 +3,17 @@ class Getter {
 	boolean isBar;
 	boolean hasBaz;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean isFoo() {
 		return this.foo;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean isBar() {
 		return this.isBar;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean isHasBaz() {
 		return this.hasBaz;
 	}
@@ -21,6 +24,7 @@ class MoreGetter {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean isFoo() {
 		return this.foo;
 	}
diff --git a/test/transform/resource/after-delombok/GetterDeprecated.java b/test/transform/resource/after-delombok/GetterDeprecated.java
index 09ea9929..d9d09e6c 100644
--- a/test/transform/resource/after-delombok/GetterDeprecated.java
+++ b/test/transform/resource/after-delombok/GetterDeprecated.java
@@ -7,6 +7,7 @@ class GetterDeprecated {
 	int javadoc;
 	@java.lang.Deprecated
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getAnnotation() {
 		return this.annotation;
 	}
@@ -15,6 +16,7 @@ class GetterDeprecated {
 	 */
 	@java.lang.Deprecated
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getJavadoc() {
 		return this.javadoc;
 	}
diff --git a/test/transform/resource/after-delombok/GetterEnum.java b/test/transform/resource/after-delombok/GetterEnum.java
index 3c6e6e0c..841325c0 100644
--- a/test/transform/resource/after-delombok/GetterEnum.java
+++ b/test/transform/resource/after-delombok/GetterEnum.java
@@ -3,15 +3,18 @@ enum GetterEnum {
 	private final int id;
 	private final String name;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private GetterEnum(final int id, final String name) {
 		this.id = id;
 		this.name = name;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getId() {
 		return this.id;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public String getName() {
 		return this.name;
 	}
diff --git a/test/transform/resource/after-delombok/GetterLazy.java b/test/transform/resource/after-delombok/GetterLazy.java
index 4f6f2c03..9c7db37b 100644
--- a/test/transform/resource/after-delombok/GetterLazy.java
+++ b/test/transform/resource/after-delombok/GetterLazy.java
@@ -3,6 +3,7 @@ class GetterLazy {
 	}
 	private final java.util.concurrent.atomic.AtomicReference<java.lang.Object> fieldName = new java.util.concurrent.atomic.AtomicReference<java.lang.Object>();
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public ValueType getFieldName() {
 		java.lang.Object value = this.fieldName.get();
 		if (value == null) {
diff --git a/test/transform/resource/after-delombok/GetterLazyBoolean.java b/test/transform/resource/after-delombok/GetterLazyBoolean.java
index f684fc07..f9a42e66 100644
--- a/test/transform/resource/after-delombok/GetterLazyBoolean.java
+++ b/test/transform/resource/after-delombok/GetterLazyBoolean.java
@@ -6,6 +6,7 @@ class GetterLazyBoolean {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof GetterLazyBoolean)) return false;
@@ -15,11 +16,13 @@ class GetterLazyBoolean {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof GetterLazyBoolean;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -28,10 +31,12 @@ class GetterLazyBoolean {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "GetterLazyBoolean(booleanValue=" + this.isBooleanValue() + ")";
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean isBooleanValue() {
 		java.lang.Object value = this.booleanValue.get();
 		if (value == null) {
@@ -47,6 +52,7 @@ class GetterLazyBoolean {
 		return (java.lang.Boolean)value;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean isOtherBooleanValue() {
 		java.lang.Object value = this.otherBooleanValue.get();
 		if (value == null) {
diff --git a/test/transform/resource/after-delombok/GetterLazyEahcToString.java b/test/transform/resource/after-delombok/GetterLazyEahcToString.java
index 65c63fba..c89b2980 100644
--- a/test/transform/resource/after-delombok/GetterLazyEahcToString.java
+++ b/test/transform/resource/after-delombok/GetterLazyEahcToString.java
@@ -5,6 +5,7 @@ class GetterLazyEahcToString {
 	
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof GetterLazyEahcToString)) return false;
@@ -20,12 +21,15 @@ class GetterLazyEahcToString {
 	}
 	
 	@java.lang.SuppressWarnings("all")
+	
+	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof GetterLazyEahcToString;
 	}
 	
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -38,11 +42,14 @@ class GetterLazyEahcToString {
 	
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "GetterLazyEahcToString(value=" + this.getValue() + ", value2=" + this.value2 + ")";
 	}
 	
 	@java.lang.SuppressWarnings("all")
+	
+	@javax.annotation.Generated("lombok")
 	public String getValue() {
 		java.lang.Object value = this.value.get();
 		if (value == null) {
@@ -59,6 +66,8 @@ class GetterLazyEahcToString {
 	}
 	
 	@java.lang.SuppressWarnings("all")
+	
+	@javax.annotation.Generated("lombok")
 	public String getValue2() {
 		return this.value2;
 	}
diff --git a/test/transform/resource/after-delombok/GetterLazyInvalid.java b/test/transform/resource/after-delombok/GetterLazyInvalid.java
index 25963921..311b7e4a 100644
--- a/test/transform/resource/after-delombok/GetterLazyInvalid.java
+++ b/test/transform/resource/after-delombok/GetterLazyInvalid.java
@@ -13,6 +13,7 @@ class GetterLazyInvalidNone {
 class GetterLazyInvalidClass {
 	private final String fieldName = "";
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public String getFieldName() {
 		return this.fieldName;
 	}
diff --git a/test/transform/resource/after-delombok/GetterLazyNative.java b/test/transform/resource/after-delombok/GetterLazyNative.java
index eb31991a..50e3ff2b 100644
--- a/test/transform/resource/after-delombok/GetterLazyNative.java
+++ b/test/transform/resource/after-delombok/GetterLazyNative.java
@@ -9,6 +9,7 @@ class GetterLazyNative {
 	private final java.util.concurrent.atomic.AtomicReference<java.lang.Object> charField = new java.util.concurrent.atomic.AtomicReference<java.lang.Object>();
 	private final java.util.concurrent.atomic.AtomicReference<java.lang.Object> intArrayField = new java.util.concurrent.atomic.AtomicReference<java.lang.Object>();
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean isBooleanField() {
 		java.lang.Object value = this.booleanField.get();
 		if (value == null) {
@@ -24,6 +25,7 @@ class GetterLazyNative {
 		return (java.lang.Boolean)value;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public byte getByteField() {
 		java.lang.Object value = this.byteField.get();
 		if (value == null) {
@@ -39,6 +41,7 @@ class GetterLazyNative {
 		return (java.lang.Byte)value;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public short getShortField() {
 		java.lang.Object value = this.shortField.get();
 		if (value == null) {
@@ -54,6 +57,7 @@ class GetterLazyNative {
 		return (java.lang.Short)value;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getIntField() {
 		java.lang.Object value = this.intField.get();
 		if (value == null) {
@@ -69,6 +73,7 @@ class GetterLazyNative {
 		return (java.lang.Integer)value;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public long getLongField() {
 		java.lang.Object value = this.longField.get();
 		if (value == null) {
@@ -84,6 +89,7 @@ class GetterLazyNative {
 		return (java.lang.Long)value;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public float getFloatField() {
 		java.lang.Object value = this.floatField.get();
 		if (value == null) {
@@ -99,6 +105,7 @@ class GetterLazyNative {
 		return (java.lang.Float)value;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public double getDoubleField() {
 		java.lang.Object value = this.doubleField.get();
 		if (value == null) {
@@ -114,6 +121,7 @@ class GetterLazyNative {
 		return (java.lang.Double)value;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public char getCharField() {
 		java.lang.Object value = this.charField.get();
 		if (value == null) {
@@ -129,6 +137,7 @@ class GetterLazyNative {
 		return (java.lang.Character)value;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int[] getIntArrayField() {
 		java.lang.Object value = this.intArrayField.get();
 		if (value == null) {
diff --git a/test/transform/resource/after-delombok/GetterNone.java b/test/transform/resource/after-delombok/GetterNone.java
index 11b4fd09..743ff468 100644
--- a/test/transform/resource/after-delombok/GetterNone.java
+++ b/test/transform/resource/after-delombok/GetterNone.java
@@ -2,6 +2,7 @@ class GetterNone {
 	int i;
 	int foo;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getI() {
 		return this.i;
 	}
diff --git a/test/transform/resource/after-delombok/GetterOnClass.java b/test/transform/resource/after-delombok/GetterOnClass.java
index bd15ce35..a509f5cb 100644
--- a/test/transform/resource/after-delombok/GetterOnClass.java
+++ b/test/transform/resource/after-delombok/GetterOnClass.java
@@ -2,6 +2,7 @@ class GetterOnClass1 {
 	boolean isNone;
 	boolean isPublic;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean isPublic() {
 		return this.isPublic;
 	}
@@ -11,10 +12,12 @@ class GetterOnClass2 {
 	boolean isProtected;
 	boolean isPackage;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	protected boolean isProtected() {
 		return this.isProtected;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	boolean isPackage() {
 		return this.isPackage;
 	}
@@ -23,6 +26,7 @@ class GetterOnClass3 {
 	boolean isNone;
 	boolean isPackage;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	boolean isPackage() {
 		return this.isPackage;
 	}
@@ -31,6 +35,7 @@ class GetterOnClass4 {
 	boolean isNone;
 	boolean isPrivate;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private boolean isPrivate() {
 		return this.isPrivate;
 	}
@@ -39,6 +44,7 @@ class GetterOnClass5 {
 	boolean isNone;
 	boolean isPublic;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean isPublic() {
 		return this.isPublic;
 	}
@@ -48,11 +54,13 @@ class GetterOnClass6 {
 	@lombok.NonNull
 	String nonNull;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public String getCouldBeNull() {
 		return this.couldBeNull;
 	}
 	@lombok.NonNull
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public String getNonNull() {
 		return this.nonNull;
 	}
diff --git a/test/transform/resource/after-delombok/GetterOnMethod.java b/test/transform/resource/after-delombok/GetterOnMethod.java
index 4a5b3622..37ae83a4 100644
--- a/test/transform/resource/after-delombok/GetterOnMethod.java
+++ b/test/transform/resource/after-delombok/GetterOnMethod.java
@@ -6,18 +6,21 @@ class GetterOnMethod {
 	}
 	@Deprecated
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getI() {
 		return this.i;
 	}
 	@java.lang.Deprecated
 	@Test
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getJ() {
 		return this.j;
 	}
 	@java.lang.Deprecated
 	@Test
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getK() {
 		return this.k;
 	}
diff --git a/test/transform/resource/after-delombok/GetterOnMethodErrors.java b/test/transform/resource/after-delombok/GetterOnMethodErrors.java
index 86813bd2..094f989a 100644
--- a/test/transform/resource/after-delombok/GetterOnMethodErrors.java
+++ b/test/transform/resource/after-delombok/GetterOnMethodErrors.java
@@ -3,6 +3,7 @@ class PlaceFillerToMakeSurePositionIsRelevant {
 class GetterOnMethodErrors {
 	private int test;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getTest() {
 		return this.test;
 	}
diff --git a/test/transform/resource/after-delombok/GetterOnMethodErrors2.java b/test/transform/resource/after-delombok/GetterOnMethodErrors2.java
index 639022d0..3114d23d 100644
--- a/test/transform/resource/after-delombok/GetterOnMethodErrors2.java
+++ b/test/transform/resource/after-delombok/GetterOnMethodErrors2.java
@@ -10,38 +10,46 @@ class GetterOnMethodErrors2 {
 	public @interface Test {
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getBad1() {
 		return this.bad1;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getBad2() {
 		return this.bad2;
 	}
 	@Deprecated
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getBad3() {
 		return this.bad3;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getBad4() {
 		return this.bad4;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getGood1() {
 		return this.good1;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getGood2() {
 		return this.good2;
 	}
 	@Deprecated
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getGood3() {
 		return this.good3;
 	}
 	@Deprecated
 	@Test
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getGood4() {
 		return this.good4;
 	}
diff --git a/test/transform/resource/after-delombok/GetterOnStatic.java b/test/transform/resource/after-delombok/GetterOnStatic.java
index 99e63e05..34c2dba1 100644
--- a/test/transform/resource/after-delombok/GetterOnStatic.java
+++ b/test/transform/resource/after-delombok/GetterOnStatic.java
@@ -2,10 +2,12 @@ class Getter {
 	static boolean foo;
 	static int bar;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public static boolean isFoo() {
 		return Getter.foo;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public static int getBar() {
 		return Getter.bar;
 	}
diff --git a/test/transform/resource/after-delombok/GetterPlain.java b/test/transform/resource/after-delombok/GetterPlain.java
index 359d46e2..1cdfef8f 100644
--- a/test/transform/resource/after-delombok/GetterPlain.java
+++ b/test/transform/resource/after-delombok/GetterPlain.java
@@ -2,10 +2,12 @@ class GetterPlain {
 	int i;
 	int foo;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getI() {
 		return this.i;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getFoo() {
 		return this.foo;
 	}
diff --git a/test/transform/resource/after-delombok/GetterSetterJavadoc.java b/test/transform/resource/after-delombok/GetterSetterJavadoc.java
index 7a782434..f4f04fa1 100644
--- a/test/transform/resource/after-delombok/GetterSetterJavadoc.java
+++ b/test/transform/resource/after-delombok/GetterSetterJavadoc.java
@@ -4,6 +4,7 @@ class GetterSetterJavadoc1 {
 	 */
 	private int fieldName;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public GetterSetterJavadoc1() {
 	}
 	/**
@@ -12,6 +13,7 @@ class GetterSetterJavadoc1 {
 	 * @return Sky is blue1
 	 */
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getFieldName() {
 		return this.fieldName;
 	}
@@ -21,11 +23,13 @@ class GetterSetterJavadoc1 {
 	 * @param fieldName Hello, World1
 	 */
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void setFieldName(final int fieldName) {
 		this.fieldName = fieldName;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof GetterSetterJavadoc1)) return false;
@@ -35,11 +39,13 @@ class GetterSetterJavadoc1 {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof GetterSetterJavadoc1;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -48,6 +54,7 @@ class GetterSetterJavadoc1 {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "GetterSetterJavadoc1(fieldName=" + this.getFieldName() + ")";
 	}
@@ -63,6 +70,7 @@ class GetterSetterJavadoc2 {
 	 * @return Sky is blue2
 	 */
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getFieldName() {
 		return this.fieldName;
 	}
@@ -72,6 +80,7 @@ class GetterSetterJavadoc2 {
 	 * @param fieldName Hello, World2
 	 */
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void setFieldName(final int fieldName) {
 		this.fieldName = fieldName;
 	}
@@ -86,6 +95,7 @@ class GetterSetterJavadoc3 {
 	 * @return Sky is blue3
 	 */
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getFieldName() {
 		return this.fieldName;
 	}
@@ -94,6 +104,7 @@ class GetterSetterJavadoc3 {
 	 * @param fieldName Hello, World3
 	 */
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void setFieldName(final int fieldName) {
 		this.fieldName = fieldName;
 	}
diff --git a/test/transform/resource/after-delombok/GetterWithDollar.java b/test/transform/resource/after-delombok/GetterWithDollar.java
index 520f4ea5..21e5fac8 100644
--- a/test/transform/resource/after-delombok/GetterWithDollar.java
+++ b/test/transform/resource/after-delombok/GetterWithDollar.java
@@ -1,6 +1,7 @@
 class GetterWithDollar1 {
 	int $i;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int get$i() {
 		return this.$i;
 	}
@@ -9,10 +10,12 @@ class GetterWithDollar2 {
 	int $i;
 	int i;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int get$i() {
 		return this.$i;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getI() {
 		return this.i;
 	}
diff --git a/test/transform/resource/after-delombok/InjectField.java b/test/transform/resource/after-delombok/InjectField.java
index 59896400..55390a60 100644
--- a/test/transform/resource/after-delombok/InjectField.java
+++ b/test/transform/resource/after-delombok/InjectField.java
@@ -5,10 +5,14 @@ enum InjectField1 {
 	B;
 
 	@java.lang.SuppressWarnings("all")
+
+	@javax.annotation.Generated("lombok")
 	private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(InjectField1.class.getName());
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private final java.lang.Object $lock = new java.lang.Object[0];
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private static final java.lang.Object $LOCK = new java.lang.Object[0];
 
 	private static final String LOG_MESSAGE = "static initializer";
@@ -36,8 +40,10 @@ enum InjectField1 {
 
 class InjectField2 {
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(InjectField2.class.getName());
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private final java.lang.Object $lock = new java.lang.Object[0];
 
 	private static final String LOG_MESSAGE = "static initializer";
@@ -55,6 +61,7 @@ class InjectField2 {
 
 class InjectField3 {
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(InjectField3.class.getName());
 	static {
 		log.log(Level.FINE, "static initializer");
diff --git a/test/transform/resource/after-delombok/LoggerCommons.java b/test/transform/resource/after-delombok/LoggerCommons.java
index 32ace53a..85ad75b7 100644
--- a/test/transform/resource/after-delombok/LoggerCommons.java
+++ b/test/transform/resource/after-delombok/LoggerCommons.java
@@ -1,12 +1,15 @@
 class LoggerCommons {
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommons.class);
 }
 class LoggerCommonsWithImport {
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommonsWithImport.class);
 }
 class LoggerCommonsWithDifferentName {
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog("DifferentName");
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/LoggerConfig.java b/test/transform/resource/after-delombok/LoggerConfig.java
index ba955638..fcfb118f 100644
--- a/test/transform/resource/after-delombok/LoggerConfig.java
+++ b/test/transform/resource/after-delombok/LoggerConfig.java
@@ -1,4 +1,5 @@
 class LoggerWithConfig {
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private final org.slf4j.Logger myLogger = org.slf4j.LoggerFactory.getLogger(LoggerWithConfig.class);
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/LoggerJul.java b/test/transform/resource/after-delombok/LoggerJul.java
index ad119777..eabfb94a 100644
--- a/test/transform/resource/after-delombok/LoggerJul.java
+++ b/test/transform/resource/after-delombok/LoggerJul.java
@@ -1,12 +1,15 @@
 class LoggerJul {
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJul.class.getName());
 }
 class LoggerJulWithImport {
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJulWithImport.class.getName());
 }
 class LoggerJulWithDifferentName {
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger("DifferentName");
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/LoggerLog4j.java b/test/transform/resource/after-delombok/LoggerLog4j.java
index 99eac34f..39667670 100644
--- a/test/transform/resource/after-delombok/LoggerLog4j.java
+++ b/test/transform/resource/after-delombok/LoggerLog4j.java
@@ -1,12 +1,15 @@
 class LoggerLog4j {
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4j.class);
 }
 class LoggerLog4jWithImport {
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4jWithImport.class);
 }
 class LoggerLog4jWithDifferentName {
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger("DifferentName");
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/LoggerLog4j2.java b/test/transform/resource/after-delombok/LoggerLog4j2.java
index 8473134b..4d1ef01f 100644
--- a/test/transform/resource/after-delombok/LoggerLog4j2.java
+++ b/test/transform/resource/after-delombok/LoggerLog4j2.java
@@ -1,12 +1,15 @@
 class LoggerLog4j2 {
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(LoggerLog4j2.class);
 }
 class LoggerLog4j2WithImport {
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger(LoggerLog4j2WithImport.class);
 }
 class LoggerLog4j2WithDifferentName {
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger("DifferentName");
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/LoggerSlf4j.java b/test/transform/resource/after-delombok/LoggerSlf4j.java
index 3c6e6d2f..91109145 100644
--- a/test/transform/resource/after-delombok/LoggerSlf4j.java
+++ b/test/transform/resource/after-delombok/LoggerSlf4j.java
@@ -1,19 +1,23 @@
 class LoggerSlf4j {
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4j.class);
 }
 class LoggerSlf4jWithImport {
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithImport.class);
 }
 class LoggerSlf4jOuter {
 	static class Inner {
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class);
 	}
 }
 
 class LoggerSlf4jWithDifferentLoggerName {
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger("DifferentLogger");
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/LoggerSlf4jTypes.java b/test/transform/resource/after-delombok/LoggerSlf4jTypes.java
index 5ea59924..e987d807 100644
--- a/test/transform/resource/after-delombok/LoggerSlf4jTypes.java
+++ b/test/transform/resource/after-delombok/LoggerSlf4jTypes.java
@@ -5,16 +5,19 @@ interface LoggerSlf4jTypesInterface {
 enum LoggerSlf4jTypesEnum {
 ;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesEnum.class);
 }
 enum LoggerSlf4jTypesEnumWithElement {
 	FOO;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesEnumWithElement.class);
 }
 interface LoggerSlf4jTypesInterfaceOuter {
 	class Inner {
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class);
 	}
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/LoggerSlf4jWithPackage.java b/test/transform/resource/after-delombok/LoggerSlf4jWithPackage.java
index b82ed6ec..8a1d543f 100644
--- a/test/transform/resource/after-delombok/LoggerSlf4jWithPackage.java
+++ b/test/transform/resource/after-delombok/LoggerSlf4jWithPackage.java
@@ -1,11 +1,13 @@
 package before;
 class LoggerSlf4jWithPackage {
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithPackage.class);
 }
 class LoggerSlf4jWithPackageOuter {
 	static class Inner {
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class);
 	}
 }
diff --git a/test/transform/resource/after-delombok/LoggerXSlf4j.java b/test/transform/resource/after-delombok/LoggerXSlf4j.java
index d0654b51..ec1c3e4e 100644
--- a/test/transform/resource/after-delombok/LoggerXSlf4j.java
+++ b/test/transform/resource/after-delombok/LoggerXSlf4j.java
@@ -1,12 +1,15 @@
 class LoggerXSlf4j {
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private static final org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger(LoggerXSlf4j.class);
 }
 class LoggerXSlf4jWithImport {
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private static final org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger(LoggerXSlf4jWithImport.class);
 }
 class LoggerXSlf4jWithDifferentName {
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private static final org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger("DifferentName");
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/MixGetterVal.java b/test/transform/resource/after-delombok/MixGetterVal.java
index abc60d56..ee747e2a 100644
--- a/test/transform/resource/after-delombok/MixGetterVal.java
+++ b/test/transform/resource/after-delombok/MixGetterVal.java
@@ -9,6 +9,7 @@ class MixGetterVal {
 		m(a);
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getX() {
 		return this.x;
 	}
diff --git a/test/transform/resource/after-delombok/MultiFieldGetter.java b/test/transform/resource/after-delombok/MultiFieldGetter.java
index ed84f4ed..8ed250e1 100644
--- a/test/transform/resource/after-delombok/MultiFieldGetter.java
+++ b/test/transform/resource/after-delombok/MultiFieldGetter.java
@@ -2,10 +2,12 @@ class MultiFieldGetter {
 	int x;
 	int y;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	protected int getX() {
 		return this.x;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	protected int getY() {
 		return this.y;
 	}
@@ -14,10 +16,12 @@ class MultiFieldGetter2 {
 	int x;
 	int y;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	int getX() {
 		return this.x;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	int getY() {
 		return this.y;
 	}
diff --git a/test/transform/resource/after-delombok/NonNullPlain.java b/test/transform/resource/after-delombok/NonNullPlain.java
index b7d27ef3..52a80c1a 100644
--- a/test/transform/resource/after-delombok/NonNullPlain.java
+++ b/test/transform/resource/after-delombok/NonNullPlain.java
@@ -12,6 +12,7 @@ class NonNullPlain {
 	}
 	@java.beans.ConstructorProperties({"i", "s"})
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public NonNullPlain(@lombok.NonNull final int i, @lombok.NonNull final String s) {
 		if (s == null) {
 			throw new java.lang.NullPointerException("s");
@@ -21,23 +22,28 @@ class NonNullPlain {
 	}
 	@lombok.NonNull
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getI() {
 		return this.i;
 	}
 	@lombok.NonNull
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public String getS() {
 		return this.s;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public Object getO() {
 		return this.o;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void setI(@lombok.NonNull final int i) {
 		this.i = i;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void setS(@lombok.NonNull final String s) {
 		if (s == null) {
 			throw new java.lang.NullPointerException("s");
@@ -45,6 +51,7 @@ class NonNullPlain {
 		this.s = s;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void setO(final Object o) {
 		this.o = o;
 	}
diff --git a/test/transform/resource/after-delombok/NonNullWithAlternateException.java b/test/transform/resource/after-delombok/NonNullWithAlternateException.java
index 686a1219..9b606076 100644
--- a/test/transform/resource/after-delombok/NonNullWithAlternateException.java
+++ b/test/transform/resource/after-delombok/NonNullWithAlternateException.java
@@ -8,6 +8,7 @@ public class NonNullWithAlternateException {
 		System.out.println(arg);
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void setTest(@lombok.NonNull final String test) {
 		if (test == null) {
 			throw new java.lang.IllegalArgumentException("test is null");
diff --git a/test/transform/resource/after-delombok/SetterAccessLevel.java b/test/transform/resource/after-delombok/SetterAccessLevel.java
index 45df2b35..0bf20cd7 100644
--- a/test/transform/resource/after-delombok/SetterAccessLevel.java
+++ b/test/transform/resource/after-delombok/SetterAccessLevel.java
@@ -6,22 +6,27 @@ class SetterAccessLevel {
 	boolean isPublic;
 	boolean value;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private void setPrivate(final boolean isPrivate) {
 		this.isPrivate = isPrivate;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	void setPackage(final boolean isPackage) {
 		this.isPackage = isPackage;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	protected void setProtected(final boolean isProtected) {
 		this.isProtected = isProtected;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void setPublic(final boolean isPublic) {
 		this.isPublic = isPublic;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void setValue(final boolean value) {
 		this.value = value;
 	}
diff --git a/test/transform/resource/after-delombok/SetterAlreadyExists.java b/test/transform/resource/after-delombok/SetterAlreadyExists.java
index 5bfc1f83..52e0ca10 100644
--- a/test/transform/resource/after-delombok/SetterAlreadyExists.java
+++ b/test/transform/resource/after-delombok/SetterAlreadyExists.java
@@ -23,6 +23,7 @@ class Setter5 {
 	void setFoo() {
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void setFoo(final String foo) {
 		this.foo = foo;
 	}
@@ -32,6 +33,7 @@ class Setter6 {
 	void setFoo(String foo, int x) {
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void setFoo(final String foo) {
 		this.foo = foo;
 	}
diff --git a/test/transform/resource/after-delombok/SetterDeprecated.java b/test/transform/resource/after-delombok/SetterDeprecated.java
index 72a609ad..7e984c6d 100644
--- a/test/transform/resource/after-delombok/SetterDeprecated.java
+++ b/test/transform/resource/after-delombok/SetterDeprecated.java
@@ -7,6 +7,7 @@ class SetterDeprecated {
 	int javadoc;
 	@java.lang.Deprecated
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void setAnnotation(final int annotation) {
 		this.annotation = annotation;
 	}
@@ -15,6 +16,7 @@ class SetterDeprecated {
 	 */
 	@java.lang.Deprecated
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void setJavadoc(final int javadoc) {
 		this.javadoc = javadoc;
 	}
diff --git a/test/transform/resource/after-delombok/SetterOnClass.java b/test/transform/resource/after-delombok/SetterOnClass.java
index 7077c492..eaf57def 100644
--- a/test/transform/resource/after-delombok/SetterOnClass.java
+++ b/test/transform/resource/after-delombok/SetterOnClass.java
@@ -2,6 +2,7 @@ class SetterOnClass1 {
 	boolean isNone;
 	boolean isPublic;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void setPublic(final boolean isPublic) {
 		this.isPublic = isPublic;
 	}
@@ -11,10 +12,12 @@ class SetterOnClass2 {
 	boolean isProtected;
 	boolean isPackage;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	protected void setProtected(final boolean isProtected) {
 		this.isProtected = isProtected;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	void setPackage(final boolean isPackage) {
 		this.isPackage = isPackage;
 	}
@@ -23,6 +26,7 @@ class SetterOnClass3 {
 	boolean isNone;
 	boolean isPackage;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	void setPackage(final boolean isPackage) {
 		this.isPackage = isPackage;
 	}
@@ -31,6 +35,7 @@ class SetterOnClass4 {
 	boolean isNone;
 	boolean isPrivate;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private void setPrivate(final boolean isPrivate) {
 		this.isPrivate = isPrivate;
 	}
@@ -39,6 +44,7 @@ class SetterOnClass5 {
 	boolean isNone;
 	boolean isPublic;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void setPublic(final boolean isPublic) {
 		this.isPublic = isPublic;
 	}
@@ -48,10 +54,12 @@ class SetterOnClass6 {
 	@lombok.NonNull
 	String nonNull;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void setCouldBeNull(final String couldBeNull) {
 		this.couldBeNull = couldBeNull;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void setNonNull(@lombok.NonNull final String nonNull) {
 		if (nonNull == null) {
 			throw new java.lang.NullPointerException("nonNull");
diff --git a/test/transform/resource/after-delombok/SetterOnMethodOnParam.java b/test/transform/resource/after-delombok/SetterOnMethodOnParam.java
index 555bf698..c166f936 100644
--- a/test/transform/resource/after-delombok/SetterOnMethodOnParam.java
+++ b/test/transform/resource/after-delombok/SetterOnMethodOnParam.java
@@ -6,18 +6,21 @@ class SetterOnMethodOnParam {
 	}
 	@Deprecated
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void setI(final int i) {
 		this.i = i;
 	}
 	@java.lang.Deprecated
 	@Test
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void setJ(@Test final int j) {
 		this.j = j;
 	}
 	@java.lang.Deprecated
 	@Test
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void setK(@Test final int k) {
 		this.k = k;
 	}
diff --git a/test/transform/resource/after-delombok/SetterOnStatic.java b/test/transform/resource/after-delombok/SetterOnStatic.java
index 7ef68362..a1947b36 100644
--- a/test/transform/resource/after-delombok/SetterOnStatic.java
+++ b/test/transform/resource/after-delombok/SetterOnStatic.java
@@ -2,10 +2,12 @@ class Setter {
 	static boolean foo;
 	static int bar;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public static void setFoo(final boolean foo) {
 		Setter.foo = foo;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public static void setBar(final int bar) {
 		Setter.bar = bar;
 	}
diff --git a/test/transform/resource/after-delombok/SetterPlain.java b/test/transform/resource/after-delombok/SetterPlain.java
index 39aa7b61..3f55bd21 100644
--- a/test/transform/resource/after-delombok/SetterPlain.java
+++ b/test/transform/resource/after-delombok/SetterPlain.java
@@ -2,10 +2,12 @@ class SetterPlain {
 	int i;
 	int foo;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void setI(final int i) {
 		this.i = i;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void setFoo(final int foo) {
 		this.foo = foo;
 	}
diff --git a/test/transform/resource/after-delombok/SetterWithDollar.java b/test/transform/resource/after-delombok/SetterWithDollar.java
index 974efdcd..3bdafa1b 100644
--- a/test/transform/resource/after-delombok/SetterWithDollar.java
+++ b/test/transform/resource/after-delombok/SetterWithDollar.java
@@ -2,6 +2,8 @@ class SetterWithDollar1 {
 	int $i;
 	
 	@java.lang.SuppressWarnings("all")
+	
+	@javax.annotation.Generated("lombok")
 	public void set$i(final int $i) {
 		this.$i = $i;
 	}
@@ -11,10 +13,13 @@ class SetterWithDollar2 {
 	int i;
 	
 	@java.lang.SuppressWarnings("all")
+	
+	@javax.annotation.Generated("lombok")
 	public void set$i(final int $i) {
 		this.$i = $i;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public void setI(final int i) {
 		this.i = i;
 	}
diff --git a/test/transform/resource/after-delombok/SimpleTypeResolution.java b/test/transform/resource/after-delombok/SimpleTypeResolution.java
index c6e08d70..1e45bb79 100644
--- a/test/transform/resource/after-delombok/SimpleTypeResolution.java
+++ b/test/transform/resource/after-delombok/SimpleTypeResolution.java
@@ -5,6 +5,7 @@ class SimpleTypeResolutionFail {
 class SimpleTypeResolutionSuccess {
 	private int x;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getX() {
 		return this.x;
 	}
diff --git a/test/transform/resource/after-delombok/SynchronizedPlain.java b/test/transform/resource/after-delombok/SynchronizedPlain.java
index 1a065085..f0082faf 100644
--- a/test/transform/resource/after-delombok/SynchronizedPlain.java
+++ b/test/transform/resource/after-delombok/SynchronizedPlain.java
@@ -1,5 +1,6 @@
 class SynchronizedPlain1 {
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private final java.lang.Object $lock = new java.lang.Object[0];
 	void test() {
 		synchronized (this.$lock) {
@@ -14,6 +15,7 @@ class SynchronizedPlain1 {
 }
 class SynchronizedPlain2 {
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private static final java.lang.Object $LOCK = new java.lang.Object[0];
 	static void test() {
 		synchronized (SynchronizedPlain2.$LOCK) {
diff --git a/test/transform/resource/after-delombok/ToStringConfiguration.java b/test/transform/resource/after-delombok/ToStringConfiguration.java
index 035ecdb2..c44f8b75 100644
--- a/test/transform/resource/after-delombok/ToStringConfiguration.java
+++ b/test/transform/resource/after-delombok/ToStringConfiguration.java
@@ -2,10 +2,12 @@ class ToStringConfiguration {
 	int x;
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "ToStringConfiguration(" + this.x + ")";
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getX() {
 		return this.x;
 	}
@@ -14,6 +16,7 @@ class ToStringConfiguration2 {
 	int x;
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "ToStringConfiguration2(x=" + this.x + ")";
 	}
@@ -22,10 +25,12 @@ class ToStringConfiguration3 {
 	int x;
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "ToStringConfiguration3(" + this.getX() + ")";
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getX() {
 		return this.x;
 	}
diff --git a/test/transform/resource/after-delombok/ToStringInner.java b/test/transform/resource/after-delombok/ToStringInner.java
index 7b1d5e21..e8cea8fd 100644
--- a/test/transform/resource/after-delombok/ToStringInner.java
+++ b/test/transform/resource/after-delombok/ToStringInner.java
@@ -5,6 +5,7 @@ class ToStringOuter {
 		int y;
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "ToStringOuter.ToStringInner(y=" + this.y + ")";
 		}
@@ -13,6 +14,7 @@ class ToStringOuter {
 		int y;
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
+		@javax.annotation.Generated("lombok")
 		public java.lang.String toString() {
 			return "ToStringOuter.ToStringStaticInner(y=" + this.y + ")";
 		}
@@ -22,6 +24,7 @@ class ToStringOuter {
 			String name;
 			@java.lang.Override
 			@java.lang.SuppressWarnings("all")
+			@javax.annotation.Generated("lombok")
 			public java.lang.String toString() {
 				return "ToStringOuter.ToStringMiddle.ToStringMoreInner(name=" + this.name + ")";
 			}
@@ -30,6 +33,7 @@ class ToStringOuter {
 	
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "ToStringOuter(x=" + this.x + ", name=" + this.name + ")";
 	}
diff --git a/test/transform/resource/after-delombok/ToStringPlain.java b/test/transform/resource/after-delombok/ToStringPlain.java
index e6f3db7a..a4265575 100644
--- a/test/transform/resource/after-delombok/ToStringPlain.java
+++ b/test/transform/resource/after-delombok/ToStringPlain.java
@@ -3,6 +3,7 @@ class ToString1 {
 	String name;
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "ToString1(x=" + this.x + ", name=" + this.name + ")";
 	}
@@ -12,6 +13,7 @@ class ToString2 {
 	String name;
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "ToString2(x=" + this.x + ", name=" + this.name + ")";
 	}
diff --git a/test/transform/resource/after-delombok/Tolerate.java b/test/transform/resource/after-delombok/Tolerate.java
index fbb42f1b..387739af 100644
--- a/test/transform/resource/after-delombok/Tolerate.java
+++ b/test/transform/resource/after-delombok/Tolerate.java
@@ -10,11 +10,15 @@ class Tolerate {
 	}
 	
 	@java.lang.SuppressWarnings("all")
+	
+	@javax.annotation.Generated("lombok")
 	public void setPattern(final Pattern pattern) {
 		this.pattern = pattern;
 	}
 	
 	@java.lang.SuppressWarnings("all")
+	
+	@javax.annotation.Generated("lombok")
 	public Pattern getPattern() {
 		return this.pattern;
 	}
@@ -32,17 +36,22 @@ class Tolerate2 {
 	}
 	
 	@java.lang.SuppressWarnings("all")
+	
+	@javax.annotation.Generated("lombok")
 	public Pattern getPattern() {
 		return this.pattern;
 	}
 	
 	@java.lang.SuppressWarnings("all")
+	
+	@javax.annotation.Generated("lombok")
 	public Tolerate2 withPattern(final Pattern pattern) {
 		return this.pattern == pattern ? this : new Tolerate2(pattern);
 	}
 	
 	@java.beans.ConstructorProperties({"pattern"})
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public Tolerate2(final Pattern pattern) {
 		this.pattern = pattern;
 	}
diff --git a/test/transform/resource/after-delombok/TrickyTypeResolution.java b/test/transform/resource/after-delombok/TrickyTypeResolution.java
index 9a5aae16..6badfbf4 100644
--- a/test/transform/resource/after-delombok/TrickyTypeResolution.java
+++ b/test/transform/resource/after-delombok/TrickyTypeResolution.java
@@ -14,6 +14,7 @@ class TrickyDoNothing2 {
 class TrickySuccess {
 	int x;
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getX() {
 		return this.x;
 	}
diff --git a/test/transform/resource/after-delombok/ValueExperimental.java b/test/transform/resource/after-delombok/ValueExperimental.java
index 77a48ec9..20e7a9f4 100644
--- a/test/transform/resource/after-delombok/ValueExperimental.java
+++ b/test/transform/resource/after-delombok/ValueExperimental.java
@@ -1,9 +1,11 @@
 final class ValueExperimental1 {
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public ValueExperimental1() {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof ValueExperimental1)) return false;
@@ -11,22 +13,26 @@ final class ValueExperimental1 {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		int result = 1;
 		return result;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "ValueExperimental1()";
 	}
 }
 final class ValueExperimental2 {
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public ValueExperimental2() {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof ValueExperimental2)) return false;
@@ -34,12 +40,14 @@ final class ValueExperimental2 {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		int result = 1;
 		return result;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "ValueExperimental2()";
 	}
diff --git a/test/transform/resource/after-delombok/ValueExperimentalStarImport.java b/test/transform/resource/after-delombok/ValueExperimentalStarImport.java
index 6911f260..ea9c4600 100644
--- a/test/transform/resource/after-delombok/ValueExperimentalStarImport.java
+++ b/test/transform/resource/after-delombok/ValueExperimentalStarImport.java
@@ -1,11 +1,13 @@
 import lombok.experimental.*;
 final class ValueExperimentalStarImport {
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public ValueExperimentalStarImport() {
 		
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof ValueExperimentalStarImport)) return false;
@@ -13,12 +15,14 @@ final class ValueExperimentalStarImport {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		int result = 1;
 		return result;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "ValueExperimentalStarImport()";
 	}
diff --git a/test/transform/resource/after-delombok/ValuePlain.java b/test/transform/resource/after-delombok/ValuePlain.java
index 64e5b9b9..09c301d2 100644
--- a/test/transform/resource/after-delombok/ValuePlain.java
+++ b/test/transform/resource/after-delombok/ValuePlain.java
@@ -3,20 +3,24 @@ final class Value1 {
 	private final String name;
 	@java.beans.ConstructorProperties({"x", "name"})
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public Value1(final int x, final String name) {
 		this.x = x;
 		this.name = name;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getX() {
 		return this.x;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public String getName() {
 		return this.name;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof Value1)) return false;
@@ -29,6 +33,7 @@ final class Value1 {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -39,6 +44,7 @@ final class Value1 {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "Value1(x=" + this.getX() + ", name=" + this.getName() + ")";
 	}
@@ -48,20 +54,24 @@ class Value2 {
 	private final String name;
 	@java.beans.ConstructorProperties({"x", "name"})
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public Value2(final int x, final String name) {
 		this.x = x;
 		this.name = name;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getX() {
 		return this.x;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public String getName() {
 		return this.name;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof Value2)) return false;
@@ -74,11 +84,13 @@ class Value2 {
 		return true;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	protected boolean canEqual(final java.lang.Object other) {
 		return other instanceof Value2;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -89,6 +101,7 @@ class Value2 {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "Value2(x=" + this.getX() + ", name=" + this.getName() + ")";
 	}
@@ -98,20 +111,24 @@ final class Value3 {
 	private final int y;
 	@java.beans.ConstructorProperties({"x", "y"})
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public Value3(final int x, final int y) {
 		this.x = x;
 		this.y = y;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getX() {
 		return this.x;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int getY() {
 		return this.y;
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public boolean equals(final java.lang.Object o) {
 		if (o == this) return true;
 		if (!(o instanceof Value3)) return false;
@@ -122,6 +139,7 @@ final class Value3 {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -131,6 +149,7 @@ final class Value3 {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "Value3(x=" + this.getX() + ", y=" + this.getY() + ")";
 	}
diff --git a/test/transform/resource/after-delombok/WitherAccessLevel.java b/test/transform/resource/after-delombok/WitherAccessLevel.java
index 963f6972..7ec03215 100644
--- a/test/transform/resource/after-delombok/WitherAccessLevel.java
+++ b/test/transform/resource/after-delombok/WitherAccessLevel.java
@@ -8,22 +8,27 @@ class WitherAccessLevel {
 	WitherAccessLevel(boolean isNone, boolean isPrivate, boolean isPackage, boolean isProtected, boolean isPublic, boolean value) {
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	private WitherAccessLevel withPrivate(final boolean isPrivate) {
 		return this.isPrivate == isPrivate ? this : new WitherAccessLevel(this.isNone, isPrivate, this.isPackage, this.isProtected, this.isPublic, this.value);
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	WitherAccessLevel withPackage(final boolean isPackage) {
 		return this.isPackage == isPackage ? this : new WitherAccessLevel(this.isNone, this.isPrivate, isPackage, this.isProtected, this.isPublic, this.value);
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	protected WitherAccessLevel withProtected(final boolean isProtected) {
 		return this.isProtected == isProtected ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, isProtected, this.isPublic, this.value);
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public WitherAccessLevel withPublic(final boolean isPublic) {
 		return this.isPublic == isPublic ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, this.isProtected, isPublic, this.value);
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public WitherAccessLevel withValue(final boolean value) {
 		return this.value == value ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, this.isProtected, this.isPublic, value);
 	}
diff --git a/test/transform/resource/after-delombok/WitherAlreadyExists.java b/test/transform/resource/after-delombok/WitherAlreadyExists.java
index be41f6bc..48dda94d 100644
--- a/test/transform/resource/after-delombok/WitherAlreadyExists.java
+++ b/test/transform/resource/after-delombok/WitherAlreadyExists.java
@@ -33,6 +33,7 @@ class Wither5 {
 	Wither5(String foo) {
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public Wither5 withFoo(final String foo) {
 		return this.foo == foo ? this : new Wither5(foo);
 	}
@@ -44,6 +45,7 @@ class Wither6 {
 	Wither6(String foo) {
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public Wither6 withFoo(final String foo) {
 		return this.foo == foo ? this : new Wither6(foo);
 	}
diff --git a/test/transform/resource/after-delombok/WitherAndAllArgsConstructor.java b/test/transform/resource/after-delombok/WitherAndAllArgsConstructor.java
index 7607dce4..2ffd310c 100644
--- a/test/transform/resource/after-delombok/WitherAndAllArgsConstructor.java
+++ b/test/transform/resource/after-delombok/WitherAndAllArgsConstructor.java
@@ -6,6 +6,7 @@ class WitherAndAllArgsConstructor<T, J extends T, L extends java.lang.Number> {
 	final int z;
 	@java.beans.ConstructorProperties({"test", "test2", "y", "z"})
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public WitherAndAllArgsConstructor(final J test, final java.util.List<L> test2, final int y, final int z) {
 		this.test = test;
 		this.test2 = test2;
@@ -13,10 +14,12 @@ class WitherAndAllArgsConstructor<T, J extends T, L extends java.lang.Number> {
 		this.z = z;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public WitherAndAllArgsConstructor<T, J, L> withTest(final J test) {
 		return this.test == test ? this : new WitherAndAllArgsConstructor<T, J, L>(test, this.test2, this.y, this.z);
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public WitherAndAllArgsConstructor<T, J, L> withTest2(final java.util.List<L> test2) {
 		return this.test2 == test2 ? this : new WitherAndAllArgsConstructor<T, J, L>(this.test, test2, this.y, this.z);
 	}
diff --git a/test/transform/resource/after-delombok/WitherDeprecated.java b/test/transform/resource/after-delombok/WitherDeprecated.java
index 29192012..712bd603 100644
--- a/test/transform/resource/after-delombok/WitherDeprecated.java
+++ b/test/transform/resource/after-delombok/WitherDeprecated.java
@@ -9,6 +9,7 @@ class WitherDeprecated {
 	}
 	@java.lang.Deprecated
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public WitherDeprecated withAnnotation(final int annotation) {
 		return this.annotation == annotation ? this : new WitherDeprecated(annotation, this.javadoc);
 	}
@@ -17,6 +18,7 @@ class WitherDeprecated {
 	 */
 	@java.lang.Deprecated
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public WitherDeprecated withJavadoc(final int javadoc) {
 		return this.javadoc == javadoc ? this : new WitherDeprecated(this.annotation, javadoc);
 	}
diff --git a/test/transform/resource/after-delombok/WitherOnClass.java b/test/transform/resource/after-delombok/WitherOnClass.java
index 45d0c4b5..ae352d33 100644
--- a/test/transform/resource/after-delombok/WitherOnClass.java
+++ b/test/transform/resource/after-delombok/WitherOnClass.java
@@ -4,6 +4,7 @@ class WitherOnClass1 {
 	WitherOnClass1(boolean isNone, boolean isPublic) {
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public WitherOnClass1 withPublic(final boolean isPublic) {
 		return this.isPublic == isPublic ? this : new WitherOnClass1(this.isNone, isPublic);
 	}
@@ -15,10 +16,12 @@ class WitherOnClass2 {
 	WitherOnClass2(boolean isNone, boolean isProtected, boolean isPackage) {
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	protected WitherOnClass2 withProtected(final boolean isProtected) {
 		return this.isProtected == isProtected ? this : new WitherOnClass2(this.isNone, isProtected, this.isPackage);
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	WitherOnClass2 withPackage(final boolean isPackage) {
 		return this.isPackage == isPackage ? this : new WitherOnClass2(this.isNone, this.isProtected, isPackage);
 	}
@@ -30,10 +33,12 @@ class WitherOnClass3 {
 	WitherOnClass3(String couldBeNull, String nonNull) {
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public WitherOnClass3 withCouldBeNull(final String couldBeNull) {
 		return this.couldBeNull == couldBeNull ? this : new WitherOnClass3(couldBeNull, this.nonNull);
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public WitherOnClass3 withNonNull(@lombok.NonNull final String nonNull) {
 		if (nonNull == null) {
 			throw new java.lang.NullPointerException("nonNull");
@@ -48,6 +53,7 @@ class WitherOnClass4 {
 		this.fY = y;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public WitherOnClass4 withY(final int fY) {
 		return this.fY == fY ? this : new WitherOnClass4(fY);
 	}
diff --git a/test/transform/resource/after-delombok/WitherPlain.java b/test/transform/resource/after-delombok/WitherPlain.java
index a2e947bd..548ff299 100644
--- a/test/transform/resource/after-delombok/WitherPlain.java
+++ b/test/transform/resource/after-delombok/WitherPlain.java
@@ -6,10 +6,12 @@ class WitherPlain {
 		this.foo = foo;
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public WitherPlain withI(final int i) {
 		return this.i == i ? this : new WitherPlain(i, this.foo);
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public WitherPlain withFoo(final int foo) {
 		return this.foo == foo ? this : new WitherPlain(this.i, foo);
 	}
diff --git a/test/transform/resource/after-delombok/WitherWithGenerics.java b/test/transform/resource/after-delombok/WitherWithGenerics.java
index 98bbd04d..fd466559 100644
--- a/test/transform/resource/after-delombok/WitherWithGenerics.java
+++ b/test/transform/resource/after-delombok/WitherWithGenerics.java
@@ -6,14 +6,17 @@ class WitherWithGenerics<T, J extends T, L extends java.lang.Number> {
 	public WitherWithGenerics(J test, java.util.List<L> test2, java.util.List<? extends L> test3) {
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public WitherWithGenerics<T, J, L> withTest(final J test) {
 		return this.test == test ? this : new WitherWithGenerics<T, J, L>(test, this.test2, this.test3);
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public WitherWithGenerics<T, J, L> withTest2(final java.util.List<L> test2) {
 		return this.test2 == test2 ? this : new WitherWithGenerics<T, J, L>(this.test, test2, this.test3);
 	}
 	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
 	public WitherWithGenerics<T, J, L> withTest3(final java.util.List<? extends L> test3) {
 		return this.test3 == test3 ? this : new WitherWithGenerics<T, J, L>(this.test, this.test2, test3);
 	}
diff --git a/test/transform/resource/after-ecj/Accessors.java b/test/transform/resource/after-ecj/Accessors.java
index 6b8976d0..1b50c97e 100644
--- a/test/transform/resource/after-ecj/Accessors.java
+++ b/test/transform/resource/after-ecj/Accessors.java
@@ -3,10 +3,10 @@ class AccessorsFluent {
   AccessorsFluent() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") String fieldName() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String fieldName() {
     return this.fieldName;
   }
-  public @java.lang.SuppressWarnings("all") AccessorsFluent fieldName(final String fieldName) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") AccessorsFluent fieldName(final String fieldName) {
     this.fieldName = fieldName;
     return this;
   }
@@ -17,14 +17,14 @@ class AccessorsFluent {
   AccessorsFluentOnClass() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") AccessorsFluentOnClass fieldName(final String fieldName) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") AccessorsFluentOnClass fieldName(final String fieldName) {
     this.fieldName = fieldName;
     return this;
   }
-  public @java.lang.SuppressWarnings("all") String fieldName() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String fieldName() {
     return this.fieldName;
   }
-  public @java.lang.SuppressWarnings("all") String getOtherFieldWithOverride() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getOtherFieldWithOverride() {
     return this.otherFieldWithOverride;
   }
 }
@@ -33,7 +33,7 @@ class AccessorsChain {
   AccessorsChain() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") AccessorsChain setRunning(final boolean isRunning) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") AccessorsChain setRunning(final boolean isRunning) {
     this.isRunning = isRunning;
     return this;
   }
@@ -44,7 +44,7 @@ class AccessorsChain {
   AccessorsPrefix() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") void setActualField(final String fActualField) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setActualField(final String fActualField) {
     this.fActualField = fActualField;
   }
 }
@@ -54,10 +54,10 @@ class AccessorsChain {
   AccessorsPrefix2() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") void setFieldName(final String fieldName) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setFieldName(final String fieldName) {
     this.fieldName = fieldName;
   }
-  public @java.lang.SuppressWarnings("all") void setActualField(final String fActualField) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setActualField(final String fActualField) {
     this.fActualField = fActualField;
   }
 }
@@ -69,15 +69,15 @@ class AccessorsChain {
   private String getName() {
     return fName;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
     return (("AccessorsPrefix3(fName=" + this.getName()) + ")");
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof AccessorsPrefix3)))
         return false;
-    final @java.lang.SuppressWarnings("all") AccessorsPrefix3 other = (AccessorsPrefix3) o;
+    final AccessorsPrefix3 other = (AccessorsPrefix3) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     final java.lang.Object this$fName = this.getName();
@@ -86,10 +86,10 @@ class AccessorsChain {
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
     return (other instanceof AccessorsPrefix3);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     final java.lang.Object $fName = this.getName();
@@ -102,7 +102,7 @@ class AccessorsFluentGenerics<T extends Number> {
   AccessorsFluentGenerics() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") AccessorsFluentGenerics<T> name(final String name) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") AccessorsFluentGenerics<T> name(final String name) {
     this.name = name;
     return this;
   }
@@ -112,7 +112,7 @@ class AccessorsFluentNoChaining {
   AccessorsFluentNoChaining() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") void name(final String name) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void name(final String name) {
     this.name = name;
   }
 }
@@ -123,7 +123,7 @@ class AccessorsFluentStatic<T extends Number> {
   AccessorsFluentStatic() {
     super();
   }
-  public static @java.lang.SuppressWarnings("all") void name(final String name) {
+  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void name(final String name) {
     AccessorsFluentStatic.name = name;
   }
 }
diff --git a/test/transform/resource/after-ecj/AccessorsConfiguration.java b/test/transform/resource/after-ecj/AccessorsConfiguration.java
index 6678e020..fdf2ff85 100644
--- a/test/transform/resource/after-ecj/AccessorsConfiguration.java
+++ b/test/transform/resource/after-ecj/AccessorsConfiguration.java
@@ -3,10 +3,10 @@ class AccessorsConfiguration {
   AccessorsConfiguration() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") String fieldName() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String fieldName() {
     return this.m_FieldName;
   }
-  public @java.lang.SuppressWarnings("all") void fieldName(final String m_FieldName) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void fieldName(final String m_FieldName) {
     this.m_FieldName = m_FieldName;
   }
 }
@@ -15,7 +15,7 @@ class AccessorsConfiguration {
   AccessorsConfiguration2() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") void setM_FieldName(final String m_FieldName) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setM_FieldName(final String m_FieldName) {
     this.m_FieldName = m_FieldName;
   }
 }
@@ -24,7 +24,7 @@ class AccessorsConfiguration {
   AccessorsConfiguration3() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") AccessorsConfiguration3 setFieldName(final String fFieldName) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") AccessorsConfiguration3 setFieldName(final String fFieldName) {
     this.fFieldName = fFieldName;
     return this;
   }
diff --git a/test/transform/resource/after-ecj/BuilderChainAndFluent.java b/test/transform/resource/after-ecj/BuilderChainAndFluent.java
index 6a307105..888c6239 100644
--- a/test/transform/resource/after-ecj/BuilderChainAndFluent.java
+++ b/test/transform/resource/after-ecj/BuilderChainAndFluent.java
@@ -1,25 +1,25 @@
 @lombok.experimental.Builder(fluent = false,chain = false) class BuilderChainAndFluent {
-  public static @java.lang.SuppressWarnings("all") class BuilderChainAndFluentBuilder {
+  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderChainAndFluentBuilder {
     private int yes;
-    @java.lang.SuppressWarnings("all") BuilderChainAndFluentBuilder() {
+    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderChainAndFluentBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") void setYes(final int yes) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setYes(final int yes) {
       this.yes = yes;
     }
-    public @java.lang.SuppressWarnings("all") BuilderChainAndFluent build() {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderChainAndFluent build() {
       return new BuilderChainAndFluent(yes);
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
       return (("BuilderChainAndFluent.BuilderChainAndFluentBuilder(yes=" + this.yes) + ")");
     }
   }
   private final int yes;
-  @java.lang.SuppressWarnings("all") BuilderChainAndFluent(final int yes) {
+  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderChainAndFluent(final int yes) {
     super();
     this.yes = yes;
   }
-  public static @java.lang.SuppressWarnings("all") BuilderChainAndFluentBuilder builder() {
+  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderChainAndFluentBuilder builder() {
     return new BuilderChainAndFluentBuilder();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderComplex.java b/test/transform/resource/after-ecj/BuilderComplex.java
index 19aeb043..d7546879 100644
--- a/test/transform/resource/after-ecj/BuilderComplex.java
+++ b/test/transform/resource/after-ecj/BuilderComplex.java
@@ -1,34 +1,34 @@
 import java.util.List;
 import lombok.experimental.Builder;
 class BuilderComplex {
-  public static @java.lang.SuppressWarnings("all") class VoidBuilder<T extends Number> {
+  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;
-    @java.lang.SuppressWarnings("all") VoidBuilder() {
+    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") VoidBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") VoidBuilder<T> number(final T number) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") VoidBuilder<T> number(final T number) {
       this.number = number;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") VoidBuilder<T> arg2(final int arg2) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") VoidBuilder<T> arg2(final int arg2) {
       this.arg2 = arg2;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") VoidBuilder<T> arg3(final String arg3) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") VoidBuilder<T> arg3(final String arg3) {
       this.arg3 = arg3;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") VoidBuilder<T> selfRef(final BuilderComplex selfRef) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") VoidBuilder<T> selfRef(final BuilderComplex selfRef) {
       this.selfRef = selfRef;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") void execute() {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void execute() {
       BuilderComplex.<T>testVoidWithGenerics(number, arg2, arg3, selfRef);
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
       return (((((((("BuilderComplex.VoidBuilder(number=" + this.number) + ", arg2=") + this.arg2) + ", arg3=") + this.arg3) + ", selfRef=") + this.selfRef) + ")");
     }
   }
@@ -37,7 +37,7 @@ class BuilderComplex {
   }
   private static @Builder(buildMethodName = "execute") <T extends Number>void testVoidWithGenerics(T number, int arg2, String arg3, BuilderComplex selfRef) {
   }
-  public static @java.lang.SuppressWarnings("all") <T extends Number>VoidBuilder<T> builder() {
+  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <T extends Number>VoidBuilder<T> builder() {
     return new VoidBuilder<T>();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderSimple.java b/test/transform/resource/after-ecj/BuilderSimple.java
index 85db360d..41240a94 100644
--- a/test/transform/resource/after-ecj/BuilderSimple.java
+++ b/test/transform/resource/after-ecj/BuilderSimple.java
@@ -1,23 +1,23 @@
 import java.util.List;
 @lombok.experimental.Builder class BuilderSimple<T> {
-  public static @java.lang.SuppressWarnings("all") class BuilderSimpleBuilder<T> {
+  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderSimpleBuilder<T> {
     private int yes;
     private List<T> also;
-    @java.lang.SuppressWarnings("all") BuilderSimpleBuilder() {
+    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSimpleBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderSimpleBuilder<T> yes(final int yes) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSimpleBuilder<T> yes(final int yes) {
       this.yes = yes;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSimpleBuilder<T> also(final List<T> also) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSimpleBuilder<T> also(final List<T> also) {
       this.also = also;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSimple<T> build() {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSimple<T> build() {
       return new BuilderSimple<T>(yes, also);
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
       return (((("BuilderSimple.BuilderSimpleBuilder(yes=" + this.yes) + ", also=") + this.also) + ")");
     }
   }
@@ -25,12 +25,12 @@ import java.util.List;
   private final int yes;
   private List<T> also;
   private int $butNotMe;
-  @java.lang.SuppressWarnings("all") BuilderSimple(final int yes, final List<T> also) {
+  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSimple(final int yes, final List<T> also) {
     super();
     this.yes = yes;
     this.also = also;
   }
-  public static @java.lang.SuppressWarnings("all") <T>BuilderSimpleBuilder<T> builder() {
+  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <T>BuilderSimpleBuilder<T> builder() {
     return new BuilderSimpleBuilder<T>();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderSingularGuavaListsSets.java b/test/transform/resource/after-ecj/BuilderSingularGuavaListsSets.java
index aee837b6..0a04da34 100644
--- a/test/transform/resource/after-ecj/BuilderSingularGuavaListsSets.java
+++ b/test/transform/resource/after-ecj/BuilderSingularGuavaListsSets.java
@@ -4,70 +4,70 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedSet;
 import lombok.Singular;
 @lombok.Builder class BuilderSingularGuavaListsSets<T> {
-  public static @java.lang.SuppressWarnings("all") class BuilderSingularGuavaListsSetsBuilder<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;
-    @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder() {
+    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> card(T card) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> 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") BuilderSingularGuavaListsSetsBuilder<T> cards(java.lang.Iterable<? extends T> cards) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> cards(java.lang.Iterable<? extends T> cards) {
       if ((this.cards == null))
           this.cards = com.google.common.collect.ImmutableList.builder();
       this.cards.addAll(cards);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> frog(Number frog) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> 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") BuilderSingularGuavaListsSetsBuilder<T> frogs(java.lang.Iterable<? extends Number> frogs) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> frogs(java.lang.Iterable<? extends Number> frogs) {
       if ((this.frogs == null))
           this.frogs = com.google.common.collect.ImmutableList.builder();
       this.frogs.addAll(frogs);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSetsBuilder<T> rawSet(java.lang.Object rawSet) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> 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") BuilderSingularGuavaListsSetsBuilder<T> rawSet(java.lang.Iterable<?> rawSet) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> 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") BuilderSingularGuavaListsSetsBuilder<T> pass(String pass) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> 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") BuilderSingularGuavaListsSetsBuilder<T> passes(java.lang.Iterable<? extends String> passes) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSetsBuilder<T> passes(java.lang.Iterable<? extends String> passes) {
       if ((this.passes == null))
           this.passes = com.google.common.collect.ImmutableSortedSet.naturalOrder();
       this.passes.addAll(passes);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets<T> build() {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSets<T> build() {
       com.google.common.collect.ImmutableList<T> cards = ((this.cards == null) ? com.google.common.collect.ImmutableList.<T>of() : this.cards.build());
       com.google.common.collect.ImmutableCollection<Number> frogs = ((this.frogs == null) ? com.google.common.collect.ImmutableList.<Number>of() : this.frogs.build());
       com.google.common.collect.ImmutableSet<java.lang.Object> rawSet = ((this.rawSet == null) ? com.google.common.collect.ImmutableSet.<java.lang.Object>of() : this.rawSet.build());
       com.google.common.collect.ImmutableSortedSet<String> passes = ((this.passes == null) ? com.google.common.collect.ImmutableSortedSet.<String>of() : this.passes.build());
       return new BuilderSingularGuavaListsSets<T>(cards, frogs, rawSet, passes);
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
       return (((((((("BuilderSingularGuavaListsSets.BuilderSingularGuavaListsSetsBuilder(cards=" + this.cards) + ", frogs=") + this.frogs) + ", rawSet=") + this.rawSet) + ", passes=") + this.passes) + ")");
     }
   }
@@ -75,14 +75,14 @@ import lombok.Singular;
   private @Singular ImmutableCollection<? extends Number> frogs;
   private @SuppressWarnings("all") @Singular("rawSet") ImmutableSet rawSet;
   private @Singular ImmutableSortedSet<String> passes;
-  @java.lang.SuppressWarnings("all") BuilderSingularGuavaListsSets(final ImmutableList<T> cards, final ImmutableCollection<? extends Number> frogs, final ImmutableSet rawSet, final ImmutableSortedSet<String> passes) {
+  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaListsSets(final ImmutableList<T> cards, final ImmutableCollection<? extends Number> frogs, final ImmutableSet rawSet, final ImmutableSortedSet<String> passes) {
     super();
     this.cards = cards;
     this.frogs = frogs;
     this.rawSet = rawSet;
     this.passes = passes;
   }
-  public static @java.lang.SuppressWarnings("all") <T>BuilderSingularGuavaListsSetsBuilder<T> builder() {
+  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <T>BuilderSingularGuavaListsSetsBuilder<T> builder() {
     return new BuilderSingularGuavaListsSetsBuilder<T>();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderSingularGuavaMaps.java b/test/transform/resource/after-ecj/BuilderSingularGuavaMaps.java
index 27961e2b..3696c794 100644
--- a/test/transform/resource/after-ecj/BuilderSingularGuavaMaps.java
+++ b/test/transform/resource/after-ecj/BuilderSingularGuavaMaps.java
@@ -3,69 +3,69 @@ import com.google.common.collect.ImmutableBiMap;
 import com.google.common.collect.ImmutableSortedMap;
 import lombok.Singular;
 @lombok.Builder class BuilderSingularGuavaMaps<K, V> {
-  public static @java.lang.SuppressWarnings("all") class BuilderSingularGuavaMapsBuilder<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;
-    @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder() {
+    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder<K, V> battleaxe(K battleaxe$key, V battleaxe$value) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder<K, V> 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") BuilderSingularGuavaMapsBuilder<K, V> battleaxes(java.util.Map<? extends K, ? extends V> battleaxes) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder<K, V> battleaxes(java.util.Map<? extends K, ? extends V> battleaxes) {
       if ((this.battleaxes == null))
           this.battleaxes = com.google.common.collect.ImmutableMap.builder();
       this.battleaxes.putAll(battleaxes);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder<K, V> vertex(Integer vertex$key, V vertex$value) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder<K, V> 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") BuilderSingularGuavaMapsBuilder<K, V> vertices(java.util.Map<? extends Integer, ? extends V> vertices) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder<K, V> vertices(java.util.Map<? extends Integer, ? extends V> vertices) {
       if ((this.vertices == null))
           this.vertices = com.google.common.collect.ImmutableSortedMap.naturalOrder();
       this.vertices.putAll(vertices);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularGuavaMapsBuilder<K, V> rawMap(java.lang.Object rawMap$key, java.lang.Object rawMap$value) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder<K, V> 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") BuilderSingularGuavaMapsBuilder<K, V> rawMap(java.util.Map<?, ?> rawMap) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMapsBuilder<K, V> 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") BuilderSingularGuavaMaps<K, V> build() {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMaps<K, V> build() {
       com.google.common.collect.ImmutableMap<K, V> battleaxes = ((this.battleaxes == null) ? com.google.common.collect.ImmutableMap.<K, V>of() : this.battleaxes.build());
       com.google.common.collect.ImmutableSortedMap<Integer, V> vertices = ((this.vertices == null) ? com.google.common.collect.ImmutableSortedMap.<Integer, V>of() : this.vertices.build());
       com.google.common.collect.ImmutableBiMap<java.lang.Object, java.lang.Object> rawMap = ((this.rawMap == null) ? com.google.common.collect.ImmutableBiMap.<java.lang.Object, java.lang.Object>of() : this.rawMap.build());
       return new BuilderSingularGuavaMaps<K, V>(battleaxes, vertices, rawMap);
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
       return (((((("BuilderSingularGuavaMaps.BuilderSingularGuavaMapsBuilder(battleaxes=" + this.battleaxes) + ", vertices=") + this.vertices) + ", rawMap=") + this.rawMap) + ")");
     }
   }
   private @Singular ImmutableMap<K, V> battleaxes;
   private @Singular ImmutableSortedMap<Integer, ? extends V> vertices;
   private @SuppressWarnings("all") @Singular("rawMap") ImmutableBiMap rawMap;
-  @java.lang.SuppressWarnings("all") BuilderSingularGuavaMaps(final ImmutableMap<K, V> battleaxes, final ImmutableSortedMap<Integer, ? extends V> vertices, final ImmutableBiMap rawMap) {
+  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularGuavaMaps(final ImmutableMap<K, V> battleaxes, final ImmutableSortedMap<Integer, ? extends V> vertices, final ImmutableBiMap rawMap) {
     super();
     this.battleaxes = battleaxes;
     this.vertices = vertices;
     this.rawMap = rawMap;
   }
-  public static @java.lang.SuppressWarnings("all") <K, V>BuilderSingularGuavaMapsBuilder<K, V> builder() {
+  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <K, V>BuilderSingularGuavaMapsBuilder<K, V> builder() {
     return new BuilderSingularGuavaMapsBuilder<K, V>();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderSingularLists.java b/test/transform/resource/after-ecj/BuilderSingularLists.java
index 9e4bb894..bbba29f4 100644
--- a/test/transform/resource/after-ecj/BuilderSingularLists.java
+++ b/test/transform/resource/after-ecj/BuilderSingularLists.java
@@ -3,50 +3,50 @@ import java.util.Collection;
 
 import lombok.Singular;
 @lombok.Builder class BuilderSingularLists<T> {
-  public static @java.lang.SuppressWarnings("all") class BuilderSingularListsBuilder<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;
-    @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder() {
+    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularListsBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> child(T child) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularListsBuilder<T> child(T child) {
       if ((this.children == null))
           this.children = new java.util.ArrayList<T>();
       this.children.add(child);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> children(java.util.Collection<? extends T> children) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularListsBuilder<T> children(java.util.Collection<? extends T> children) {
       if ((this.children == null))
           this.children = new java.util.ArrayList<T>();
       this.children.addAll(children);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> scarf(Number scarf) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularListsBuilder<T> scarf(Number scarf) {
       if ((this.scarves == null))
           this.scarves = new java.util.ArrayList<Number>();
       this.scarves.add(scarf);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> scarves(java.util.Collection<? extends Number> scarves) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularListsBuilder<T> scarves(java.util.Collection<? extends Number> scarves) {
       if ((this.scarves == null))
           this.scarves = new java.util.ArrayList<Number>();
       this.scarves.addAll(scarves);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> rawList(java.lang.Object rawList) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularListsBuilder<T> rawList(java.lang.Object rawList) {
       if ((this.rawList == null))
           this.rawList = new java.util.ArrayList<java.lang.Object>();
       this.rawList.add(rawList);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularListsBuilder<T> rawList(java.util.Collection<?> rawList) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularListsBuilder<T> rawList(java.util.Collection<?> rawList) {
       if ((this.rawList == null))
           this.rawList = new java.util.ArrayList<java.lang.Object>();
       this.rawList.addAll(rawList);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularLists<T> build() {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularLists<T> build() {
       java.util.List<T> children;
       switch (((this.children == null) ? 0 : this.children.size())) {
       case 0 :
@@ -82,20 +82,20 @@ import lombok.Singular;
       }
       return new BuilderSingularLists<T>(children, scarves, rawList);
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
       return (((((("BuilderSingularLists.BuilderSingularListsBuilder(children=" + this.children) + ", scarves=") + this.scarves) + ", rawList=") + this.rawList) + ")");
     }
   }
   private @Singular List<T> children;
   private @Singular Collection<? extends Number> scarves;
   private @SuppressWarnings("all") @Singular("rawList") List rawList;
-  @java.lang.SuppressWarnings("all") BuilderSingularLists(final List<T> children, final Collection<? extends Number> scarves, final List rawList) {
+  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularLists(final List<T> children, final Collection<? extends Number> scarves, final List rawList) {
     super();
     this.children = children;
     this.scarves = scarves;
     this.rawList = rawList;
   }
-  public static @java.lang.SuppressWarnings("all") <T>BuilderSingularListsBuilder<T> builder() {
+  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <T>BuilderSingularListsBuilder<T> builder() {
     return new BuilderSingularListsBuilder<T>();
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/BuilderSingularMaps.java b/test/transform/resource/after-ecj/BuilderSingularMaps.java
index 0ce5a0a9..c439cd2a 100644
--- a/test/transform/resource/after-ecj/BuilderSingularMaps.java
+++ b/test/transform/resource/after-ecj/BuilderSingularMaps.java
@@ -2,7 +2,7 @@ import java.util.Map;
 import java.util.SortedMap;
 import lombok.Singular;
 @lombok.Builder class BuilderSingularMaps<K, V> {
-  public static @java.lang.SuppressWarnings("all") class BuilderSingularMapsBuilder<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;
@@ -11,10 +11,10 @@ import lombok.Singular;
     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") BuilderSingularMapsBuilder() {
+    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> woman(K womanKey, V womanValue) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> woman(K womanKey, V womanValue) {
       if ((this.women$key == null))
           {
             this.women$key = new java.util.ArrayList<K>();
@@ -24,7 +24,7 @@ import lombok.Singular;
       this.women$value.add(womanValue);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> women(java.util.Map<? extends K, ? extends V> women) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> women(java.util.Map<? extends K, ? extends V> women) {
       if ((this.women$key == null))
           {
             this.women$key = new java.util.ArrayList<K>();
@@ -37,7 +37,7 @@ import lombok.Singular;
         }
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> man(K manKey, Number manValue) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> man(K manKey, Number manValue) {
       if ((this.men$key == null))
           {
             this.men$key = new java.util.ArrayList<K>();
@@ -47,7 +47,7 @@ import lombok.Singular;
       this.men$value.add(manValue);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> men(java.util.Map<? extends K, ? extends Number> men) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> men(java.util.Map<? extends K, ? extends Number> men) {
       if ((this.men$key == null))
           {
             this.men$key = new java.util.ArrayList<K>();
@@ -60,7 +60,7 @@ import lombok.Singular;
         }
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> rawMap(java.lang.Object rawMapKey, java.lang.Object rawMapValue) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<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>();
@@ -70,7 +70,7 @@ import lombok.Singular;
       this.rawMap$value.add(rawMapValue);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> rawMap(java.util.Map<?, ?> rawMap) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> rawMap(java.util.Map<?, ?> rawMap) {
       if ((this.rawMap$key == null))
           {
             this.rawMap$key = new java.util.ArrayList<java.lang.Object>();
@@ -83,7 +83,7 @@ import lombok.Singular;
         }
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> stringMap(String stringMapKey, V stringMapValue) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> stringMap(String stringMapKey, V stringMapValue) {
       if ((this.stringMap$key == null))
           {
             this.stringMap$key = new java.util.ArrayList<String>();
@@ -93,7 +93,7 @@ import lombok.Singular;
       this.stringMap$value.add(stringMapValue);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularMapsBuilder<K, V> stringMap(java.util.Map<? extends String, ? extends V> stringMap) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMapsBuilder<K, V> stringMap(java.util.Map<? extends String, ? extends V> stringMap) {
       if ((this.stringMap$key == null))
           {
             this.stringMap$key = new java.util.ArrayList<String>();
@@ -106,7 +106,7 @@ import lombok.Singular;
         }
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularMaps<K, V> build() {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMaps<K, V> build() {
       java.util.Map<K, V> women;
       switch (((this.women$key == null) ? 0 : this.women$key.size())) {
       case 0 :
@@ -156,7 +156,7 @@ import lombok.Singular;
       }
       return new BuilderSingularMaps<K, V>(women, men, rawMap, stringMap);
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
       return (((((((((((((((("BuilderSingularMaps.BuilderSingularMapsBuilder(women$key=" + this.women$key) + ", women$value=") + this.women$value) + ", men$key=") + this.men$key) + ", men$value=") + this.men$value) + ", rawMap$key=") + this.rawMap$key) + ", rawMap$value=") + this.rawMap$value) + ", stringMap$key=") + this.stringMap$key) + ", stringMap$value=") + this.stringMap$value) + ")");
     }
   }
@@ -164,14 +164,14 @@ import lombok.Singular;
   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") BuilderSingularMaps(final Map<K, V> women, final SortedMap<K, ? extends Number> men, final Map rawMap, final Map<String, V> stringMap) {
+  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularMaps(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>BuilderSingularMapsBuilder<K, V> builder() {
+  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <K, V>BuilderSingularMapsBuilder<K, V> builder() {
     return new BuilderSingularMapsBuilder<K, V>();
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/BuilderSingularNoAutosingularize.java b/test/transform/resource/after-ecj/BuilderSingularNoAutosingularize.java
index 16febc2e..47d91593 100644
--- a/test/transform/resource/after-ecj/BuilderSingularNoAutosingularize.java
+++ b/test/transform/resource/after-ecj/BuilderSingularNoAutosingularize.java
@@ -1,50 +1,50 @@
 import java.util.List;
 import lombok.Singular;
 @lombok.Builder class BuilderSingularNoAutosingularize {
-  public static @java.lang.SuppressWarnings("all") class BuilderSingularNoAutosingularizeBuilder {
+  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;
-    @java.lang.SuppressWarnings("all") BuilderSingularNoAutosingularizeBuilder() {
+    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutosingularizeBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularNoAutosingularizeBuilder things(String things) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutosingularizeBuilder things(String things) {
       if ((this.things == null))
           this.things = new java.util.ArrayList<String>();
       this.things.add(things);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularNoAutosingularizeBuilder things(java.util.Collection<? extends String> things) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutosingularizeBuilder things(java.util.Collection<? extends String> things) {
       if ((this.things == null))
           this.things = new java.util.ArrayList<String>();
       this.things.addAll(things);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularNoAutosingularizeBuilder widget(String widget) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutosingularizeBuilder widget(String widget) {
       if ((this.widgets == null))
           this.widgets = new java.util.ArrayList<String>();
       this.widgets.add(widget);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularNoAutosingularizeBuilder widgets(java.util.Collection<? extends String> widgets) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutosingularizeBuilder widgets(java.util.Collection<? extends String> widgets) {
       if ((this.widgets == null))
           this.widgets = new java.util.ArrayList<String>();
       this.widgets.addAll(widgets);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularNoAutosingularizeBuilder items(String items) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutosingularizeBuilder items(String items) {
       if ((this.items == null))
           this.items = new java.util.ArrayList<String>();
       this.items.add(items);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularNoAutosingularizeBuilder items(java.util.Collection<? extends String> items) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutosingularizeBuilder items(java.util.Collection<? extends String> items) {
       if ((this.items == null))
           this.items = new java.util.ArrayList<String>();
       this.items.addAll(items);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularNoAutosingularize build() {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutosingularize build() {
       java.util.List<String> things;
       switch (((this.things == null) ? 0 : this.things.size())) {
       case 0 :
@@ -80,20 +80,20 @@ import lombok.Singular;
       }
       return new BuilderSingularNoAutosingularize(things, widgets, items);
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
       return (((((("BuilderSingularNoAutosingularize.BuilderSingularNoAutosingularizeBuilder(things=" + this.things) + ", widgets=") + this.widgets) + ", items=") + this.items) + ")");
     }
   }
   private @Singular List<String> things;
   private @Singular("widget") List<String> widgets;
   private @Singular List<String> items;
-  @java.lang.SuppressWarnings("all") BuilderSingularNoAutosingularize(final List<String> things, final List<String> widgets, final List<String> items) {
+  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutosingularize(final List<String> things, final List<String> widgets, final List<String> items) {
     super();
     this.things = things;
     this.widgets = widgets;
     this.items = items;
   }
-  public static @java.lang.SuppressWarnings("all") BuilderSingularNoAutosingularizeBuilder builder() {
+  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularNoAutosingularizeBuilder builder() {
     return new BuilderSingularNoAutosingularizeBuilder();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderSingularRedirectToGuava.java b/test/transform/resource/after-ecj/BuilderSingularRedirectToGuava.java
index a71090bf..01ccecb4 100644
--- a/test/transform/resource/after-ecj/BuilderSingularRedirectToGuava.java
+++ b/test/transform/resource/after-ecj/BuilderSingularRedirectToGuava.java
@@ -3,69 +3,69 @@ import java.util.NavigableMap;
 import java.util.Collection;
 import lombok.Singular;
 @lombok.Builder class BuilderSingularRedirectToGuava {
-  public static @java.lang.SuppressWarnings("all") class BuilderSingularRedirectToGuavaBuilder {
+  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;
-    @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder() {
+    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder dangerMouse(String dangerMouse) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") 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") BuilderSingularRedirectToGuavaBuilder dangerMice(java.lang.Iterable<? extends String> dangerMice) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder dangerMice(java.lang.Iterable<? extends String> dangerMice) {
       if ((this.dangerMice == null))
           this.dangerMice = com.google.common.collect.ImmutableSet.builder();
       this.dangerMice.addAll(dangerMice);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder thing(Integer thing$key, Number thing$value) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") 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") BuilderSingularRedirectToGuavaBuilder things(java.util.Map<? extends Integer, ? extends Number> things) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder things(java.util.Map<? extends Integer, ? extends Number> things) {
       if ((this.things == null))
           this.things = com.google.common.collect.ImmutableSortedMap.naturalOrder();
       this.things.putAll(things);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder doohickey(Class<?> doohickey) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") 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") BuilderSingularRedirectToGuavaBuilder doohickeys(java.lang.Iterable<? extends Class<?>> doohickeys) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder doohickeys(java.lang.Iterable<? extends Class<?>> doohickeys) {
       if ((this.doohickeys == null))
           this.doohickeys = com.google.common.collect.ImmutableList.builder();
       this.doohickeys.addAll(doohickeys);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuava build() {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuava build() {
       java.util.Set<String> dangerMice = ((this.dangerMice == null) ? com.google.common.collect.ImmutableSet.<String>of() : this.dangerMice.build());
       java.util.NavigableMap<Integer, Number> things = ((this.things == null) ? com.google.common.collect.ImmutableSortedMap.<Integer, Number>of() : this.things.build());
       java.util.Collection<Class<?>> doohickeys = ((this.doohickeys == null) ? com.google.common.collect.ImmutableList.<Class<?>>of() : this.doohickeys.build());
       return new BuilderSingularRedirectToGuava(dangerMice, things, doohickeys);
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
       return (((((("BuilderSingularRedirectToGuava.BuilderSingularRedirectToGuavaBuilder(dangerMice=" + this.dangerMice) + ", things=") + this.things) + ", doohickeys=") + this.doohickeys) + ")");
     }
   }
   private @Singular Set<String> dangerMice;
   private @Singular NavigableMap<Integer, Number> things;
   private @Singular Collection<Class<?>> doohickeys;
-  @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuava(final Set<String> dangerMice, final NavigableMap<Integer, Number> things, final Collection<Class<?>> doohickeys) {
+  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuava(final Set<String> dangerMice, final NavigableMap<Integer, Number> things, final Collection<Class<?>> doohickeys) {
     super();
     this.dangerMice = dangerMice;
     this.things = things;
     this.doohickeys = doohickeys;
   }
-  public static @java.lang.SuppressWarnings("all") BuilderSingularRedirectToGuavaBuilder builder() {
+  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularRedirectToGuavaBuilder builder() {
     return new BuilderSingularRedirectToGuavaBuilder();
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/BuilderSingularSets.java b/test/transform/resource/after-ecj/BuilderSingularSets.java
index 5d2fcc59..749d8439 100644
--- a/test/transform/resource/after-ecj/BuilderSingularSets.java
+++ b/test/transform/resource/after-ecj/BuilderSingularSets.java
@@ -2,63 +2,63 @@ import java.util.Set;
 import java.util.SortedSet;
 import lombok.Singular;
 @lombok.Builder class BuilderSingularSets<T> {
-  public static @java.lang.SuppressWarnings("all") class BuilderSingularSetsBuilder<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;
-    @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder() {
+    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularSetsBuilder<T> dangerMouse(T dangerMouse) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<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") BuilderSingularSetsBuilder<T> dangerMice(java.util.Collection<? extends T> dangerMice) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<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") BuilderSingularSetsBuilder<T> octopus(Number octopus) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<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") BuilderSingularSetsBuilder<T> octopodes(java.util.Collection<? extends Number> octopodes) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<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") BuilderSingularSetsBuilder<T> rawSet(java.lang.Object rawSet) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<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") BuilderSingularSetsBuilder<T> rawSet(java.util.Collection<?> rawSet) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<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") BuilderSingularSetsBuilder<T> stringSet(String stringSet) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<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") BuilderSingularSetsBuilder<T> stringSet(java.util.Collection<? extends String> stringSet) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSetsBuilder<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") BuilderSingularSets<T> build() {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSets<T> build() {
       java.util.Set<T> dangerMice;
       switch (((this.dangerMice == null) ? 0 : this.dangerMice.size())) {
       case 0 :
@@ -104,7 +104,7 @@ import lombok.Singular;
       }
       return new BuilderSingularSets<T>(dangerMice, octopodes, rawSet, stringSet);
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
       return (((((((("BuilderSingularSets.BuilderSingularSetsBuilder(dangerMice=" + this.dangerMice) + ", octopodes=") + this.octopodes) + ", rawSet=") + this.rawSet) + ", stringSet=") + this.stringSet) + ")");
     }
   }
@@ -112,14 +112,14 @@ import lombok.Singular;
   private @Singular SortedSet<? extends Number> octopodes;
   private @SuppressWarnings("all") @Singular("rawSet") Set rawSet;
   private @Singular("stringSet") Set<String> stringSet;
-  @java.lang.SuppressWarnings("all") BuilderSingularSets(final Set<T> dangerMice, final SortedSet<? extends Number> octopodes, final Set rawSet, final Set<String> stringSet) {
+  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderSingularSets(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>BuilderSingularSetsBuilder<T> builder() {
+  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <T>BuilderSingularSetsBuilder<T> builder() {
     return new BuilderSingularSetsBuilder<T>();
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/BuilderWithAccessors.java b/test/transform/resource/after-ecj/BuilderWithAccessors.java
index 79776dc4..b90ba937 100644
--- a/test/transform/resource/after-ecj/BuilderWithAccessors.java
+++ b/test/transform/resource/after-ecj/BuilderWithAccessors.java
@@ -1,32 +1,32 @@
 @lombok.experimental.Builder @lombok.experimental.Accessors(prefix = {"p", "_"}) class BuilderWithAccessors {
-  public static @java.lang.SuppressWarnings("all") class BuilderWithAccessorsBuilder {
+  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") class BuilderWithAccessorsBuilder {
     private int plower;
     private int upper;
     private int foo;
     private int _bar;
-    @java.lang.SuppressWarnings("all") BuilderWithAccessorsBuilder() {
+    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithAccessorsBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderWithAccessorsBuilder plower(final int plower) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithAccessorsBuilder plower(final int plower) {
       this.plower = plower;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderWithAccessorsBuilder upper(final int upper) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithAccessorsBuilder upper(final int upper) {
       this.upper = upper;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderWithAccessorsBuilder foo(final int foo) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithAccessorsBuilder foo(final int foo) {
       this.foo = foo;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderWithAccessorsBuilder _bar(final int _bar) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithAccessorsBuilder _bar(final int _bar) {
       this._bar = _bar;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderWithAccessors build() {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithAccessors build() {
       return new BuilderWithAccessors(plower, upper, foo, _bar);
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
       return (((((((("BuilderWithAccessors.BuilderWithAccessorsBuilder(plower=" + this.plower) + ", upper=") + this.upper) + ", foo=") + this.foo) + ", _bar=") + this._bar) + ")");
     }
   }
@@ -34,14 +34,14 @@
   private final int pUpper;
   private int _foo;
   private int __bar;
-  @java.lang.SuppressWarnings("all") BuilderWithAccessors(final int plower, final int upper, final int foo, final int _bar) {
+  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithAccessors(final int plower, final int upper, final int foo, final int _bar) {
     super();
     this.plower = plower;
     this.pUpper = upper;
     this._foo = foo;
     this.__bar = _bar;
   }
-  public static @java.lang.SuppressWarnings("all") BuilderWithAccessorsBuilder builder() {
+  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithAccessorsBuilder builder() {
     return new BuilderWithAccessorsBuilder();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderWithExistingBuilderClass.java b/test/transform/resource/after-ecj/BuilderWithExistingBuilderClass.java
index 8fb42a59..9ddbda7b 100644
--- a/test/transform/resource/after-ecj/BuilderWithExistingBuilderClass.java
+++ b/test/transform/resource/after-ecj/BuilderWithExistingBuilderClass.java
@@ -6,21 +6,21 @@ class BuilderWithExistingBuilderClass<T, K extends Number> {
     private Z arg1;
     public void arg2(boolean arg) {
     }
-    @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClassBuilder() {
+    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithExistingBuilderClassBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClassBuilder<Z> arg1(final Z arg1) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithExistingBuilderClassBuilder<Z> arg1(final Z arg1) {
       this.arg1 = arg1;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClassBuilder<Z> arg3(final String arg3) {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithExistingBuilderClassBuilder<Z> arg3(final String arg3) {
       this.arg3 = arg3;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderWithExistingBuilderClass<String, Z> build() {
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithExistingBuilderClass<String, Z> build() {
       return BuilderWithExistingBuilderClass.<Z>staticMethod(arg1, arg2, arg3);
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
       return (((((("BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder(arg1=" + this.arg1) + ", arg2=") + this.arg2) + ", arg3=") + this.arg3) + ")");
     }
   }
@@ -30,7 +30,7 @@ class BuilderWithExistingBuilderClass<T, K extends Number> {
   public static @Builder <Z extends Number>BuilderWithExistingBuilderClass<String, Z> staticMethod(Z arg1, boolean arg2, String arg3) {
     return null;
   }
-  public static @java.lang.SuppressWarnings("all") <Z extends Number>BuilderWithExistingBuilderClassBuilder<Z> builder() {
+  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <Z extends Number>BuilderWithExistingBuilderClassBuilder<Z> builder() {
     return new BuilderWithExistingBuilderClassBuilder<Z>();
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/ClassNamedAfterGetter.java b/test/transform/resource/after-ecj/ClassNamedAfterGetter.java
index fdb6f122..79b422cc 100644
--- a/test/transform/resource/after-ecj/ClassNamedAfterGetter.java
+++ b/test/transform/resource/after-ecj/ClassNamedAfterGetter.java
@@ -3,7 +3,7 @@ class GetFoo {
   GetFoo() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") int getFoo() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getFoo() {
     return this.foo;
   }
 }
diff --git a/test/transform/resource/after-ecj/CommentsInterspersed.java b/test/transform/resource/after-ecj/CommentsInterspersed.java
index d708ad72..95489d54 100644
--- a/test/transform/resource/after-ecj/CommentsInterspersed.java
+++ b/test/transform/resource/after-ecj/CommentsInterspersed.java
@@ -6,7 +6,7 @@ public class CommentsInterspersed {
     super();
   }
   public native void gwtTest();
-  public @java.lang.SuppressWarnings("all") String getTest() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getTest() {
     return this.test;
   }
 }
diff --git a/test/transform/resource/after-ecj/ConflictingStaticConstructorNames.java b/test/transform/resource/after-ecj/ConflictingStaticConstructorNames.java
index f8aff69c..f9437f0e 100644
--- a/test/transform/resource/after-ecj/ConflictingStaticConstructorNames.java
+++ b/test/transform/resource/after-ecj/ConflictingStaticConstructorNames.java
@@ -1,25 +1,25 @@
 @lombok.Data(staticConstructor = "of") @lombok.NoArgsConstructor class ConflictingStaticConstructorNames {
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof ConflictingStaticConstructorNames)))
         return false;
-    final @java.lang.SuppressWarnings("all") ConflictingStaticConstructorNames other = (ConflictingStaticConstructorNames) o;
+    final ConflictingStaticConstructorNames other = (ConflictingStaticConstructorNames) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
     return (other instanceof ConflictingStaticConstructorNames);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
     int result = 1;
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
     return "ConflictingStaticConstructorNames()";
   }
-  public @java.lang.SuppressWarnings("all") ConflictingStaticConstructorNames() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ConflictingStaticConstructorNames() {
     super();
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/Constructors.java b/test/transform/resource/after-ecj/Constructors.java
index a4597ce6..998872a2 100644
--- a/test/transform/resource/after-ecj/Constructors.java
+++ b/test/transform/resource/after-ecj/Constructors.java
@@ -1,7 +1,7 @@
 @lombok.RequiredArgsConstructor class RequiredArgsConstructor1 {
   final int x;
   String name;
-  public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") RequiredArgsConstructor1(final int x) {
+  public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") RequiredArgsConstructor1(final int x) {
     super();
     this.x = x;
   }
@@ -9,7 +9,7 @@
 @lombok.RequiredArgsConstructor(access = lombok.AccessLevel.PROTECTED) class RequiredArgsConstructorAccess {
   final int x;
   String name;
-  protected @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") RequiredArgsConstructorAccess(final int x) {
+  protected @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") RequiredArgsConstructorAccess(final int x) {
     super();
     this.x = x;
   }
@@ -17,18 +17,18 @@
 @lombok.RequiredArgsConstructor(staticName = "staticname") class RequiredArgsConstructorStaticName {
   final int x;
   String name;
-  private @java.lang.SuppressWarnings("all") RequiredArgsConstructorStaticName(final int x) {
+  private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") RequiredArgsConstructorStaticName(final int x) {
     super();
     this.x = x;
   }
-  public static @java.lang.SuppressWarnings("all") RequiredArgsConstructorStaticName staticname(final int x) {
+  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") RequiredArgsConstructorStaticName staticname(final int x) {
     return new RequiredArgsConstructorStaticName(x);
   }
 }
 @lombok.RequiredArgsConstructor() class RequiredArgsConstructorWithAnnotations {
   final int x;
   String name;
-  public @Deprecated @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") RequiredArgsConstructorWithAnnotations(final int x) {
+  public @Deprecated @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") RequiredArgsConstructorWithAnnotations(final int x) {
     super();
     this.x = x;
   }
@@ -36,7 +36,7 @@
 @lombok.AllArgsConstructor class AllArgsConstructor1 {
   final int x;
   String name;
-  public @java.beans.ConstructorProperties({"x", "name"}) @java.lang.SuppressWarnings("all") AllArgsConstructor1(final int x, final String name) {
+  public @java.beans.ConstructorProperties({"x", "name"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") AllArgsConstructor1(final int x, final String name) {
     super();
     this.x = x;
     this.name = name;
@@ -45,35 +45,35 @@
 @lombok.NoArgsConstructor class NoArgsConstructor1 {
   int x;
   String name;
-  public @java.lang.SuppressWarnings("all") NoArgsConstructor1() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") NoArgsConstructor1() {
     super();
   }
 }
 @lombok.RequiredArgsConstructor(staticName = "of") class RequiredArgsConstructorStaticNameGenerics<T extends Number> {
   final T x;
   String name;
-  private @java.lang.SuppressWarnings("all") RequiredArgsConstructorStaticNameGenerics(final T x) {
+  private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") RequiredArgsConstructorStaticNameGenerics(final T x) {
     super();
     this.x = x;
   }
-  public static @java.lang.SuppressWarnings("all") <T extends Number>RequiredArgsConstructorStaticNameGenerics<T> of(final T x) {
+  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <T extends Number>RequiredArgsConstructorStaticNameGenerics<T> of(final T x) {
     return new RequiredArgsConstructorStaticNameGenerics<T>(x);
   }
 }
 @lombok.RequiredArgsConstructor(staticName = "of") class RequiredArgsConstructorStaticNameGenerics2<T extends Number> {
   final Class<T> x;
   String name;
-  private @java.lang.SuppressWarnings("all") RequiredArgsConstructorStaticNameGenerics2(final Class<T> x) {
+  private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") RequiredArgsConstructorStaticNameGenerics2(final Class<T> x) {
     super();
     this.x = x;
   }
-  public static @java.lang.SuppressWarnings("all") <T extends Number>RequiredArgsConstructorStaticNameGenerics2<T> of(final Class<T> x) {
+  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") <T extends Number>RequiredArgsConstructorStaticNameGenerics2<T> of(final Class<T> x) {
     return new RequiredArgsConstructorStaticNameGenerics2<T>(x);
   }
 }
 @lombok.AllArgsConstructor(access = lombok.AccessLevel.PACKAGE) class AllArgsConstructorPackageAccess {
   final String x;
-  @java.lang.SuppressWarnings("all") AllArgsConstructorPackageAccess(final String x) {
+  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") AllArgsConstructorPackageAccess(final String x) {
     super();
     this.x = x;
   }
diff --git a/test/transform/resource/after-ecj/ConstructorsConfiguration.java b/test/transform/resource/after-ecj/ConstructorsConfiguration.java
index b55d3e03..33a95181 100644
--- a/test/transform/resource/after-ecj/ConstructorsConfiguration.java
+++ b/test/transform/resource/after-ecj/ConstructorsConfiguration.java
@@ -1,13 +1,13 @@
 @lombok.AllArgsConstructor class ConstructorsConfiguration {
   int x;
-  public @java.lang.SuppressWarnings("all") ConstructorsConfiguration(final int x) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ConstructorsConfiguration(final int x) {
     super();
     this.x = x;
   }
 }
 @lombok.AllArgsConstructor(suppressConstructorProperties = false) class ConstructorsConfigurationExplicit {
   int x;
-  public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") ConstructorsConfigurationExplicit(final int x) {
+  public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ConstructorsConfigurationExplicit(final int x) {
     super();
     this.x = x;
   }
diff --git a/test/transform/resource/after-ecj/ConstructorsWithAccessors.java b/test/transform/resource/after-ecj/ConstructorsWithAccessors.java
index 0df8fbe1..7c691b42 100644
--- a/test/transform/resource/after-ecj/ConstructorsWithAccessors.java
+++ b/test/transform/resource/after-ecj/ConstructorsWithAccessors.java
@@ -3,7 +3,7 @@
   int pUpper;
   int _huh;
   int __huh2;
-  public @java.beans.ConstructorProperties({"plower", "upper", "huh", "_huh2"}) @java.lang.SuppressWarnings("all") ConstructorsWithAccessors(final int plower, final int upper, final int huh, final int _huh2) {
+  public @java.beans.ConstructorProperties({"plower", "upper", "huh", "_huh2"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ConstructorsWithAccessors(final int plower, final int upper, final int huh, final int _huh2) {
     super();
     this.plower = plower;
     this.pUpper = upper;
diff --git a/test/transform/resource/after-ecj/DataConfiguration.java b/test/transform/resource/after-ecj/DataConfiguration.java
index f2733a88..4ca1f093 100644
--- a/test/transform/resource/after-ecj/DataConfiguration.java
+++ b/test/transform/resource/after-ecj/DataConfiguration.java
@@ -1,33 +1,33 @@
 @lombok.Data class DataConfiguration {
   final int x;
-  public @java.lang.SuppressWarnings("all") int getX() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
     return this.x;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof DataConfiguration)))
         return false;
-    final @java.lang.SuppressWarnings("all") DataConfiguration other = (DataConfiguration) o;
+    final DataConfiguration other = (DataConfiguration) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     if ((this.getX() != other.getX()))
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
     return (other instanceof DataConfiguration);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.getX());
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
     return (("DataConfiguration(x=" + this.getX()) + ")");
   }
-  public @java.lang.SuppressWarnings("all") DataConfiguration(final int x) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") DataConfiguration(final int x) {
     super();
     this.x = x;
   }
diff --git a/test/transform/resource/after-ecj/DataExtended.java b/test/transform/resource/after-ecj/DataExtended.java
index c2652ba4..46446a0f 100644
--- a/test/transform/resource/after-ecj/DataExtended.java
+++ b/test/transform/resource/after-ecj/DataExtended.java
@@ -1,36 +1,36 @@
 @lombok.Data @lombok.ToString(doNotUseGetters = true) class DataExtended {
   int x;
-  public @java.lang.SuppressWarnings("all") int getX() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
     return this.x;
   }
-  public @java.lang.SuppressWarnings("all") void setX(final int x) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setX(final int x) {
     this.x = x;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof DataExtended)))
         return false;
-    final @java.lang.SuppressWarnings("all") DataExtended other = (DataExtended) o;
+    final DataExtended other = (DataExtended) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     if ((this.getX() != other.getX()))
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
     return (other instanceof DataExtended);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.getX());
     return result;
   }
-  public @java.lang.SuppressWarnings("all") DataExtended() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") DataExtended() {
     super();
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
     return (("DataExtended(x=" + this.x) + ")");
   }
 }
diff --git a/test/transform/resource/after-ecj/DataIgnore.java b/test/transform/resource/after-ecj/DataIgnore.java
index d077a5db..dbf9713f 100644
--- a/test/transform/resource/after-ecj/DataIgnore.java
+++ b/test/transform/resource/after-ecj/DataIgnore.java
@@ -1,34 +1,34 @@
 @lombok.Data class DataIgnore {
   final int x;
   String $name;
-  public @java.lang.SuppressWarnings("all") int getX() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
     return this.x;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof DataIgnore)))
         return false;
-    final @java.lang.SuppressWarnings("all") DataIgnore other = (DataIgnore) o;
+    final DataIgnore other = (DataIgnore) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     if ((this.getX() != other.getX()))
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
     return (other instanceof DataIgnore);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.getX());
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
     return (("DataIgnore(x=" + this.getX()) + ")");
   }
-  public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") DataIgnore(final int x) {
+  public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") DataIgnore(final int x) {
     super();
     this.x = x;
   }
diff --git a/test/transform/resource/after-ecj/DataOnEnum.java b/test/transform/resource/after-ecj/DataOnEnum.java
index 0f07088e..917a840b 100644
--- a/test/transform/resource/after-ecj/DataOnEnum.java
+++ b/test/transform/resource/after-ecj/DataOnEnum.java
@@ -3,13 +3,13 @@ public @lombok.Getter @lombok.ToString @lombok.RequiredArgsConstructor enum Data
   private final String someField;
   <clinit>() {
   }
-  public @java.lang.SuppressWarnings("all") String getSomeField() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getSomeField() {
     return this.someField;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
     return (("DataOnEnum(someField=" + this.getSomeField()) + ")");
   }
-  private @java.lang.SuppressWarnings("all") DataOnEnum(final String someField) {
+  private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") DataOnEnum(final String someField) {
     super();
     this.someField = someField;
   }
diff --git a/test/transform/resource/after-ecj/DataOnLocalClass.java b/test/transform/resource/after-ecj/DataOnLocalClass.java
index 3f4832ff..856160de 100644
--- a/test/transform/resource/after-ecj/DataOnLocalClass.java
+++ b/test/transform/resource/after-ecj/DataOnLocalClass.java
@@ -7,21 +7,21 @@ class DataOnLocalClass1 {
     @Data class Local {
       final int x;
       String name;
-      public @java.lang.SuppressWarnings("all") int getX() {
+      public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
         return this.x;
       }
-      public @java.lang.SuppressWarnings("all") String getName() {
+      public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getName() {
         return this.name;
       }
-      public @java.lang.SuppressWarnings("all") void setName(final String name) {
+      public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setName(final String name) {
         this.name = name;
       }
-      public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+      public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
         if ((o == this))
             return true;
         if ((! (o instanceof Local)))
             return false;
-        final @java.lang.SuppressWarnings("all") Local other = (Local) o;
+        final Local other = (Local) o;
         if ((! other.canEqual((java.lang.Object) this)))
             return false;
         if ((this.getX() != other.getX()))
@@ -32,10 +32,10 @@ class DataOnLocalClass1 {
             return false;
         return true;
       }
-      protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+      protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
         return (other instanceof Local);
       }
-      public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+      public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
         final int PRIME = 59;
         int result = 1;
         result = ((result * PRIME) + this.getX());
@@ -43,10 +43,10 @@ class DataOnLocalClass1 {
         result = ((result * PRIME) + (($name == null) ? 0 : $name.hashCode()));
         return result;
       }
-      public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+      public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
         return (((("Local(x=" + this.getX()) + ", name=") + this.getName()) + ")");
       }
-      public @java.lang.SuppressWarnings("all") Local(final int x) {
+      public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Local(final int x) {
         super();
         this.x = x;
       }
@@ -58,22 +58,22 @@ class DataOnLocalClass2 {
     @Data class Local {
       @Data class InnerLocal {
         @lombok.NonNull String name;
-        public @lombok.NonNull @java.lang.SuppressWarnings("all") String getName() {
+        public @lombok.NonNull @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getName() {
           return this.name;
         }
-        public @java.lang.SuppressWarnings("all") void setName(final @lombok.NonNull String name) {
+        public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setName(final @lombok.NonNull String name) {
           if ((name == null))
               {
                 throw new java.lang.NullPointerException("name");
               }
           this.name = name;
         }
-        public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+        public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
           if ((o == this))
               return true;
           if ((! (o instanceof Local.InnerLocal)))
               return false;
-          final @java.lang.SuppressWarnings("all") InnerLocal other = (InnerLocal) o;
+          final InnerLocal other = (InnerLocal) o;
           if ((! other.canEqual((java.lang.Object) this)))
               return false;
           final java.lang.Object this$name = this.getName();
@@ -82,20 +82,20 @@ class DataOnLocalClass2 {
               return false;
           return true;
         }
-        protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+        protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
           return (other instanceof Local.InnerLocal);
         }
-        public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+        public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
           final int PRIME = 59;
           int result = 1;
           final java.lang.Object $name = this.getName();
           result = ((result * PRIME) + (($name == null) ? 0 : $name.hashCode()));
           return result;
         }
-        public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+        public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
           return (("Local.InnerLocal(name=" + this.getName()) + ")");
         }
-        public @java.lang.SuppressWarnings("all") InnerLocal(final @lombok.NonNull String name) {
+        public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") InnerLocal(final @lombok.NonNull String name) {
           super();
           if ((name == null))
               {
@@ -105,34 +105,34 @@ class DataOnLocalClass2 {
         }
       }
       final int x;
-      public @java.lang.SuppressWarnings("all") int getX() {
+      public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
         return this.x;
       }
-      public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+      public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
         if ((o == this))
             return true;
         if ((! (o instanceof Local)))
             return false;
-        final @java.lang.SuppressWarnings("all") Local other = (Local) o;
+        final Local other = (Local) o;
         if ((! other.canEqual((java.lang.Object) this)))
             return false;
         if ((this.getX() != other.getX()))
             return false;
         return true;
       }
-      protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+      protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
         return (other instanceof Local);
       }
-      public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+      public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
         final int PRIME = 59;
         int result = 1;
         result = ((result * PRIME) + this.getX());
         return result;
       }
-      public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+      public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
         return (("Local(x=" + this.getX()) + ")");
       }
-      public @java.lang.SuppressWarnings("all") Local(final int x) {
+      public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Local(final int x) {
         super();
         this.x = x;
       }
diff --git a/test/transform/resource/after-ecj/DataPlain.java b/test/transform/resource/after-ecj/DataPlain.java
index 858f46dd..8b243766 100644
--- a/test/transform/resource/after-ecj/DataPlain.java
+++ b/test/transform/resource/after-ecj/DataPlain.java
@@ -2,21 +2,21 @@ import lombok.Data;
 @lombok.Data class Data1 {
   final int x;
   String name;
-  public @java.lang.SuppressWarnings("all") int getX() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
     return this.x;
   }
-  public @java.lang.SuppressWarnings("all") String getName() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getName() {
     return this.name;
   }
-  public @java.lang.SuppressWarnings("all") void setName(final String name) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setName(final String name) {
     this.name = name;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof Data1)))
         return false;
-    final @java.lang.SuppressWarnings("all") Data1 other = (Data1) o;
+    final Data1 other = (Data1) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     if ((this.getX() != other.getX()))
@@ -27,10 +27,10 @@ import lombok.Data;
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
     return (other instanceof Data1);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.getX());
@@ -38,10 +38,10 @@ import lombok.Data;
     result = ((result * PRIME) + (($name == null) ? 0 : $name.hashCode()));
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
     return (((("Data1(x=" + this.getX()) + ", name=") + this.getName()) + ")");
   }
-  public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") Data1(final int x) {
+  public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Data1(final int x) {
     super();
     this.x = x;
   }
@@ -49,21 +49,21 @@ import lombok.Data;
 @Data class Data2 {
   final int x;
   String name;
-  public @java.lang.SuppressWarnings("all") int getX() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
     return this.x;
   }
-  public @java.lang.SuppressWarnings("all") String getName() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getName() {
     return this.name;
   }
-  public @java.lang.SuppressWarnings("all") void setName(final String name) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setName(final String name) {
     this.name = name;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof Data2)))
         return false;
-    final @java.lang.SuppressWarnings("all") Data2 other = (Data2) o;
+    final Data2 other = (Data2) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     if ((this.getX() != other.getX()))
@@ -74,10 +74,10 @@ import lombok.Data;
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
     return (other instanceof Data2);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.getX());
@@ -85,10 +85,10 @@ import lombok.Data;
     result = ((result * PRIME) + (($name == null) ? 0 : $name.hashCode()));
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
     return (((("Data2(x=" + this.getX()) + ", name=") + this.getName()) + ")");
   }
-  public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") Data2(final int x) {
+  public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Data2(final int x) {
     super();
     this.x = x;
   }
@@ -96,21 +96,21 @@ import lombok.Data;
 final @Data class Data3 {
   final int x;
   String name;
-  public @java.lang.SuppressWarnings("all") int getX() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
     return this.x;
   }
-  public @java.lang.SuppressWarnings("all") String getName() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getName() {
     return this.name;
   }
-  public @java.lang.SuppressWarnings("all") void setName(final String name) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setName(final String name) {
     this.name = name;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof Data3)))
         return false;
-    final @java.lang.SuppressWarnings("all") Data3 other = (Data3) o;
+    final Data3 other = (Data3) o;
     if ((this.getX() != other.getX()))
         return false;
     final java.lang.Object this$name = this.getName();
@@ -119,7 +119,7 @@ final @Data class Data3 {
         return false;
     return true;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.getX());
@@ -127,10 +127,10 @@ final @Data class Data3 {
     result = ((result * PRIME) + (($name == null) ? 0 : $name.hashCode()));
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
     return (((("Data3(x=" + this.getX()) + ", name=") + this.getName()) + ")");
   }
-  public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") Data3(final int x) {
+  public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Data3(final int x) {
     super();
     this.x = x;
   }
@@ -140,21 +140,21 @@ final @Data @lombok.EqualsAndHashCode(callSuper = true) class Data4 extends java
   Data4() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") int getX() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
     return this.x;
   }
-  public @java.lang.SuppressWarnings("all") void setX(final int x) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setX(final int x) {
     this.x = x;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
     return (("Data4(x=" + this.getX()) + ")");
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof Data4)))
         return false;
-    final @java.lang.SuppressWarnings("all") Data4 other = (Data4) o;
+    final Data4 other = (Data4) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     if ((! super.equals(o)))
@@ -163,10 +163,10 @@ final @Data @lombok.EqualsAndHashCode(callSuper = true) class Data4 extends java
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
     return (other instanceof Data4);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + super.hashCode());
@@ -175,46 +175,46 @@ final @Data @lombok.EqualsAndHashCode(callSuper = true) class Data4 extends java
   }
 }
 @Data class Data5 {
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof Data5)))
         return false;
-    final @java.lang.SuppressWarnings("all") Data5 other = (Data5) o;
+    final Data5 other = (Data5) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
     return (other instanceof Data5);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
     int result = 1;
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
     return "Data5()";
   }
-  public @java.lang.SuppressWarnings("all") Data5() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Data5() {
     super();
   }
 }
 final @Data class Data6 {
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof Data6)))
         return false;
     return true;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
     int result = 1;
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
     return "Data6()";
   }
-  public @java.lang.SuppressWarnings("all") Data6() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Data6() {
     super();
   }
 }
diff --git a/test/transform/resource/after-ecj/DataWithGetter.java b/test/transform/resource/after-ecj/DataWithGetter.java
index ee74ed4e..b37aa137 100644
--- a/test/transform/resource/after-ecj/DataWithGetter.java
+++ b/test/transform/resource/after-ecj/DataWithGetter.java
@@ -2,18 +2,18 @@
   private int x;
   private int y;
   private final String z;
-  public @java.lang.SuppressWarnings("all") void setX(final int x) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setX(final int x) {
     this.x = x;
   }
-  public @java.lang.SuppressWarnings("all") void setY(final int y) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setY(final int y) {
     this.y = y;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof DataWithGetter)))
         return false;
-    final @java.lang.SuppressWarnings("all") DataWithGetter other = (DataWithGetter) o;
+    final DataWithGetter other = (DataWithGetter) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     if ((this.getX() != other.getX()))
@@ -26,10 +26,10 @@
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
     return (other instanceof DataWithGetter);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.getX());
@@ -38,20 +38,20 @@
     result = ((result * PRIME) + (($z == null) ? 0 : $z.hashCode()));
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
     return (((((("DataWithGetter(x=" + this.getX()) + ", y=") + this.getY()) + ", z=") + this.getZ()) + ")");
   }
-  public @java.beans.ConstructorProperties({"z"}) @java.lang.SuppressWarnings("all") DataWithGetter(final String z) {
+  public @java.beans.ConstructorProperties({"z"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") DataWithGetter(final String z) {
     super();
     this.z = z;
   }
-  public @java.lang.SuppressWarnings("all") int getX() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
     return this.x;
   }
-  public @java.lang.SuppressWarnings("all") int getY() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getY() {
     return this.y;
   }
-  public @java.lang.SuppressWarnings("all") String getZ() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getZ() {
     return this.z;
   }
 }
diff --git a/test/transform/resource/after-ecj/DataWithGetterNone.java b/test/transform/resource/after-ecj/DataWithGetterNone.java
index 056e071d..66a26277 100644
--- a/test/transform/resource/after-ecj/DataWithGetterNone.java
+++ b/test/transform/resource/after-ecj/DataWithGetterNone.java
@@ -2,18 +2,18 @@
   private int x;
   private int y;
   private final String z;
-  public @java.lang.SuppressWarnings("all") void setX(final int x) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setX(final int x) {
     this.x = x;
   }
-  public @java.lang.SuppressWarnings("all") void setY(final int y) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setY(final int y) {
     this.y = y;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof DataWithGetterNone)))
         return false;
-    final @java.lang.SuppressWarnings("all") DataWithGetterNone other = (DataWithGetterNone) o;
+    final DataWithGetterNone other = (DataWithGetterNone) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     if ((this.x != other.x))
@@ -26,10 +26,10 @@
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
     return (other instanceof DataWithGetterNone);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.x);
@@ -38,10 +38,10 @@
     result = ((result * PRIME) + (($z == null) ? 0 : $z.hashCode()));
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
     return (((((("DataWithGetterNone(x=" + this.x) + ", y=") + this.y) + ", z=") + this.z) + ")");
   }
-  public @java.beans.ConstructorProperties({"z"}) @java.lang.SuppressWarnings("all") DataWithGetterNone(final String z) {
+  public @java.beans.ConstructorProperties({"z"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") DataWithGetterNone(final String z) {
     super();
     this.z = z;
   }
diff --git a/test/transform/resource/after-ecj/DelegateOnGetter.java b/test/transform/resource/after-ecj/DelegateOnGetter.java
index 59f6a3b8..06b57ceb 100644
--- a/test/transform/resource/after-ecj/DelegateOnGetter.java
+++ b/test/transform/resource/after-ecj/DelegateOnGetter.java
@@ -9,7 +9,7 @@ class DelegateOnGetter {
   DelegateOnGetter() {
     super();
   }
-  public @Delegate @java.lang.SuppressWarnings("all") Bar getBar() {
+  public @Delegate @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Bar getBar() {
     java.lang.Object value = this.bar.get();
     if ((value == null))
         {
@@ -35,10 +35,10 @@ class DelegateOnGetter {
         }
     return (Bar) ((value == this.bar) ? null : value);
   }
-  public @java.lang.SuppressWarnings("all") int getInt() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getInt() {
     return this.getBar().getInt();
   }
-  public @java.lang.SuppressWarnings("all") void setList(final java.util.ArrayList<java.lang.String> list) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setList(final java.util.ArrayList<java.lang.String> list) {
     this.getBar().setList(list);
   }
 }
diff --git a/test/transform/resource/after-ecj/DelegateOnGetterNone.java b/test/transform/resource/after-ecj/DelegateOnGetterNone.java
index 0cfb02c0..2018e1e9 100644
--- a/test/transform/resource/after-ecj/DelegateOnGetterNone.java
+++ b/test/transform/resource/after-ecj/DelegateOnGetterNone.java
@@ -10,10 +10,10 @@ import lombok.Getter;
   DelegateOnGetterNone() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") int getInt() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getInt() {
     return this.bar.getInt();
   }
-  public @java.lang.SuppressWarnings("all") void setList(final java.util.ArrayList<java.lang.String> list) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setList(final java.util.ArrayList<java.lang.String> list) {
     this.bar.setList(list);
   }
 }
diff --git a/test/transform/resource/after-ecj/DelegateOnMethods.java b/test/transform/resource/after-ecj/DelegateOnMethods.java
index 6560657c..3e833ebb 100644
--- a/test/transform/resource/after-ecj/DelegateOnMethods.java
+++ b/test/transform/resource/after-ecj/DelegateOnMethods.java
@@ -7,7 +7,7 @@ abstract class DelegateOnMethods {
     super();
   }
   public abstract @Delegate Bar getBar();
-  public @java.lang.SuppressWarnings("all") void bar(final java.util.ArrayList<java.lang.String> list) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void bar(final java.util.ArrayList<java.lang.String> list) {
     this.getBar().bar(list);
   }
 }
diff --git a/test/transform/resource/after-ecj/DelegateTypesAndExcludes.java b/test/transform/resource/after-ecj/DelegateTypesAndExcludes.java
index 86f54139..3718c5d9 100644
--- a/test/transform/resource/after-ecj/DelegateTypesAndExcludes.java
+++ b/test/transform/resource/after-ecj/DelegateTypesAndExcludes.java
@@ -27,10 +27,10 @@ class DelegatePlain {
   DelegatePlain() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") void bar(final java.util.ArrayList<java.lang.String> list) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void bar(final java.util.ArrayList<java.lang.String> list) {
     this.bar.bar(list);
   }
-  public @java.lang.SuppressWarnings("all") void foo() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void foo() {
     this.foo.foo();
   }
 }
diff --git a/test/transform/resource/after-ecj/DelegateWithDeprecated.java b/test/transform/resource/after-ecj/DelegateWithDeprecated.java
index 71eb7889..ab3aa188 100644
--- a/test/transform/resource/after-ecj/DelegateWithDeprecated.java
+++ b/test/transform/resource/after-ecj/DelegateWithDeprecated.java
@@ -9,13 +9,13 @@ class DelegateWithDeprecated {
   DelegateWithDeprecated() {
     super();
   }
-  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") void deprecatedAnnotation() {
+  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void deprecatedAnnotation() {
     this.bar.deprecatedAnnotation();
   }
-  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") void deprecatedComment() {
+  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void deprecatedComment() {
     this.bar.deprecatedComment();
   }
-  public @java.lang.SuppressWarnings("all") void notDeprecated() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void notDeprecated() {
     this.bar.notDeprecated();
   }
 }
diff --git a/test/transform/resource/after-ecj/EncodingUtf8.java b/test/transform/resource/after-ecj/EncodingUtf8.java
index 5a7a1644..29dce86f 100644
--- a/test/transform/resource/after-ecj/EncodingUtf8.java
+++ b/test/transform/resource/after-ecj/EncodingUtf8.java
@@ -3,7 +3,7 @@
   EncodingUtf8() {
     super();
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
     return (("EncodingUtf8(foo๑๑=" + this.foo๑๑) + ")");
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/EqualsAndHashCode.java b/test/transform/resource/after-ecj/EqualsAndHashCode.java
index 05cbf2a3..7db65c82 100644
--- a/test/transform/resource/after-ecj/EqualsAndHashCode.java
+++ b/test/transform/resource/after-ecj/EqualsAndHashCode.java
@@ -7,12 +7,12 @@
   EqualsAndHashCode() {
     super();
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof EqualsAndHashCode)))
         return false;
-    final @java.lang.SuppressWarnings("all") EqualsAndHashCode other = (EqualsAndHashCode) o;
+    final EqualsAndHashCode other = (EqualsAndHashCode) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     if ((this.x != other.x))
@@ -31,10 +31,10 @@
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
     return (other instanceof EqualsAndHashCode);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.x);
@@ -56,12 +56,12 @@ final @lombok.EqualsAndHashCode class EqualsAndHashCode2 {
   EqualsAndHashCode2() {
     super();
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof EqualsAndHashCode2)))
         return false;
-    final @java.lang.SuppressWarnings("all") EqualsAndHashCode2 other = (EqualsAndHashCode2) o;
+    final EqualsAndHashCode2 other = (EqualsAndHashCode2) o;
     if ((this.x != other.x))
         return false;
     if ((this.y != other.y))
@@ -74,7 +74,7 @@ final @lombok.EqualsAndHashCode class EqualsAndHashCode2 {
         return false;
     return true;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.x);
@@ -91,20 +91,20 @@ final @lombok.EqualsAndHashCode(callSuper = false) class EqualsAndHashCode3 exte
   EqualsAndHashCode3() {
     super();
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof EqualsAndHashCode3)))
         return false;
-    final @java.lang.SuppressWarnings("all") EqualsAndHashCode3 other = (EqualsAndHashCode3) o;
+    final EqualsAndHashCode3 other = (EqualsAndHashCode3) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
     return (other instanceof EqualsAndHashCode3);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
     int result = 1;
     return result;
   }
@@ -113,22 +113,22 @@ final @lombok.EqualsAndHashCode(callSuper = false) class EqualsAndHashCode3 exte
   EqualsAndHashCode4() {
     super();
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof EqualsAndHashCode4)))
         return false;
-    final @java.lang.SuppressWarnings("all") EqualsAndHashCode4 other = (EqualsAndHashCode4) o;
+    final EqualsAndHashCode4 other = (EqualsAndHashCode4) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     if ((! super.equals(o)))
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
     return (other instanceof EqualsAndHashCode4);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + super.hashCode());
diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeWithExistingMethods.java b/test/transform/resource/after-ecj/EqualsAndHashCodeWithExistingMethods.java
index feda33ce..e4efb336 100644
--- a/test/transform/resource/after-ecj/EqualsAndHashCodeWithExistingMethods.java
+++ b/test/transform/resource/after-ecj/EqualsAndHashCodeWithExistingMethods.java
@@ -24,12 +24,12 @@ final @lombok.EqualsAndHashCode(callSuper = true) class EqualsAndHashCodeWithExi
   private boolean canEqual(Object other) {
     return true;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof EqualsAndHashCodeWithExistingMethods3)))
         return false;
-    final @java.lang.SuppressWarnings("all") EqualsAndHashCodeWithExistingMethods3 other = (EqualsAndHashCodeWithExistingMethods3) o;
+    final EqualsAndHashCodeWithExistingMethods3 other = (EqualsAndHashCodeWithExistingMethods3) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     if ((! super.equals(o)))
@@ -38,7 +38,7 @@ final @lombok.EqualsAndHashCode(callSuper = true) class EqualsAndHashCodeWithExi
         return false;
     return true;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + super.hashCode());
diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeWithOnParam.java b/test/transform/resource/after-ecj/EqualsAndHashCodeWithOnParam.java
index fc226f06..77bba8e0 100644
--- a/test/transform/resource/after-ecj/EqualsAndHashCodeWithOnParam.java
+++ b/test/transform/resource/after-ecj/EqualsAndHashCodeWithOnParam.java
@@ -10,12 +10,12 @@
   EqualsAndHashCodeWithOnParam() {
     super();
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final @Nullable java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final @Nullable java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof EqualsAndHashCodeWithOnParam)))
         return false;
-    final @java.lang.SuppressWarnings("all") EqualsAndHashCodeWithOnParam other = (EqualsAndHashCodeWithOnParam) o;
+    final EqualsAndHashCodeWithOnParam other = (EqualsAndHashCodeWithOnParam) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     if ((this.x != other.x))
@@ -34,10 +34,10 @@
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") boolean canEqual(final @Nullable java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final @Nullable java.lang.Object other) {
     return (other instanceof EqualsAndHashCodeWithOnParam);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.x);
diff --git a/test/transform/resource/after-ecj/EqualsAndHashCodeWithSomeExistingMethods.java b/test/transform/resource/after-ecj/EqualsAndHashCodeWithSomeExistingMethods.java
index ee846c64..48705f64 100644
--- a/test/transform/resource/after-ecj/EqualsAndHashCodeWithSomeExistingMethods.java
+++ b/test/transform/resource/after-ecj/EqualsAndHashCodeWithSomeExistingMethods.java
@@ -5,10 +5,10 @@ import static lombok.AccessLevel.NONE;
   public int hashCode() {
     return 42;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
     return (("EqualsAndHashCodeWithSomeExistingMethods(x=" + this.x) + ")");
   }
-  public @java.lang.SuppressWarnings("all") EqualsAndHashCodeWithSomeExistingMethods() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") EqualsAndHashCodeWithSomeExistingMethods() {
     super();
   }
 }
@@ -17,28 +17,28 @@ import static lombok.AccessLevel.NONE;
   protected boolean canEqual(Object other) {
     return false;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof EqualsAndHashCodeWithSomeExistingMethods2)))
         return false;
-    final @java.lang.SuppressWarnings("all") EqualsAndHashCodeWithSomeExistingMethods2 other = (EqualsAndHashCodeWithSomeExistingMethods2) o;
+    final EqualsAndHashCodeWithSomeExistingMethods2 other = (EqualsAndHashCodeWithSomeExistingMethods2) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     if ((this.x != other.x))
         return false;
     return true;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.x);
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
     return (("EqualsAndHashCodeWithSomeExistingMethods2(x=" + this.x) + ")");
   }
-  public @java.lang.SuppressWarnings("all") EqualsAndHashCodeWithSomeExistingMethods2() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") EqualsAndHashCodeWithSomeExistingMethods2() {
     super();
   }
 }
@@ -50,40 +50,40 @@ import static lombok.AccessLevel.NONE;
   public boolean equals(Object other) {
     return false;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
     return (("EqualsAndHashCodeWithAllExistingMethods(x=" + this.x) + ")");
   }
-  public @java.lang.SuppressWarnings("all") EqualsAndHashCodeWithAllExistingMethods() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") EqualsAndHashCodeWithAllExistingMethods() {
     super();
   }
 }
 @Data @Getter(AccessLevel.NONE) @Setter(lombok.AccessLevel.NONE) class EqualsAndHashCodeWithNoExistingMethods {
   int x;
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof EqualsAndHashCodeWithNoExistingMethods)))
         return false;
-    final @java.lang.SuppressWarnings("all") EqualsAndHashCodeWithNoExistingMethods other = (EqualsAndHashCodeWithNoExistingMethods) o;
+    final EqualsAndHashCodeWithNoExistingMethods other = (EqualsAndHashCodeWithNoExistingMethods) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     if ((this.x != other.x))
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
     return (other instanceof EqualsAndHashCodeWithNoExistingMethods);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.x);
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
     return (("EqualsAndHashCodeWithNoExistingMethods(x=" + this.x) + ")");
   }
-  public @java.lang.SuppressWarnings("all") EqualsAndHashCodeWithNoExistingMethods() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") EqualsAndHashCodeWithNoExistingMethods() {
     super();
   }
 }
diff --git a/test/transform/resource/after-ecj/GetterAccessLevel.java b/test/transform/resource/after-ecj/GetterAccessLevel.java
index 14edfb56..533e05cc 100644
--- a/test/transform/resource/after-ecj/GetterAccessLevel.java
+++ b/test/transform/resource/after-ecj/GetterAccessLevel.java
@@ -13,31 +13,31 @@ class GetterAccessLevel {
   GetterAccessLevel() {
     super();
   }
-  private @java.lang.SuppressWarnings("all") boolean isPrivate() {
+  private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isPrivate() {
     return this.isPrivate;
   }
-  @java.lang.SuppressWarnings("all") boolean isPackage() {
+  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isPackage() {
     return this.isPackage;
   }
-  protected @java.lang.SuppressWarnings("all") boolean isProtected() {
+  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isProtected() {
     return this.isProtected;
   }
-  public @java.lang.SuppressWarnings("all") boolean isPublic() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isPublic() {
     return this.isPublic;
   }
-  private @java.lang.SuppressWarnings("all") String getPrivateString() {
+  private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getPrivateString() {
     return this.privateString;
   }
-  @java.lang.SuppressWarnings("all") String getPackageString() {
+  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getPackageString() {
     return this.packageString;
   }
-  protected @java.lang.SuppressWarnings("all") String getProtectedString() {
+  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getProtectedString() {
     return this.protectedString;
   }
-  public @java.lang.SuppressWarnings("all") String getPublicString() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getPublicString() {
     return this.publicString;
   }
-  public @java.lang.SuppressWarnings("all") String getValue() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getValue() {
     return this.value;
   }
 }
diff --git a/test/transform/resource/after-ecj/GetterAlreadyExists.java b/test/transform/resource/after-ecj/GetterAlreadyExists.java
index 04f5b81e..b0856dce 100644
--- a/test/transform/resource/after-ecj/GetterAlreadyExists.java
+++ b/test/transform/resource/after-ecj/GetterAlreadyExists.java
@@ -6,7 +6,7 @@ class Getter1 {
   boolean hasFoo() {
     return true;
   }
-  public @java.lang.SuppressWarnings("all") boolean isFoo() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isFoo() {
     return this.foo;
   }
 }
@@ -36,7 +36,7 @@ class Getter4 {
   String hasFoo() {
     return null;
   }
-  public @java.lang.SuppressWarnings("all") String getFoo() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getFoo() {
     return this.foo;
   }
 }
@@ -48,7 +48,7 @@ class Getter5 {
   String isFoo() {
     return null;
   }
-  public @java.lang.SuppressWarnings("all") String getFoo() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getFoo() {
     return this.foo;
   }
 }
@@ -69,7 +69,7 @@ class Getter7 {
   boolean hasFoo() {
     return false;
   }
-  public @java.lang.SuppressWarnings("all") String getFoo() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getFoo() {
     return this.foo;
   }
 }
@@ -81,7 +81,7 @@ class Getter8 {
   boolean isFoo() {
     return false;
   }
-  public @java.lang.SuppressWarnings("all") String getFoo() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getFoo() {
     return this.foo;
   }
 }
@@ -102,7 +102,7 @@ class Getter10 {
   static boolean hasFoo() {
     return false;
   }
-  public @java.lang.SuppressWarnings("all") boolean isFoo() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isFoo() {
     return this.foo;
   }
 }
@@ -132,7 +132,7 @@ class Getter13 {
   static boolean hasFoo() {
     return false;
   }
-  public @java.lang.SuppressWarnings("all") String getFoo() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getFoo() {
     return this.foo;
   }
 }
@@ -144,7 +144,7 @@ class Getter14 {
   static boolean isFoo() {
     return false;
   }
-  public @java.lang.SuppressWarnings("all") String getFoo() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getFoo() {
     return this.foo;
   }
 }
@@ -165,7 +165,7 @@ class Getter16 {
   static String hasFoo() {
     return "";
   }
-  public @java.lang.SuppressWarnings("all") String getFoo() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getFoo() {
     return this.foo;
   }
 }
@@ -177,7 +177,7 @@ class Getter17 {
   static String isFoo() {
     return "";
   }
-  public @java.lang.SuppressWarnings("all") String getFoo() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getFoo() {
     return this.foo;
   }
 }
diff --git a/test/transform/resource/after-ecj/GetterBoolean.java b/test/transform/resource/after-ecj/GetterBoolean.java
index a7dc2e2f..a1d1446e 100644
--- a/test/transform/resource/after-ecj/GetterBoolean.java
+++ b/test/transform/resource/after-ecj/GetterBoolean.java
@@ -5,13 +5,13 @@ class Getter {
   Getter() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") boolean isFoo() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isFoo() {
     return this.foo;
   }
-  public @java.lang.SuppressWarnings("all") boolean isBar() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isBar() {
     return this.isBar;
   }
-  public @java.lang.SuppressWarnings("all") boolean isHasBaz() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isHasBaz() {
     return this.hasBaz;
   }
 }
@@ -23,7 +23,7 @@ class MoreGetter {
   boolean hasFoo() {
     return true;
   }
-  public @java.lang.SuppressWarnings("all") boolean isFoo() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isFoo() {
     return this.foo;
   }
 }
diff --git a/test/transform/resource/after-ecj/GetterDeprecated.java b/test/transform/resource/after-ecj/GetterDeprecated.java
index 546f7fb7..fc7ce561 100644
--- a/test/transform/resource/after-ecj/GetterDeprecated.java
+++ b/test/transform/resource/after-ecj/GetterDeprecated.java
@@ -5,10 +5,10 @@ class GetterDeprecated {
   GetterDeprecated() {
     super();
   }
-  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") int getAnnotation() {
+  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getAnnotation() {
     return this.annotation;
   }
-  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") int getJavadoc() {
+  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getJavadoc() {
     return this.javadoc;
   }
 }
diff --git a/test/transform/resource/after-ecj/GetterEnum.java b/test/transform/resource/after-ecj/GetterEnum.java
index fd70ce9e..22a5b0fd 100644
--- a/test/transform/resource/after-ecj/GetterEnum.java
+++ b/test/transform/resource/after-ecj/GetterEnum.java
@@ -7,13 +7,13 @@ import lombok.RequiredArgsConstructor;
   private final @Getter String name;
   <clinit>() {
   }
-  public @java.lang.SuppressWarnings("all") int getId() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getId() {
     return this.id;
   }
-  public @java.lang.SuppressWarnings("all") String getName() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getName() {
     return this.name;
   }
-  private @java.lang.SuppressWarnings("all") GetterEnum(final int id, final String name) {
+  private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") GetterEnum(final int id, final String name) {
     super();
     this.id = id;
     this.name = name;
diff --git a/test/transform/resource/after-ecj/GetterLazy.java b/test/transform/resource/after-ecj/GetterLazy.java
index 8394f58d..d1ec507c 100644
--- a/test/transform/resource/after-ecj/GetterLazy.java
+++ b/test/transform/resource/after-ecj/GetterLazy.java
@@ -8,7 +8,7 @@ class GetterLazy {
   GetterLazy() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") ValueType getFieldName() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ValueType getFieldName() {
     java.lang.Object value = this.fieldName.get();
     if ((value == null))
         {
diff --git a/test/transform/resource/after-ecj/GetterLazyBoolean.java b/test/transform/resource/after-ecj/GetterLazyBoolean.java
index cd5bac20..0a1d2564 100644
--- a/test/transform/resource/after-ecj/GetterLazyBoolean.java
+++ b/test/transform/resource/after-ecj/GetterLazyBoolean.java
@@ -7,7 +7,7 @@
   private static boolean calculateBoolean() {
     return true;
   }
-  public @java.lang.SuppressWarnings("all") boolean isBooleanValue() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isBooleanValue() {
     java.lang.Object value = this.booleanValue.get();
     if ((value == null))
         {
@@ -24,7 +24,7 @@
         }
     return (java.lang.Boolean) value;
   }
-  public @java.lang.SuppressWarnings("all") boolean isOtherBooleanValue() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isOtherBooleanValue() {
     java.lang.Object value = this.otherBooleanValue.get();
     if ((value == null))
         {
@@ -41,28 +41,28 @@
         }
     return (java.lang.Boolean) value;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof GetterLazyBoolean)))
         return false;
-    final @java.lang.SuppressWarnings("all") GetterLazyBoolean other = (GetterLazyBoolean) o;
+    final GetterLazyBoolean other = (GetterLazyBoolean) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     if ((this.isBooleanValue() != other.isBooleanValue()))
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
     return (other instanceof GetterLazyBoolean);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + (this.isBooleanValue() ? 79 : 97));
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
     return (("GetterLazyBoolean(booleanValue=" + this.isBooleanValue()) + ")");
   }
 }
diff --git a/test/transform/resource/after-ecj/GetterLazyEahcToString.java b/test/transform/resource/after-ecj/GetterLazyEahcToString.java
index df26f912..f0cb2ec2 100644
--- a/test/transform/resource/after-ecj/GetterLazyEahcToString.java
+++ b/test/transform/resource/after-ecj/GetterLazyEahcToString.java
@@ -4,7 +4,7 @@
   GetterLazyEahcToString() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") String getValue() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getValue() {
     java.lang.Object value = this.value.get();
     if ((value == null))
         {
@@ -21,15 +21,15 @@
         }
     return (String) ((value == this.value) ? null : value);
   }
-  public @java.lang.SuppressWarnings("all") String getValue2() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getValue2() {
     return this.value2;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof GetterLazyEahcToString)))
         return false;
-    final @java.lang.SuppressWarnings("all") GetterLazyEahcToString other = (GetterLazyEahcToString) o;
+    final GetterLazyEahcToString other = (GetterLazyEahcToString) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     final java.lang.Object this$value = this.getValue();
@@ -42,10 +42,10 @@
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
     return (other instanceof GetterLazyEahcToString);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     final java.lang.Object $value = this.getValue();
@@ -54,7 +54,7 @@
     result = ((result * PRIME) + (($value2 == null) ? 0 : $value2.hashCode()));
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
     return (((("GetterLazyEahcToString(value=" + this.getValue()) + ", value2=") + this.value2) + ")");
   }
 }
diff --git a/test/transform/resource/after-ecj/GetterLazyInvalid.java b/test/transform/resource/after-ecj/GetterLazyInvalid.java
index da89c333..8e2bc4f3 100644
--- a/test/transform/resource/after-ecj/GetterLazyInvalid.java
+++ b/test/transform/resource/after-ecj/GetterLazyInvalid.java
@@ -27,7 +27,7 @@ class GetterLazyInvalidNone {
   GetterLazyInvalidClass() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") String getFieldName() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getFieldName() {
     return this.fieldName;
   }
 }
diff --git a/test/transform/resource/after-ecj/GetterLazyNative.java b/test/transform/resource/after-ecj/GetterLazyNative.java
index db70f2f4..40fe1c84 100644
--- a/test/transform/resource/after-ecj/GetterLazyNative.java
+++ b/test/transform/resource/after-ecj/GetterLazyNative.java
@@ -11,7 +11,7 @@ class GetterLazyNative {
   GetterLazyNative() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") boolean isBooleanField() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isBooleanField() {
     java.lang.Object value = this.booleanField.get();
     if ((value == null))
         {
@@ -28,7 +28,7 @@ class GetterLazyNative {
         }
     return (java.lang.Boolean) value;
   }
-  public @java.lang.SuppressWarnings("all") byte getByteField() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") byte getByteField() {
     java.lang.Object value = this.byteField.get();
     if ((value == null))
         {
@@ -45,7 +45,7 @@ class GetterLazyNative {
         }
     return (java.lang.Byte) value;
   }
-  public @java.lang.SuppressWarnings("all") short getShortField() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") short getShortField() {
     java.lang.Object value = this.shortField.get();
     if ((value == null))
         {
@@ -62,7 +62,7 @@ class GetterLazyNative {
         }
     return (java.lang.Short) value;
   }
-  public @java.lang.SuppressWarnings("all") int getIntField() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getIntField() {
     java.lang.Object value = this.intField.get();
     if ((value == null))
         {
@@ -79,7 +79,7 @@ class GetterLazyNative {
         }
     return (java.lang.Integer) value;
   }
-  public @java.lang.SuppressWarnings("all") long getLongField() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") long getLongField() {
     java.lang.Object value = this.longField.get();
     if ((value == null))
         {
@@ -96,7 +96,7 @@ class GetterLazyNative {
         }
     return (java.lang.Long) value;
   }
-  public @java.lang.SuppressWarnings("all") float getFloatField() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") float getFloatField() {
     java.lang.Object value = this.floatField.get();
     if ((value == null))
         {
@@ -113,7 +113,7 @@ class GetterLazyNative {
         }
     return (java.lang.Float) value;
   }
-  public @java.lang.SuppressWarnings("all") double getDoubleField() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") double getDoubleField() {
     java.lang.Object value = this.doubleField.get();
     if ((value == null))
         {
@@ -130,7 +130,7 @@ class GetterLazyNative {
         }
     return (java.lang.Double) value;
   }
-  public @java.lang.SuppressWarnings("all") char getCharField() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") char getCharField() {
     java.lang.Object value = this.charField.get();
     if ((value == null))
         {
@@ -147,7 +147,7 @@ class GetterLazyNative {
         }
     return (java.lang.Character) value;
   }
-  public @java.lang.SuppressWarnings("all") int[] getIntArrayField() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int[] getIntArrayField() {
     java.lang.Object value = this.intArrayField.get();
     if ((value == null))
         {
diff --git a/test/transform/resource/after-ecj/GetterNone.java b/test/transform/resource/after-ecj/GetterNone.java
index f08726d0..e13379e0 100644
--- a/test/transform/resource/after-ecj/GetterNone.java
+++ b/test/transform/resource/after-ecj/GetterNone.java
@@ -6,7 +6,7 @@ import lombok.Getter;
   GetterNone() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") int getI() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getI() {
     return this.i;
   }
 }
diff --git a/test/transform/resource/after-ecj/GetterOnClass.java b/test/transform/resource/after-ecj/GetterOnClass.java
index 7668c9d3..deb56392 100644
--- a/test/transform/resource/after-ecj/GetterOnClass.java
+++ b/test/transform/resource/after-ecj/GetterOnClass.java
@@ -4,7 +4,7 @@
   GetterOnClass1() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") boolean isPublic() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isPublic() {
     return this.isPublic;
   }
 }
@@ -15,10 +15,10 @@
   GetterOnClass2() {
     super();
   }
-  @java.lang.SuppressWarnings("all") boolean isPackage() {
+  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isPackage() {
     return this.isPackage;
   }
-  protected @java.lang.SuppressWarnings("all") boolean isProtected() {
+  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isProtected() {
     return this.isProtected;
   }
 }
@@ -28,7 +28,7 @@
   GetterOnClass3() {
     super();
   }
-  @java.lang.SuppressWarnings("all") boolean isPackage() {
+  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isPackage() {
     return this.isPackage;
   }
 }
@@ -38,7 +38,7 @@
   GetterOnClass4() {
     super();
   }
-  private @java.lang.SuppressWarnings("all") boolean isPrivate() {
+  private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isPrivate() {
     return this.isPrivate;
   }
 }
@@ -48,7 +48,7 @@
   GetterOnClass5() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") boolean isPublic() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isPublic() {
     return this.isPublic;
   }
 }
@@ -58,10 +58,10 @@
   GetterOnClass6() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") String getCouldBeNull() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getCouldBeNull() {
     return this.couldBeNull;
   }
-  public @lombok.NonNull @java.lang.SuppressWarnings("all") String getNonNull() {
+  public @lombok.NonNull @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getNonNull() {
     return this.nonNull;
   }
 }
diff --git a/test/transform/resource/after-ecj/GetterOnMethod.java b/test/transform/resource/after-ecj/GetterOnMethod.java
index a21f628c..6b227326 100644
--- a/test/transform/resource/after-ecj/GetterOnMethod.java
+++ b/test/transform/resource/after-ecj/GetterOnMethod.java
@@ -7,13 +7,13 @@ class GetterOnMethod {
   GetterOnMethod() {
     super();
   }
-  public @Deprecated @java.lang.SuppressWarnings("all") int getI() {
+  public @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getI() {
     return this.i;
   }
-  public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") int getJ() {
+  public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getJ() {
     return this.j;
   }
-  public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") int getK() {
+  public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getK() {
     return this.k;
   }
 }
diff --git a/test/transform/resource/after-ecj/GetterOnMethodErrors.java b/test/transform/resource/after-ecj/GetterOnMethodErrors.java
index 16c625b5..7ba02422 100644
--- a/test/transform/resource/after-ecj/GetterOnMethodErrors.java
+++ b/test/transform/resource/after-ecj/GetterOnMethodErrors.java
@@ -8,7 +8,7 @@ class PlaceFillerToMakeSurePositionIsRelevant {
   GetterOnMethodErrors() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") int getTest() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getTest() {
     return this.test;
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/GetterOnMethodErrors2.java b/test/transform/resource/after-ecj/GetterOnMethodErrors2.java
index bfaa5dd4..0dfd4c13 100644
--- a/test/transform/resource/after-ecj/GetterOnMethodErrors2.java
+++ b/test/transform/resource/after-ecj/GetterOnMethodErrors2.java
@@ -12,28 +12,28 @@ class GetterOnMethodErrors2 {
   GetterOnMethodErrors2() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") int getBad1() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getBad1() {
     return this.bad1;
   }
-  public @java.lang.SuppressWarnings("all") int getBad2() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getBad2() {
     return this.bad2;
   }
-  public @java.lang.SuppressWarnings("all") int getBad3() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getBad3() {
     return this.bad3;
   }
-  public @java.lang.SuppressWarnings("all") int getBad4() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getBad4() {
     return this.bad4;
   }
-  public @java.lang.SuppressWarnings("all") int getGood1() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getGood1() {
     return this.good1;
   }
-  public @java.lang.SuppressWarnings("all") int getGood2() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getGood2() {
     return this.good2;
   }
-  public @Deprecated @java.lang.SuppressWarnings("all") int getGood3() {
+  public @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getGood3() {
     return this.good3;
   }
-  public @Deprecated @Test @java.lang.SuppressWarnings("all") int getGood4() {
+  public @Deprecated @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getGood4() {
     return this.good4;
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/GetterOnStatic.java b/test/transform/resource/after-ecj/GetterOnStatic.java
index ee90b897..89b83ed0 100644
--- a/test/transform/resource/after-ecj/GetterOnStatic.java
+++ b/test/transform/resource/after-ecj/GetterOnStatic.java
@@ -6,10 +6,10 @@ class Getter {
   Getter() {
     super();
   }
-  public static @java.lang.SuppressWarnings("all") boolean isFoo() {
+  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isFoo() {
     return Getter.foo;
   }
-  public static @java.lang.SuppressWarnings("all") int getBar() {
+  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getBar() {
     return Getter.bar;
   }
 }
diff --git a/test/transform/resource/after-ecj/GetterPlain.java b/test/transform/resource/after-ecj/GetterPlain.java
index 10f0f9d7..d3801b62 100644
--- a/test/transform/resource/after-ecj/GetterPlain.java
+++ b/test/transform/resource/after-ecj/GetterPlain.java
@@ -5,10 +5,10 @@ class GetterPlain {
   GetterPlain() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") int getI() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getI() {
     return this.i;
   }
-  public @java.lang.SuppressWarnings("all") int getFoo() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getFoo() {
     return this.foo;
   }
 }
diff --git a/test/transform/resource/after-ecj/GetterSetterJavadoc.java b/test/transform/resource/after-ecj/GetterSetterJavadoc.java
index 9f3bb9bd..21841d47 100644
--- a/test/transform/resource/after-ecj/GetterSetterJavadoc.java
+++ b/test/transform/resource/after-ecj/GetterSetterJavadoc.java
@@ -1,36 +1,36 @@
 @lombok.Data class GetterSetterJavadoc1 {
   private int fieldName;
-  public @java.lang.SuppressWarnings("all") int getFieldName() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getFieldName() {
     return this.fieldName;
   }
-  public @java.lang.SuppressWarnings("all") void setFieldName(final int fieldName) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setFieldName(final int fieldName) {
     this.fieldName = fieldName;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof GetterSetterJavadoc1)))
         return false;
-    final @java.lang.SuppressWarnings("all") GetterSetterJavadoc1 other = (GetterSetterJavadoc1) o;
+    final GetterSetterJavadoc1 other = (GetterSetterJavadoc1) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     if ((this.getFieldName() != other.getFieldName()))
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
     return (other instanceof GetterSetterJavadoc1);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.getFieldName());
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
     return (("GetterSetterJavadoc1(fieldName=" + this.getFieldName()) + ")");
   }
-  public @java.lang.SuppressWarnings("all") GetterSetterJavadoc1() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") GetterSetterJavadoc1() {
     super();
   }
 }
@@ -39,10 +39,10 @@ class GetterSetterJavadoc2 {
   GetterSetterJavadoc2() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") int getFieldName() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getFieldName() {
     return this.fieldName;
   }
-  public @java.lang.SuppressWarnings("all") void setFieldName(final int fieldName) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setFieldName(final int fieldName) {
     this.fieldName = fieldName;
   }
 }
@@ -51,10 +51,10 @@ class GetterSetterJavadoc3 {
   GetterSetterJavadoc3() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") int getFieldName() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getFieldName() {
     return this.fieldName;
   }
-  public @java.lang.SuppressWarnings("all") void setFieldName(final int fieldName) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setFieldName(final int fieldName) {
     this.fieldName = fieldName;
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/GetterWithDollar.java b/test/transform/resource/after-ecj/GetterWithDollar.java
index f4bc799c..424635ed 100644
--- a/test/transform/resource/after-ecj/GetterWithDollar.java
+++ b/test/transform/resource/after-ecj/GetterWithDollar.java
@@ -3,7 +3,7 @@ class GetterWithDollar1 {
   GetterWithDollar1() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") int get$i() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int get$i() {
     return this.$i;
   }
 }
@@ -13,10 +13,10 @@ class GetterWithDollar2 {
   GetterWithDollar2() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") int get$i() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int get$i() {
     return this.$i;
   }
-  public @java.lang.SuppressWarnings("all") int getI() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getI() {
     return this.i;
   }
 }
diff --git a/test/transform/resource/after-ecj/MixGetterVal.java b/test/transform/resource/after-ecj/MixGetterVal.java
index d9809703..fbc89a02 100644
--- a/test/transform/resource/after-ecj/MixGetterVal.java
+++ b/test/transform/resource/after-ecj/MixGetterVal.java
@@ -13,7 +13,7 @@ class MixGetterVal {
     final @val int a = getX();
     m(a);
   }
-  public @java.lang.SuppressWarnings("all") int getX() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
     return this.x;
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/MultiFieldGetter.java b/test/transform/resource/after-ecj/MultiFieldGetter.java
index 151c61c8..a608578e 100644
--- a/test/transform/resource/after-ecj/MultiFieldGetter.java
+++ b/test/transform/resource/after-ecj/MultiFieldGetter.java
@@ -6,10 +6,10 @@ class MultiFieldGetter {
   MultiFieldGetter() {
     super();
   }
-  protected @java.lang.SuppressWarnings("all") int getX() {
+  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
     return this.x;
   }
-  protected @java.lang.SuppressWarnings("all") int getY() {
+  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getY() {
     return this.y;
   }
 }
@@ -19,10 +19,10 @@ class MultiFieldGetter {
   MultiFieldGetter2() {
     super();
   }
-  @java.lang.SuppressWarnings("all") int getX() {
+  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
     return this.x;
   }
-  @java.lang.SuppressWarnings("all") int getY() {
+  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getY() {
     return this.y;
   }
 }
diff --git a/test/transform/resource/after-ecj/NonNullPlain.java b/test/transform/resource/after-ecj/NonNullPlain.java
index 6e937f6a..592ff4b5 100644
--- a/test/transform/resource/after-ecj/NonNullPlain.java
+++ b/test/transform/resource/after-ecj/NonNullPlain.java
@@ -5,7 +5,7 @@ import java.lang.annotation.*;
   @lombok.NonNull int i;
   @lombok.NonNull String s;
   @NotNull Object o;
-  public @java.beans.ConstructorProperties({"i", "s"}) @java.lang.SuppressWarnings("all") NonNullPlain(final @lombok.NonNull int i, final @lombok.NonNull String s) {
+  public @java.beans.ConstructorProperties({"i", "s"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") NonNullPlain(final @lombok.NonNull int i, final @lombok.NonNull String s) {
     super();
     if ((s == null))
         {
@@ -14,26 +14,26 @@ import java.lang.annotation.*;
     this.i = i;
     this.s = s;
   }
-  public @lombok.NonNull @java.lang.SuppressWarnings("all") int getI() {
+  public @lombok.NonNull @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getI() {
     return this.i;
   }
-  public @lombok.NonNull @java.lang.SuppressWarnings("all") String getS() {
+  public @lombok.NonNull @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getS() {
     return this.s;
   }
-  public @java.lang.SuppressWarnings("all") Object getO() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Object getO() {
     return this.o;
   }
-  public @java.lang.SuppressWarnings("all") void setI(final @lombok.NonNull int i) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final @lombok.NonNull int i) {
     this.i = i;
   }
-  public @java.lang.SuppressWarnings("all") void setS(final @lombok.NonNull String s) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setS(final @lombok.NonNull String s) {
     if ((s == null))
         {
           throw new java.lang.NullPointerException("s");
         }
     this.s = s;
   }
-  public @java.lang.SuppressWarnings("all") void setO(final Object o) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setO(final Object o) {
     this.o = o;
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/NonNullWithAlternateException.java b/test/transform/resource/after-ecj/NonNullWithAlternateException.java
index 8a547ecf..1df18538 100644
--- a/test/transform/resource/after-ecj/NonNullWithAlternateException.java
+++ b/test/transform/resource/after-ecj/NonNullWithAlternateException.java
@@ -10,7 +10,7 @@ public class NonNullWithAlternateException {
         }
     System.out.println(arg);
   }
-  public @java.lang.SuppressWarnings("all") void setTest(final @lombok.NonNull String test) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setTest(final @lombok.NonNull String test) {
     if ((test == null))
         {
           throw new java.lang.IllegalArgumentException("test is null");
diff --git a/test/transform/resource/after-ecj/SetterAccessLevel.java b/test/transform/resource/after-ecj/SetterAccessLevel.java
index 4c1a0b97..db26226f 100644
--- a/test/transform/resource/after-ecj/SetterAccessLevel.java
+++ b/test/transform/resource/after-ecj/SetterAccessLevel.java
@@ -8,19 +8,19 @@ class SetterAccessLevel {
   SetterAccessLevel() {
     super();
   }
-  private @java.lang.SuppressWarnings("all") void setPrivate(final boolean isPrivate) {
+  private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setPrivate(final boolean isPrivate) {
     this.isPrivate = isPrivate;
   }
-  @java.lang.SuppressWarnings("all") void setPackage(final boolean isPackage) {
+  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setPackage(final boolean isPackage) {
     this.isPackage = isPackage;
   }
-  protected @java.lang.SuppressWarnings("all") void setProtected(final boolean isProtected) {
+  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setProtected(final boolean isProtected) {
     this.isProtected = isProtected;
   }
-  public @java.lang.SuppressWarnings("all") void setPublic(final boolean isPublic) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setPublic(final boolean isPublic) {
     this.isPublic = isPublic;
   }
-  public @java.lang.SuppressWarnings("all") void setValue(final boolean value) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setValue(final boolean value) {
     this.value = value;
   }
 }
diff --git a/test/transform/resource/after-ecj/SetterAlreadyExists.java b/test/transform/resource/after-ecj/SetterAlreadyExists.java
index 91b011b6..4a4d0c4c 100644
--- a/test/transform/resource/after-ecj/SetterAlreadyExists.java
+++ b/test/transform/resource/after-ecj/SetterAlreadyExists.java
@@ -37,7 +37,7 @@ class Setter5 {
   }
   void setFoo() {
   }
-  public @java.lang.SuppressWarnings("all") void setFoo(final String foo) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setFoo(final String foo) {
     this.foo = foo;
   }
 }
@@ -48,7 +48,7 @@ class Setter6 {
   }
   void setFoo(String foo, int x) {
   }
-  public @java.lang.SuppressWarnings("all") void setFoo(final String foo) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setFoo(final String foo) {
     this.foo = foo;
   }
 }
diff --git a/test/transform/resource/after-ecj/SetterDeprecated.java b/test/transform/resource/after-ecj/SetterDeprecated.java
index d76612b7..91008c96 100644
--- a/test/transform/resource/after-ecj/SetterDeprecated.java
+++ b/test/transform/resource/after-ecj/SetterDeprecated.java
@@ -5,10 +5,10 @@ class SetterDeprecated {
   SetterDeprecated() {
     super();
   }
-  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") void setAnnotation(final int annotation) {
+  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setAnnotation(final int annotation) {
     this.annotation = annotation;
   }
-  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") void setJavadoc(final int javadoc) {
+  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setJavadoc(final int javadoc) {
     this.javadoc = javadoc;
   }
 }
diff --git a/test/transform/resource/after-ecj/SetterOnClass.java b/test/transform/resource/after-ecj/SetterOnClass.java
index aa3459bb..8e6455d3 100644
--- a/test/transform/resource/after-ecj/SetterOnClass.java
+++ b/test/transform/resource/after-ecj/SetterOnClass.java
@@ -4,7 +4,7 @@
   SetterOnClass1() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") void setPublic(final boolean isPublic) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setPublic(final boolean isPublic) {
     this.isPublic = isPublic;
   }
 }
@@ -15,10 +15,10 @@
   SetterOnClass2() {
     super();
   }
-  @java.lang.SuppressWarnings("all") void setPackage(final boolean isPackage) {
+  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setPackage(final boolean isPackage) {
     this.isPackage = isPackage;
   }
-  protected @java.lang.SuppressWarnings("all") void setProtected(final boolean isProtected) {
+  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setProtected(final boolean isProtected) {
     this.isProtected = isProtected;
   }
 }
@@ -28,7 +28,7 @@
   SetterOnClass3() {
     super();
   }
-  @java.lang.SuppressWarnings("all") void setPackage(final boolean isPackage) {
+  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setPackage(final boolean isPackage) {
     this.isPackage = isPackage;
   }
 }
@@ -38,7 +38,7 @@
   SetterOnClass4() {
     super();
   }
-  private @java.lang.SuppressWarnings("all") void setPrivate(final boolean isPrivate) {
+  private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setPrivate(final boolean isPrivate) {
     this.isPrivate = isPrivate;
   }
 }
@@ -48,7 +48,7 @@
   SetterOnClass5() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") void setPublic(final boolean isPublic) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setPublic(final boolean isPublic) {
     this.isPublic = isPublic;
   }
 }
@@ -58,10 +58,10 @@
   SetterOnClass6() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") void setCouldBeNull(final String couldBeNull) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setCouldBeNull(final String couldBeNull) {
     this.couldBeNull = couldBeNull;
   }
-  public @java.lang.SuppressWarnings("all") void setNonNull(final @lombok.NonNull String nonNull) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setNonNull(final @lombok.NonNull String nonNull) {
     if ((nonNull == null))
         {
           throw new java.lang.NullPointerException("nonNull");
diff --git a/test/transform/resource/after-ecj/SetterOnMethod.java b/test/transform/resource/after-ecj/SetterOnMethod.java
index 8bdff212..4eaea8e5 100644
--- a/test/transform/resource/after-ecj/SetterOnMethod.java
+++ b/test/transform/resource/after-ecj/SetterOnMethod.java
@@ -2,10 +2,10 @@ import lombok.Setter;
 class SetterOnMethod {
   @lombok.Setter() int i;
   @lombok.Setter() int j;
-  public @Deprecated @java.lang.SuppressWarnings("all") void setI(final int i) {
+  public @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final int i) {
     this.i = i;
   }
-  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") void setJ(final int j) {
+  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setJ(final int j) {
     this.j = j;
   }
   SetterOnMethod() {
@@ -15,10 +15,10 @@ class SetterOnMethod {
 @lombok.Setter() class SetterOnClassOnMethod {
   int i;
   int j;
-  public @java.lang.SuppressWarnings("all") void setI(final int i) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final int i) {
     this.i = i;
   }
-  public @java.lang.SuppressWarnings("all") void setJ(final int j) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setJ(final int j) {
     this.j = j;
   }
   SetterOnClassOnMethod() {
@@ -28,10 +28,10 @@ class SetterOnMethod {
 @lombok.Setter() class SetterOnClassAndOnAField {
   int i;
   @lombok.Setter() int j;
-  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") void setJ(final int j) {
+  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setJ(final int j) {
     this.j = j;
   }
-  public @java.lang.SuppressWarnings("all") void setI(final int i) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final int i) {
     this.i = i;
   }
   SetterOnClassAndOnAField() {
diff --git a/test/transform/resource/after-ecj/SetterOnMethodOnParam.java b/test/transform/resource/after-ecj/SetterOnMethodOnParam.java
index d4ea9f5d..28799f42 100644
--- a/test/transform/resource/after-ecj/SetterOnMethodOnParam.java
+++ b/test/transform/resource/after-ecj/SetterOnMethodOnParam.java
@@ -7,13 +7,13 @@ class SetterOnMethodOnParam {
   SetterOnMethodOnParam() {
     super();
   }
-  public @Deprecated @java.lang.SuppressWarnings("all") void setI(final int i) {
+  public @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final int i) {
     this.i = i;
   }
-  public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") void setJ(final @Test int j) {
+  public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setJ(final @Test int j) {
     this.j = j;
   }
-  public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") void setK(final @Test int k) {
+  public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setK(final @Test int k) {
     this.k = k;
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/SetterOnParam.java b/test/transform/resource/after-ecj/SetterOnParam.java
index 119c8fc3..7c2d1fc6 100644
--- a/test/transform/resource/after-ecj/SetterOnParam.java
+++ b/test/transform/resource/after-ecj/SetterOnParam.java
@@ -2,10 +2,10 @@ import lombok.Setter;
 class SetterOnParam {
   @lombok.Setter() int i;
   @lombok.Setter() int j;
-  public @java.lang.SuppressWarnings("all") void setI(final @SuppressWarnings("all") int i) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final @SuppressWarnings("all") int i) {
     this.i = i;
   }
-  public @java.lang.SuppressWarnings("all") void setJ(final @java.lang.SuppressWarnings("all") int j) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setJ(final @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int j) {
     this.j = j;
   }
   SetterOnParam() {
@@ -15,10 +15,10 @@ class SetterOnParam {
 @lombok.Setter() class SetterOnClassOnParam {
   int i;
   int j;
-  public @java.lang.SuppressWarnings("all") void setI(final int i) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final int i) {
     this.i = i;
   }
-  public @java.lang.SuppressWarnings("all") void setJ(final int j) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setJ(final int j) {
     this.j = j;
   }
   SetterOnClassOnParam() {
@@ -28,10 +28,10 @@ class SetterOnParam {
 @lombok.Setter() class SetterOnClassAndOnAFieldParam {
   int i;
   @lombok.Setter() int j;
-  public @java.lang.SuppressWarnings("all") void setJ(final @java.lang.SuppressWarnings("all") int j) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setJ(final @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int j) {
     this.j = j;
   }
-  public @java.lang.SuppressWarnings("all") void setI(final int i) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final int i) {
     this.i = i;
   }
   SetterOnClassAndOnAFieldParam() {
diff --git a/test/transform/resource/after-ecj/SetterOnParamAndOnMethod.java b/test/transform/resource/after-ecj/SetterOnParamAndOnMethod.java
index 21d22a8f..011b2241 100644
--- a/test/transform/resource/after-ecj/SetterOnParamAndOnMethod.java
+++ b/test/transform/resource/after-ecj/SetterOnParamAndOnMethod.java
@@ -1,6 +1,6 @@
 class SetterOnParamAndOnMethod {
   @lombok.Setter() int i;
-  public @Deprecated @java.lang.SuppressWarnings("all") void setI(final @SuppressWarnings("all") int i) {
+  public @Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final @SuppressWarnings("all") int i) {
     this.i = i;
   }
   SetterOnParamAndOnMethod() {
diff --git a/test/transform/resource/after-ecj/SetterOnStatic.java b/test/transform/resource/after-ecj/SetterOnStatic.java
index 8a5abdd8..1c5b71ae 100644
--- a/test/transform/resource/after-ecj/SetterOnStatic.java
+++ b/test/transform/resource/after-ecj/SetterOnStatic.java
@@ -6,10 +6,10 @@ class Setter {
   Setter() {
     super();
   }
-  public static @java.lang.SuppressWarnings("all") void setFoo(final boolean foo) {
+  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setFoo(final boolean foo) {
     Setter.foo = foo;
   }
-  public static @java.lang.SuppressWarnings("all") void setBar(final int bar) {
+  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setBar(final int bar) {
     Setter.bar = bar;
   }
 }
diff --git a/test/transform/resource/after-ecj/SetterPlain.java b/test/transform/resource/after-ecj/SetterPlain.java
index a4b40295..4f428f0b 100644
--- a/test/transform/resource/after-ecj/SetterPlain.java
+++ b/test/transform/resource/after-ecj/SetterPlain.java
@@ -5,10 +5,10 @@ class SetterPlain {
   SetterPlain() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") void setI(final int i) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final int i) {
     this.i = i;
   }
-  public @java.lang.SuppressWarnings("all") void setFoo(final int foo) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setFoo(final int foo) {
     this.foo = foo;
   }
 }
diff --git a/test/transform/resource/after-ecj/SetterWithDollar.java b/test/transform/resource/after-ecj/SetterWithDollar.java
index c5bc14f1..e8bd91df 100644
--- a/test/transform/resource/after-ecj/SetterWithDollar.java
+++ b/test/transform/resource/after-ecj/SetterWithDollar.java
@@ -3,7 +3,7 @@ class SetterWithDollar1 {
   SetterWithDollar1() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") void set$i(final int $i) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void set$i(final int $i) {
     this.$i = $i;
   }
 }
@@ -13,10 +13,10 @@ class SetterWithDollar2 {
   SetterWithDollar2() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") void set$i(final int $i) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void set$i(final int $i) {
     this.$i = $i;
   }
-  public @java.lang.SuppressWarnings("all") void setI(final int i) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setI(final int i) {
     this.i = i;
   }
 }
diff --git a/test/transform/resource/after-ecj/SimpleTypeResolution.java b/test/transform/resource/after-ecj/SimpleTypeResolution.java
index c413623e..736632bc 100644
--- a/test/transform/resource/after-ecj/SimpleTypeResolution.java
+++ b/test/transform/resource/after-ecj/SimpleTypeResolution.java
@@ -7,7 +7,7 @@ class SimpleTypeResolutionSuccess {
   private @lombok.Getter int x;
   SimpleTypeResolutionSuccess() {
   }
-  public @java.lang.SuppressWarnings("all") int getX() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
     return this.x;
   }
 }
diff --git a/test/transform/resource/after-ecj/ToStringConfiguration.java b/test/transform/resource/after-ecj/ToStringConfiguration.java
index 8bb99146..ca36d1b4 100644
--- a/test/transform/resource/after-ecj/ToStringConfiguration.java
+++ b/test/transform/resource/after-ecj/ToStringConfiguration.java
@@ -5,10 +5,10 @@ import lombok.Getter;
   ToStringConfiguration() {
     super();
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
     return (("ToStringConfiguration(" + this.x) + ")");
   }
-  public @java.lang.SuppressWarnings("all") int getX() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
     return this.x;
   }
 }
@@ -17,7 +17,7 @@ import lombok.Getter;
   ToStringConfiguration2() {
     super();
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
     return (("ToStringConfiguration2(x=" + this.x) + ")");
   }
 }
@@ -26,10 +26,10 @@ import lombok.Getter;
   ToStringConfiguration3() {
     super();
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
     return (("ToStringConfiguration3(" + this.getX()) + ")");
   }
-  public @java.lang.SuppressWarnings("all") int getX() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
     return this.x;
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/ToStringInner.java b/test/transform/resource/after-ecj/ToStringInner.java
index a8624823..027ccd0c 100644
--- a/test/transform/resource/after-ecj/ToStringInner.java
+++ b/test/transform/resource/after-ecj/ToStringInner.java
@@ -5,7 +5,7 @@ import lombok.ToString;
     ToStringInner() {
       super();
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
       return (("ToStringOuter.ToStringInner(y=" + this.y) + ")");
     }
   }
@@ -14,7 +14,7 @@ import lombok.ToString;
     ToStringStaticInner() {
       super();
     }
-    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
       return (("ToStringOuter.ToStringStaticInner(y=" + this.y) + ")");
     }
   }
@@ -24,7 +24,7 @@ import lombok.ToString;
       ToStringMoreInner() {
         super();
       }
-      public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+      public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
         return (("ToStringOuter.ToStringMiddle.ToStringMoreInner(name=" + this.name) + ")");
       }
     }
@@ -37,7 +37,7 @@ import lombok.ToString;
   ToStringOuter() {
     super();
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
     return (((("ToStringOuter(x=" + this.x) + ", name=") + this.name) + ")");
   }
 }
diff --git a/test/transform/resource/after-ecj/ToStringPlain.java b/test/transform/resource/after-ecj/ToStringPlain.java
index 7c9b47f5..939aa78e 100644
--- a/test/transform/resource/after-ecj/ToStringPlain.java
+++ b/test/transform/resource/after-ecj/ToStringPlain.java
@@ -5,7 +5,7 @@ import lombok.ToString;
   ToString1() {
     super();
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
     return (((("ToString1(x=" + this.x) + ", name=") + this.name) + ")");
   }
 }
@@ -15,7 +15,7 @@ import lombok.ToString;
   ToString2() {
     super();
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
     return (((("ToString2(x=" + this.x) + ", name=") + this.name) + ")");
   }
 }
diff --git a/test/transform/resource/after-ecj/Tolerate.java b/test/transform/resource/after-ecj/Tolerate.java
index b5039a98..1c7b1038 100644
--- a/test/transform/resource/after-ecj/Tolerate.java
+++ b/test/transform/resource/after-ecj/Tolerate.java
@@ -7,10 +7,10 @@ import java.util.regex.Pattern;
   public @lombok.experimental.Tolerate void setPattern(String pattern) {
     setPattern(Pattern.compile(pattern));
   }
-  public @java.lang.SuppressWarnings("all") void setPattern(final Pattern pattern) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") void setPattern(final Pattern pattern) {
     this.pattern = pattern;
   }
-  public @java.lang.SuppressWarnings("all") Pattern getPattern() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Pattern getPattern() {
     return this.pattern;
   }
 }
@@ -22,13 +22,13 @@ import java.util.regex.Pattern;
   public Tolerate2 withPattern(String nameGlob, String extensionGlob) {
     return withPattern(((nameGlob.replace("*", ".*") + "\\.") + extensionGlob.replace("*", ".*")));
   }
-  public @java.lang.SuppressWarnings("all") Pattern getPattern() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Pattern getPattern() {
     return this.pattern;
   }
-  public @java.lang.SuppressWarnings("all") Tolerate2 withPattern(final Pattern pattern) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Tolerate2 withPattern(final Pattern pattern) {
     return ((this.pattern == pattern) ? this : new Tolerate2(pattern));
   }
-  public @java.beans.ConstructorProperties({"pattern"}) @java.lang.SuppressWarnings("all") Tolerate2(final Pattern pattern) {
+  public @java.beans.ConstructorProperties({"pattern"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Tolerate2(final Pattern pattern) {
     super();
     this.pattern = pattern;
   }
diff --git a/test/transform/resource/after-ecj/TrickyTypeResolution.java b/test/transform/resource/after-ecj/TrickyTypeResolution.java
index 4553aaba..5ea802dc 100644
--- a/test/transform/resource/after-ecj/TrickyTypeResolution.java
+++ b/test/transform/resource/after-ecj/TrickyTypeResolution.java
@@ -20,7 +20,7 @@ class TrickySuccess {
   TrickySuccess() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") int getX() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
     return this.x;
   }
 }
diff --git a/test/transform/resource/after-ecj/ValueExperimental.java b/test/transform/resource/after-ecj/ValueExperimental.java
index dd13574a..92deb614 100644
--- a/test/transform/resource/after-ecj/ValueExperimental.java
+++ b/test/transform/resource/after-ecj/ValueExperimental.java
@@ -1,39 +1,39 @@
 import lombok.experimental.Value;
 final @Value class ValueExperimental1 {
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof ValueExperimental1)))
         return false;
     return true;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
     int result = 1;
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
     return "ValueExperimental1()";
   }
-  public @java.lang.SuppressWarnings("all") ValueExperimental1() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ValueExperimental1() {
     super();
   }
 }
 final @lombok.experimental.Value class ValueExperimental2 {
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof ValueExperimental2)))
         return false;
     return true;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
     int result = 1;
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
     return "ValueExperimental2()";
   }
-  public @java.lang.SuppressWarnings("all") ValueExperimental2() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ValueExperimental2() {
     super();
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/ValueExperimentalStarImport.java b/test/transform/resource/after-ecj/ValueExperimentalStarImport.java
index b69e85d9..5b366e04 100644
--- a/test/transform/resource/after-ecj/ValueExperimentalStarImport.java
+++ b/test/transform/resource/after-ecj/ValueExperimentalStarImport.java
@@ -1,20 +1,20 @@
 import lombok.experimental.*;
 final @Value class ValueExperimentalStarImport {
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof ValueExperimentalStarImport)))
         return false;
     return true;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
     int result = 1;
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
     return "ValueExperimentalStarImport()";
   }
-  public @java.lang.SuppressWarnings("all") ValueExperimentalStarImport() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") ValueExperimentalStarImport() {
     super();
   }
 }
diff --git a/test/transform/resource/after-ecj/ValuePlain.java b/test/transform/resource/after-ecj/ValuePlain.java
index 8162ab93..1fd05da8 100644
--- a/test/transform/resource/after-ecj/ValuePlain.java
+++ b/test/transform/resource/after-ecj/ValuePlain.java
@@ -2,18 +2,18 @@ import lombok.Value;
 final @lombok.Value class Value1 {
   private final int x;
   private final String name;
-  public @java.lang.SuppressWarnings("all") int getX() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
     return this.x;
   }
-  public @java.lang.SuppressWarnings("all") String getName() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getName() {
     return this.name;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof Value1)))
         return false;
-    final @java.lang.SuppressWarnings("all") Value1 other = (Value1) o;
+    final Value1 other = (Value1) o;
     if ((this.getX() != other.getX()))
         return false;
     final java.lang.Object this$name = this.getName();
@@ -22,7 +22,7 @@ final @lombok.Value class Value1 {
         return false;
     return true;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.getX());
@@ -30,10 +30,10 @@ final @lombok.Value class Value1 {
     result = ((result * PRIME) + (($name == null) ? 0 : $name.hashCode()));
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
     return (((("Value1(x=" + this.getX()) + ", name=") + this.getName()) + ")");
   }
-  public @java.beans.ConstructorProperties({"x", "name"}) @java.lang.SuppressWarnings("all") Value1(final int x, final String name) {
+  public @java.beans.ConstructorProperties({"x", "name"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Value1(final int x, final String name) {
     super();
     this.x = x;
     this.name = name;
@@ -42,18 +42,18 @@ final @lombok.Value class Value1 {
 @Value @lombok.experimental.NonFinal class Value2 {
   public final int x;
   private final String name;
-  public @java.lang.SuppressWarnings("all") int getX() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
     return this.x;
   }
-  public @java.lang.SuppressWarnings("all") String getName() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getName() {
     return this.name;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof Value2)))
         return false;
-    final @java.lang.SuppressWarnings("all") Value2 other = (Value2) o;
+    final Value2 other = (Value2) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
     if ((this.getX() != other.getX()))
@@ -64,10 +64,10 @@ final @lombok.Value class Value1 {
         return false;
     return true;
   }
-  protected @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
+  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean canEqual(final java.lang.Object other) {
     return (other instanceof Value2);
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.getX());
@@ -75,10 +75,10 @@ final @lombok.Value class Value1 {
     result = ((result * PRIME) + (($name == null) ? 0 : $name.hashCode()));
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
     return (((("Value2(x=" + this.getX()) + ", name=") + this.getName()) + ")");
   }
-  public @java.beans.ConstructorProperties({"x", "name"}) @java.lang.SuppressWarnings("all") Value2(final int x, final String name) {
+  public @java.beans.ConstructorProperties({"x", "name"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Value2(final int x, final String name) {
     super();
     this.x = x;
     this.name = name;
@@ -87,35 +87,35 @@ final @lombok.Value class Value1 {
 final @Value class Value3 {
   private @lombok.experimental.NonFinal int x;
   private final int y;
-  public @java.lang.SuppressWarnings("all") int getX() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getX() {
     return this.x;
   }
-  public @java.lang.SuppressWarnings("all") int getY() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getY() {
     return this.y;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
     if ((! (o instanceof Value3)))
         return false;
-    final @java.lang.SuppressWarnings("all") Value3 other = (Value3) o;
+    final Value3 other = (Value3) o;
     if ((this.getX() != other.getX()))
         return false;
     if ((this.getY() != other.getY()))
         return false;
     return true;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.getX());
     result = ((result * PRIME) + this.getY());
     return result;
   }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
     return (((("Value3(x=" + this.getX()) + ", y=") + this.getY()) + ")");
   }
-  public @java.beans.ConstructorProperties({"x", "y"}) @java.lang.SuppressWarnings("all") Value3(final int x, final int y) {
+  public @java.beans.ConstructorProperties({"x", "y"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Value3(final int x, final int y) {
     super();
     this.x = x;
     this.y = y;
diff --git a/test/transform/resource/after-ecj/WitherAccessLevel.java b/test/transform/resource/after-ecj/WitherAccessLevel.java
index 09a2e514..18b896df 100644
--- a/test/transform/resource/after-ecj/WitherAccessLevel.java
+++ b/test/transform/resource/after-ecj/WitherAccessLevel.java
@@ -9,19 +9,19 @@ class WitherAccessLevel {
   WitherAccessLevel(boolean isNone, boolean isPrivate, boolean isPackage, boolean isProtected, boolean isPublic, boolean value) {
     super();
   }
-  private @java.lang.SuppressWarnings("all") WitherAccessLevel withPrivate(final boolean isPrivate) {
+  private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherAccessLevel withPrivate(final boolean isPrivate) {
     return ((this.isPrivate == isPrivate) ? this : new WitherAccessLevel(this.isNone, isPrivate, this.isPackage, this.isProtected, this.isPublic, this.value));
   }
-  @java.lang.SuppressWarnings("all") WitherAccessLevel withPackage(final boolean isPackage) {
+  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherAccessLevel withPackage(final boolean isPackage) {
     return ((this.isPackage == isPackage) ? this : new WitherAccessLevel(this.isNone, this.isPrivate, isPackage, this.isProtected, this.isPublic, this.value));
   }
-  protected @java.lang.SuppressWarnings("all") WitherAccessLevel withProtected(final boolean isProtected) {
+  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherAccessLevel withProtected(final boolean isProtected) {
     return ((this.isProtected == isProtected) ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, isProtected, this.isPublic, this.value));
   }
-  public @java.lang.SuppressWarnings("all") WitherAccessLevel withPublic(final boolean isPublic) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherAccessLevel withPublic(final boolean isPublic) {
     return ((this.isPublic == isPublic) ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, this.isProtected, isPublic, this.value));
   }
-  public @java.lang.SuppressWarnings("all") WitherAccessLevel withValue(final boolean value) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherAccessLevel withValue(final boolean value) {
     return ((this.value == value) ? this : new WitherAccessLevel(this.isNone, this.isPrivate, this.isPackage, this.isProtected, this.isPublic, value));
   }
 }
diff --git a/test/transform/resource/after-ecj/WitherAlreadyExists.java b/test/transform/resource/after-ecj/WitherAlreadyExists.java
index ded10755..f0186ca3 100644
--- a/test/transform/resource/after-ecj/WitherAlreadyExists.java
+++ b/test/transform/resource/after-ecj/WitherAlreadyExists.java
@@ -37,7 +37,7 @@ class Wither5 {
   Wither5(String foo) {
     super();
   }
-  public @java.lang.SuppressWarnings("all") Wither5 withFoo(final String foo) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Wither5 withFoo(final String foo) {
     return ((this.foo == foo) ? this : new Wither5(foo));
   }
 }
@@ -48,7 +48,7 @@ class Wither6 {
   Wither6(String foo) {
     super();
   }
-  public @java.lang.SuppressWarnings("all") Wither6 withFoo(final String foo) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") Wither6 withFoo(final String foo) {
     return ((this.foo == foo) ? this : new Wither6(foo));
   }
 }
diff --git a/test/transform/resource/after-ecj/WitherAndAllArgsConstructor.java b/test/transform/resource/after-ecj/WitherAndAllArgsConstructor.java
index 091024e2..4443085c 100644
--- a/test/transform/resource/after-ecj/WitherAndAllArgsConstructor.java
+++ b/test/transform/resource/after-ecj/WitherAndAllArgsConstructor.java
@@ -4,13 +4,13 @@
   final int x = 10;
   int y = 20;
   final int z;
-  public @java.lang.SuppressWarnings("all") WitherAndAllArgsConstructor<T, J, L> withTest(final J test) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherAndAllArgsConstructor<T, J, L> withTest(final J test) {
     return ((this.test == test) ? this : new WitherAndAllArgsConstructor<T, J, L>(test, this.test2, this.y, this.z));
   }
-  public @java.lang.SuppressWarnings("all") WitherAndAllArgsConstructor<T, J, L> withTest2(final java.util.List<L> test2) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherAndAllArgsConstructor<T, J, L> withTest2(final java.util.List<L> test2) {
     return ((this.test2 == test2) ? this : new WitherAndAllArgsConstructor<T, J, L>(this.test, test2, this.y, this.z));
   }
-  public @java.beans.ConstructorProperties({"test", "test2", "y", "z"}) @java.lang.SuppressWarnings("all") WitherAndAllArgsConstructor(final J test, final java.util.List<L> test2, final int y, final int z) {
+  public @java.beans.ConstructorProperties({"test", "test2", "y", "z"}) @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherAndAllArgsConstructor(final J test, final java.util.List<L> test2, final int y, final int z) {
     super();
     this.test = test;
     this.test2 = test2;
diff --git a/test/transform/resource/after-ecj/WitherDeprecated.java b/test/transform/resource/after-ecj/WitherDeprecated.java
index b57d0d79..90e5fb88 100644
--- a/test/transform/resource/after-ecj/WitherDeprecated.java
+++ b/test/transform/resource/after-ecj/WitherDeprecated.java
@@ -5,10 +5,10 @@ class WitherDeprecated {
   WitherDeprecated(int annotation, int javadoc) {
     super();
   }
-  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") WitherDeprecated withAnnotation(final int annotation) {
+  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherDeprecated withAnnotation(final int annotation) {
     return ((this.annotation == annotation) ? this : new WitherDeprecated(annotation, this.javadoc));
   }
-  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") WitherDeprecated withJavadoc(final int javadoc) {
+  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherDeprecated withJavadoc(final int javadoc) {
     return ((this.javadoc == javadoc) ? this : new WitherDeprecated(this.annotation, javadoc));
   }
 }
diff --git a/test/transform/resource/after-ecj/WitherOnClass.java b/test/transform/resource/after-ecj/WitherOnClass.java
index 82132e87..1d5414d0 100644
--- a/test/transform/resource/after-ecj/WitherOnClass.java
+++ b/test/transform/resource/after-ecj/WitherOnClass.java
@@ -4,7 +4,7 @@
   WitherOnClass1(boolean isNone, boolean isPublic) {
     super();
   }
-  public @java.lang.SuppressWarnings("all") WitherOnClass1 withPublic(final boolean isPublic) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherOnClass1 withPublic(final boolean isPublic) {
     return ((this.isPublic == isPublic) ? this : new WitherOnClass1(this.isNone, isPublic));
   }
 }
@@ -15,10 +15,10 @@
   WitherOnClass2(boolean isNone, boolean isProtected, boolean isPackage) {
     super();
   }
-  @java.lang.SuppressWarnings("all") WitherOnClass2 withPackage(final boolean isPackage) {
+  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherOnClass2 withPackage(final boolean isPackage) {
     return ((this.isPackage == isPackage) ? this : new WitherOnClass2(this.isNone, this.isProtected, isPackage));
   }
-  protected @java.lang.SuppressWarnings("all") WitherOnClass2 withProtected(final boolean isProtected) {
+  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherOnClass2 withProtected(final boolean isProtected) {
     return ((this.isProtected == isProtected) ? this : new WitherOnClass2(this.isNone, isProtected, this.isPackage));
   }
 }
@@ -28,10 +28,10 @@
   WitherOnClass3(String couldBeNull, String nonNull) {
     super();
   }
-  public @java.lang.SuppressWarnings("all") WitherOnClass3 withCouldBeNull(final String couldBeNull) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherOnClass3 withCouldBeNull(final String couldBeNull) {
     return ((this.couldBeNull == couldBeNull) ? this : new WitherOnClass3(couldBeNull, this.nonNull));
   }
-  public @java.lang.SuppressWarnings("all") WitherOnClass3 withNonNull(final @lombok.NonNull String nonNull) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherOnClass3 withNonNull(final @lombok.NonNull String nonNull) {
     if ((nonNull == null))
         {
           throw new java.lang.NullPointerException("nonNull");
@@ -46,7 +46,7 @@
     super();
     this.fY = y;
   }
-  public @java.lang.SuppressWarnings("all") WitherOnClass4 withY(final int fY) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherOnClass4 withY(final int fY) {
     return ((this.fY == fY) ? this : new WitherOnClass4(fY));
   }
 }
diff --git a/test/transform/resource/after-ecj/WitherPlain.java b/test/transform/resource/after-ecj/WitherPlain.java
index ae1988bc..52177ef1 100644
--- a/test/transform/resource/after-ecj/WitherPlain.java
+++ b/test/transform/resource/after-ecj/WitherPlain.java
@@ -7,10 +7,10 @@ class WitherPlain {
     this.i = i;
     this.foo = foo;
   }
-  public @java.lang.SuppressWarnings("all") WitherPlain withI(final int i) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherPlain withI(final int i) {
     return ((this.i == i) ? this : new WitherPlain(i, this.foo));
   }
-  public @java.lang.SuppressWarnings("all") WitherPlain withFoo(final int foo) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherPlain withFoo(final int foo) {
     return ((this.foo == foo) ? this : new WitherPlain(this.i, foo));
   }
 }
diff --git a/test/transform/resource/after-ecj/WitherWithGenerics.java b/test/transform/resource/after-ecj/WitherWithGenerics.java
index ee73297c..66d8a8f8 100644
--- a/test/transform/resource/after-ecj/WitherWithGenerics.java
+++ b/test/transform/resource/after-ecj/WitherWithGenerics.java
@@ -6,13 +6,13 @@ class WitherWithGenerics<T, J extends T, L extends java.lang.Number> {
   public WitherWithGenerics(J test, java.util.List<L> test2, java.util.List<? extends L> test3) {
     super();
   }
-  public @java.lang.SuppressWarnings("all") WitherWithGenerics<T, J, L> withTest(final J test) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherWithGenerics<T, J, L> withTest(final J test) {
     return ((this.test == test) ? this : new WitherWithGenerics<T, J, L>(test, this.test2, this.test3));
   }
-  public @java.lang.SuppressWarnings("all") WitherWithGenerics<T, J, L> withTest2(final java.util.List<L> test2) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherWithGenerics<T, J, L> withTest2(final java.util.List<L> test2) {
     return ((this.test2 == test2) ? this : new WitherWithGenerics<T, J, L>(this.test, test2, this.test3));
   }
-  public @java.lang.SuppressWarnings("all") WitherWithGenerics<T, J, L> withTest3(final java.util.List<? extends L> test3) {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherWithGenerics<T, J, L> withTest3(final java.util.List<? extends L> test3) {
     return ((this.test3 == test3) ? this : new WitherWithGenerics<T, J, L>(this.test, this.test2, test3));
   }
 }
diff --git a/test/transform/resource/messages-idempotent/NonNullPlain.java.messages b/test/transform/resource/messages-idempotent/NonNullPlain.java.messages
index 1d8c4d9c..0b520462 100644
--- a/test/transform/resource/messages-idempotent/NonNullPlain.java.messages
+++ b/test/transform/resource/messages-idempotent/NonNullPlain.java.messages
@@ -1,3 +1,3 @@
 3 @NonNull is meaningless on a primitive.
-15 @NonNull is meaningless on a primitive.
-37 @NonNull is meaningless on a primitive.
\ No newline at end of file
+16 @NonNull is meaningless on a primitive.
+42 @NonNull is meaningless on a primitive.
\ No newline at end of file