* Added config key ‘lombok.addGeneratedAnnotation’.

* Added ‘format’ directive for tests.
* Updates tests to salt in some more format and config keys.

2 files changed, 39 insertions, 66 deletions

diff --git a/test/transform/resource/after-delombok/BuilderSingularMaps.java b/test/transform/resource/after-delombok/BuilderSingularMaps.java
index 49f555b5..753abfec 100644
--- a/test/transform/resource/after-delombok/BuilderSingularMaps.java
+++ b/test/transform/resource/after-delombok/BuilderSingularMaps.java
@@ -6,32 +6,28 @@ class BuilderSingularMaps<K, V> {
 	@SuppressWarnings("all")
 	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) {
+	@SuppressWarnings("all")
+	BuilderSingularMaps(Map<K, V> women, SortedMap<K, ? extends Number> men, Map rawMap, Map<String, V> stringMap) {
 		this.women = women;
 		this.men = men;
 		this.rawMap = rawMap;
 		this.stringMap = stringMap;
 	}
-	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
+	@SuppressWarnings("all")
 	public static class BuilderSingularMapsBuilder<K, V> {
 		private java.util.ArrayList<K> women$key;
 		private java.util.ArrayList<V> women$value;
 		private java.util.ArrayList<K> men$key;
 		private java.util.ArrayList<Number> men$value;
-		private java.util.ArrayList<java.lang.Object> rawMap$key;
-		private java.util.ArrayList<java.lang.Object> rawMap$value;
+		private java.util.ArrayList<Object> rawMap$key;
+		private java.util.ArrayList<Object> rawMap$value;
 		private java.util.ArrayList<String> stringMap$key;
 		private java.util.ArrayList<V> stringMap$value;
-		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
+		@SuppressWarnings("all")
 		BuilderSingularMapsBuilder() {
 		}
-		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
-		public BuilderSingularMapsBuilder<K, V> woman(final K womanKey, final V womanValue) {
+		@SuppressWarnings("all")
+		public BuilderSingularMapsBuilder<K, V> woman(K womanKey, V womanValue) {
 			if (this.women$key == null) {
 				this.women$key = new java.util.ArrayList<K>();
 				this.women$value = new java.util.ArrayList<V>();
@@ -40,22 +36,20 @@ class BuilderSingularMaps<K, V> {
 			this.women$value.add(womanValue);
 			return this;
 		}
-		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
-		public BuilderSingularMapsBuilder<K, V> women(final java.util.Map<? extends K, ? extends V> women) {
+		@SuppressWarnings("all")
+		public 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>();
 				this.women$value = new java.util.ArrayList<V>();
 			}
-			for (final java.util.Map.Entry<? extends K, ? extends V> $lombokEntry : women.entrySet()) {
+			for (java.util.Map.Entry<? extends K, ? extends V> $lombokEntry : women.entrySet()) {
 				this.women$key.add($lombokEntry.getKey());
 				this.women$value.add($lombokEntry.getValue());
 			}
 			return this;
 		}
-		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
-		public BuilderSingularMapsBuilder<K, V> man(final K manKey, final Number manValue) {
+		@SuppressWarnings("all")
+		public BuilderSingularMapsBuilder<K, V> man(K manKey, Number manValue) {
 			if (this.men$key == null) {
 				this.men$key = new java.util.ArrayList<K>();
 				this.men$value = new java.util.ArrayList<Number>();
@@ -64,46 +58,42 @@ class BuilderSingularMaps<K, V> {
 			this.men$value.add(manValue);
 			return this;
 		}
-		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
-		public BuilderSingularMapsBuilder<K, V> men(final java.util.Map<? extends K, ? extends Number> men) {
+		@SuppressWarnings("all")
+		public 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>();
 				this.men$value = new java.util.ArrayList<Number>();
 			}
-			for (final java.util.Map.Entry<? extends K, ? extends Number> $lombokEntry : men.entrySet()) {
+			for (java.util.Map.Entry<? extends K, ? extends Number> $lombokEntry : men.entrySet()) {
 				this.men$key.add($lombokEntry.getKey());
 				this.men$value.add($lombokEntry.getValue());
 			}
 			return this;
 		}
-		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
-		public BuilderSingularMapsBuilder<K, V> rawMap(final java.lang.Object rawMapKey, final java.lang.Object rawMapValue) {
+		@SuppressWarnings("all")
+		public BuilderSingularMapsBuilder<K, V> rawMap(Object rawMapKey, Object rawMapValue) {
 			if (this.rawMap$key == null) {
-				this.rawMap$key = new java.util.ArrayList<java.lang.Object>();
-				this.rawMap$value = new java.util.ArrayList<java.lang.Object>();
+				this.rawMap$key = new java.util.ArrayList<Object>();
+				this.rawMap$value = new java.util.ArrayList<Object>();
 			}
 			this.rawMap$key.add(rawMapKey);
 			this.rawMap$value.add(rawMapValue);
 			return this;
 		}
-		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
-		public BuilderSingularMapsBuilder<K, V> rawMap(final java.util.Map<?, ?> rawMap) {
+		@SuppressWarnings("all")
+		public BuilderSingularMapsBuilder<K, V> rawMap(java.util.Map<?, ?> rawMap) {
 			if (this.rawMap$key == null) {
-				this.rawMap$key = new java.util.ArrayList<java.lang.Object>();
-				this.rawMap$value = new java.util.ArrayList<java.lang.Object>();
+				this.rawMap$key = new java.util.ArrayList<Object>();
+				this.rawMap$value = new java.util.ArrayList<Object>();
 			}
-			for (final java.util.Map.Entry<?, ?> $lombokEntry : rawMap.entrySet()) {
+			for (java.util.Map.Entry<?, ?> $lombokEntry : rawMap.entrySet()) {
 				this.rawMap$key.add($lombokEntry.getKey());
 				this.rawMap$value.add($lombokEntry.getValue());
 			}
 			return this;
 		}
-		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
-		public BuilderSingularMapsBuilder<K, V> stringMap(final String stringMapKey, final V stringMapValue) {
+		@SuppressWarnings("all")
+		public BuilderSingularMapsBuilder<K, V> stringMap(String stringMapKey, V stringMapValue) {
 			if (this.stringMap$key == null) {
 				this.stringMap$key = new java.util.ArrayList<String>();
 				this.stringMap$value = new java.util.ArrayList<V>();
@@ -112,21 +102,19 @@ class BuilderSingularMaps<K, V> {
 			this.stringMap$value.add(stringMapValue);
 			return this;
 		}
-		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
-		public BuilderSingularMapsBuilder<K, V> stringMap(final java.util.Map<? extends String, ? extends V> stringMap) {
+		@SuppressWarnings("all")
+		public 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>();
 				this.stringMap$value = new java.util.ArrayList<V>();
 			}
-			for (final java.util.Map.Entry<? extends String, ? extends V> $lombokEntry : stringMap.entrySet()) {
+			for (java.util.Map.Entry<? extends String, ? extends V> $lombokEntry : stringMap.entrySet()) {
 				this.stringMap$key.add($lombokEntry.getKey());
 				this.stringMap$value.add($lombokEntry.getValue());
 			}
 			return this;
 		}
-		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
+		@SuppressWarnings("all")
 		public BuilderSingularMaps<K, V> build() {
 			java.util.Map<K, V> women;
 			switch (this.women$key == null ? 0 : this.women$key.size()) {
@@ -137,14 +125,14 @@ class BuilderSingularMaps<K, V> {
 				women = java.util.Collections.singletonMap(this.women$key.get(0), this.women$value.get(0));
 				break;
 			default:
-				women = new java.util.LinkedHashMap<K, V>(this.women$key.size() < 1073741824 ? 1 + this.women$key.size() + (this.women$key.size() - 3) / 3 : java.lang.Integer.MAX_VALUE);
+				women = new java.util.LinkedHashMap<K, V>(this.women$key.size() < 1073741824 ? 1 + this.women$key.size() + (this.women$key.size() - 3) / 3 : Integer.MAX_VALUE);
 				for (int $i = 0; $i < this.women$key.size(); $i++) women.put(this.women$key.get($i), this.women$value.get($i));
 				women = java.util.Collections.unmodifiableMap(women);
 			}
 			java.util.SortedMap<K, Number> men = new java.util.TreeMap<K, Number>();
 			if (this.men$key != null) for (int $i = 0; $i < (this.men$key == null ? 0 : this.men$key.size()); $i++) men.put(this.men$key.get($i), this.men$value.get($i));
 			men = java.util.Collections.unmodifiableSortedMap(men);
-			java.util.Map<java.lang.Object, java.lang.Object> rawMap;
+			java.util.Map<Object, Object> rawMap;
 			switch (this.rawMap$key == null ? 0 : this.rawMap$key.size()) {
 			case 0:
 				rawMap = java.util.Collections.emptyMap();
@@ -153,7 +141,7 @@ class BuilderSingularMaps<K, V> {
 				rawMap = java.util.Collections.singletonMap(this.rawMap$key.get(0), this.rawMap$value.get(0));
 				break;
 			default:
-				rawMap = new java.util.LinkedHashMap<java.lang.Object, java.lang.Object>(this.rawMap$key.size() < 1073741824 ? 1 + this.rawMap$key.size() + (this.rawMap$key.size() - 3) / 3 : java.lang.Integer.MAX_VALUE);
+				rawMap = new java.util.LinkedHashMap<Object, Object>(this.rawMap$key.size() < 1073741824 ? 1 + this.rawMap$key.size() + (this.rawMap$key.size() - 3) / 3 : Integer.MAX_VALUE);
 				for (int $i = 0; $i < this.rawMap$key.size(); $i++) rawMap.put(this.rawMap$key.get($i), this.rawMap$value.get($i));
 				rawMap = java.util.Collections.unmodifiableMap(rawMap);
 			}
@@ -166,21 +154,19 @@ class BuilderSingularMaps<K, V> {
 				stringMap = java.util.Collections.singletonMap(this.stringMap$key.get(0), this.stringMap$value.get(0));
 				break;
 			default:
-				stringMap = new java.util.LinkedHashMap<String, V>(this.stringMap$key.size() < 1073741824 ? 1 + this.stringMap$key.size() + (this.stringMap$key.size() - 3) / 3 : java.lang.Integer.MAX_VALUE);
+				stringMap = new java.util.LinkedHashMap<String, V>(this.stringMap$key.size() < 1073741824 ? 1 + this.stringMap$key.size() + (this.stringMap$key.size() - 3) / 3 : Integer.MAX_VALUE);
 				for (int $i = 0; $i < this.stringMap$key.size(); $i++) stringMap.put(this.stringMap$key.get($i), this.stringMap$value.get($i));
 				stringMap = java.util.Collections.unmodifiableMap(stringMap);
 			}
 			return new BuilderSingularMaps<K, V>(women, men, rawMap, stringMap);
 		}
-		@java.lang.Override
-		@java.lang.SuppressWarnings("all")
-		@javax.annotation.Generated("lombok")
-		public java.lang.String toString() {
+		@Override
+		@SuppressWarnings("all")
+		public String toString() {
 			return "BuilderSingularMaps.BuilderSingularMapsBuilder(women$key=" + this.women$key + ", women$value=" + this.women$value + ", men$key=" + this.men$key + ", men$value=" + this.men$value + ", rawMap$key=" + this.rawMap$key + ", rawMap$value=" + this.rawMap$value + ", stringMap$key=" + this.stringMap$key + ", stringMap$value=" + this.stringMap$value + ")";
 		}
 	}
-	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
+	@SuppressWarnings("all")
 	public static <K, V> BuilderSingularMapsBuilder<K, V> builder() {
 		return new BuilderSingularMapsBuilder<K, V>();
 	}
diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeWithSomeExistingMethods.java b/test/transform/resource/after-delombok/EqualsAndHashCodeWithSomeExistingMethods.java
index 44f61eb4..37eeb8df 100644
--- a/test/transform/resource/after-delombok/EqualsAndHashCodeWithSomeExistingMethods.java
+++ b/test/transform/resource/after-delombok/EqualsAndHashCodeWithSomeExistingMethods.java
@@ -6,13 +6,11 @@ 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 + ")";
 	}
@@ -23,12 +21,10 @@ 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;
@@ -39,7 +35,6 @@ class EqualsAndHashCodeWithSomeExistingMethods2 {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
@@ -48,7 +43,6 @@ class EqualsAndHashCodeWithSomeExistingMethods2 {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "EqualsAndHashCodeWithSomeExistingMethods2(x=" + this.x + ")";
 	}
@@ -62,12 +56,10 @@ 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 + ")";
 	}
@@ -75,13 +67,11 @@ 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;
@@ -91,13 +81,11 @@ 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;
@@ -106,7 +94,6 @@ class EqualsAndHashCodeWithNoExistingMethods {
 	}
 	@java.lang.Override
 	@java.lang.SuppressWarnings("all")
-	@javax.annotation.Generated("lombok")
 	public java.lang.String toString() {
 		return "EqualsAndHashCodeWithNoExistingMethods(x=" + this.x + ")";
 	}